From 88ff7983c806ad8062b31d6464fb0ed1805d04f2 Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Wed, 20 Dec 2023 19:17:34 +0100
Subject: [PATCH] adding additional fields to be parsed for transaction:
 description & participator
 https://developer.gocardless.com/bank-account-data/transactions

---
 app/Helpers/Bank/Nordigen/Nordigen.php         |  5 +++--
 .../Transformer/TransactionTransformer.php     | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/Helpers/Bank/Nordigen/Nordigen.php b/app/Helpers/Bank/Nordigen/Nordigen.php
index 5c7185efc567..24bc0dc58aa9 100644
--- a/app/Helpers/Bank/Nordigen/Nordigen.php
+++ b/app/Helpers/Bank/Nordigen/Nordigen.php
@@ -21,7 +21,6 @@ namespace App\Helpers\Bank\Nordigen;
 
 use App\Helpers\Bank\Nordigen\Transformer\AccountTransformer;
 use App\Helpers\Bank\Nordigen\Transformer\TransactionTransformer;
-use Log;
 
 class Nordigen
 {
@@ -99,8 +98,10 @@ class Nordigen
         try {
             $account = $this->client->account($account_id)->getAccountMetaData();
 
-            if ($account["status"] != "READY")
+            if ($account["status"] != "READY") {
+                nlog('nordigen account was not in status ready. accountId: ' . $account_id . ' status: ' . $account["status"]);
                 return false;
+            }
 
             return true;
         } catch (\Exception $e) {
diff --git a/app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php b/app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php
index 6df825131224..406458e08a00 100644
--- a/app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php
+++ b/app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php
@@ -94,19 +94,31 @@ class TransactionTransformer implements BankRevenueInterface
             $description = implode(' \r\n', $transaction["remittanceInformationStructuredArray"]);
         else if (array_key_exists('remittanceInformationUnstructured', $transaction))
             $description = $transaction["remittanceInformationUnstructured"];
+        else if (array_key_exists('remittanceInformationUnstructuredArray', $transaction))
+            $description = implode(' \r\n', $transaction["remittanceInformationUnstructuredArray"]);
         else
             Log::warning("Missing description for the following transaction: " . json_encode($transaction));
 
+        // participant
+        $participant = array_key_exists('debtorAccount', $transaction) && array_key_exists('iban', $transaction["debtorAccount"]) ?
+            $transaction['debtorAccount']['iban'] :
+            (array_key_exists('creditorAccount', $transaction) && array_key_exists('iban', $transaction["creditorAccount"]) ?
+                $transaction['creditorAccount']['iban'] : null);
+        $participant_name = array_key_exists('debtorName', $transaction) ?
+            $transaction['debtorName'] :
+            (array_key_exists('creditorName', $transaction) ?
+                $transaction['creditorName'] : null);
+
         return [
             'transaction_id' => $transaction["transactionId"],
             'amount' => abs((int) $transaction["transactionAmount"]["amount"]),
             'currency_id' => $this->convertCurrency($transaction["transactionAmount"]["currency"]),
             'category_id' => null, // nordigen has no categories
-            'category_type' => array_key_exists('additionalInformation', $transaction) ? $transaction["additionalInformation"] : '', // TODO: institution specific keys like: GUTSCHRIFT, ABSCHLUSS, MONATSABSCHLUSS etc
+            'category_type' => array_key_exists('additionalInformation', $transaction) ? $transaction["additionalInformation"] : null, // TODO: institution specific keys like: GUTSCHRIFT, ABSCHLUSS, MONATSABSCHLUSS etc
             'date' => $transaction["bookingDate"],
             'description' => $description,
-            'participant' => array_key_exists('debtorAccount', $transaction) && array_key_exists('iban', $transaction["debtorAccount"]) ? $transaction['debtorAccount']['iban'] : null,
-            'participant_name' => array_key_exists('debtorName', $transaction) ? $transaction['debtorName'] : null,
+            'participant' => $participant,
+            'participant_name' => $participant_name,
             'base_type' => (int) $transaction["transactionAmount"]["amount"] <= 0 ? 'DEBIT' : 'CREDIT',
         ];