From 0f04cec17076d380178a5f7ee265eada3a62764c Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 01:53:14 +0800 Subject: [PATCH 01/15] Laravel Vapor - Deployment day to production, Update production domain 1 --- vapor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vapor.yml b/vapor.yml index b3eee585..31881bd3 100644 --- a/vapor.yml +++ b/vapor.yml @@ -2,7 +2,9 @@ id: 52493 name: shipping-portal environments: production: - domain: production.portal.izyim.com + domain: + - production.portal.izyim.com + - izyim.cief-malaysia.com memory: 1024 cli-memory: 512 queues: From 28dd444c0a9650c71b6c66cf634ed554a5f2a94a Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 02:53:05 +0800 Subject: [PATCH 02/15] Laravel Vapor - Deployment day to production, Update production domain 2 --- vapor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vapor.yml b/vapor.yml index 31881bd3..0971418e 100644 --- a/vapor.yml +++ b/vapor.yml @@ -5,6 +5,7 @@ environments: domain: - production.portal.izyim.com - izyim.cief-malaysia.com + - portal.izyim.com memory: 1024 cli-memory: 512 queues: From 78b36dab9d793234f5273b174b49b65f0339f936 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 03:17:26 +0800 Subject: [PATCH 03/15] Laravel Vapor - Deployment day to production, Fix some undetected merge conflict --- .../Processors/CheckStorageInvoiceTransactionProcessor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php index e3a09e90..b31505a5 100644 --- a/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php @@ -206,7 +206,7 @@ class CheckStorageInvoiceTransactionProcessor $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded; $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00')); - LogHelper::channel('storage_invoices')->info('storageInvoice: '.json_encode($storageInvoice).', $transaction->status: '.$transaction->status); + LogHelper::channel('storage_invoices')->info('dateToCompare: '.json_encode($dateToCompare)); if(!$storageInvoice && $resultNumberOfDaysExceeded > 0 && $transaction->status != ApprovalStatus::COMPLETED){ LogHelper::channel('storage_invoices')->info('Created $transaction->id: '.$transaction->id); $billNumber = $this->generatesTransactionBillNumber->execute('STOR-'); @@ -232,7 +232,7 @@ class CheckStorageInvoiceTransactionProcessor $paymentStorageTransaction = $storageInvoice->transactions()->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', ApprovalStatus::APPROVED)->first(); if($paymentStorageTransaction){ $dateStorageInvoicePaid = $paymentStorageTransaction->created_at->copy()->addDay()->startOfDay(); - LogHelper::channel('storage_invoices')->info('dateStorageInvoicePaid: '.$dateStorageInvoicePaid.', resultCurrentDate: '.$resultCurrentDate); + LogHelper::channel('storage_invoices')->info('dateStorageInvoicePaid: '.$dateStorageInvoicePaid.', resultCurrentDate: '.$dt2->format('Y-m-d H:i:s')); $intervalRecalculate = Carbon::parse($dateStorageInvoicePaid)->diff($dt1); $resultNumberOfDaysExceeded = $intervalRecalculate->days - $resultNumberOfDaysFree; $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded; From a8cac0a1212ec54a6c01daa27fdd2be05635a66e Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 03:36:15 +0800 Subject: [PATCH 04/15] Laravel Vapor - Deployment day to production, enable YD API query for a full run --- .../Commands/V2/ProcessYDPortalDataV2Command.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index f00eefb1..79680c46 100644 --- a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php +++ b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php @@ -43,9 +43,9 @@ class ProcessYDPortalDataV2Command extends Command { $jobs = []; $jobs = array_merge($jobs, $this->fetchPackingListsFromYdPortalV2CommandJobs()); - // $jobs = array_merge($jobs, $this->fetchContainersFromYdPortalV2CommandJobs()); - // $jobs = array_merge($jobs, $this->fetchContainersUpdatesFromYdPortalV2CommandJob()); - // $jobs = array_merge($jobs, $this->fetchDeliveryUpdatesFromYdPortalV2CommandJobs()); + $jobs = array_merge($jobs, $this->fetchContainersFromYdPortalV2CommandJobs()); + $jobs = array_merge($jobs, $this->fetchContainersUpdatesFromYdPortalV2CommandJob()); + $jobs = array_merge($jobs, $this->fetchDeliveryUpdatesFromYdPortalV2CommandJobs()); // The following job is intentionally excluded ////$jobs = array_merge($jobs, $this->fetchOrderListsFromYdPortalV2CommandJob()); @@ -72,9 +72,9 @@ class ProcessYDPortalDataV2Command extends Command $count = 0; for ($x = $from; $x <= $to; $x++) { - if ($count >= 2) { - break; - } + // if ($count >= 2) { + // break; + // } $startDate = Carbon::today()->subDays($x); $startLimit = Carbon::parse('01-12-2021'); From d93ee2462cef545c3fecbe2bc7950907f5f82eaa Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 04:04:21 +0800 Subject: [PATCH 05/15] Laravel Vapor - Deployment day to production, enable YD API query for a full run --- .../Processors/V2/FetchContainersFromYdPortalV2Processor.php | 2 +- .../V2/FetchContainersUpdatesFromYdPortalV2Processor.php | 2 +- .../V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersFromYdPortalV2Processor.php b/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersFromYdPortalV2Processor.php index 24ba2946..a93e9476 100644 --- a/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersFromYdPortalV2Processor.php +++ b/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersFromYdPortalV2Processor.php @@ -97,7 +97,7 @@ class FetchContainersFromYdPortalV2Processor public function execute(PackingList $packingList) { Log::info('FetchContainersFromYdPortalV2Processor starts with packingList id '. $packingList->id); - return; + // return; $time_start = microtime(true); diff --git a/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersUpdatesFromYdPortalV2Processor.php b/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersUpdatesFromYdPortalV2Processor.php index dae8eb1b..680bc63d 100644 --- a/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersUpdatesFromYdPortalV2Processor.php +++ b/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersUpdatesFromYdPortalV2Processor.php @@ -56,7 +56,7 @@ class FetchContainersUpdatesFromYdPortalV2Processor public function execute(Container $container) { Log::info('FetchContainersUpdatesFromYdPortalV2Processor starts with container id ' . $container->id); - return; + // return; $time_start = microtime(true); diff --git a/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php b/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php index 8fb9ad5a..980b41fb 100644 --- a/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php +++ b/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php @@ -65,7 +65,7 @@ class FetchDeliveryUpdatesFromYdPortalV2Processor $packingList = PackingList::where('id', $packingListId)->first(); Log::info('FetchDeliveryUpdatesFromYdPortalV2Processor starts with packingList id ' . json_encode($packingList) ); - return; + // return; if(!$packingList->reference) return; $time_start = microtime(true); From e933470c17514945a39ea890d3f2d53b4f136d00 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 04:52:46 +0800 Subject: [PATCH 06/15] Laravel Vapor - Deployment day to production, solve an error in YD API query --- .../V2/ProcessYDPortalDataV2Command.php | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index 79680c46..ee76ad07 100644 --- a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php +++ b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php @@ -136,15 +136,22 @@ class ProcessYDPortalDataV2Command extends Command })->doesntHave('transports')->get()->reverse(); $count = 0; - foreach ($packingLists->chunk(50) as $chunk) { - foreach ($chunk as $packingList){ - // $processor = app(FetchDeliveryUpdatesFromYdPortalV2Processor::class); - // $processor->execute($packingList); - $jobs[] = new FetchDeliveryUpdatesFromYdPortalV2CommandJob($packingList->id); - Log::info('Dispatched FetchDeliveryUpdatesFromYdPortalV2CommandJob for packingList with id ' . $packingList->id); - $count++; + foreach ($packingLists as $packingList) { + if ($count >= 1000) { + break; } + + // foreach ($packingLists->chunk(50) as $chunk) { + // foreach ($chunk as $packingList){ + // $processor = app(FetchDeliveryUpdatesFromYdPortalV2Processor::class); + // $processor->execute($packingList); + $jobs[] = new FetchDeliveryUpdatesFromYdPortalV2CommandJob($packingList->id); + Log::info('Dispatched FetchDeliveryUpdatesFromYdPortalV2CommandJob for packingList with id ' . $packingList->id); + $count++; + // } + // } } + Log::info('Total FetchDeliveryUpdatesFromYdPortalV2CommandJob count($packingLists): ' . count($packingLists)); Log::info('Total FetchDeliveryUpdatesFromYdPortalV2CommandJob dispatched: ' . $count); return $jobs; From b117730619a5010d51f89f4c1fd669fb4ccddab4 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 05:17:01 +0800 Subject: [PATCH 07/15] Laravel Vapor - Deployment day to production, solve an error in YD API query --- .../YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php | 8 ++++---- .../V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php | 6 +++--- app/Console/Commands/V2/ProcessYDPortalDataV2Command.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Classes/Jobs/Commands/V2/YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php b/app/Classes/Jobs/Commands/V2/YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php index 6498f933..936ba679 100644 --- a/app/Classes/Jobs/Commands/V2/YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php @@ -20,17 +20,17 @@ class FetchDeliveryUpdatesFromYdPortalV2CommandJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - protected $packingListId; + protected $packingList; - public function __construct(int $packingListId) + public function __construct(PackingList $packingList) { - $this->packingListId = $packingListId; + $this->packingList = $packingList; } public function handle() { Log::info('Processing FetchDeliveryUpdatesFromYdPortalV2CommandJob'); $processor = app(FetchDeliveryUpdatesFromYdPortalV2Processor::class); - $processor->execute($this->packingListId); + $processor->execute($this->packingList); } } diff --git a/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php b/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php index 980b41fb..35635bcf 100644 --- a/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php +++ b/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php @@ -55,14 +55,14 @@ class FetchDeliveryUpdatesFromYdPortalV2Processor /** - * @param int $packingListId + * @param PackingList $packingList * @return void * @throws MalformedRequestException * @throws GuzzleException */ - public function execute(int $packingListId) + public function execute(PackingList $packingList) { - $packingList = PackingList::where('id', $packingListId)->first(); + // $packingList = PackingList::where('id', $packingListId)->first(); Log::info('FetchDeliveryUpdatesFromYdPortalV2Processor starts with packingList id ' . json_encode($packingList) ); // return; diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index ee76ad07..baa5ff8f 100644 --- a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php +++ b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php @@ -145,7 +145,7 @@ class ProcessYDPortalDataV2Command extends Command // foreach ($chunk as $packingList){ // $processor = app(FetchDeliveryUpdatesFromYdPortalV2Processor::class); // $processor->execute($packingList); - $jobs[] = new FetchDeliveryUpdatesFromYdPortalV2CommandJob($packingList->id); + $jobs[] = new FetchDeliveryUpdatesFromYdPortalV2CommandJob($packingList); Log::info('Dispatched FetchDeliveryUpdatesFromYdPortalV2CommandJob for packingList with id ' . $packingList->id); $count++; // } From 9782ac6fda1488d3fb83ec703b0e51f8825b3213 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 05:45:29 +0800 Subject: [PATCH 08/15] Laravel Vapor - Deployment day to production, solve an error in YD API query --- .../Commands/V2/ProcessYDPortalDataV2Command.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index baa5ff8f..7a353992 100644 --- a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php +++ b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php @@ -45,7 +45,9 @@ class ProcessYDPortalDataV2Command extends Command $jobs = array_merge($jobs, $this->fetchPackingListsFromYdPortalV2CommandJobs()); $jobs = array_merge($jobs, $this->fetchContainersFromYdPortalV2CommandJobs()); $jobs = array_merge($jobs, $this->fetchContainersUpdatesFromYdPortalV2CommandJob()); - $jobs = array_merge($jobs, $this->fetchDeliveryUpdatesFromYdPortalV2CommandJobs()); + // $jobs = array_merge($jobs, $this->fetchDeliveryUpdatesFromYdPortalV2CommandJobs()); + + $jobsWithDelay = $this->fetchDeliveryUpdatesFromYdPortalV2CommandJobs(); // The following job is intentionally excluded ////$jobs = array_merge($jobs, $this->fetchOrderListsFromYdPortalV2CommandJob()); @@ -55,6 +57,10 @@ class ProcessYDPortalDataV2Command extends Command foreach ($jobs as $job) { dispatch($job); } + + foreach ($jobsWithDelay as $job) { + dispatch($job)->delay(now()->addSeconds(2)); + } } private function fetchPackingListsFromYdPortalV2CommandJobs(){ @@ -137,7 +143,7 @@ class ProcessYDPortalDataV2Command extends Command $count = 0; foreach ($packingLists as $packingList) { - if ($count >= 1000) { + if ($count >= 500) { break; } From 9516721ff5d62e609d119eae0081572c3a4a74df Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 06:08:37 +0800 Subject: [PATCH 09/15] Laravel Vapor - Deployment day to production, solve an error in YD API query --- .../Commands/V2/ProcessYDPortalDataV2Command.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index 7a353992..0f422a89 100644 --- a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php +++ b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php @@ -45,9 +45,7 @@ class ProcessYDPortalDataV2Command extends Command $jobs = array_merge($jobs, $this->fetchPackingListsFromYdPortalV2CommandJobs()); $jobs = array_merge($jobs, $this->fetchContainersFromYdPortalV2CommandJobs()); $jobs = array_merge($jobs, $this->fetchContainersUpdatesFromYdPortalV2CommandJob()); - // $jobs = array_merge($jobs, $this->fetchDeliveryUpdatesFromYdPortalV2CommandJobs()); - - $jobsWithDelay = $this->fetchDeliveryUpdatesFromYdPortalV2CommandJobs(); + $jobs = array_merge($jobs, $this->fetchDeliveryUpdatesFromYdPortalV2CommandJobs()); // The following job is intentionally excluded ////$jobs = array_merge($jobs, $this->fetchOrderListsFromYdPortalV2CommandJob()); @@ -57,10 +55,6 @@ class ProcessYDPortalDataV2Command extends Command foreach ($jobs as $job) { dispatch($job); } - - foreach ($jobsWithDelay as $job) { - dispatch($job)->delay(now()->addSeconds(2)); - } } private function fetchPackingListsFromYdPortalV2CommandJobs(){ @@ -143,7 +137,7 @@ class ProcessYDPortalDataV2Command extends Command $count = 0; foreach ($packingLists as $packingList) { - if ($count >= 500) { + if ($count >= 200) { break; } From 92d5ae0c76bb4e29dec2937ee65e694a15f42c48 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 06:32:19 +0800 Subject: [PATCH 10/15] Laravel Vapor - Deployment day to production, enable the rest of schedule tasks for production via commands --- app/Console/Kernel.php | 52 +++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 3f65cdfb..ecff7f45 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -38,39 +38,39 @@ class Kernel extends ConsoleKernel ->dailyAt('01:00') ->withoutOverlapping(); - //cief todo: disable commands to avoid unintentional interfering with production starts - // $schedule->command('curl-vt-command') - // ->cron('0 8 * * *') - // ->withoutOverlapping(); + if(env('APP_ENV') === 'production'){ + $schedule->command('curl-vt-command') + ->cron('0 8 * * *') + ->withoutOverlapping(); - // $schedule->command('curl-yd-order-list-command') - // ->cron('0 9-18/3 * * *') - // ->withoutOverlapping(); + $schedule->command('curl-yd-order-list-command') + ->cron('0 9-18/3 * * *') + ->withoutOverlapping(); - // $schedule->command('fix-packinglist-command') - // ->cron('30 9-18/3 * * *') - // ->withoutOverlapping(); + $schedule->command('fix-packinglist-command') + ->cron('30 9-18/3 * * *') + ->withoutOverlapping(); - // $schedule->command('fix-duplicate-container-reference-command') - // ->cron('0 1 * * *') - // ->withoutOverlapping(); + $schedule->command('fix-duplicate-container-reference-command') + ->cron('0 1 * * *') + ->withoutOverlapping(); - // $schedule->command('invoice-generate-command') - // ->hourly() - // ->withoutOverlapping(); + $schedule->command('invoice-generate-command') + ->hourly() + ->withoutOverlapping(); - // $schedule->command('billplz-failed-callback-fix-command') - // ->hourly() - // ->withoutOverlapping(); + $schedule->command('billplz-failed-callback-fix-command') + ->hourly() + ->withoutOverlapping(); - // $schedule->command('check-storage-invoices-group-transactions-command') - // ->dailyAt('0:01') - // ->withoutOverlapping(); + $schedule->command('check-storage-invoices-group-transactions-command') + ->dailyAt('0:01') + ->withoutOverlapping(); - // $schedule->command('permits-reminder-send-command') - // ->dailyAt('09:30') - // ->withoutOverlapping(); - //cief todo: disable commands to avoid unintentional interfering with production ends + $schedule->command('permits-reminder-send-command') + ->dailyAt('09:30') + ->withoutOverlapping(); + } } //Commands Version 1: Before AWS else From ef7cc681210ed44731954feccd6e0b2d7c595056 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 06:58:02 +0800 Subject: [PATCH 11/15] Laravel Vapor - Deployment day to production, solve an error in YD API query --- app/Console/Commands/V2/ProcessYDPortalDataV2Command.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index 0f422a89..d1025733 100644 --- a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php +++ b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php @@ -45,7 +45,7 @@ class ProcessYDPortalDataV2Command extends Command $jobs = array_merge($jobs, $this->fetchPackingListsFromYdPortalV2CommandJobs()); $jobs = array_merge($jobs, $this->fetchContainersFromYdPortalV2CommandJobs()); $jobs = array_merge($jobs, $this->fetchContainersUpdatesFromYdPortalV2CommandJob()); - $jobs = array_merge($jobs, $this->fetchDeliveryUpdatesFromYdPortalV2CommandJobs()); + $jobsWithDelay = array_merge($jobs, $this->fetchDeliveryUpdatesFromYdPortalV2CommandJobs()); // The following job is intentionally excluded ////$jobs = array_merge($jobs, $this->fetchOrderListsFromYdPortalV2CommandJob()); @@ -55,6 +55,12 @@ class ProcessYDPortalDataV2Command extends Command foreach ($jobs as $job) { dispatch($job); } + + foreach ($jobsWithDelay as $index => $job) { + // Delay each job by 2 seconds multiplied by its index + dispatch($job)->delay(now()->addSeconds($index * 2)); + } + } private function fetchPackingListsFromYdPortalV2CommandJobs(){ From a6d032050caedbc54f49c896679895e18dc35cba Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 06:58:23 +0800 Subject: [PATCH 12/15] Laravel Vapor - Deployment day to production, solve an error in YD API query --- app/Console/Commands/V2/ProcessYDPortalDataV2Command.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index d1025733..5843066c 100644 --- a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php +++ b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php @@ -143,7 +143,7 @@ class ProcessYDPortalDataV2Command extends Command $count = 0; foreach ($packingLists as $packingList) { - if ($count >= 200) { + if ($count >= 500) { break; } From 44e124dfa3e3b6362993a2a705c06c76752624d0 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 07:37:47 +0800 Subject: [PATCH 13/15] Laravel Vapor - Deployment day to production, solve an error in YD API query --- app/Console/Commands/V2/ProcessYDPortalDataV2Command.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index 5843066c..897a6e5f 100644 --- a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php +++ b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php @@ -58,7 +58,7 @@ class ProcessYDPortalDataV2Command extends Command foreach ($jobsWithDelay as $index => $job) { // Delay each job by 2 seconds multiplied by its index - dispatch($job)->delay(now()->addSeconds($index * 2)); + dispatch($job)->delay(now()->addSeconds($index * 1)); } } From 91fa3e08cddaf7610f4505791c783d853ca7ab0a Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 07:55:27 +0800 Subject: [PATCH 14/15] Laravel Vapor - Deployment day to production, solve an error in YD API query --- .../YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php | 8 ++++---- .../V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php | 6 +++--- app/Console/Commands/V2/ProcessYDPortalDataV2Command.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Classes/Jobs/Commands/V2/YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php b/app/Classes/Jobs/Commands/V2/YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php index 936ba679..6498f933 100644 --- a/app/Classes/Jobs/Commands/V2/YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php @@ -20,17 +20,17 @@ class FetchDeliveryUpdatesFromYdPortalV2CommandJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - protected $packingList; + protected $packingListId; - public function __construct(PackingList $packingList) + public function __construct(int $packingListId) { - $this->packingList = $packingList; + $this->packingListId = $packingListId; } public function handle() { Log::info('Processing FetchDeliveryUpdatesFromYdPortalV2CommandJob'); $processor = app(FetchDeliveryUpdatesFromYdPortalV2Processor::class); - $processor->execute($this->packingList); + $processor->execute($this->packingListId); } } diff --git a/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php b/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php index 35635bcf..980b41fb 100644 --- a/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php +++ b/app/Classes/Modules/PackingLists/Processors/V2/FetchDeliveryUpdatesFromYdPortalV2Processor.php @@ -55,14 +55,14 @@ class FetchDeliveryUpdatesFromYdPortalV2Processor /** - * @param PackingList $packingList + * @param int $packingListId * @return void * @throws MalformedRequestException * @throws GuzzleException */ - public function execute(PackingList $packingList) + public function execute(int $packingListId) { - // $packingList = PackingList::where('id', $packingListId)->first(); + $packingList = PackingList::where('id', $packingListId)->first(); Log::info('FetchDeliveryUpdatesFromYdPortalV2Processor starts with packingList id ' . json_encode($packingList) ); // return; diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index 897a6e5f..85297f3f 100644 --- a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php +++ b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php @@ -58,7 +58,7 @@ class ProcessYDPortalDataV2Command extends Command foreach ($jobsWithDelay as $index => $job) { // Delay each job by 2 seconds multiplied by its index - dispatch($job)->delay(now()->addSeconds($index * 1)); + dispatch($job)->delay(now()->addSeconds($index * 2)); } } @@ -151,7 +151,7 @@ class ProcessYDPortalDataV2Command extends Command // foreach ($chunk as $packingList){ // $processor = app(FetchDeliveryUpdatesFromYdPortalV2Processor::class); // $processor->execute($packingList); - $jobs[] = new FetchDeliveryUpdatesFromYdPortalV2CommandJob($packingList); + $jobs[] = new FetchDeliveryUpdatesFromYdPortalV2CommandJob($packingList->id); Log::info('Dispatched FetchDeliveryUpdatesFromYdPortalV2CommandJob for packingList with id ' . $packingList->id); $count++; // } From 33341feb0e9f253f9ec034c9ef99f40f24ee1a45 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 14 Sep 2024 08:08:02 +0800 Subject: [PATCH 15/15] Laravel Vapor - Deployment day to production, solve an error in YD API query --- app/Console/Commands/V2/ProcessYDPortalDataV2Command.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index 85297f3f..f2411602 100644 --- a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php +++ b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php @@ -58,7 +58,7 @@ class ProcessYDPortalDataV2Command extends Command foreach ($jobsWithDelay as $index => $job) { // Delay each job by 2 seconds multiplied by its index - dispatch($job)->delay(now()->addSeconds($index * 2)); + dispatch($job)->delay(now()->addSeconds($index * 1)); } }