Merge branch 'master' into master

Author: twk3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "actual-sync",
-  "version": "24.4.0",
+  "version": "24.5.0",
   "license": "MIT",
   "description": "actual syncing server",
   "type": "module",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@actual-app/crdt": "2.1.0",
-    "@actual-app/web": "24.4.0",
+    "@actual-app/web": "24.5.0",
     "bcrypt": "^5.1.0",
     "better-sqlite3": "^9.1.1",
     "body-parser": "^1.20.1",

src/app-gocardless/bank-factory.js

@@ -12,6 +12,7 @@ import SEBPrivat from './banks/seb-privat.js';
 import SandboxfinanceSfin0000 from './banks/sandboxfinance-sfin0000.js';
 import SparNordSpNoDK22 from './banks/sparnord-spnodk22.js';
 import SpkMarburgBiedenkopfHeladef1mar from './banks/spk-marburg-biedenkopf-heladef1mar.js';
+import SpkKarlsruhekarsde66 from './banks/spk-karlsruhe-karsde66.js';
 
 const banks = [
   AmericanExpressAesudef1,
@@ -27,6 +28,7 @@ const banks = [
   SandboxfinanceSfin0000,
   SparNordSpNoDK22,
   SpkMarburgBiedenkopfHeladef1mar,
+  SpkKarlsruhekarsde66,
 ];
 
 export default (institutionId) =>

src/app-gocardless/banks/seb-kort-bank-ab.js

@@ -6,7 +6,7 @@ import {
 
 /** @type {import('./bank.interface.js').IBank} */
 export default {
-  institutionIds: ['SEB_KORT_AB_SE_SKHSFI21'],
+  institutionIds: ['SEB_KORT_AB_NO_SKHSFI21', 'SEB_KORT_AB_SE_SKHSFI21'],
 
   accessValidForDays: 180,
 
@@ -44,11 +44,11 @@ export default {
   },
 
   /**
-   *  For SEB_KORT_AB_SE_SKHSFI21 we don't know what balance was
+   *  For SEB_KORT_AB_NO_SKHSFI21 and SEB_KORT_AB_SE_SKHSFI21 we don't know what balance was
    *  after each transaction so we have to calculate it by getting
    *  current balance from the account and subtract all the transactions
    *
-   *  As a current balance we use `expected` balance type because it
+   *  As a current balance we use `expected` and `nonInvoiced` balance types because it
    *  corresponds to the current running balance, whereas `interimAvailable`
    *  holds the remaining credit limit.
    */
@@ -57,8 +57,12 @@ export default {
       (balance) => 'expected' === balance.balanceType,
     );
 
+    const nonInvoiced = balances.find(
+      (balance) => 'nonInvoiced' === balance.balanceType,
+    );
+
     return sortedTransactions.reduce((total, trans) => {
       return total - amountToInteger(trans.transactionAmount.amount);
-    }, -amountToInteger(currentBalance.balanceAmount.amount));
+    }, -amountToInteger(currentBalance.balanceAmount.amount) + amountToInteger(nonInvoiced.balanceAmount.amount));
   },
 };

src/app-gocardless/banks/spk-karlsruhe-karsde66.js

@@ -0,0 +1,98 @@
+import {
+  printIban,
+  amountToInteger,
+  sortByBookingDateOrValueDate,
+} from '../utils.js';
+
+/** @type {import('./bank.interface.js').IBank} */
+export default {
+  institutionIds: ['SPK_KARLSRUHE_KARSDE66XXX'],
+
+  accessValidForDays: 90,
+
+  normalizeAccount(account) {
+    return {
+      account_id: account.id,
+      institution: account.institution,
+      mask: account.iban.slice(-4),
+      iban: account.iban,
+      name: [account.name, printIban(account)].join(' '),
+      official_name: account.product,
+      type: 'checking',
+    };
+  },
+
+  /**
+   * Following the GoCardless documentation[0] we should prefer `bookingDate`
+   * here, though some of their bank integrations uses the date field
+   * differently from what's describen in their documentation and so it's
+   * sometimes necessary to use `valueDate` instead.
+   *
+   *   [0]: https://nordigen.zendesk.com/hc/en-gb/articles/7899367372829-valueDate-and-bookingDate-for-transactions
+   */
+  normalizeTransaction(transaction, _booked) {
+    const date =
+      transaction.bookingDate ||
+      transaction.bookingDateTime ||
+      transaction.valueDate ||
+      transaction.valueDateTime;
+
+    // If we couldn't find a valid date field we filter out this transaction
+    // and hope that we will import it again once the bank has processed the
+    // transaction further.
+    if (!date) {
+      return null;
+    }
+
+    let remittanceInformationUnstructured;
+
+    if (transaction.remittanceInformationUnstructured) {
+      remittanceInformationUnstructured =
+        transaction.remittanceInformationUnstructured;
+    } else if (transaction.remittanceInformationStructured) {
+      remittanceInformationUnstructured =
+        transaction.remittanceInformationStructured;
+    } else if (transaction.remittanceInformationStructuredArray?.length > 0) {
+      remittanceInformationUnstructured =
+        transaction.remittanceInformationStructuredArray?.join(' ');
+    }
+
+    if (transaction.additionalInformation)
+      remittanceInformationUnstructured +=
+        ' ' + transaction.additionalInformation;
+
+    const usefulCreditorName =
+      transaction.ultimateCreditor ||
+      transaction.creditorName ||
+      transaction.debtorName;
+
+    return {
+      ...transaction,
+      creditorName: usefulCreditorName,
+      remittanceInformationUnstructured: remittanceInformationUnstructured,
+      date: transaction.bookingDate || transaction.valueDate,
+    };
+  },
+
+  sortTransactions(transactions = []) {
+    return sortByBookingDateOrValueDate(transactions);
+  },
+
+  /**
+   *  For SANDBOXFINANCE_SFIN0000 we don't know what balance was
+   *  after each transaction so we have to calculate it by getting
+   *  current balance from the account and subtract all the transactions
+   *
+   *  As a current balance we use `interimBooked` balance type because
+   *  it includes transaction placed during current day
+   */
+  calculateStartingBalance(sortedTransactions = [], balances = []) {
+    const currentBalance = balances.find(
+      (balance) => 'interimAvailable' === balance.balanceType,
+    );
+
+    return sortedTransactions.reduce((total, trans) => {
+      return total - amountToInteger(trans.transactionAmount.amount);
+    }, amountToInteger(currentBalance.balanceAmount.amount));
+  },
+};

upcoming-release-notes/333.md

@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [Nebukadneza]
+---
+
+Add gocardless support for Sparkasse Karlsruhe (Germany)

upcoming-release-notes/334.md

@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [jakoblover]
+---
+
+Extended bank adapter for SEB to support SEB_KORT_AB_NO_SKHSFI21

upcoming-release-notes/341.md

@@ -16,10 +16,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@actual-app/web@npm:24.4.0":
-  version: 24.4.0
-  resolution: "@actual-app/web@npm:24.4.0"
-  checksum: c2b8b1e5fb3e8e9ad021e78405bb1ba45ce74d32ab3f15078bae4645a7b7d2683bdcea45e34f1c88d645df60d0c20f805d8cdd5ebe7a256c6001e4d59559cd43
+"@actual-app/web@npm:24.5.0":
+  version: 24.5.0
+  resolution: "@actual-app/web@npm:24.5.0"
+  checksum: f4200326fc5014ddf9b91922da7ed7bab0f7d370f1b288e6f6fe3fc5108778abfa2cf586c293aafa2c8725ef90a2844c7b001db0850681bd1f464533e1010f64
   languageName: node
   linkType: hard
 
@@ -1611,7 +1611,7 @@ __metadata:
   resolution: "actual-sync@workspace:."
   dependencies:
     "@actual-app/crdt": "npm:2.1.0"
-    "@actual-app/web": "npm:24.4.0"
+    "@actual-app/web": "npm:24.5.0"
     "@babel/preset-typescript": "npm:^7.20.2"
     "@types/bcrypt": "npm:^5.0.0"
     "@types/better-sqlite3": "npm:^7.6.7"