From bbf61b757dab7ef77c4a2ed068cf1a41b5340e04 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 2 Jan 2024 03:07:04 +0800 Subject: [PATCH] Laravel Vapor - Version 2 of Commands, fix syntax inaccurate --- ...eInvoicesGroupTransactionsV2CommandJob.php | 22 +--------- ...CheckStorageInvoicesOrdersV2CommandJob.php | 22 +--------- ...llplzFailedCallbackPaymentV2CommandJob.php | 43 +------------------ ...SuccessUpdatePaymentStatusV2CommandJob.php | 38 ++-------------- 4 files changed, 8 insertions(+), 117 deletions(-) diff --git a/app/Classes/Jobs/Commands/V2/CheckStorageInvoicesGroupTransactionsV2CommandJob.php b/app/Classes/Jobs/Commands/V2/CheckStorageInvoicesGroupTransactionsV2CommandJob.php index a2a40db5..def7da5b 100644 --- a/app/Classes/Jobs/Commands/V2/CheckStorageInvoicesGroupTransactionsV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/CheckStorageInvoicesGroupTransactionsV2CommandJob.php @@ -17,24 +17,6 @@ class CheckStorageInvoicesGroupTransactionsV2CommandJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** @var ListsGroups */ - private $listsGroups; - - /** @var CheckStorageInvoiceTransactionProcessor */ - private $storageInvoiceTransactionProcessor; - - - /** - * CheckStorageInvoicesGroupTransactionsV2CommandJob constructor. - * @param ListsGroups $listsGroups - * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor - */ - public function __construct(ListsGroups $listsGroups, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor) - { - $this->listsGroups = $listsGroups; - $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor; - } - public function handle() { Log::info(Carbon::now() . ': Start job - Check all pending group payment with storage invoice is valid.'); @@ -43,7 +25,7 @@ class CheckStorageInvoicesGroupTransactionsV2CommandJob implements ShouldQueue $newfilters['order_by_updated_at_desc'] = true; $newfilters['status_in'] = [0, 1]; - $groups = $this->listsGroups->execute($newfilters); + $groups = (App()->make(ListsGroups::class))->execute($newfilters); foreach ($groups as $group){ Log::info('CheckForStorageInvoiceByTransactions group: '.json_encode($group)); @@ -53,7 +35,7 @@ class CheckStorageInvoicesGroupTransactionsV2CommandJob implements ShouldQueue if($packingList){ $order = $packingList->owner()->first(); if($order instanceof Order){ - $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order); + $storages = (App()->make(CheckStorageInvoiceTransactionProcessor::class))->executeOrder($order); } } } diff --git a/app/Classes/Jobs/Commands/V2/CheckStorageInvoicesOrdersV2CommandJob.php b/app/Classes/Jobs/Commands/V2/CheckStorageInvoicesOrdersV2CommandJob.php index 9e11f5e7..5a6b6503 100644 --- a/app/Classes/Jobs/Commands/V2/CheckStorageInvoicesOrdersV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/CheckStorageInvoicesOrdersV2CommandJob.php @@ -17,35 +17,17 @@ class CheckStorageInvoicesOrdersV2CommandJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** @var ListsOrders */ - private $listsOrders; - - /** @var CheckStorageInvoiceTransactionProcessor */ - private $storageInvoiceTransactionProcessor; - - - /** - * CheckStorageInvoicesOrdersV2CommandJob constructor. - * @param ListsOrders $listsOrders - * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor - */ - public function __construct(ListsOrders $listsOrders, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor) - { - $this->listsOrders = $listsOrders; - $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor; - } - public function handle() { Log::info(Carbon::now() . ': Start job - Check all orders for storage invoice.'); $start = new Carbon(); - $orders = $this->listsOrders->execute(['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]); + $orders = (App()->make(ListsOrders::class))->execute(['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]); $count = 0; foreach ($orders as $order){ try{ - $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order); + $storages = (App()->make(CheckStorageInvoiceTransactionProcessor::class))->executeOrder($order); $count = $count + 1; Log::info('Order '.$count); } diff --git a/app/Classes/Jobs/Commands/V2/FixBillplzFailedCallbackPaymentV2CommandJob.php b/app/Classes/Jobs/Commands/V2/FixBillplzFailedCallbackPaymentV2CommandJob.php index e669bfaa..77cfd075 100644 --- a/app/Classes/Jobs/Commands/V2/FixBillplzFailedCallbackPaymentV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/FixBillplzFailedCallbackPaymentV2CommandJob.php @@ -25,47 +25,6 @@ class FixBillplzFailedCallbackPaymentV2CommandJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - - /** @var GetBillplzBill */ - private $getBillplzBill; - - /** @var FetchesTransaction */ - private $fetchesTransaction; - - /** @var UpdatesTransactionStatus */ - private $updatesTransactionStatus; - - /** @var UpdateDoFromVTPortalProcessor */ - private $updateDoFromVTPortalProcessor; - - /** @var UpdateDoFromYDPortalProcessor */ - private $updateDoFromYDPortalProcessor ; - - /** @var CallbackBillplzProcessor */ - private $callbackBillplzProcessor; - - - - /** - * FixBillplzFailedCallbackPaymentV2CommandJob constructor. - * @param GetBillplzBill $getBillplzBill - * @param FetchesTransaction $fetchesTransaction - * @param UpdatesTransactionStatus $updatesTransactionStatus - * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor - * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor - * @param CallbackBillplzProcessor $callbackBillplzProcessor - */ - public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, CallbackBillplzProcessor $callbackBillplzProcessor) - { - $this->getBillplzBill = $getBillplzBill; - $this->fetchesTransaction = $fetchesTransaction; - $this->updatesTransactionStatus = $updatesTransactionStatus; - $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor; - $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor; - $this->callbackBillplzProcessor = $callbackBillplzProcessor; - } - - public function handle() { Log::info(Carbon::now() . ': Start job - Billplz Failled Callback.'); @@ -100,7 +59,7 @@ class FixBillplzFailedCallbackPaymentV2CommandJob implements ShouldQueue } Log::info(Carbon::now() . ' : Fixing ' . $transaction->payment_reference); - $this->callbackBillplzProcessor->execute($transaction, $status); + (App()->make(CallbackBillplzProcessor::class))->execute($transaction, $status); } }else{ Log::info("billplz error
"); diff --git a/app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php b/app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php index 359af941..6fb2051d 100644 --- a/app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php @@ -24,38 +24,6 @@ class SuccessUpdatePaymentStatusV2CommandJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** @var GetBillplzBill */ - private $getBillplzBill; - - /** @var FetchesTransaction */ - private $fetchesTransaction; - - /** @var UpdatesTransactionStatus */ - private $updatesTransactionStatus; - - /** @var UpdateDoFromVTPortalProcessor */ - private $updateDoFromVTPortalProcessor; - - /** @var UpdateDoFromYDPortalProcessor */ - private $updateDoFromYDPortalProcessor ; - - - /** - * SuccessUpdatePaymentStatusV2CommandJob constructor. - * @param GetBillplzBill $getBillplzBill - * @param FetchesTransaction $fetchesTransaction - * @param UpdatesTransactionStatus $updatesTransactionStatus - * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor - * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor - */ - public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor) - { - $this->getBillplzBill = $getBillplzBill; - $this->fetchesTransaction = $fetchesTransaction; - $this->updatesTransactionStatus = $updatesTransactionStatus; - $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor; - $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor; - } public function handle() { Log::info(Carbon::now() . ': Start job - Success Updated Payment Status.'); @@ -95,14 +63,14 @@ class SuccessUpdatePaymentStatusV2CommandJob implements ShouldQueue $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount'); if(($invoice->amount - $totalPaidAmount) < 0.01) { - $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED); + (App()->make(UpdatesTransactionStatus::class))->execute($invoice, ApprovalStatus::COMPLETED); $packingList->status = ApprovalStatus::APPROVED; $packingList->save(); if(app()->environment('production')){ - $this->updateDoFromVTPortalProcessor->execute($packingList); - $this->updateDoFromYDPortalProcessor->execute($packingList); + (App()->make(UpdateDoFromVTPortalProcessor::class))->execute($packingList); + (App()->make(UpdateDoFromYDPortalProcessor::class))->execute($packingList); } dump('Updated invoice ' . $invoice->id . '. Order: '. $order->reference);