From 1d7d55447ac6ba08d9d342d5598904c2c13daba2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 14 Aug 2023 20:01:28 +1000 Subject: [PATCH] Add specific delays for some activities --- app/Listeners/Activity/PaymentCreatedActivity.php | 1 + app/Listeners/Invoice/InvoicePaidActivity.php | 2 ++ app/Services/PurchaseOrder/PurchaseOrderExpense.php | 2 +- app/Services/PurchaseOrder/PurchaseOrderService.php | 7 ++----- phpstan.neon | 6 ++---- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/Listeners/Activity/PaymentCreatedActivity.php b/app/Listeners/Activity/PaymentCreatedActivity.php index ff0c0abd0889..12ed24c288b4 100644 --- a/app/Listeners/Activity/PaymentCreatedActivity.php +++ b/app/Listeners/Activity/PaymentCreatedActivity.php @@ -21,6 +21,7 @@ class PaymentCreatedActivity implements ShouldQueue { protected $activity_repo; + public $delay = 5; /** * Create the event listener. * diff --git a/app/Listeners/Invoice/InvoicePaidActivity.php b/app/Listeners/Invoice/InvoicePaidActivity.php index 2d340dfb08df..836136aad0e0 100644 --- a/app/Listeners/Invoice/InvoicePaidActivity.php +++ b/app/Listeners/Invoice/InvoicePaidActivity.php @@ -21,6 +21,8 @@ class InvoicePaidActivity implements ShouldQueue { protected $activity_repo; + public $delay = 10; + /** * Create the event listener. * diff --git a/app/Services/PurchaseOrder/PurchaseOrderExpense.php b/app/Services/PurchaseOrder/PurchaseOrderExpense.php index d206efbb28fb..e25bc84de163 100644 --- a/app/Services/PurchaseOrder/PurchaseOrderExpense.php +++ b/app/Services/PurchaseOrder/PurchaseOrderExpense.php @@ -57,7 +57,7 @@ class PurchaseOrderExpense $expense->number = empty($expense->number) ? $this->getNextExpenseNumber($expense) : $expense->number; - $expense->save(); + $expense->saveQuietly(); event('eloquent.created: App\Models\Expense', $expense); $this->purchase_order->expense_id = $expense->id; diff --git a/app/Services/PurchaseOrder/PurchaseOrderService.php b/app/Services/PurchaseOrder/PurchaseOrderService.php index f9bc5d7c75e1..3445e261dd7d 100644 --- a/app/Services/PurchaseOrder/PurchaseOrderService.php +++ b/app/Services/PurchaseOrder/PurchaseOrderService.php @@ -20,11 +20,8 @@ class PurchaseOrderService { use MakesHash; - public PurchaseOrder $purchase_order; - - public function __construct(PurchaseOrder $purchase_order) + public function __construct(public PurchaseOrder $purchase_order) { - $this->purchase_order = $purchase_order; } public function createInvitations() @@ -156,7 +153,7 @@ class PurchaseOrderService /** * Saves the purchase order. - * @return \App\Models\PurchaseOrder object + * @return \App\Models\PurchaseOrder */ public function save(): ?PurchaseOrder { diff --git a/phpstan.neon b/phpstan.neon index 92bb5444400e..ff93e96cc5b3 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -8,6 +8,7 @@ parameters: excludePaths: - 'vendor/' - 'app/Jobs/Ninja/*' + - 'app/Models/Presenters/*' - 'app/Console/Commands/*' - 'app/DataMapper/Analytics/*' - 'app/PaymentDrivers/Authorize/*' @@ -17,10 +18,7 @@ parameters: - App\DataMapper\FeesAndLimits reportUnmatchedIgnoredErrors: false ignoreErrors: - - '#Call to an undefined method [a-zA-Z0-9\\_]+::company\(\)#' - - '#Call to an undefined method [a-zA-Z0-9\\_]+::entityFilter\(\)#' - - '#Call to an undefined method [a-zA-Z0-9\\_]+::exclude\(\)#' - '#Array has 2 duplicate keys with value#' - - '#Undefined method#' + - '#Call to an undefined method#' - '#makeHidden#' - '#Socialite#' \ No newline at end of file