feat(notifications): add real-time notifications to imports

resources/lang/en/countries.php

@@ -68,4 +68,22 @@
             'helper' => 'Numeric code (ISO-3166)',
         ],
     ],
+
+    'import' => [
+        'action_label' => 'Import Countries',
+        'modal_heading' => 'Import Countries',
+        'success_title' => 'Import Countries',
+        'success_message' => 'The import countries job has been queued.',
+    ],
+
+    'notifications' => [
+        'success' => [
+            'title' => 'Countries Import Completed',
+            'message' => 'All countries have been successfully imported and updated.',
+        ],
+        'failed' => [
+            'title' => 'Countries Import Failed',
+            'message' => 'Failed to import countries data.',
+        ],
+    ],
 ];

resources/lang/en/posts.php

@@ -75,4 +75,15 @@
             'HR' => 'Croatia',
         ],
     ],
-];
+
+    'notifications' => [
+        'success' => [
+            'title' => 'Posts Import Completed',
+            'message' => 'Postal data for :country has been successfully imported.',
+        ],
+        'failed' => [
+            'title' => 'Posts Import Failed',
+            'message' => 'Failed to import postal data for :country.',
+        ],
+    ],
+];

resources/lang/hr/countries.php

@@ -68,4 +68,22 @@
             'helper' => 'Numerička oznaka (ISO-3166)',
         ],
     ],
+
+    'import' => [
+        'action_label' => 'Uvezi države',
+        'modal_heading' => 'Uvoz država',
+        'success_title' => 'Uvoz država',
+        'success_message' => 'Zadatak za uvoz država je dodan u red čekanja.',
+    ],
+
+    'notifications' => [
+        'success' => [
+            'title' => 'Uvoz država završen',
+            'message' => 'Sve države su uspješno uvežene i ažurirane.',
+        ],
+        'failed' => [
+            'title' => 'Uvoz država neuspješan',
+            'message' => 'Neuspješan uvoz podataka država.',
+        ],
+    ],
 ];

resources/lang/hr/posts.php

@@ -75,4 +75,15 @@
             'HR' => 'Hrvatska',
         ],
     ],
-];
+
+    'notifications' => [
+        'success' => [
+            'title' => 'Uvoz pošta završen',
+            'message' => 'Poštanski podaci za :country su uspješno uveženi.',
+        ],
+        'failed' => [
+            'title' => 'Uvoz pošta neuspješan',
+            'message' => 'Neuspješan uvoz poštanskih podataka za :country.',
+        ],
+    ],
+];

resources/lang/sl/countries.php

@@ -68,4 +68,22 @@
             'helper' => 'Numerična šifra (ISO-3166)',
         ],
     ],
+
+    'import' => [
+        'action_label' => 'Uvozi države',
+        'modal_heading' => 'Uvoz držav',
+        'success_title' => 'Uvoz držav',
+        'success_message' => 'Naloga za uvoz držav je bila dodana v čakalno vrsto.',
+    ],
+
+    'notifications' => [
+        'success' => [
+            'title' => 'Uvoz držav uspešno končan',
+            'message' => 'Vse države so bile uspešno uvožene in posodobljene.',
+        ],
+        'failed' => [
+            'title' => 'Uvoz držav neuspešen',
+            'message' => 'Uvoz podatkov držav ni uspel.',
+        ],
+    ],
 ];

resources/lang/sl/posts.php

@@ -75,4 +75,15 @@
             'HR' => 'Hrvaška',
         ],
     ],
-];
+
+    'notifications' => [
+        'success' => [
+            'title' => 'Uvoz pošt uspešno končan',
+            'message' => 'Poštni podatki za :country so bili uspešno uvoženi.',
+        ],
+        'failed' => [
+            'title' => 'Uvoz pošt neuspešen',
+            'message' => 'Uvoz poštnih podatkov za :country ni uspel.',
+        ],
+    ],
+];

resources/lang/sr/countries.php

@@ -68,4 +68,22 @@
             'helper' => 'Numerička oznaka (ISO-3166)',
         ],
     ],
+
+    'import' => [
+        'action_label' => 'Uvezi države',
+        'modal_heading' => 'Uvoz država',
+        'success_title' => 'Uvoz država',
+        'success_message' => 'Zadatak za uvoz država je dodat u red čekanja.',
+    ],
+
+    'notifications' => [
+        'success' => [
+            'title' => 'Uvoz država završen',
+            'message' => 'Sve države su uspešno uvežene i ažurirane.',
+        ],
+        'failed' => [
+            'title' => 'Uvoz država neuspešan',
+            'message' => 'Neuspešan uvoz podataka država.',
+        ],
+    ],
 ];

resources/lang/sr/posts.php

@@ -75,4 +75,15 @@
             'HR' => 'Hrvatska',
         ],
     ],
-];
+
+    'notifications' => [
+        'success' => [
+            'title' => 'Uvoz pošta završen',
+            'message' => 'Poštanski podaci za :country su uspešno uveženi.',
+        ],
+        'failed' => [
+            'title' => 'Uvoz pošta neuspešan',
+            'message' => 'Neuspešan uvoz poštanskih podataka za :country.',
+        ],
+    ],
+];

src/Console/Commands/ImportCommand.php

@@ -4,6 +4,7 @@
 
 use Eclipse\World\Jobs\ImportCountries;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\App;
 
 class ImportCommand extends Command
 {
@@ -16,7 +17,7 @@ public function handle(): void
         $this->info('Import command started');
 
         // Run ImportCountries job
-        ImportCountries::dispatchSync();
+        ImportCountries::dispatchSync(auth()->id(), App::getLocale());
 
         $this->info('Import command ran successfully');
     }

src/Console/Commands/ImportPostsCommand.php

@@ -4,6 +4,7 @@
 
 use Eclipse\World\Jobs\ImportPosts;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\App;
 
 class ImportPostsCommand extends Command
 {
@@ -28,19 +29,18 @@ public function handle(): int
     {
         $country = strtoupper($this->argument('country'));
 
-        if (! in_array($country, ['SI', 'HR'])) {
+        if (!in_array($country, ['SI', 'HR'])) {
             $this->error('Invalid country code. Only SI and HR are supported.');
-
             return self::FAILURE;
         }
 
         $this->info("Dispatching import job for country: {$country}");
 
-        ImportPosts::dispatch($country);
+        ImportPosts::dispatch($country, auth()->id(), App::getLocale());
 
         $this->info('Import job has been queued successfully!');
         $this->comment('The import will run in the background. Check the logs for progress.');
 
         return self::SUCCESS;
     }
-}
+}

src/Filament/Clusters/World/Resources/CountryResource/Pages/ListCountries.php

@@ -8,6 +8,7 @@
 use Filament\Actions\CreateAction;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
+use Illuminate\Support\Facades\App;
 
 class ListCountries extends ListRecords
 {
@@ -24,7 +25,7 @@ protected function getHeaderActions(): array
                 ->icon('heroicon-o-arrow-down-tray')
                 ->action(function () {
                     // Dispatch the job
-                    ImportCountries::dispatch();
+                    ImportCountries::dispatch(auth()->id(), App::getLocale());
 
                     // Show notification
                     Notification::make()

src/Filament/Clusters/World/Resources/PostResource.php

@@ -20,8 +20,8 @@
 use Filament\Tables\Actions\RestoreAction;
 use Filament\Tables\Actions\RestoreBulkAction;
 use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Filters\TrashedFilter;
+use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
@@ -76,7 +76,7 @@ public static function table(Table $table): Table
             ->columns([
                 TextColumn::make('country.name')
                     ->label(__('eclipse-world::posts.table.country.label'))
-                    ->formatStateUsing(fn (string $state, Post $record) => trim("{$record->country->flag} {$state}"))
+                    ->formatStateUsing(fn(string $state, Post $record) => trim("{$record->country->flag} {$state}"))
                     ->searchable()
                     ->sortable(),
 
@@ -110,7 +110,7 @@ public static function table(Table $table): Table
                     ForceDeleteAction::make()
                         ->label(__('eclipse-world::posts.actions.force_delete.label'))
                         ->modalHeading(__('eclipse-world::posts.actions.force_delete.heading'))
-                        ->modalDescription(fn (Post $record): string => __('eclipse-world::posts.actions.force_delete.description', [
+                        ->modalDescription(fn(Post $record): string => __('eclipse-world::posts.actions.force_delete.description', [
                             'name' => $record->name,
                         ])),
                 ]),

src/Filament/Clusters/World/Resources/PostResource/Pages/ListPosts.php

@@ -9,6 +9,7 @@
 use Filament\Forms\Components\Select;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
+use Illuminate\Support\Facades\App;
 
 class ListPosts extends ListRecords
 {
@@ -36,14 +37,14 @@ protected function getHeaderActions(): array
                 ])
                 ->modalHeading(__('eclipse-world::posts.import.modal_heading'))
                 ->action(function (array $data) {
-                    // Dispatch the job with selected country
-                    ImportPosts::dispatch($data['country_id']);
+                    // Dispatch the job
+                    ImportPosts::dispatch($data['country_id'], auth()->id(), App::getLocale());
 
                     // Show notification
                     Notification::make()
                         ->title(__('eclipse-world::posts.import.success_title'))
                         ->body(__('eclipse-world::posts.import.success_message', [
-                            'country' => __('eclipse-world::posts.import.countries.'.$data['country_id']),
+                            'country' => __('eclipse-world::posts.import.countries.' . $data['country_id'])
                         ]))
                         ->success()
                         ->send();

src/Jobs/ImportCountries.php

@@ -3,11 +3,15 @@
 namespace Eclipse\World\Jobs;
 
 use Eclipse\World\Models\Country;
+use Eclipse\Core\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use App\Notifications\ImportFinishedNotification;
+use Exception;
+use Illuminate\Support\Facades\Log;
 
 class ImportCountries implements ShouldQueue
 {
@@ -17,32 +21,64 @@ class ImportCountries implements ShouldQueue
 
     public bool $failOnTimeout = true;
 
+    public ?int $userId;
+    public string $locale;
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(?int $userId, string $locale = 'en')
+    {
+        $this->userId = $userId;
+        $this->locale = $locale;
+    }
+
     public function handle(): void
     {
-        // Load existing countries into an associative array
-        $existingCountries = Country::withTrashed()->get()->keyBy('id');
+        Log::info("Starting countries import");
+
+        $user = $this->userId ? User::find($this->userId) : null;
+
+        try {
+            // Load existing countries into an associative array
+            $existingCountries = Country::withTrashed()->get()->keyBy('id');
 
-        // Load new country data
-        $countries = json_decode(file_get_contents('https://raw.githubusercontent.com/mledoze/countries/master/dist/countries.json'), true);
+            // Load new country data
+            $countries = json_decode(file_get_contents('https://raw.githubusercontent.com/mledoze/countries/master/dist/countries.json'), true);
 
-        foreach ($countries as $rawData) {
-            if (! $rawData['independent']) {
-                continue;
+            if (!$countries) {
+                throw new Exception('Failed to fetch or parse countries data');
             }
 
-            $data = [
-                'id' => $rawData['cca2'],
-                'a3_id' => $rawData['cca3'],
-                'num_code' => $rawData['ccn3'],
-                'name' => $rawData['name']['common'],
-                'flag' => $rawData['flag'],
-            ];
-
-            if (isset($existingCountries[$data['id']])) {
-                $existingCountries[$data['id']]->update($data);
-            } else {
-                Country::create($data);
+            foreach ($countries as $rawData) {
+                if (! $rawData['independent']) {
+                    continue;
+                }
+
+                $data = [
+                    'id' => $rawData['cca2'],
+                    'a3_id' => $rawData['cca3'],
+                    'num_code' => $rawData['ccn3'],
+                    'name' => $rawData['name']['common'],
+                    'flag' => $rawData['flag'],
+                ];
+
+                if (isset($existingCountries[$data['id']])) {
+                    $existingCountries[$data['id']]->update($data);
+                } else {
+                    Country::create($data);
+                }
+            }
+
+            Log::info("Countries import completed");
+            if ($user) {
+                $user->notify(new ImportFinishedNotification('success', 'countries', null, $this->locale));
+            }
+        } catch (Exception $e) {
+            Log::error("Countries import failed: " . $e->getMessage());
+            if ($user) {
+                $user->notify(new ImportFinishedNotification('failed', 'countries', null, $this->locale));
             }
+            throw $e;
         }
     }
 }