From d5a9a1c839db87e288455db8c94137889bdc3190 Mon Sep 17 00:00:00 2001 From: paulwer Date: Tue, 12 Dec 2023 07:08:40 +0100 Subject: [PATCH] fixes --- .../Bank/ProcessBankTransactionsNordigen.php | 32 +++++++++---------- .../Bank/ProcessBankTransactionsYodlee.php | 8 ++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/Jobs/Bank/ProcessBankTransactionsNordigen.php b/app/Jobs/Bank/ProcessBankTransactionsNordigen.php index 6ba21e3bbc04..4f2d887ec705 100644 --- a/app/Jobs/Bank/ProcessBankTransactionsNordigen.php +++ b/app/Jobs/Bank/ProcessBankTransactionsNordigen.php @@ -53,22 +53,6 @@ class ProcessBankTransactionsNordigen implements ShouldQueue $this->bank_integration = $bank_integration; $this->from_date = $bank_integration->from_date; $this->company = $this->bank_integration->company; - - if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_NORDIGEN) - throw new \Exception("Invalid BankIntegration Type"); - - if (!(($this->account->bank_integration_secret_id && $this->account->integration_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key')))) - throw new \Exception("Missing credentials for bank_integration service nortigen"); - - if ($this->account->bank_integration_secret_id && $this->account->bank_integration_secret_key) { - $this->secret_id = $this->account->bank_integration_secret_id; - $this->secret_key = $this->account->bank_integration_secret_key; - } else { - $this->secret_id = config('ninja.nordigen.secret_id'); - $this->secret_key = config('ninja.nordigen.secret_key'); - } - - $this->nordigen = new Nordigen($this->secret_id, $this->secret_key); } /** @@ -80,6 +64,22 @@ class ProcessBankTransactionsNordigen implements ShouldQueue public function handle() { + if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_NORDIGEN) + throw new \Exception("Invalid BankIntegration Type"); + + if (!(($this->account->bank_integration_nordigen_secret_id && $this->account->bank_integration_nordigen_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key')))) + throw new \Exception("Missing credentials for bank_integration service nortigen"); + + if ($this->account->bank_integration_nordigen_secret_id && $this->account->bank_integration_nordigen_secret_key) { + $this->secret_id = $this->account->bank_integration_nordigen_secret_id; + $this->secret_key = $this->account->bank_integration_nordigen_secret_key; + } else { + $this->secret_id = config('ninja.nordigen.secret_id'); + $this->secret_key = config('ninja.nordigen.secret_key'); + } + + $this->nordigen = new Nordigen($this->secret_id, $this->secret_key); + set_time_limit(0); //Loop through everything until we are up to date diff --git a/app/Jobs/Bank/ProcessBankTransactionsYodlee.php b/app/Jobs/Bank/ProcessBankTransactionsYodlee.php index 1e74c95533c9..e88819c0d55a 100644 --- a/app/Jobs/Bank/ProcessBankTransactionsYodlee.php +++ b/app/Jobs/Bank/ProcessBankTransactionsYodlee.php @@ -52,10 +52,6 @@ class ProcessBankTransactionsYodlee implements ShouldQueue $this->bank_integration = $bank_integration; $this->from_date = $bank_integration->from_date; $this->company = $this->bank_integration->company; - - if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_YODLEE) - throw new \Exception("Invalid BankIntegration Type"); - } /** @@ -66,6 +62,10 @@ class ProcessBankTransactionsYodlee implements ShouldQueue */ public function handle() { + + if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_YODLEE) + throw new \Exception("Invalid BankIntegration Type"); + set_time_limit(0); //Loop through everything until we are up to date