refactor: better organize jobs (#118)

code4romania · Nov 30, 2024 · 5e1b645 · 5e1b645
1 parent 7d610fb
commit 5e1b645
Show file tree

Hide file tree

Showing 28 changed files with 65 additions and 52 deletions.
diff --git a/...ilament/Admin/Resources/ElectionResource/RelationManagers/ScheduledJobRelationManager.php b/...ilament/Admin/Resources/ElectionResource/RelationManagers/ScheduledJobRelationManager.php
@@ -37,7 +37,10 @@ public function form(Form $form): Form
                             ->mapWithKeys(fn (string $job) => [
                                 $job => $job::name(),
                             ]);
-                    }),
+                    })
+                    ->searchable()
+                    ->preload()
+                    ->required(),
 
                 Select::make('cron')
                     ->label(__('app.field.cron'))
@@ -47,23 +50,18 @@ public function form(Form $form): Form
 
                 Fieldset::make('source')
                     ->label('Source')
-                    ->columns(4)
+                    ->columns(2)
                     ->schema([
                         TextInput::make('source_url')
                             ->label(__('app.field.source_url'))
-                            ->columnSpan(3),
-
-                        TextInput::make('source_part')
-                            ->label(__('app.field.source_part')),
+                            ->columnSpanFull(),
 
                         TextInput::make('source_username')
-                            ->label(__('app.field.source_username'))
-                            ->columnSpan(2),
+                            ->label(__('app.field.source_username')),
 
                         TextInput::make('source_password')
                             ->label(__('app.field.source_password'))
-                            ->password()
-                            ->columnSpan(2),
+                            ->password(),
                     ]),
             ]);
     }
@@ -80,7 +78,7 @@ public function table(Table $table): Table
                 TextColumn::make('job')
                     ->label(__('app.field.job'))
                     ->description(fn (string $state) => $state, 'above')
-                    ->formatStateUsing(fn (string $state) => $state::name()),
+                    ->formatStateUsing(fn (string $state) => rescue(fn () => $state::name())),
 
                 TextColumn::make('cron')
                     ->label(__('app.field.cron')),

diff --git a/...uroparl240609/Records/FetchRecordsJob.php → ...eanParliament/Records/FetchRecordsJob.php b/...uroparl240609/Records/FetchRecordsJob.php → ...eanParliament/Records/FetchRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Europarl240609\Records;
+namespace App\Jobs\Y2024\M06\EuropeanParliament\Records;
 
 use App\Jobs\DeleteTemporaryTableData;
 use App\Jobs\PersistTemporaryTableData;
@@ -17,7 +17,7 @@ class FetchRecordsJob extends SchedulableJob
 {
     public static function name(): string
     {
-        return 'Europarlamentare 09.06.2024 / Procese Verbale';
+        return '2024-06-09 / Europarlamentare / Procese Verbale';
     }
 
     public function execute(): void

diff --git a/...240609/Records/ImportAbroadRecordsJob.php → ...iament/Records/ImportAbroadRecordsJob.php b/...240609/Records/ImportAbroadRecordsJob.php → ...iament/Records/ImportAbroadRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Europarl240609\Records;
+namespace App\Jobs\Y2024\M06\EuropeanParliament\Records;
 
 use App\Events\CountryCodeNotFound;
 use App\Exceptions\CountryCodeNotFoundException;

diff --git a/...240609/Records/ImportCountyRecordsJob.php → ...iament/Records/ImportCountyRecordsJob.php b/...240609/Records/ImportCountyRecordsJob.php → ...iament/Records/ImportCountyRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Europarl240609\Records;
+namespace App\Jobs\Y2024\M06\EuropeanParliament\Records;
 
 use App\Exceptions\MissingSourceFileException;
 use App\Models\County;

diff --git a/...oparl240609/Turnouts/FetchTurnoutsJob.php → ...nParliament/Turnouts/FetchTurnoutsJob.php b/...oparl240609/Turnouts/FetchTurnoutsJob.php → ...nParliament/Turnouts/FetchTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Europarl240609\Turnouts;
+namespace App\Jobs\Y2024\M06\EuropeanParliament\Turnouts;
 
 use App\Jobs\DeleteTemporaryTableData;
 use App\Jobs\PersistTemporaryTableData;
@@ -19,7 +19,7 @@ class FetchTurnoutsJob extends SchedulableJob
 {
     public static function name(): string
     {
-        return 'Europarlamentare 09.06.2024 / Prezență';
+        return '2024-06-09 / Europarlamentare / Prezență';
     }
 
     public function execute(): void

diff --git a/...0609/Turnouts/ImportAbroadTurnoutsJob.php → ...ment/Turnouts/ImportAbroadTurnoutsJob.php b/...0609/Turnouts/ImportAbroadTurnoutsJob.php → ...ment/Turnouts/ImportAbroadTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Europarl240609\Turnouts;
+namespace App\Jobs\Y2024\M06\EuropeanParliament\Turnouts;
 
 use App\Events\CountryCodeNotFound;
 use App\Exceptions\CountryCodeNotFoundException;

diff --git a/...0609/Turnouts/ImportCountyTurnoutsJob.php → ...ment/Turnouts/ImportCountyTurnoutsJob.php b/...0609/Turnouts/ImportCountyTurnoutsJob.php → ...ment/Turnouts/ImportCountyTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Europarl240609\Turnouts;
+namespace App\Jobs\Y2024\M06\EuropeanParliament\Turnouts;
 
 use App\Exceptions\MissingSourceFileException;
 use App\Models\County;

diff --git a/...dential241124/Records/FetchRecordsJob.php → ...M11/President/Records/FetchRecordsJob.php b/...dential241124/Records/FetchRecordsJob.php → ...M11/President/Records/FetchRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Presidential241124\Records;
+namespace App\Jobs\Y2024\M11\President\Records;
 
 use App\Jobs\DeleteTemporaryTableData;
 use App\Jobs\PersistTemporaryTableData;
@@ -20,7 +20,7 @@ class FetchRecordsJob extends SchedulableJob
 {
     public static function name(): string
     {
-        return 'Prezidențiale 24.11.2024 / Procese Verbale';
+        return '2024-11-24 / Prezidențiale / Procese Verbale';
     }
 
     public function execute(): void

diff --git a/...241124/Records/ImportAbroadRecordsJob.php → ...sident/Records/ImportAbroadRecordsJob.php b/...241124/Records/ImportAbroadRecordsJob.php → ...sident/Records/ImportAbroadRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Presidential241124\Records;
+namespace App\Jobs\Y2024\M11\President\Records;
 
 use App\Events\CountryCodeNotFound;
 use App\Exceptions\CountryCodeNotFoundException;

diff --git a/...ecords/ImportCorrespondenceRecordsJob.php → ...ecords/ImportCorrespondenceRecordsJob.php b/...ecords/ImportCorrespondenceRecordsJob.php → ...ecords/ImportCorrespondenceRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Presidential241124\Records;
+namespace App\Jobs\Y2024\M11\President\Records;
 
 use App\Events\CountryCodeNotFound;
 use App\Exceptions\CountryCodeNotFoundException;

diff --git a/...241124/Records/ImportCountyRecordsJob.php → ...sident/Records/ImportCountyRecordsJob.php b/...241124/Records/ImportCountyRecordsJob.php → ...sident/Records/ImportCountyRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Presidential241124\Records;
+namespace App\Jobs\Y2024\M11\President\Records;
 
 use App\Exceptions\MissingSourceFileException;
 use App\Models\County;

diff --git a/...are01122024/Turnouts/FetchTurnoutsJob.php → ...1/President/Turnouts/FetchTurnoutsJob.php b/...are01122024/Turnouts/FetchTurnoutsJob.php → ...1/President/Turnouts/FetchTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Parlamentare01122024\Turnouts;
+namespace App\Jobs\Y2024\M11\President\Turnouts;
 
 use App\Jobs\DeleteTemporaryTableData;
 use App\Jobs\PersistTemporaryTableData;
@@ -19,7 +19,7 @@ class FetchTurnoutsJob extends SchedulableJob
 {
     public static function name(): string
     {
-        return 'Parlamentar 01.12.2024 / Prezență';
+        return '2024-11-24 / Prezidențiale / Prezență';
     }
 
     public function execute(): void

diff --git a/...1124/Turnouts/ImportAbroadTurnoutsJob.php → ...dent/Turnouts/ImportAbroadTurnoutsJob.php b/...1124/Turnouts/ImportAbroadTurnoutsJob.php → ...dent/Turnouts/ImportAbroadTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Presidential241124\Turnouts;
+namespace App\Jobs\Y2024\M11\President\Turnouts;
 
 use App\Events\CountryCodeNotFound;
 use App\Exceptions\CountryCodeNotFoundException;

diff --git a/...1124/Turnouts/ImportCountyTurnoutsJob.php → ...dent/Turnouts/ImportCountyTurnoutsJob.php b/...1124/Turnouts/ImportCountyTurnoutsJob.php → ...dent/Turnouts/ImportCountyTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Presidential241124\Turnouts;
+namespace App\Jobs\Y2024\M11\President\Turnouts;
 
 use App\Exceptions\MissingSourceFileException;
 use App\Models\County;

diff --git a/...curesti241124/Records/FetchRecordsJob.php → ...ndumBucuresti/Records/FetchRecordsJob.php b/...curesti241124/Records/FetchRecordsJob.php → ...ndumBucuresti/Records/FetchRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\ReferendumBucuresti241124\Records;
+namespace App\Jobs\Y2024\M11\ReferendumBucuresti\Records;
 
 use App\Jobs\DeleteTemporaryTableData;
 use App\Jobs\PersistTemporaryTableData;
@@ -20,7 +20,7 @@ class FetchRecordsJob extends SchedulableJob
 {
     public static function name(): string
     {
-        return 'Referendum Bucuresti 24.11.2024 / Procese Verbale';
+        return '2024-11-24 / Referendum București / Procese Verbale';
     }
 
     public function execute(): void

diff --git a/...uresti241124/Records/ImportRecordsJob.php → ...dumBucuresti/Records/ImportRecordsJob.php b/...uresti241124/Records/ImportRecordsJob.php → ...dumBucuresti/Records/ImportRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\ReferendumBucuresti241124\Records;
+namespace App\Jobs\Y2024\M11\ReferendumBucuresti\Records;
 
 use App\Exceptions\MissingSourceFileException;
 use App\Models\County;

diff --git a/...resti241124/Turnouts/FetchTurnoutsJob.php → ...umBucuresti/Turnouts/FetchTurnoutsJob.php b/...resti241124/Turnouts/FetchTurnoutsJob.php → ...umBucuresti/Turnouts/FetchTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\ReferendumBucuresti241124\Turnouts;
+namespace App\Jobs\Y2024\M11\ReferendumBucuresti\Turnouts;
 
 use App\Jobs\DeleteTemporaryTableData;
 use App\Jobs\PersistTemporaryTableData;
@@ -19,7 +19,7 @@ class FetchTurnoutsJob extends SchedulableJob
 {
     public static function name(): string
     {
-        return 'Referendum Bucuresti 24.11.2024 / Prezență';
+        return '2024-11-24 / Referendum București / Prezență';
     }
 
     public function execute(): void

diff --git a/...esti241124/Turnouts/ImportTurnoutsJob.php → ...mBucuresti/Turnouts/ImportTurnoutsJob.php b/...esti241124/Turnouts/ImportTurnoutsJob.php → ...mBucuresti/Turnouts/ImportTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\ReferendumBucuresti241124\Turnouts;
+namespace App\Jobs\Y2024\M11\ReferendumBucuresti\Turnouts;
 
 use App\Exceptions\MissingSourceFileException;
 use App\Models\County;

diff --git a/...ntare01122024/Records/FetchRecordsJob.php → ...12/Parliament/Records/FetchRecordsJob.php b/...ntare01122024/Records/FetchRecordsJob.php → ...12/Parliament/Records/FetchRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Parlamentare01122024\Records;
+namespace App\Jobs\Y2024\M12\Parliament\Records;
 
 use App\Jobs\DeleteTemporaryTableData;
 use App\Jobs\PersistTemporaryTableData;
@@ -20,7 +20,7 @@ class FetchRecordsJob extends SchedulableJob
 {
     public static function name(): string
     {
-        return 'Parlamentar 01.12.2024 / Procese Verbale';
+        return '2024-12-01 / Parlamentare / Procese Verbale';
     }
 
     public function execute(): void

diff --git a/...122024/Records/ImportAbroadRecordsJob.php → ...iament/Records/ImportAbroadRecordsJob.php b/...122024/Records/ImportAbroadRecordsJob.php → ...iament/Records/ImportAbroadRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Parlamentare01122024\Records;
+namespace App\Jobs\Y2024\M12\Parliament\Records;
 
 use App\Events\CountryCodeNotFound;
 use App\Exceptions\CountryCodeNotFoundException;

diff --git a/...ecords/ImportCorrespondenceRecordsJob.php → ...ecords/ImportCorrespondenceRecordsJob.php b/...ecords/ImportCorrespondenceRecordsJob.php → ...ecords/ImportCorrespondenceRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Parlamentare01122024\Records;
+namespace App\Jobs\Y2024\M12\Parliament\Records;
 
 use App\Events\CountryCodeNotFound;
 use App\Exceptions\CountryCodeNotFoundException;
@@ -20,7 +20,7 @@ class ImportCorrespondenceRecordsJob extends SchedulableJob
 
     public static function name(): string
     {
-        return 'Parlamentare 06.12.2020/ Procese Verbale Corespondență';
+        return '2024-12-01 / Parlamentare / Procese Verbale Corespondență';
     }
 
     public function execute(): void

diff --git a/...122024/Records/ImportCountyRecordsJob.php → ...iament/Records/ImportCountyRecordsJob.php b/...122024/Records/ImportCountyRecordsJob.php → ...iament/Records/ImportCountyRecordsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Parlamentare01122024\Records;
+namespace App\Jobs\Y2024\M12\Parliament\Records;
 
 use App\Exceptions\MissingSourceFileException;
 use App\Models\County;

diff --git a/...ntial241124/Turnouts/FetchTurnoutsJob.php → .../Parliament/Turnouts/FetchTurnoutsJob.php b/...ntial241124/Turnouts/FetchTurnoutsJob.php → .../Parliament/Turnouts/FetchTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Presidential241124\Turnouts;
+namespace App\Jobs\Y2024\M12\Parliament\Turnouts;
 
 use App\Jobs\DeleteTemporaryTableData;
 use App\Jobs\PersistTemporaryTableData;
@@ -19,7 +19,7 @@ class FetchTurnoutsJob extends SchedulableJob
 {
     public static function name(): string
     {
-        return 'Prezidențiale 24.11.2024 / Prezență';
+        return '2024-12-01 / Parlamentare / Prezență';
     }
 
     public function execute(): void

diff --git a/...2024/Turnouts/ImportAbroadTurnoutsJob.php → ...ment/Turnouts/ImportAbroadTurnoutsJob.php b/...2024/Turnouts/ImportAbroadTurnoutsJob.php → ...ment/Turnouts/ImportAbroadTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Parlamentare01122024\Turnouts;
+namespace App\Jobs\Y2024\M12\Parliament\Turnouts;
 
 use App\Events\CountryCodeNotFound;
 use App\Exceptions\CountryCodeNotFoundException;

diff --git a/...2024/Turnouts/ImportCountyTurnoutsJob.php → ...ment/Turnouts/ImportCountyTurnoutsJob.php b/...2024/Turnouts/ImportCountyTurnoutsJob.php → ...ment/Turnouts/ImportCountyTurnoutsJob.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Jobs\Parlamentare01122024\Turnouts;
+namespace App\Jobs\Y2024\M12\Parliament\Turnouts;
 
 use App\Exceptions\MissingSourceFileException;
 use App\Models\County;

diff --git a/app/Models/ScheduledJob.php b/app/Models/ScheduledJob.php
@@ -35,7 +35,6 @@ class ScheduledJob extends Model
         'job',
         'cron',
         'is_enabled',
-        'source_part',
         'source_url',
         'source_username',
         'source_password',
@@ -86,10 +85,6 @@ public function getPreparedSourceUrl(array $map = []): string
             throw new MissingSourceUrlException;
         }
 
-        $map = array_merge($map, [
-            '{{part}}' => $this->source_part,
-        ]);
-
         $search = array_keys($map);
         $replace = array_values($map);
 

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -121,13 +121,13 @@ protected function resolveSchedule(): void
                 ScheduledJob::query()
                     ->with('election')
                     ->where('is_enabled', true)
-                    ->each(
-                        fn (ScheduledJob $job) => $schedule
+                    ->each(fn (ScheduledJob $job) => rescue(
+                        fn () => $schedule
                             ->job(new $job->job($job))
                             ->cron($job->cron->value)
                             ->withoutOverlapping()
                             ->onOneServer()
-                    );
+                    ));
             } catch (QueryException|MissingAppKeyException $th) {
                 // fix for composer install
             }