Apply domain structure
This commit is contained in:
parent
f03a5c7603
commit
ed93dc3630
149 changed files with 671 additions and 541 deletions
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Jobs\ArticleDiscoveryJob;
|
||||
use App\Models\Feed;
|
||||
use App\Models\Setting;
|
||||
use Domains\Article\Jobs\ArticleDiscoveryJob;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Settings\Models\Setting;
|
||||
use Illuminate\Console\Command;
|
||||
|
||||
class FetchNewArticlesCommand extends Command
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Jobs\SyncChannelPostsJob;
|
||||
use Domains\Platform\Jobs\SyncChannelPostsJob;
|
||||
use Illuminate\Console\Command;
|
||||
|
||||
class SyncChannelPostsCommand extends Command
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Http\Resources\ArticleResource;
|
||||
use App\Models\Article;
|
||||
use App\Models\Setting;
|
||||
use App\Jobs\ArticleDiscoveryJob;
|
||||
use Domains\Article\Resources\ArticleResource;
|
||||
use Domains\Article\Models\Article;
|
||||
use Domains\Settings\Models\Setting;
|
||||
use Domains\Article\Jobs\ArticleDiscoveryJob;
|
||||
use Exception;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Models\User;
|
||||
use Domains\User\Models\User;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Models\Article;
|
||||
use App\Models\Feed;
|
||||
use App\Models\PlatformAccount;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Services\DashboardStatsService;
|
||||
use Domains\Article\Models\Article;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Platform\Models\PlatformAccount;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Article\Services\DashboardStatsService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Http\Requests\StoreFeedRequest;
|
||||
use App\Http\Requests\UpdateFeedRequest;
|
||||
use App\Http\Resources\FeedResource;
|
||||
use App\Models\Feed;
|
||||
use Domains\Feed\Requests\StoreFeedRequest;
|
||||
use Domains\Feed\Requests\UpdateFeedRequest;
|
||||
use Domains\Feed\Resources\FeedResource;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
|
@ -49,8 +49,8 @@ public function store(StoreFeedRequest $request): JsonResponse
|
|||
|
||||
// Map provider to URL and set type
|
||||
$providers = [
|
||||
'vrt' => new \App\Services\Parsers\VrtHomepageParserAdapter(),
|
||||
'belga' => new \App\Services\Parsers\BelgaHomepageParserAdapter(),
|
||||
'vrt' => new \Domains\Article\Parsers\Vrt\VrtHomepageParserAdapter(),
|
||||
'belga' => new \Domains\Article\Parsers\Belga\BelgaHomepageParserAdapter(),
|
||||
];
|
||||
|
||||
$adapter = $providers[$validated['provider']];
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Models\Feed;
|
||||
use App\Models\Keyword;
|
||||
use App\Models\PlatformChannel;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Article\Models\Keyword;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Models\Log;
|
||||
use Domains\Logging\Models\Log;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Http\Requests\StoreFeedRequest;
|
||||
use App\Http\Resources\FeedResource;
|
||||
use App\Http\Resources\PlatformAccountResource;
|
||||
use App\Http\Resources\PlatformChannelResource;
|
||||
use App\Http\Resources\RouteResource;
|
||||
use App\Jobs\ArticleDiscoveryJob;
|
||||
use App\Models\Feed;
|
||||
use App\Models\Language;
|
||||
use App\Models\PlatformAccount;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Models\PlatformInstance;
|
||||
use App\Models\Route;
|
||||
use App\Models\Setting;
|
||||
use App\Services\Auth\LemmyAuthService;
|
||||
use Domains\Feed\Requests\StoreFeedRequest;
|
||||
use Domains\Feed\Resources\FeedResource;
|
||||
use Domains\Platform\Resources\PlatformAccountResource;
|
||||
use Domains\Platform\Resources\PlatformChannelResource;
|
||||
use Domains\Feed\Resources\RouteResource;
|
||||
use Domains\Article\Jobs\ArticleDiscoveryJob;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Settings\Models\Language;
|
||||
use Domains\Platform\Models\PlatformAccount;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Platform\Models\PlatformInstance;
|
||||
use Domains\Feed\Models\Route;
|
||||
use Domains\Settings\Models\Setting;
|
||||
use Domains\Platform\Services\Auth\Authenticators\LemmyAuthService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
|
|
@ -174,7 +174,7 @@ public function createPlatform(Request $request): JsonResponse
|
|||
'Platform account created successfully.'
|
||||
);
|
||||
|
||||
} catch (\App\Exceptions\PlatformAuthException $e) {
|
||||
} catch (\Domains\Platform\Exceptions\PlatformAuthException $e) {
|
||||
// Check if it's a rate limit error
|
||||
if (str_contains($e->getMessage(), 'Rate limited by')) {
|
||||
return $this->sendError($e->getMessage(), [], 429);
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use App\Http\Resources\PlatformAccountResource;
|
||||
use App\Models\PlatformAccount;
|
||||
use App\Models\PlatformInstance;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Platform\Resources\PlatformAccountResource;
|
||||
use Domains\Platform\Models\PlatformAccount;
|
||||
use Domains\Platform\Models\PlatformInstance;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Http\Resources\PlatformChannelResource;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Models\PlatformAccount;
|
||||
use Domains\Platform\Resources\PlatformChannelResource;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Platform\Models\PlatformAccount;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
|
@ -45,7 +45,7 @@ public function store(Request $request): JsonResponse
|
|||
$validated['is_active'] = $validated['is_active'] ?? true;
|
||||
|
||||
// Get the platform instance to check for active accounts
|
||||
$platformInstance = \App\Models\PlatformInstance::findOrFail($validated['platform_instance_id']);
|
||||
$platformInstance = \Domains\Platform\Models\PlatformInstance::findOrFail($validated['platform_instance_id']);
|
||||
|
||||
// Check if there are active platform accounts for this instance
|
||||
$activeAccounts = PlatformAccount::where('instance_url', $platformInstance->url)
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Http\Resources\RouteResource;
|
||||
use App\Models\Feed;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Models\Route;
|
||||
use Domains\Feed\Resources\RouteResource;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Feed\Models\Route;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Models\Setting;
|
||||
use Domains\Settings\Models\Setting;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
namespace App\Providers;
|
||||
|
||||
use App\Enums\LogLevelEnum;
|
||||
use App\Events\ExceptionOccurred;
|
||||
use App\Listeners\LogExceptionToDatabase;
|
||||
use Domains\Logging\Enums\LogLevelEnum;
|
||||
use Domains\Logging\Events\ExceptionOccurred;
|
||||
use Domains\Logging\Listeners\LogExceptionToDatabase;
|
||||
use Error;
|
||||
use Illuminate\Contracts\Debug\ExceptionHandler;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
|
|
@ -26,8 +26,8 @@ public function boot(): void
|
|||
);
|
||||
|
||||
Event::listen(
|
||||
\App\Events\NewArticleFetched::class,
|
||||
\App\Listeners\ValidateArticleListener::class,
|
||||
\Domains\Article\Events\NewArticleFetched::class,
|
||||
\Domains\Article\Listeners\ValidateArticleListener::class,
|
||||
);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
->withExceptions(function (Exceptions $exceptions) {
|
||||
$exceptions->reportable(function (Throwable $e) {
|
||||
$level = match (true) {
|
||||
$e instanceof Error => \App\Enums\LogLevelEnum::CRITICAL,
|
||||
$e instanceof RuntimeException => \App\Enums\LogLevelEnum::ERROR,
|
||||
$e instanceof InvalidArgumentException => \App\Enums\LogLevelEnum::WARNING,
|
||||
default => \App\Enums\LogLevelEnum::ERROR,
|
||||
$e instanceof Error => \Domains\Logging\Enums\LogLevelEnum::CRITICAL,
|
||||
$e instanceof RuntimeException => \Domains\Logging\Enums\LogLevelEnum::ERROR,
|
||||
$e instanceof InvalidArgumentException => \Domains\Logging\Enums\LogLevelEnum::WARNING,
|
||||
default => \Domains\Logging\Enums\LogLevelEnum::ERROR,
|
||||
};
|
||||
|
||||
App\Events\ExceptionOccurred::dispatch(
|
||||
Domains\Logging\Events\ExceptionOccurred::dispatch(
|
||||
$e,
|
||||
$level,
|
||||
$e->getMessage(),
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
"autoload": {
|
||||
"psr-4": {
|
||||
"App\\": "app/",
|
||||
"Database\\Factories\\": "database/factories/",
|
||||
"Domains\\": "src/Domains/",
|
||||
"Database\\Seeders\\": "database/seeders/"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
'providers' => [
|
||||
'users' => [
|
||||
'driver' => 'eloquent',
|
||||
'model' => env('AUTH_MODEL', App\Models\User::class),
|
||||
'model' => env('AUTH_MODEL', Domains\User\Models\User::class),
|
||||
],
|
||||
|
||||
// 'users' => [
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
'type' => 'website',
|
||||
'is_active' => true,
|
||||
'parsers' => [
|
||||
'homepage' => \App\Services\Parsers\VrtHomepageParserAdapter::class,
|
||||
'article' => \App\Services\Parsers\VrtArticleParser::class,
|
||||
'article_page' => \App\Services\Parsers\VrtArticlePageParser::class,
|
||||
'homepage' => \Domains\Article\Parsers\Vrt\VrtHomepageParserAdapter::class,
|
||||
'article' => \Domains\Article\Parsers\Vrt\VrtArticleParser::class,
|
||||
'article_page' => \Domains\Article\Parsers\Vrt\VrtArticlePageParser::class,
|
||||
],
|
||||
],
|
||||
'belga' => [
|
||||
|
|
@ -32,9 +32,9 @@
|
|||
'type' => 'rss',
|
||||
'is_active' => true,
|
||||
'parsers' => [
|
||||
'homepage' => \App\Services\Parsers\BelgaHomepageParserAdapter::class,
|
||||
'article' => \App\Services\Parsers\BelgaArticleParser::class,
|
||||
'article_page' => \App\Services\Parsers\BelgaArticlePageParser::class,
|
||||
'homepage' => \Domains\Article\Parsers\Belga\BelgaHomepageParserAdapter::class,
|
||||
'article' => \Domains\Article\Parsers\Belga\BelgaArticleParser::class,
|
||||
'article_page' => \Domains\Article\Parsers\Belga\BelgaArticlePageParser::class,
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
namespace Database\Seeders;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use App\Models\PlatformInstance;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Platform\Models\PlatformInstance;
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
class PlatformInstanceSeeder extends Seeder
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
namespace Database\Seeders;
|
||||
|
||||
use App\Models\Setting;
|
||||
use Domains\Settings\Models\Setting;
|
||||
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
<source>
|
||||
<include>
|
||||
<directory>app</directory>
|
||||
<directory>src</directory>
|
||||
</include>
|
||||
</source>
|
||||
<php>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
use App\Jobs\ArticleDiscoveryJob;
|
||||
use App\Jobs\PublishNextArticleJob;
|
||||
use App\Jobs\SyncChannelPostsJob;
|
||||
use Domains\Article\Jobs\ArticleDiscoveryJob;
|
||||
use Domains\Platform\Jobs\PublishNextArticleJob;
|
||||
use Domains\Platform\Jobs\SyncChannelPostsJob;
|
||||
use Illuminate\Support\Facades\Schedule;
|
||||
|
||||
Schedule::call(function () {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Contracts;
|
||||
namespace Domains\Article\Contracts;
|
||||
|
||||
interface ArticleParserInterface
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Contracts;
|
||||
namespace Domains\Article\Contracts;
|
||||
|
||||
interface HomepageParserInterface
|
||||
{
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Events;
|
||||
namespace Domains\Article\Events;
|
||||
|
||||
use App\Models\Article;
|
||||
use Domains\Article\Models\Article;
|
||||
use Illuminate\Foundation\Events\Dispatchable;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Events;
|
||||
namespace Domains\Article\Events;
|
||||
|
||||
use App\Models\Article;
|
||||
use Domains\Article\Models\Article;
|
||||
use Illuminate\Broadcasting\InteractsWithSockets;
|
||||
use Illuminate\Foundation\Events\Dispatchable;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
|
@ -1,14 +1,21 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Article\Factories;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
/**
|
||||
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Article>
|
||||
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\Domains\Article\Models\Article>
|
||||
*/
|
||||
class ArticleFactory extends Factory
|
||||
{
|
||||
/**
|
||||
* The name of the factory's corresponding model.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $model = \Domains\Article\Models\Article::class;
|
||||
|
||||
/**
|
||||
* Define the model's default state.
|
||||
*
|
||||
|
|
@ -17,7 +24,7 @@ class ArticleFactory extends Factory
|
|||
public function definition(): array
|
||||
{
|
||||
return [
|
||||
'feed_id' => \App\Models\Feed::factory(),
|
||||
'feed_id' => \Domains\Feed\Models\Feed::factory(),
|
||||
'url' => $this->faker->url(),
|
||||
'title' => $this->faker->sentence(),
|
||||
'description' => $this->faker->paragraph(),
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Article\Factories;
|
||||
|
||||
use App\Models\ArticlePublication;
|
||||
use App\Models\Article;
|
||||
use App\Models\PlatformChannel;
|
||||
use Domains\Article\Models\ArticlePublication;
|
||||
use Domains\Article\Models\Article;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
class ArticlePublicationFactory extends Factory
|
||||
{
|
||||
protected $model = ArticlePublication::class;
|
||||
protected $model = \Domains\Article\Models\ArticlePublication::class;
|
||||
|
||||
public function definition(): array
|
||||
{
|
||||
|
|
@ -1,19 +1,19 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Article\Factories;
|
||||
|
||||
use App\Models\Keyword;
|
||||
use Domains\Article\Models\Keyword;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
class KeywordFactory extends Factory
|
||||
{
|
||||
protected $model = Keyword::class;
|
||||
protected $model = \Domains\Article\Models\Keyword::class;
|
||||
|
||||
public function definition(): array
|
||||
{
|
||||
return [
|
||||
'feed_id' => \App\Models\Feed::factory(),
|
||||
'platform_channel_id' => \App\Models\PlatformChannel::factory(),
|
||||
'feed_id' => \Domains\Feed\Models\Feed::factory(),
|
||||
'platform_channel_id' => \Domains\Platform\Models\PlatformChannel::factory(),
|
||||
'keyword' => $this->faker->word(),
|
||||
'is_active' => $this->faker->boolean(70), // 70% chance of being active
|
||||
'created_at' => $this->faker->dateTimeBetween('-1 year', 'now'),
|
||||
|
|
@ -21,14 +21,14 @@ public function definition(): array
|
|||
];
|
||||
}
|
||||
|
||||
public function forFeed(\App\Models\Feed $feed): static
|
||||
public function forFeed(\Domains\Feed\Models\Feed $feed): static
|
||||
{
|
||||
return $this->state(fn (array $attributes) => [
|
||||
'feed_id' => $feed->id,
|
||||
]);
|
||||
}
|
||||
|
||||
public function forChannel(\App\Models\PlatformChannel $channel): static
|
||||
public function forChannel(\Domains\Platform\Models\PlatformChannel $channel): static
|
||||
{
|
||||
return $this->state(fn (array $attributes) => [
|
||||
'platform_channel_id' => $channel->id,
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
|
||||
namespace App\Jobs;
|
||||
namespace Domains\Article\Jobs;
|
||||
|
||||
use App\Models\Feed;
|
||||
use App\Services\Article\ArticleFetcher;
|
||||
use App\Services\Log\LogSaver;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Article\Services\ArticleFetcher;
|
||||
use Domains\Logging\Services\LogSaver;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Queue\Queueable;
|
||||
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace App\Jobs;
|
||||
namespace Domains\Article\Jobs;
|
||||
|
||||
use App\Models\Setting;
|
||||
use App\Services\Log\LogSaver;
|
||||
use Domains\Settings\Models\Setting;
|
||||
use Domains\Logging\Services\LogSaver;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Queue\Queueable;
|
||||
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Listeners;
|
||||
namespace Domains\Article\Listeners;
|
||||
|
||||
use App\Events\NewArticleFetched;
|
||||
use App\Events\ArticleApproved;
|
||||
use App\Models\Setting;
|
||||
use App\Services\Article\ValidationService;
|
||||
use Domains\Article\Events\NewArticleFetched;
|
||||
use Domains\Article\Events\ArticleApproved;
|
||||
use Domains\Settings\Models\Setting;
|
||||
use Domains\Article\Services\ValidationService;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
|
||||
class ValidateArticleListener implements ShouldQueue
|
||||
|
|
@ -1,10 +1,12 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Article\Models;
|
||||
|
||||
use App\Events\ArticleApproved;
|
||||
use App\Events\NewArticleFetched;
|
||||
use Database\Factories\ArticleFactory;
|
||||
use Domains\Article\Events\ArticleApproved;
|
||||
use Domains\Article\Events\NewArticleFetched;
|
||||
use Domains\Article\Factories\ArticleFactory;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Settings\Models\Setting;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
|
@ -12,9 +14,9 @@
|
|||
use Illuminate\Support\Carbon;
|
||||
|
||||
/**
|
||||
* @method static firstOrCreate(array<string, mixed> $array)
|
||||
* @method static firstOrCreate(array $array)
|
||||
* @method static where(string $string, string $url)
|
||||
* @method static create(array<string, mixed> $array)
|
||||
* @method static create(array $array)
|
||||
* @property integer $id
|
||||
* @property int $feed_id
|
||||
* @property Feed $feed
|
||||
|
|
@ -30,6 +32,11 @@ class Article extends Model
|
|||
/** @use HasFactory<ArticleFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return ArticleFactory::new();
|
||||
}
|
||||
|
||||
protected $fillable = [
|
||||
'feed_id',
|
||||
'url',
|
||||
|
|
@ -101,7 +108,7 @@ public function canBePublished(): bool
|
|||
}
|
||||
|
||||
// If approval system is disabled, auto-approve valid articles
|
||||
if (!\App\Models\Setting::isPublishingApprovalsEnabled()) {
|
||||
if (!Setting::isPublishingApprovalsEnabled()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Article\Models;
|
||||
|
||||
use Database\Factories\ArticlePublicationFactory;
|
||||
use Domains\Article\Factories\ArticlePublicationFactory;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
|
@ -12,13 +12,18 @@
|
|||
* @property integer $platform_channel_id
|
||||
* @property integer $post_id
|
||||
*
|
||||
* @method static create(array<string, mixed> $array)
|
||||
* @method static create(array $array)
|
||||
*/
|
||||
class ArticlePublication extends Model
|
||||
{
|
||||
/** @use HasFactory<ArticlePublicationFactory> */
|
||||
use HasFactory;
|
||||
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return \Domains\Article\Factories\ArticlePublicationFactory::new();
|
||||
}
|
||||
|
||||
protected $fillable = [
|
||||
'article_id',
|
||||
'platform_channel_id',
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Article\Models;
|
||||
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
|
@ -22,6 +24,11 @@ class Keyword extends Model
|
|||
{
|
||||
use HasFactory;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return \Domains\Article\Factories\KeywordFactory::new();
|
||||
}
|
||||
|
||||
protected $fillable = [
|
||||
'feed_id',
|
||||
'platform_channel_id',
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Parsers;
|
||||
namespace Domains\Article\Parsers\Belga;
|
||||
|
||||
class BelgaArticlePageParser
|
||||
{
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Parsers;
|
||||
namespace Domains\Article\Parsers\Belga;
|
||||
|
||||
use App\Contracts\ArticleParserInterface;
|
||||
use Domains\Article\Contracts\ArticleParserInterface;
|
||||
|
||||
class BelgaArticleParser implements ArticleParserInterface
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Parsers;
|
||||
namespace Domains\Article\Parsers\Belga;
|
||||
|
||||
class BelgaHomepageParser
|
||||
{
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Parsers;
|
||||
namespace Domains\Article\Parsers\Belga;
|
||||
|
||||
use App\Contracts\HomepageParserInterface;
|
||||
use Domains\Article\Contracts\HomepageParserInterface;
|
||||
|
||||
class BelgaHomepageParserAdapter implements HomepageParserInterface
|
||||
{
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Factories;
|
||||
namespace Domains\Article\Parsers\Factories;
|
||||
|
||||
use App\Contracts\ArticleParserInterface;
|
||||
use App\Models\Feed;
|
||||
use App\Services\Parsers\VrtArticleParser;
|
||||
use App\Services\Parsers\BelgaArticleParser;
|
||||
use Domains\Article\Contracts\ArticleParserInterface;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Article\Parsers\Vrt\VrtArticleParser;
|
||||
use Domains\Article\Parsers\Belga\BelgaArticleParser;
|
||||
use Exception;
|
||||
|
||||
class ArticleParserFactory
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Factories;
|
||||
namespace Domains\Article\Parsers\Factories;
|
||||
|
||||
use App\Contracts\HomepageParserInterface;
|
||||
use App\Models\Feed;
|
||||
use App\Services\Parsers\VrtHomepageParserAdapter;
|
||||
use App\Services\Parsers\BelgaHomepageParserAdapter;
|
||||
use Domains\Article\Contracts\HomepageParserInterface;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Article\Parsers\Vrt\VrtHomepageParserAdapter;
|
||||
use Domains\Article\Parsers\Belga\BelgaHomepageParserAdapter;
|
||||
use Exception;
|
||||
|
||||
class HomepageParserFactory
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Parsers;
|
||||
namespace Domains\Article\Parsers\Vrt;
|
||||
|
||||
class VrtArticlePageParser
|
||||
{
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Parsers;
|
||||
namespace Domains\Article\Parsers\Vrt;
|
||||
|
||||
use App\Contracts\ArticleParserInterface;
|
||||
use Domains\Article\Contracts\ArticleParserInterface;
|
||||
|
||||
class VrtArticleParser implements ArticleParserInterface
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Parsers;
|
||||
namespace Domains\Article\Parsers\Vrt;
|
||||
|
||||
class VrtHomepageParser
|
||||
{
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Parsers;
|
||||
namespace Domains\Article\Parsers\Vrt;
|
||||
|
||||
use App\Contracts\HomepageParserInterface;
|
||||
use Domains\Article\Contracts\HomepageParserInterface;
|
||||
|
||||
class VrtHomepageParserAdapter implements HomepageParserInterface
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources;
|
||||
namespace Domains\Article\Resources;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources;
|
||||
namespace Domains\Article\Resources;
|
||||
|
||||
use Domains\Feed\Resources\FeedResource;
|
||||
use Domains\Article\Resources\ArticlePublicationResource;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Article;
|
||||
namespace Domains\Article\Services;
|
||||
|
||||
use App\Models\Article;
|
||||
use App\Models\Feed;
|
||||
use App\Services\Http\HttpFetcher;
|
||||
use App\Services\Factories\ArticleParserFactory;
|
||||
use App\Services\Factories\HomepageParserFactory;
|
||||
use App\Services\Log\LogSaver;
|
||||
use Domains\Article\Models\Article;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Shared\Services\HttpFetcher;
|
||||
use Domains\Article\Parsers\Factories\ArticleParserFactory;
|
||||
use Domains\Article\Parsers\Factories\HomepageParserFactory;
|
||||
use Domains\Logging\Services\LogSaver;
|
||||
use Exception;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services;
|
||||
namespace Domains\Article\Services;
|
||||
|
||||
use App\Models\Article;
|
||||
use App\Models\ArticlePublication;
|
||||
use App\Models\Feed;
|
||||
use App\Models\PlatformAccount;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Models\Route;
|
||||
use Domains\Article\Models\Article;
|
||||
use Domains\Article\Models\ArticlePublication;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Platform\Models\PlatformAccount;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Feed\Models\Route;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Article;
|
||||
namespace Domains\Article\Services;
|
||||
|
||||
use App\Models\Article;
|
||||
use Domains\Article\Models\Article;
|
||||
|
||||
class ValidationService
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Exceptions;
|
||||
namespace Domains\Feed\Exceptions;
|
||||
|
||||
use Exception;
|
||||
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace App\Exceptions;
|
||||
namespace Domains\Feed\Exceptions;
|
||||
|
||||
use App\Models\Feed;
|
||||
use App\Models\PlatformChannel;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
|
||||
class RoutingMismatchException extends RoutingException
|
||||
{
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Feed\Factories;
|
||||
|
||||
use App\Models\Feed;
|
||||
use App\Models\Language;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Settings\Models\Language;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
/**
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
*/
|
||||
class FeedFactory extends Factory
|
||||
{
|
||||
protected $model = Feed::class;
|
||||
protected $model = \Domains\Feed\Models\Feed::class;
|
||||
|
||||
public function definition(): array
|
||||
{
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Feed\Factories;
|
||||
|
||||
use App\Models\Route;
|
||||
use App\Models\Feed;
|
||||
use App\Models\PlatformChannel;
|
||||
use Domains\Feed\Models\Route;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
class RouteFactory extends Factory
|
||||
{
|
||||
protected $model = Route::class;
|
||||
protected $model = \Domains\Feed\Models\Route::class;
|
||||
|
||||
public function definition(): array
|
||||
{
|
||||
|
|
@ -1,8 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Feed\Models;
|
||||
|
||||
use Database\Factories\FeedFactory;
|
||||
use Domains\Article\Models\Article;
|
||||
use Domains\Feed\Factories\FeedFactory;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Settings\Models\Language;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
|
@ -32,6 +35,11 @@ class Feed extends Model
|
|||
{
|
||||
/** @use HasFactory<FeedFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return \Domains\Feed\Factories\FeedFactory::new();
|
||||
}
|
||||
private const RECENT_FETCH_THRESHOLD_HOURS = 2;
|
||||
private const DAILY_FETCH_THRESHOLD_HOURS = 24;
|
||||
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Feed\Models;
|
||||
|
||||
use Database\Factories\RouteFactory;
|
||||
use Domains\Article\Models\Keyword;
|
||||
use Domains\Feed\Factories\RouteFactory;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
|
|
@ -21,6 +23,11 @@ class Route extends Model
|
|||
{
|
||||
/** @use HasFactory<RouteFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return \Domains\Feed\Factories\RouteFactory::new();
|
||||
}
|
||||
|
||||
protected $table = 'routes';
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
namespace Domains\Feed\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
namespace Domains\Feed\Requests;
|
||||
|
||||
use App\Models\Feed;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateFeedRequest extends FormRequest
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources;
|
||||
namespace Domains\Feed\Resources;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources;
|
||||
namespace Domains\Feed\Resources;
|
||||
|
||||
use Domains\Feed\Resources\FeedResource;
|
||||
use Domains\Platform\Resources\PlatformChannelResource;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services;
|
||||
namespace Domains\Feed\Services;
|
||||
|
||||
use App\Exceptions\RoutingMismatchException;
|
||||
use App\Models\Feed;
|
||||
use App\Models\PlatformChannel;
|
||||
use Domains\Feed\Exceptions\RoutingMismatchException;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
class RoutingValidationService
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
namespace Domains\Logging\Enums;
|
||||
|
||||
enum LogLevelEnum: string
|
||||
{
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Events;
|
||||
namespace Domains\Logging\Events;
|
||||
|
||||
use App\Models\Log;
|
||||
use Domains\Logging\Models\Log;
|
||||
use Illuminate\Foundation\Events\Dispatchable;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Events;
|
||||
namespace Domains\Logging\Events;
|
||||
|
||||
use App\Enums\LogLevelEnum;
|
||||
use Domains\Logging\Enums\LogLevelEnum;
|
||||
use Illuminate\Foundation\Events\Dispatchable;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
use Throwable;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Facades;
|
||||
namespace Domains\Logging\Facades;
|
||||
|
||||
use Illuminate\Support\Facades\Facade;
|
||||
|
||||
|
|
@ -8,6 +8,6 @@ class LogSaver extends Facade
|
|||
{
|
||||
protected static function getFacadeAccessor()
|
||||
{
|
||||
return \App\Services\Log\LogSaver::class;
|
||||
return \Domains\Logging\Services\LogSaver::class;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Logging\Factories;
|
||||
|
||||
use App\Enums\LogLevelEnum;
|
||||
use App\Models\Log;
|
||||
use Domains\Logging\Enums\LogLevelEnum;
|
||||
use Domains\Logging\Models\Log;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
/**
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
*/
|
||||
class LogFactory extends Factory
|
||||
{
|
||||
protected $model = Log::class;
|
||||
protected $model = \Domains\Logging\Models\Log::class;
|
||||
|
||||
/**
|
||||
* Define the model's default state.
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
|
||||
namespace App\Listeners;
|
||||
namespace Domains\Logging\Listeners;
|
||||
|
||||
use App\Events\ExceptionLogged;
|
||||
use App\Events\ExceptionOccurred;
|
||||
use App\Models\Log;
|
||||
use Domains\Logging\Events\ExceptionLogged;
|
||||
use Domains\Logging\Events\ExceptionOccurred;
|
||||
use Domains\Logging\Models\Log;
|
||||
class LogExceptionToDatabase
|
||||
{
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Logging\Models;
|
||||
|
||||
use App\Enums\LogLevelEnum;
|
||||
use Domains\Logging\Enums\LogLevelEnum;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Carbon;
|
||||
|
|
@ -19,6 +19,11 @@ class Log extends Model
|
|||
{
|
||||
use HasFactory;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return \Domains\Logging\Factories\LogFactory::new();
|
||||
}
|
||||
|
||||
protected $table = 'logs';
|
||||
|
||||
protected $fillable = [
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Log;
|
||||
namespace Domains\Logging\Services;
|
||||
|
||||
use App\Enums\LogLevelEnum;
|
||||
use App\Models\Log;
|
||||
use App\Models\PlatformChannel;
|
||||
use Domains\Logging\Enums\LogLevelEnum;
|
||||
use Domains\Logging\Models\Log;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
|
||||
class LogSaver
|
||||
{
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
|
||||
namespace App\Modules\Lemmy\Services;
|
||||
namespace Domains\Platform\Api\Lemmy;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use App\Models\PlatformChannelPost;
|
||||
use App\Modules\Lemmy\LemmyRequest;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Platform\Models\PlatformChannelPost;
|
||||
use Domains\Platform\Api\Lemmy\LemmyRequest;
|
||||
use Exception;
|
||||
|
||||
class LemmyApiService
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Modules\Lemmy;
|
||||
namespace Domains\Platform\Api\Lemmy;
|
||||
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Http\Client\Response;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
namespace Domains\Platform\Enums;
|
||||
|
||||
enum PlatformEnum: string
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Exceptions;
|
||||
namespace Domains\Platform\Exceptions;
|
||||
|
||||
use Exception;
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Exceptions;
|
||||
namespace Domains\Platform\Exceptions;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Exception;
|
||||
|
||||
class PlatformAuthException extends Exception
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace App\Exceptions;
|
||||
namespace Domains\Platform\Exceptions;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use App\Models\Article;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Article\Models\Article;
|
||||
use Exception;
|
||||
use Throwable;
|
||||
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Platform\Factories;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use App\Models\PlatformAccount;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Platform\Models\PlatformAccount;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
/**
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
*/
|
||||
class PlatformAccountFactory extends Factory
|
||||
{
|
||||
protected $model = PlatformAccount::class;
|
||||
protected $model = \Domains\Platform\Models\PlatformAccount::class;
|
||||
|
||||
public function definition(): array
|
||||
{
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Platform\Factories;
|
||||
|
||||
use App\Models\Language;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Models\PlatformInstance;
|
||||
use Domains\Settings\Models\Language;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Platform\Models\PlatformInstance;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
/**
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
*/
|
||||
class PlatformChannelFactory extends Factory
|
||||
{
|
||||
protected $model = PlatformChannel::class;
|
||||
protected $model = \Domains\Platform\Models\PlatformChannel::class;
|
||||
|
||||
public function definition(): array
|
||||
{
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
<?php
|
||||
|
||||
namespace Domains\Platform\Factories;
|
||||
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Platform\Models\PlatformChannelPost;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
/**
|
||||
* @extends Factory<PlatformChannelPost>
|
||||
*/
|
||||
class PlatformChannelPostFactory extends Factory
|
||||
{
|
||||
protected $model = PlatformChannelPost::class;
|
||||
|
||||
public function definition(): array
|
||||
{
|
||||
return [
|
||||
'platform' => $this->faker->randomElement(PlatformEnum::cases()),
|
||||
'channel_id' => $this->faker->slug(2),
|
||||
'channel_name' => $this->faker->words(2, true),
|
||||
'post_id' => $this->faker->slug(3),
|
||||
'url' => $this->faker->url(),
|
||||
'title' => $this->faker->sentence(),
|
||||
'posted_at' => $this->faker->dateTimeBetween('-1 month', 'now'),
|
||||
];
|
||||
}
|
||||
|
||||
public function lemmy(): static
|
||||
{
|
||||
return $this->state([
|
||||
'platform' => PlatformEnum::LEMMY,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Platform\Factories;
|
||||
|
||||
use App\Models\PlatformInstance;
|
||||
use Domains\Platform\Models\PlatformInstance;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
/**
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
*/
|
||||
class PlatformInstanceFactory extends Factory
|
||||
{
|
||||
protected $model = PlatformInstance::class;
|
||||
protected $model = \Domains\Platform\Models\PlatformInstance::class;
|
||||
|
||||
public function definition(): array
|
||||
{
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Jobs;
|
||||
namespace Domains\Platform\Jobs;
|
||||
|
||||
use App\Exceptions\PublishException;
|
||||
use App\Models\Article;
|
||||
use App\Services\Article\ArticleFetcher;
|
||||
use App\Services\Publishing\ArticlePublishingService;
|
||||
use Domains\Platform\Exceptions\PublishException;
|
||||
use Domains\Article\Models\Article;
|
||||
use Domains\Article\Services\ArticleFetcher;
|
||||
use Domains\Platform\Services\Publishing\ArticlePublishingService;
|
||||
use Illuminate\Contracts\Queue\ShouldBeUnique;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Queue\Queueable;
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
<?php
|
||||
|
||||
namespace App\Jobs;
|
||||
namespace Domains\Platform\Jobs;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use App\Exceptions\PlatformAuthException;
|
||||
use App\Models\PlatformAccount;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Modules\Lemmy\Services\LemmyApiService;
|
||||
use App\Services\Log\LogSaver;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Platform\Exceptions\PlatformAuthException;
|
||||
use Domains\Platform\Models\PlatformAccount;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Platform\Api\Lemmy\LemmyApiService;
|
||||
use Domains\Logging\Services\LogSaver;
|
||||
use Exception;
|
||||
use Illuminate\Contracts\Queue\ShouldBeUnique;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Platform\Models;
|
||||
|
||||
use Database\Factories\PlatformAccountFactory;
|
||||
use Domains\Platform\Factories\PlatformAccountFactory;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Facades\Crypt;
|
||||
use App\Enums\PlatformEnum;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
|
||||
/**
|
||||
* @property int $id
|
||||
|
|
@ -27,13 +27,18 @@
|
|||
* @property Collection<int, PlatformChannel> $activeChannels
|
||||
* @method static where(string $string, PlatformEnum $platform)
|
||||
* @method static orderBy(string $string)
|
||||
* @method static create(array<string, mixed> $validated)
|
||||
* @method static create(array $validated)
|
||||
*/
|
||||
class PlatformAccount extends Model
|
||||
{
|
||||
/** @use HasFactory<PlatformAccountFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return \Domains\Platform\Factories\PlatformAccountFactory::new();
|
||||
}
|
||||
|
||||
protected $fillable = [
|
||||
'platform',
|
||||
'instance_url',
|
||||
|
|
@ -64,12 +69,12 @@ protected function password(): Attribute
|
|||
if (is_null($value)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
// Return empty string if value is empty
|
||||
if (empty($value)) {
|
||||
return '';
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
return Crypt::decryptString($value);
|
||||
} catch (\Exception $e) {
|
||||
|
|
@ -82,12 +87,12 @@ protected function password(): Attribute
|
|||
if (is_null($value)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
// Store empty string as null
|
||||
if (empty($value)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
return Crypt::encryptString($value);
|
||||
},
|
||||
)->withoutObjectCaching();
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Platform\Models;
|
||||
|
||||
use Database\Factories\PlatformChannelFactory;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Platform\Factories\PlatformChannelFactory;
|
||||
use Domains\Settings\Models\Language;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
|
@ -25,6 +27,11 @@ class PlatformChannel extends Model
|
|||
/** @use HasFactory<PlatformChannelFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return \Domains\Platform\Factories\PlatformChannelFactory::new();
|
||||
}
|
||||
|
||||
protected $table = 'platform_channels';
|
||||
|
||||
protected $fillable = [
|
||||
|
|
@ -1,18 +1,24 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Platform\Models;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Platform\Factories\PlatformChannelPostFactory;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
/**
|
||||
* @method static where(string $string, PlatformEnum $platform)
|
||||
* @method static updateOrCreate(array<string, mixed> $array, array<string, mixed> $array1)
|
||||
* @method static updateOrCreate(array $array, array $array1)
|
||||
*/
|
||||
class PlatformChannelPost extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return PlatformChannelPostFactory::new();
|
||||
}
|
||||
protected $fillable = [
|
||||
'platform',
|
||||
'channel_id',
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Platform\Models;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use Database\Factories\PlatformInstanceFactory;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Platform\Factories\PlatformInstanceFactory;
|
||||
use Domains\Settings\Models\Language;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
|
||||
/**
|
||||
* @method static updateOrCreate(array<string, mixed> $array, $instanceData)
|
||||
* @method static updateOrCreate(array $array, $instanceData)
|
||||
* @method static where(string $string, mixed $operator)
|
||||
* @property PlatformEnum $platform
|
||||
* @property string $url
|
||||
|
|
@ -22,7 +23,12 @@ class PlatformInstance extends Model
|
|||
{
|
||||
/** @use HasFactory<PlatformInstanceFactory> */
|
||||
use HasFactory;
|
||||
|
||||
|
||||
protected static function newFactory(): PlatformInstanceFactory
|
||||
{
|
||||
return PlatformInstanceFactory::new();
|
||||
}
|
||||
|
||||
protected $fillable = [
|
||||
'platform',
|
||||
'url',
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources;
|
||||
namespace Domains\Platform\Resources;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
|
@ -1,7 +1,10 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources;
|
||||
namespace Domains\Platform\Resources;
|
||||
|
||||
use Domains\Feed\Resources\RouteResource;
|
||||
use Domains\Platform\Resources\PlatformInstanceResource;
|
||||
use Domains\Platform\Resources\PlatformAccountResource;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources;
|
||||
namespace Domains\Platform\Resources;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Auth;
|
||||
namespace Domains\Platform\Services\Auth\Authenticators;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use App\Exceptions\PlatformAuthException;
|
||||
use App\Models\PlatformAccount;
|
||||
use App\Modules\Lemmy\Services\LemmyApiService;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Platform\Exceptions\PlatformAuthException;
|
||||
use Domains\Platform\Models\PlatformAccount;
|
||||
use Domains\Platform\Api\Lemmy\LemmyApiService;
|
||||
use Exception;
|
||||
|
||||
class LemmyAuthService
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Publishing;
|
||||
namespace Domains\Platform\Services\Publishing;
|
||||
|
||||
use App\Enums\PlatformEnum;
|
||||
use App\Exceptions\PublishException;
|
||||
use App\Models\Article;
|
||||
use App\Models\ArticlePublication;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Models\Route;
|
||||
use App\Modules\Lemmy\Services\LemmyPublisher;
|
||||
use App\Services\Log\LogSaver;
|
||||
use Domains\Platform\Enums\PlatformEnum;
|
||||
use Domains\Platform\Exceptions\PublishException;
|
||||
use Domains\Article\Models\Article;
|
||||
use Domains\Article\Models\ArticlePublication;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Feed\Models\Route;
|
||||
use Domains\Platform\Services\Publishing\Publishers\LemmyPublisher;
|
||||
use Domains\Logging\Services\LogSaver;
|
||||
use Exception;
|
||||
use Illuminate\Database\Eloquent\Collection as EloquentCollection;
|
||||
use Illuminate\Support\Collection;
|
||||
|
|
@ -1,12 +1,13 @@
|
|||
<?php
|
||||
|
||||
namespace App\Modules\Lemmy\Services;
|
||||
namespace Domains\Platform\Services\Publishing\Publishers;
|
||||
|
||||
use App\Exceptions\PlatformAuthException;
|
||||
use App\Models\Article;
|
||||
use App\Models\PlatformAccount;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Services\Auth\LemmyAuthService;
|
||||
use Domains\Platform\Exceptions\PlatformAuthException;
|
||||
use Domains\Article\Models\Article;
|
||||
use Domains\Platform\Models\PlatformAccount;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Platform\Services\Auth\Authenticators\LemmyAuthService;
|
||||
use Domains\Platform\Api\Lemmy\LemmyApiService;
|
||||
use Exception;
|
||||
|
||||
class LemmyPublisher
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Settings\Factories;
|
||||
|
||||
use App\Models\Language;
|
||||
use Domains\Settings\Models\Language;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
/**
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
*/
|
||||
class LanguageFactory extends Factory
|
||||
{
|
||||
protected $model = Language::class;
|
||||
protected $model = \Domains\Settings\Models\Language::class;
|
||||
|
||||
public function definition(): array
|
||||
{
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\Settings\Factories;
|
||||
|
||||
use App\Models\Setting;
|
||||
use Domains\Settings\Models\Setting;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
class SettingFactory extends Factory
|
||||
{
|
||||
protected $model = Setting::class;
|
||||
protected $model = \Domains\Settings\Models\Setting::class;
|
||||
|
||||
public function definition(): array
|
||||
{
|
||||
|
|
@ -1,8 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Settings\Models;
|
||||
|
||||
use Database\Factories\LanguageFactory;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Platform\Models\PlatformInstance;
|
||||
use Domains\Settings\Factories\LanguageFactory;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||
|
|
@ -13,6 +16,11 @@ class Language extends Model
|
|||
/** @use HasFactory<LanguageFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return \Domains\Settings\Factories\LanguageFactory::new();
|
||||
}
|
||||
|
||||
protected $fillable = [
|
||||
'short_code',
|
||||
'name',
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\Settings\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
|
@ -14,6 +14,11 @@ class Setting extends Model
|
|||
{
|
||||
use HasFactory;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return \Domains\Settings\Factories\SettingFactory::new();
|
||||
}
|
||||
|
||||
protected $fillable = ['key', 'value'];
|
||||
|
||||
public static function get(string $key, mixed $default = null): mixed
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services;
|
||||
namespace Domains\Settings\Services;
|
||||
|
||||
use App\Models\Feed;
|
||||
use App\Models\Route;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Models\Setting;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Feed\Models\Route;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Settings\Models\Setting;
|
||||
|
||||
class SystemStatusService
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\Http;
|
||||
namespace Domains\Shared\Services;
|
||||
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Exception;
|
||||
|
|
@ -1,16 +1,23 @@
|
|||
<?php
|
||||
|
||||
namespace Database\Factories;
|
||||
namespace Domains\User\Factories;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
/**
|
||||
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>
|
||||
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\Domains\User\Models\User>
|
||||
*/
|
||||
class UserFactory extends Factory
|
||||
{
|
||||
/**
|
||||
* The name of the factory's corresponding model.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $model = \Domains\User\Models\User::class;
|
||||
|
||||
/**
|
||||
* The current password being used by the factory.
|
||||
*/
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
namespace Domains\User\Models;
|
||||
|
||||
// use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
|
@ -10,9 +10,14 @@
|
|||
|
||||
class User extends Authenticatable
|
||||
{
|
||||
/** @use HasFactory<\Database\Factories\UserFactory> */
|
||||
/** @use HasFactory<\Domains\User\Factories\UserFactory> */
|
||||
use HasFactory, Notifiable, HasApiTokens;
|
||||
|
||||
protected static function newFactory()
|
||||
{
|
||||
return \Domains\User\Factories\UserFactory::new();
|
||||
}
|
||||
|
||||
/**
|
||||
* The attributes that are mass assignable.
|
||||
*
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
namespace Tests\Feature;
|
||||
|
||||
use App\Models\Article;
|
||||
use App\Models\Feed;
|
||||
use App\Models\PlatformAccount;
|
||||
use App\Models\PlatformChannel;
|
||||
use App\Models\Setting;
|
||||
use Domains\Article\Models\Article;
|
||||
use Domains\Feed\Models\Feed;
|
||||
use Domains\Platform\Models\PlatformAccount;
|
||||
use Domains\Platform\Models\PlatformChannel;
|
||||
use Domains\Settings\Models\Setting;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Tests\TestCase;
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue