From abd049e715b67a2c20e1e0c2894f6cac501a1712 Mon Sep 17 00:00:00 2001
From: vojeroen <21264520+vojeroen@users.noreply.github.com>
Date: Thu, 16 May 2024 20:57:24 +0200
Subject: [PATCH] fill in creditor name for BNP bank transactions (#349)

---
 src/app-gocardless/banks/bnp-be-gebabebb.js | 22 +++++++++++++++++++++
 upcoming-release-notes/349.md               |  6 ++++++
 2 files changed, 28 insertions(+)
 create mode 100644 upcoming-release-notes/349.md

diff --git a/src/app-gocardless/banks/bnp-be-gebabebb.js b/src/app-gocardless/banks/bnp-be-gebabebb.js
index d95ebf0bbf..84e6da98b8 100644
--- a/src/app-gocardless/banks/bnp-be-gebabebb.js
+++ b/src/app-gocardless/banks/bnp-be-gebabebb.js
@@ -49,15 +49,27 @@ export default {
    *  field in the remittanceInformationUnstructuredArray field.
    */
   normalizeTransaction(transaction, _booked) {
+    // Extract the creditor name to fill it in with information from the
+    // additionalInformation field in case it's not yet defined.
+    let creditorName = transaction.creditorName;
+
     if (transaction.additionalInformation) {
       let additionalInformationObject = {};
       const additionalInfoRegex = /(, )?([^:]+): ((\[.*?\])|([^,]*))/g;
       let matches =
         transaction.additionalInformation.matchAll(additionalInfoRegex);
       if (matches) {
+        let creditorNameFromNarrative; // Possible value for creditorName
         for (let match of matches) {
           let key = match[2].trim();
           let value = (match[4] || match[5]).trim();
+          if (key === 'narrative') {
+            // Set narrativeName to the first element in the "narrative" array.
+            creditorNameFromNarrative = value
+              .matchAll(/'([a-zA-Z0-9\s]*)'/g)
+              ?.next()
+              .value[1].trim();
+          }
           // Remove square brackets and single quotes and commas
           value = value.replace(/[[\]',]/g, '');
           additionalInformationObject[key] = value;
@@ -68,11 +80,21 @@ export default {
           additionalInformationObject?.atmPosName ?? '',
           additionalInformationObject?.narrative ?? '',
         ].filter(Boolean);
+
+        // If the creditor name doesn't exist in the original transactions,
+        // set it to the atmPosName or narrativeName if they exist; otherwise
+        // leave empty and let the default rules handle it.
+        creditorName =
+          creditorName ??
+          additionalInformationObject?.atmPosName ??
+          creditorNameFromNarrative ??
+          null;
       }
     }
 
     return {
       ...transaction,
+      creditorName: creditorName,
       date: transaction.valueDate || transaction.bookingDate,
     };
   },
diff --git a/upcoming-release-notes/349.md b/upcoming-release-notes/349.md
new file mode 100644
index 0000000000..9f1aa4a730
--- /dev/null
+++ b/upcoming-release-notes/349.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [vojeroen]
+---
+
+Ensure payee names don't contain transactional information when pulling in transactions from BNP bank with GoCardless.