From 9788070a16c0327adef8d33ac3adedb5cb137701 Mon Sep 17 00:00:00 2001
From: hackerESQ <corey@coreyvarma.com>
Date: Thu, 24 Oct 2024 18:07:25 -0500
Subject: [PATCH] feat:finalize background imports

---
 app/Imports/BackupImport.php                    | 17 +++++------------
 lang/en.json                                    |  2 +-
 lang/es.json                                    |  2 +-
 .../livewire/import-portfolios-field.blade.php  |  2 +-
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/Imports/BackupImport.php b/app/Imports/BackupImport.php
index 64f9f93..3ce5103 100644
--- a/app/Imports/BackupImport.php
+++ b/app/Imports/BackupImport.php
@@ -48,19 +48,12 @@ class BackupImport implements WithMultipleSheets, WithEvents
                 
                 Artisan::queue(RefreshMarketData::class, ['--user' => $this->backupImportModel->user_id, '--force' => true])
                     ->chain([
-                        fn() => Artisan::call(RefreshDividendData::class, ['--user' => $this->backupImportModel->user_id, '--force' => true])
-                    ])
-                    ->chain([
-                        fn() => Artisan::call(SyncHoldingData::class, ['--user' => $this->backupImportModel->user_id])
-                    ])
-                    ->chain([
-                        function() {
+                        fn() => Artisan::call(RefreshDividendData::class, ['--user' => $this->backupImportModel->user_id, '--force' => true]),
+                        fn() => Artisan::call(SyncHoldingData::class, ['--user' => $this->backupImportModel->user_id]),
+                        fn() => User::find($this->backupImportModel->user_id)->portfolios->each(function($portfolio) {
 
-                            User::find($this->backupImportModel->user_id)->portfolios->each(function($portfolio) {
-
-                                Artisan::call(SyncDailyChange::class, ['portfolio_id' => $portfolio->id]);
-                            });
-                        }
+                                    Artisan::queue(SyncDailyChange::class, ['portfolio_id' => $portfolio->id]);
+                                })
                     ]);
             },
             ImportFailed::class => fn(ImportFailed $event) => $this->backupImportModel->update([
diff --git a/lang/en.json b/lang/en.json
index 06bd25e..09d0769 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -370,5 +370,5 @@
     "Importing transactions...": "Importing transactions...", 
     "Importing daily changes...": "Importing daily changes...", 
     "Import completed successfully!": "Import completed successfully!",
-    "Your import will continue in the background.": "Your import will continue in the background."
+    "Your import will continue in the background": "Your import will continue in the background"
 }
\ No newline at end of file
diff --git a/lang/es.json b/lang/es.json
index 275982f..5c1af46 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -370,5 +370,5 @@
     "Importing transactions...": "Importando transacciones...",
     "Importing daily changes...": "Importando cambios diarios...",
     "Import completed successfully!": "¡La importación se completó con éxito!",
-    "Your import will continue in the background.": "La importación continuará en segundo plano."
+    "Your import will continue in the background": "La importación continuará en segundo plano"
 }
\ No newline at end of file
diff --git a/resources/views/livewire/import-portfolios-field.blade.php b/resources/views/livewire/import-portfolios-field.blade.php
index bde3590..96ae9a7 100644
--- a/resources/views/livewire/import-portfolios-field.blade.php
+++ b/resources/views/livewire/import-portfolios-field.blade.php
@@ -123,7 +123,7 @@ new class extends Component {
 
                     <x-button wire:click="$toggle('importStatusDialog')"> {{ __('Try again') }} </x-button>
                 @else
-                    <div wire:poll="checkImportStatus" class="text-gray-400 text-sm">{{ __('Your import will continue in the background.') }}</div>
+                    <div wire:poll="checkImportStatus" class="text-gray-400 text-sm">{{ __('Your import will continue in the background') }}</div>
                     <x-ib-flex-spacer />
                     <x-button wire:click="$toggle('importStatusDialog')"> {{ __('Close') }} </x-button>
                 @endif