diff --git a/app/Helpers/Bank/Nordigen/Nordigen.php b/app/Helpers/Bank/Nordigen/Nordigen.php index 33c62d076c8d..a07daf857bdf 100644 --- a/app/Helpers/Bank/Nordigen/Nordigen.php +++ b/app/Helpers/Bank/Nordigen/Nordigen.php @@ -97,11 +97,11 @@ class Nordigen return $it->transform($out); } catch (\Exception $e) { - if (strpos($e->getMessage(), "Invalid Account ID") !== false) { - return false; - } - throw $e; + nlog("Nordigen getAccount() failed => {$account_id} => " . $e->getMessage()); + + return false; + } } diff --git a/app/Jobs/Bank/ProcessBankTransactionsNordigen.php b/app/Jobs/Bank/ProcessBankTransactionsNordigen.php index d23e78659cec..dd7c6c657b9e 100644 --- a/app/Jobs/Bank/ProcessBankTransactionsNordigen.php +++ b/app/Jobs/Bank/ProcessBankTransactionsNordigen.php @@ -114,23 +114,26 @@ class ProcessBankTransactionsNordigen implements ShouldQueue private function updateAccount() { - if (!$this->nordigen->isAccountActive($this->bank_integration->nordigen_account_id)) { + $is_account_active = $this->nordigen->isAccountActive($this->bank_integration->nordigen_account_id); + $account = $this->nordigen->getAccount($this->bank_integration->nordigen_account_id); + + if (!$is_account_active || !$account) { $this->bank_integration->disabled_upstream = true; $this->bank_integration->save(); $this->stop_loop = false; + nlog("Nordigen: account inactive: " . $this->bank_integration->nordigen_account_id); - // @turbo124 @todo send email for expired account $this->nordigen->disabledAccountEmail($this->bank_integration); return; } - $this->nordigen_account = $this->nordigen->getAccount($this->bank_integration->nordigen_account_id); + $this->nordigen_account = $account; $this->bank_integration->disabled_upstream = false; - $this->bank_integration->bank_account_status = $this->nordigen_account['account_status']; - $this->bank_integration->balance = $this->nordigen_account['current_balance']; + $this->bank_integration->bank_account_status = $account['account_status']; + $this->bank_integration->balance = $account['current_balance']; $this->bank_integration->save(); }