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); diff --git a/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php index bb07fb1c..468821a9 100644 --- a/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php @@ -205,8 +205,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-'); diff --git a/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php b/app/Console/Commands/V2/ProcessYDPortalDataV2Command.php index f00eefb1..f2411602 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()); + $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 * 1)); + } + } private function fetchPackingListsFromYdPortalV2CommandJobs(){ @@ -72,9 +78,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'); @@ -136,15 +142,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 >= 500) { + 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; diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 75f83be6..e953903f 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 diff --git a/vapor.yml b/vapor.yml index b3eee585..0971418e 100644 --- a/vapor.yml +++ b/vapor.yml @@ -2,7 +2,10 @@ id: 52493 name: shipping-portal environments: production: - domain: production.portal.izyim.com + domain: + - production.portal.izyim.com + - izyim.cief-malaysia.com + - portal.izyim.com memory: 1024 cli-memory: 512 queues: