Skip to content

A local-first personal finance app

convert GoCardless sync-server code to Typescript (#7904)

Matt Fiddaman21fda8ffbc37
diff --git a/.oxlintrc.json b/.oxlintrc.json
index c0e2a45e1d..451732bb51 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -390,7 +390,7 @@
"files": [
"packages/api/migrations/*",
"packages/loot-core/migrations/*",
- "packages/sync-server/src/app-gocardless/banks/*.js",
+ "packages/sync-server/src/app-gocardless/banks/*.ts",
"*.config.{ts,mts,mjs}"
],
"rules": {
diff --git a/packages/sync-server/src/app-gocardless/app-gocardless.js b/packages/sync-server/src/app-gocardless/app-gocardless.ts
similarity index 74%
rename from packages/sync-server/src/app-gocardless/app-gocardless.js
rename to packages/sync-server/src/app-gocardless/app-gocardless.ts
index f623fb956f..be0c4b6239 100644
--- a/packages/sync-server/src/app-gocardless/app-gocardless.js
+++ b/packages/sync-server/src/app-gocardless/app-gocardless.ts
@@ -11,16 +11,26 @@ import {
import {
AccountNotLinkedToRequisition,
GenericGoCardlessError,
+ GoCardlessClientError,
RateLimitError,
RequisitionNotLinked,
} from './errors';
+import type {
+ GoCardlessAccountId,
+ GoCardlessInstitutionId,
+ GoCardlessRequisitionId,
+} from './gocardless-node.types';
import { goCardlessService } from './services/gocardless-service';
import { handleError } from './util/handle-error';
-function validateOrigin(origin) {
+function isRecord(value: unknown): value is Record<string, unknown> {
+ return typeof value === 'object' && value !== null;
+}
+
+function validateOrigin(origin: string | undefined) {
let url;
try {
- url = new URL(origin);
+ url = new URL(origin ?? '');
} catch {
throw new Error('Invalid Origin header');
}
@@ -31,11 +41,11 @@ function validateOrigin(origin) {
}
const SAFE_ID = /^[a-zA-Z0-9_-]+$/;
-function sanitizeId(id) {
+function sanitizeId<T extends string = string>(id: unknown): T {
if (typeof id !== 'string' || !SAFE_ID.test(id)) {
throw new Error(`Invalid GoCardless identifier: ${String(id)}`);
}
- return id;
+ return id as T;
}
const app = express();
@@ -62,7 +72,7 @@ app.post(
'/create-web-token',
handleError(async (req, res) => {
const { institutionId: rawInstitutionId } = req.body || {};
- const institutionId = sanitizeId(rawInstitutionId);
+ const institutionId = sanitizeId<GoCardlessInstitutionId>(rawInstitutionId);
const host = validateOrigin(req.headers.origin);
const { link, requisitionId } = await goCardlessService.createRequisition({
@@ -83,7 +93,9 @@ app.post(
app.post(
'/get-accounts',
handleError(async (req, res) => {
- const requisitionId = sanitizeId((req.body || {}).requisitionId);
+ const requisitionId = sanitizeId<GoCardlessRequisitionId>(
+ (req.body || {}).requisitionId,
+ );
try {
const { requisition, accounts } =
@@ -106,7 +118,9 @@ app.post(
if (error instanceof RequisitionNotLinked) {
res.send({
status: 'ok',
- requisitionStatus: error.details.requisitionStatus,
+ requisitionStatus: isRecord(error.details)
+ ? error.details.requisitionStatus
+ : undefined,
});
} else {
throw error;
@@ -142,7 +156,9 @@ app.post(
app.post(
'/remove-account',
handleError(async (req, res) => {
- const requisitionId = sanitizeId((req.body || {}).requisitionId);
+ const requisitionId = sanitizeId<GoCardlessRequisitionId>(
+ (req.body || {}).requisitionId,
+ );
const data = await goCardlessService.deleteRequisition(requisitionId);
if (data.summary === 'Requisition deleted') {
@@ -172,8 +188,8 @@ app.post(
accountId: rawAccountId,
includeBalance = true,
} = req.body || {};
- const requisitionId = sanitizeId(rawRequisitionId);
- const accountId = sanitizeId(rawAccountId);
+ const requisitionId = sanitizeId<GoCardlessRequisitionId>(rawRequisitionId);
+ const accountId = sanitizeId<GoCardlessAccountId>(rawAccountId);
try {
if (includeBalance) {
@@ -226,18 +242,34 @@ app.post(
});
}
} catch (error) {
- const headers = error.details?.response?.headers ?? {};
+ const errorDetails =
+ error instanceof RequisitionNotLinked ||
+ error instanceof GenericGoCardlessError ||
+ error instanceof GoCardlessClientError ||
+ error instanceof AccountNotLinkedToRequisition
+ ? error.details
+ : undefined;
+
+ const responseHeaders =
+ isRecord(errorDetails) && isRecord(errorDetails.response)
+ ? errorDetails.response.headers
+ : undefined;
+
+ const rateLimitHeaders = isRecord(responseHeaders)
+ ? Object.fromEntries(
+ Object.entries(responseHeaders).filter(([key]) =>
+ key.startsWith('x-ratelimit-'),
+ ),
+ )
+ : {};
- const rateLimitHeaders = Object.fromEntries(
- Object.entries(headers).filter(([key]) =>
- key.startsWith('x-ratelimit-'),
- ),
- );
+ const errorMessage =
+ error instanceof Error && error.message ? error.message : String(error);
- const sendErrorResponse = data =>
+ const sendErrorResponse = (data: Record<string, unknown>) =>
res.send({
status: 'ok',
- data: { ...data, details: error.details, rateLimitHeaders },
+ data: { ...data, details: errorDetails, rateLimitHeaders },
});
switch (true) {
@@ -267,14 +299,14 @@ app.post(
});
break;
case error instanceof GenericGoCardlessError:
- console.log('Something went wrong', error.message);
+ console.log('Something went wrong', errorMessage);
sendErrorResponse({
error_type: 'SYNC_ERROR',
error_code: 'NORDIGEN_ERROR',
});
break;
default:
- console.log('Something went wrong', error.message || String(error));
+ console.log('Something went wrong', errorMessage);
sendErrorResponse({
error_type: 'UNKNOWN',
error_code: 'UNKNOWN',
diff --git a/packages/sync-server/src/app-gocardless/bank-factory.js b/packages/sync-server/src/app-gocardless/bank-factory.js
deleted file mode 100644
index cfa1c5e44e..0000000000
--- a/packages/sync-server/src/app-gocardless/bank-factory.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import IntegrationBank from './banks/integration-bank';
-
-// Filename convention: <name>_<bic>.{ts,js} (skips bank.interface,
-// integration-bank, and any other helper without an underscore).
-const bankModules = import.meta.glob('./banks/*_*.{ts,js}', { eager: true });
-
-export const banks = Object.values(bankModules).map(m => m.default);
-
-export function BankFactory(institutionId) {
- return (
- banks.find(b => b.institutionIds.includes(institutionId)) || IntegrationBank
- );
-}
diff --git a/packages/sync-server/src/app-gocardless/bank-factory.ts b/packages/sync-server/src/app-gocardless/bank-factory.ts
new file mode 100644
index 0000000000..a02004949a
--- /dev/null
+++ b/packages/sync-server/src/app-gocardless/bank-factory.ts
@@ -0,0 +1,19 @@
+import type { IBank } from './banks/bank.interface';
+import IntegrationBank from './banks/integration-bank';
+
+// Filename convention: <name>_<bic>.{ts,js} (skips bank.interface,
+// integration-bank, and any other helper without an underscore).
+const bankModules = import.meta.glob<{ default: IBank }>(
+ './banks/*_*.{ts,js}',
+ {
+ eager: true,
+ },
+);
+
+export const banks: IBank[] = Object.values(bankModules).map(m => m.default);
+
+export function BankFactory(institutionId: string): IBank {
+ return (
+ banks.find(b => b.institutionIds.includes(institutionId)) || IntegrationBank
+ );
+}
diff --git a/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.js b/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.ts
similarity index 89%
rename from packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.js
rename to packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.ts
index 599a147e9f..07d0c045f4 100644
--- a/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.js
+++ b/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -19,4 +19,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js b/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.ts
similarity index 72%
rename from packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js
rename to packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.ts
index cdfebfade2..f2d7796021 100644
--- a/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js
+++ b/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -11,27 +11,29 @@ export default {
normalizeTransaction(transaction, booked) {
const editedTrans = { ...transaction };
+ const infoArray = transaction.remittanceInformationUnstructuredArray ?? [];
+
// There is no remittanceInformationUnstructured, so we'll make it
- editedTrans.remittanceInformationUnstructured =
- transaction.remittanceInformationUnstructuredArray.join(', ');
+ editedTrans.remittanceInformationUnstructured = infoArray.join(', ');
// Remove clutter to extract the payee from remittanceInformationUnstructured ...
// ... when not otherwise provided.
- const payeeName = transaction.remittanceInformationUnstructuredArray
+ const payeeName = infoArray
.map(el => el.match(/^(?:.*\*)?(.+),PAS\d+$/))
.find(match => match)?.[1];
editedTrans.debtorName = transaction.debtorName || payeeName;
editedTrans.creditorName = transaction.creditorName || payeeName;
- editedTrans.date = transaction.valueDateTime.slice(0, 10);
+ editedTrans.date = (transaction.valueDateTime ?? '').slice(0, 10);
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
sortTransactions(transactions = []) {
return transactions.sort(
- (a, b) => +new Date(b.valueDateTime) - +new Date(a.valueDateTime),
+ (a, b) =>
+ +new Date(b.valueDateTime ?? '') - +new Date(a.valueDateTime ?? ''),
);
},
@@ -40,7 +42,7 @@ export default {
const oldestTransaction =
sortedTransactions[sortedTransactions.length - 1];
const oldestKnownBalance = amountToInteger(
- oldestTransaction.balanceAfterTransaction.balanceAmount.amount,
+ oldestTransaction.balanceAfterTransaction?.balanceAmount.amount || 0,
);
const oldestTransactionAmount = amountToInteger(
oldestTransaction.transactionAmount.amount,
@@ -50,8 +52,8 @@ export default {
} else {
return amountToInteger(
balances.find(balance => 'interimBooked' === balance.balanceType)
- .balanceAmount.amount,
+ ?.balanceAmount.amount || 0,
);
}
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.js b/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.ts
similarity index 76%
rename from packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.js
rename to packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.ts
index 1b31722751..6095919cb0 100644
--- a/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.js
+++ b/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -16,7 +16,7 @@ export default {
mask: account.iban.slice(-5),
iban: null,
name: [account.details, `(${account.iban.slice(-5)})`].join(' '),
- official_name: account.details,
+ official_name: account.details ?? '',
};
},
@@ -33,8 +33,11 @@ export default {
balance => 'information' === balance.balanceType.toString(),
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.js b/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.ts
similarity index 68%
rename from packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.js
rename to packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.ts
index 4313a04120..c85dad7dec 100644
--- a/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.js
+++ b/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -15,17 +15,14 @@ export default {
// The amount is negative for outgoing transactions, positive for incoming transactions.
const isCreditorPayee = Number.parseFloat(amount) < 0;
- const payeeName = transaction.remittanceInformationUnstructuredArray
+ const payeeName = (transaction.remittanceInformationUnstructuredArray ?? [])
.join(' ')
.trim();
// The payee name is the creditor name for outgoing transactions and the debtor name for incoming transactions.
- const creditorName = isCreditorPayee ? payeeName : null;
- const debtorName = isCreditorPayee ? null : payeeName;
-
- editedTrans.creditorName = creditorName;
- editedTrans.debtorName = debtorName;
+ editedTrans.creditorName = isCreditorPayee ? payeeName : undefined;
+ editedTrans.debtorName = isCreditorPayee ? undefined : payeeName;
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts b/packages/sync-server/src/app-gocardless/banks/bank.interface.ts
index ea0df4d644..ebebf1ad48 100644
--- a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts
+++ b/packages/sync-server/src/app-gocardless/banks/bank.interface.ts
@@ -15,6 +15,14 @@ type TransactionExtended = Transaction & {
remittanceInformationStructuredArrayString?: string;
};
+type NormalizedTransaction = Transaction & {
+ date: string;
+ payeeName: string;
+ notes: string;
+ remittanceInformationUnstructuredArrayString?: string;
+ remittanceInformationStructuredArrayString?: string;
+};
+
export type IBank = {
institutionIds: string[];
@@ -37,7 +45,7 @@ export type IBank = {
transaction: TransactionExtended,
booked: boolean,
editedTransaction?: TransactionExtended,
- ) => TransactionExtended | null;
+ ) => NormalizedTransaction | null;
/**
* Function sorts an array of transactions from newest to oldest
diff --git a/packages/sync-server/src/app-gocardless/banks/bank_of_ireland_b365_bofiie2d.js b/packages/sync-server/src/app-gocardless/banks/bank_of_ireland_b365_bofiie2d.ts
similarity index 84%
rename from packages/sync-server/src/app-gocardless/banks/bank_of_ireland_b365_bofiie2d.js
rename to packages/sync-server/src/app-gocardless/banks/bank_of_ireland_b365_bofiie2d.ts
index ab1e1da452..e8ba62c5d7 100644
--- a/packages/sync-server/src/app-gocardless/banks/bank_of_ireland_b365_bofiie2d.js
+++ b/packages/sync-server/src/app-gocardless/banks/bank_of_ireland_b365_bofiie2d.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -10,14 +10,14 @@ export default {
const editedTrans = { ...transaction };
editedTrans.remittanceInformationUnstructured = fixupPayee(
- transaction.remittanceInformationUnstructured,
+ transaction.remittanceInformationUnstructured ?? '',
);
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
-function fixupPayee(/** @type {string} */ payee) {
+function fixupPayee(payee: string) {
let fixedPayee = payee;
// remove all duplicate whitespace
diff --git a/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.js b/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.ts
similarity index 66%
rename from packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.js
rename to packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.ts
index 1b3bac7d6e..ea9961fefc 100644
--- a/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.js
+++ b/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -9,10 +9,11 @@ export default {
normalizeTransaction(transaction, booked) {
const editedTrans = { ...transaction };
- editedTrans.remittanceInformationUnstructured =
- transaction.remittanceInformationUnstructured
- .replaceAll(/\/Txt\/(\w\|)?/gi, '')
- .replaceAll(';', ' ');
+ editedTrans.remittanceInformationUnstructured = (
+ transaction.remittanceInformationUnstructured ?? ''
+ )
+ .replaceAll(/\/Txt\/(\w\|)?/gi, '')
+ .replaceAll(';', ' ');
editedTrans.debtorName = transaction.debtorName?.replaceAll(';', ' ');
editedTrans.creditorName =
@@ -21,4 +22,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.js b/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.ts
similarity index 88%
rename from packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.js
rename to packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.ts
index 6c88fccce6..8c2d08c473 100644
--- a/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.js
+++ b/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -14,4 +14,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.js b/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.ts
similarity index 82%
rename from packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.js
rename to packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.ts
index b5cdde5444..23b86fecf2 100644
--- a/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.js
+++ b/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -19,7 +19,9 @@ export default {
} else if (transaction.remittanceInformationStructured) {
remittanceInformationUnstructured =
transaction.remittanceInformationStructured;
- } else if (transaction.remittanceInformationStructuredArray?.length > 0) {
+ } else if (
+ (transaction.remittanceInformationStructuredArray?.length ?? 0) > 0
+ ) {
remittanceInformationUnstructured =
transaction.remittanceInformationStructuredArray?.join(' ');
}
@@ -54,8 +56,11 @@ export default {
balance => 'interimAvailable' === balance.balanceType,
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.js b/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.ts
similarity index 88%
rename from packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.js
rename to packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.ts
index 86220d480d..1891cb0299 100644
--- a/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.js
+++ b/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -28,7 +28,7 @@ export default {
let creditorName = transaction.creditorName;
if (transaction.additionalInformation) {
- const additionalInformationObject = {};
+ const additionalInformationObject: Record<string, string> = {};
const additionalInfoRegex = /(, )?([^:]+): ((\[.*?\])|([^,]*))/g;
const matches =
transaction.additionalInformation.matchAll(additionalInfoRegex);
@@ -50,10 +50,10 @@ export default {
}
// Keep existing unstructuredArray and add atmPosName and narrative
editedTrans.remittanceInformationUnstructuredArray = [
- transaction.remittanceInformationUnstructuredArray ?? '',
- additionalInformationObject?.atmPosName ?? '',
- additionalInformationObject?.narrative ?? '',
- ].filter(Boolean);
+ ...(transaction.remittanceInformationUnstructuredArray ?? []),
+ additionalInformationObject?.atmPosName,
+ additionalInformationObject?.narrative,
+ ].filter(Boolean) as string[];
// If the creditor name doesn't exist in the original transactions,
// set it to the atmPosName or narrativeName if they exist; otherwise
@@ -70,4 +70,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.js b/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.ts
similarity index 80%
rename from packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.js
rename to packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.ts
index 004267bdfe..ca0fb93c2c 100644
--- a/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.js
+++ b/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.ts
@@ -1,5 +1,6 @@
import { title } from '#util/title';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
const regexCard =
@@ -13,7 +14,6 @@ const regexLoan = /^ECH PRET:/;
const regexCreditNote =
/^AVOIR (?<date>\d{2}\/\d{2}\/\d{2}) (?<payeeName>.+?) CB\*\d{4,}/;
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -22,24 +22,25 @@ export default {
normalizeTransaction(transaction, booked) {
const editedTrans = { ...transaction };
- editedTrans.remittanceInformationUnstructuredArray =
+ editedTrans.remittanceInformationUnstructuredArray = (
+ transaction.remittanceInformationUnstructuredArray ?? []
+ )
// Remove the localisation with backslashes that are sometimes present
- transaction.remittanceInformationUnstructuredArray
- .map(line => line.replace(/\\.+/g, ''))
- // Remove an unwanted line that pollutes the remittance information
- .filter(line => line.startsWith('Réf : ') === false);
+ .map(line => line.replace(/\\.+/g, ''))
+ // Remove an unwanted line that pollutes the remittance information
+ .filter(line => line.startsWith('Réf : ') === false);
const infoArray = editedTrans.remittanceInformationUnstructuredArray;
- let match;
+ let match: string | undefined;
// Transactions can have their identifier in any line, as the order of lines is not guaranteed.
// This is why we check all lines for specific patterns.
if ((match = infoArray.find(line => regexCard.test(line)))) {
// Card transaction
const cardMatch = match.match(regexCard);
- editedTrans.payeeName = title(cardMatch.groups.payeeName);
- editedTrans.notes = `Carte ${cardMatch.groups.date}`;
+ editedTrans.payeeName = title(cardMatch?.groups?.payeeName ?? '');
+ editedTrans.notes = `Carte ${cardMatch?.groups?.date}`;
if (infoArray.length > 1) {
editedTrans.notes += ' ' + infoArray.filter(l => l !== match).join(' ');
}
@@ -53,15 +54,15 @@ export default {
// ATM withdrawal
const atmMatch = match.match(regexAtmWithdrawal);
editedTrans.payeeName = 'Retrait DAB';
- editedTrans.notes = `Retrait ${atmMatch.groups.date} ${atmMatch.groups.locationName}`;
+ editedTrans.notes = `Retrait ${atmMatch?.groups?.date} ${atmMatch?.groups?.locationName}`;
if (infoArray.length > 1) {
editedTrans.notes += ' ' + infoArray.filter(l => l !== match).join(' ');
}
} else if ((match = infoArray.find(line => regexCreditNote.test(line)))) {
// Credit note (refund)
const creditMatch = match.match(regexCreditNote);
- editedTrans.payeeName = title(creditMatch.groups.payeeName);
- editedTrans.notes = `Avoir ${creditMatch.groups.date}`;
+ editedTrans.payeeName = title(creditMatch?.groups?.payeeName ?? '');
+ editedTrans.notes = `Avoir ${creditMatch?.groups?.date}`;
if (infoArray.length > 1) {
editedTrans.notes += ' ' + infoArray.filter(l => l !== match).join(' ');
}
@@ -90,4 +91,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/bper_retail_bpmoit22.js b/packages/sync-server/src/app-gocardless/banks/bper_retail_bpmoit22.ts
similarity index 85%
rename from packages/sync-server/src/app-gocardless/banks/bper_retail_bpmoit22.js
rename to packages/sync-server/src/app-gocardless/banks/bper_retail_bpmoit22.ts
index 62fd9b0a3d..fc199a9a25 100644
--- a/packages/sync-server/src/app-gocardless/banks/bper_retail_bpmoit22.js
+++ b/packages/sync-server/src/app-gocardless/banks/bper_retail_bpmoit22.ts
@@ -3,6 +3,9 @@
* while keeping the raw description in the notes field.
*/
+import type { Transaction } from '#app-gocardless/gocardless-node.types';
+
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
const CARD_PAYMENT_PREFIX = 'PAGAMENTO SU CIRCUITO INTERNAZIONALE';
@@ -18,34 +21,34 @@ const SDD_PAYEE_REGEX = /ADDEBITO SDD\s+([A-Z0-9\s.'/&-]+?)(?:N:|ID:|$)/i;
const BOLLETTINO_PAYEE_REGEX = /CREDITORE:\s*([A-Z0-9\s.'/&-]+)/i;
// Extract payee for card transactions
-function parseCardPayee(description) {
+function parseCardPayee(description: string) {
const [beforeSuffix] = description.split(CARD_PAYMENT_SUFFIX);
return beforeSuffix.replace(CARD_PAYMENT_PREFIX, '').trim();
}
// Extract originator for bonifico (domestic/foreign transfers)
-function parseBonificoOriginator(description) {
+function parseBonificoOriginator(description: string) {
const match = description.match(BONIFICO_ORIGINATOR_REGEX);
return match ? match[1].trim() : '';
}
// Extract creditor for SDD direct debits
-function parseSddPayee(description) {
+function parseSddPayee(description: string) {
const match = description.match(SDD_PAYEE_REGEX);
return match ? match[1].trim() : '';
}
// Extract creditor for bollettini / utilities
-function parseBollettinoPayee(description) {
+function parseBollettinoPayee(description: string) {
const match = description.match(BOLLETTINO_PAYEE_REGEX);
return match ? match[1].trim() : '';
}
-function setPayee(editedTransaction, payee) {
+function setPayee(editedTransaction: Transaction, payee: string) {
if (!payee) {
return;
}
@@ -54,7 +57,6 @@ function setPayee(editedTransaction, payee) {
editedTransaction.debtorName = payee;
}
-/** @type {import('./bank.interface').IBank} */
const BperRetailBank = {
...Fallback,
@@ -89,6 +91,6 @@ const BperRetailBank = {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
export default BperRetailBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.js b/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.ts
similarity index 88%
rename from packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.js
rename to packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.ts
index d7422dedbc..55a1e8426c 100644
--- a/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.js
+++ b/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.ts
@@ -1,7 +1,7 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
import { extractPayeeNameFromRemittanceInfo } from './util/extract-payeeName-from-remittanceInfo';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -23,7 +23,7 @@ export default {
editedTrans.payeeName =
transaction.creditorName ||
extractPayeeNameFromRemittanceInfo(
- transaction.remittanceInformationUnstructured,
+ transaction.remittanceInformationUnstructured ?? '',
['Paiement', 'Domiciliation', 'Transfert', 'Ordre permanent'],
) ||
'undefined';
@@ -31,4 +31,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/cetelem_cetmptp1xxx.js b/packages/sync-server/src/app-gocardless/banks/cetelem_cetmptp1xxx.ts
similarity index 89%
rename from packages/sync-server/src/app-gocardless/banks/cetelem_cetmptp1xxx.js
rename to packages/sync-server/src/app-gocardless/banks/cetelem_cetmptp1xxx.ts
index 7ddeb24d7c..af0fa2caea 100644
--- a/packages/sync-server/src/app-gocardless/banks/cetelem_cetmptp1xxx.js
+++ b/packages/sync-server/src/app-gocardless/banks/cetelem_cetmptp1xxx.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -20,4 +20,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.js b/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.ts
similarity index 76%
rename from packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.js
rename to packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.ts
index c776f60ceb..9a01e535f8 100644
--- a/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.js
+++ b/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.ts
@@ -1,7 +1,7 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
import { escapeRegExp } from './util/escape-regexp';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -13,8 +13,9 @@ export default {
// remittanceInformationUnstructured is limited to 140 chars thus ...
// ... missing information form remittanceInformationUnstructuredArray ...
// ... so we recreate it.
- editedTrans.remittanceInformationUnstructured =
- transaction.remittanceInformationUnstructuredArray.join(' ');
+ editedTrans.remittanceInformationUnstructured = (
+ transaction.remittanceInformationUnstructuredArray ?? []
+ ).join(' ');
// The limitations of remittanceInformationUnstructuredArray ...
// ... can result in split keywords. We fix these. Other ...
@@ -28,12 +29,13 @@ export default {
'Dauerauftrag',
];
keywords.forEach(keyword => {
- editedTrans.remittanceInformationUnstructured =
- editedTrans.remittanceInformationUnstructured.replace(
- // There can be spaces in keywords
- RegExp(keyword.split('').join('\\s*'), 'gi'),
- ', ' + keyword + ' ',
- );
+ editedTrans.remittanceInformationUnstructured = (
+ editedTrans.remittanceInformationUnstructured ?? ''
+ ).replace(
+ // There can be spaces in keywords
+ RegExp(keyword.split('').join('\\s*'), 'gi'),
+ ', ' + keyword + ' ',
+ );
});
// Clean up remittanceInformation, deduplicate payee (removing slashes ...
@@ -51,4 +53,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/danskebank_privat.js b/packages/sync-server/src/app-gocardless/banks/danskebank_privat.ts
similarity index 67%
rename from packages/sync-server/src/app-gocardless/banks/danskebank_privat.js
rename to packages/sync-server/src/app-gocardless/banks/danskebank_privat.ts
index 8e75af6a85..a106098a62 100644
--- a/packages/sync-server/src/app-gocardless/banks/danskebank_privat.js
+++ b/packages/sync-server/src/app-gocardless/banks/danskebank_privat.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -20,11 +20,9 @@ export default {
* We clean thais up by removing any instances of this string from all transactions.
*
*/
- editedTrans.remittanceInformationUnstructured =
- transaction.remittanceInformationUnstructured.replace(
- '\nEndToEndID: NOTPROVIDED',
- '',
- );
+ editedTrans.remittanceInformationUnstructured = (
+ transaction.remittanceInformationUnstructured ?? ''
+ ).replace('\nEndToEndID: NOTPROVIDED', '');
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
@@ -34,8 +32,11 @@ export default {
balance => balance.balanceType === 'interimAvailable',
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/direkt_heladef1822.js b/packages/sync-server/src/app-gocardless/banks/direkt_heladef1822.ts
similarity index 87%
rename from packages/sync-server/src/app-gocardless/banks/direkt_heladef1822.js
rename to packages/sync-server/src/app-gocardless/banks/direkt_heladef1822.ts
index fc863496b9..59490bcfc6 100644
--- a/packages/sync-server/src/app-gocardless/banks/direkt_heladef1822.js
+++ b/packages/sync-server/src/app-gocardless/banks/direkt_heladef1822.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -15,4 +15,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js b/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.ts
similarity index 72%
rename from packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js
rename to packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.ts
index 0562bc2091..e03b478ef8 100644
--- a/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js
+++ b/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.ts
@@ -1,9 +1,10 @@
+import type { Transaction } from '#app-gocardless/gocardless-node.types';
import { formatPayeeName } from '#util/payee-name';
import { title } from '#util/title';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -13,10 +14,10 @@ export default {
sortTransactions: (transactions = []) =>
transactions.sort((a, b) => {
const diff =
- +new Date(b.valueDate || b.bookingDate) -
- +new Date(a.valueDate || a.bookingDate);
+ +new Date(b.valueDate || b.bookingDate || '') -
+ +new Date(a.valueDate || a.bookingDate || '');
if (diff !== 0) return diff;
- return parseInt(b.transactionId) - parseInt(a.transactionId);
+ return parseInt(b.transactionId ?? '') - parseInt(a.transactionId ?? '');
}),
normalizeTransaction(transaction, booked) {
@@ -28,14 +29,11 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
-
-/**
- * Extracts the payee name from the remittanceInformationStructured
- * @param {import('../gocardless-node.types').Transaction} transaction
- */
-function extractPayeeName(transaction) {
- const structured = transaction.remittanceInformationStructured;
+} satisfies IBank;
+
+// extracts the payee name from the remittanceInformationStructured
+function extractPayeeName(transaction: Transaction) {
+ const structured = transaction.remittanceInformationStructured ?? '';
// The payee name is betweeen the transaction timestamp (11.07. 11:36) and the location, that starts with \\
const regex = /\d{2}\.\d{2}\. \d{2}:\d{2}(.*)\\\\/;
const matches = structured.match(regex);
diff --git a/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js b/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.ts
similarity index 85%
rename from packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js
rename to packages/sync-server/src/app-gocardless/banks/entercard_swednokk.ts
index f2a8443772..511f9f1961 100644
--- a/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js
+++ b/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -16,7 +16,7 @@ export default {
// billed to the account is now available in
// `remittanceInformationUnstructured`.
const remittanceInformationUnstructured =
- transaction.remittanceInformationUnstructured;
+ transaction.remittanceInformationUnstructured ?? '';
if (remittanceInformationUnstructured.startsWith('billingAmount: ')) {
transaction.transactionAmount = {
amount: remittanceInformationUnstructured.substring(15),
@@ -34,7 +34,7 @@ export default {
(total, trans) => {
return total - amountToInteger(trans.transactionAmount.amount);
},
- amountToInteger(balances[0]?.balanceAmount?.amount || 0),
+ amountToInteger(balances[0]?.balanceAmount.amount || 0),
);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.js b/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.ts
similarity index 78%
rename from packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.js
rename to packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.ts
index b0e3f038f5..5620f441f5 100644
--- a/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.js
+++ b/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -22,8 +22,9 @@ export default {
'CARTE \\d{2}\\/\\d{2}',
];
- const details =
- transaction.remittanceInformationUnstructuredArray.join(' ');
+ const details = (
+ transaction.remittanceInformationUnstructuredArray ?? []
+ ).join(' ');
const amount = transaction.transactionAmount.amount;
const regex = new RegExp(keywordsToRemove.join('|'), 'g');
@@ -33,12 +34,9 @@ export default {
const isCreditorPayee = parseFloat(amount) < 0;
// The payee name is the creditor name for outgoing transactions and the debtor name for incoming transactions.
- const creditorName = isCreditorPayee ? payeeName : null;
- const debtorName = isCreditorPayee ? null : payeeName;
-
- editedTrans.creditorName = creditorName;
- editedTrans.debtorName = debtorName;
+ editedTrans.creditorName = isCreditorPayee ? payeeName : undefined;
+ editedTrans.debtorName = isCreditorPayee ? undefined : payeeName;
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.js b/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.ts
similarity index 86%
rename from packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.js
rename to packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.ts
index 89e4e52ba8..ab88a0d8f7 100644
--- a/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.js
+++ b/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -30,12 +30,10 @@ export default {
) {
// keep only {payment_info} portion of remittance info
// NOTE: if {payee_name} contains dashes (unlikely / impossible?), this probably gets bugged!
- const infoIdx =
- transaction.remittanceInformationUnstructured.indexOf(' - ') + 3;
+ const remittance = transaction.remittanceInformationUnstructured ?? '';
+ const idx = remittance.indexOf(' - ');
editedTrans.remittanceInformationUnstructured =
- infoIdx === -1
- ? transaction.remittanceInformationUnstructured
- : transaction.remittanceInformationUnstructured.slice(infoIdx).trim();
+ idx === -1 ? remittance : remittance.slice(idx + 3).trim();
}
/**
* CONVERT ESCAPED UNICODE TO CODEPOINTS
@@ -45,7 +43,7 @@ export default {
* the code below assumes this is always the case
*/
if (transaction.proprietaryBankTransactionCode === 'p2p') {
- let str = transaction.remittanceInformationUnstructured;
+ let str = transaction.remittanceInformationUnstructured ?? '';
let idx = str.indexOf('\\U');
let start_idx = idx;
let codepoints = [];
@@ -71,4 +69,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/ing_ingbrobu.js b/packages/sync-server/src/app-gocardless/banks/ing_ingbrobu.ts
similarity index 93%
rename from packages/sync-server/src/app-gocardless/banks/ing_ingbrobu.js
rename to packages/sync-server/src/app-gocardless/banks/ing_ingbrobu.ts
index 36c59209d2..dce6b92a14 100644
--- a/packages/sync-server/src/app-gocardless/banks/ing_ingbrobu.js
+++ b/packages/sync-server/src/app-gocardless/banks/ing_ingbrobu.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -41,7 +41,7 @@ export default {
transaction.remittanceInformationUnstructured;
}
} else {
- transaction.transactionId = null;
+ transaction.transactionId = undefined;
if (
transaction.remittanceInformationUnstructured &&
@@ -61,10 +61,10 @@ export default {
}
//Remove remittanceInformationUnstructured from pending transactions, so the `notes` field remains empty (there is no merchant information)
//Once booked, the right `notes` (containing the merchant) will be populated
- editedTrans.remittanceInformationUnstructured = null;
+ editedTrans.remittanceInformationUnstructured = undefined;
}
}
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js b/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.ts
similarity index 64%
rename from packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js
rename to packages/sync-server/src/app-gocardless/banks/ing_ingddeff.ts
index 06d61e83f4..440545966f 100644
--- a/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js
+++ b/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -12,7 +12,7 @@ export default {
const editedTrans = { ...transaction };
const remittanceInformationMatch = /remittanceinformation:(.*)$/.exec(
- transaction.remittanceInformationUnstructured,
+ transaction.remittanceInformationUnstructured ?? '',
);
editedTrans.remittanceInformationUnstructured = remittanceInformationMatch
@@ -25,11 +25,11 @@ export default {
sortTransactions(transactions = []) {
return transactions.sort((a, b) => {
const diff =
- +new Date(b.valueDate || b.bookingDate) -
- +new Date(a.valueDate || a.bookingDate);
+ +new Date(b.valueDate || b.bookingDate || '') -
+ +new Date(a.valueDate || a.bookingDate || '');
if (diff) return diff;
- const idA = parseInt(a.transactionId);
- const idB = parseInt(b.transactionId);
+ const idA = parseInt(a.transactionId ?? '');
+ const idB = parseInt(b.transactionId ?? '');
if (!isNaN(idA) && !isNaN(idB)) return idB - idA;
return 0;
});
@@ -40,8 +40,11 @@ export default {
balance => 'interimBooked' === balance.balanceType,
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.js b/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.ts
similarity index 79%
rename from packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.js
rename to packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.ts
index 5998560624..927cf617db 100644
--- a/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.js
+++ b/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -19,7 +19,8 @@ export default {
sortTransactions(transactions = []) {
return transactions.sort((a, b) => {
return (
- Number(b.transactionId.substr(2)) - Number(a.transactionId.substr(2))
+ Number((b.transactionId ?? '').substr(2)) -
+ Number((a.transactionId ?? '').substr(2))
);
});
},
@@ -29,7 +30,7 @@ export default {
const oldestTransaction =
sortedTransactions[sortedTransactions.length - 1];
const oldestKnownBalance = amountToInteger(
- oldestTransaction.balanceAfterTransaction.balanceAmount.amount,
+ oldestTransaction.balanceAfterTransaction?.balanceAmount.amount || 0,
);
const oldestTransactionAmount = amountToInteger(
oldestTransaction.transactionAmount.amount,
@@ -39,8 +40,8 @@ export default {
} else {
return amountToInteger(
balances.find(balance => 'interimBooked' === balance.balanceType)
- .balanceAmount.amount,
+ ?.balanceAmount.amount || 0,
);
}
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/integration-bank.js b/packages/sync-server/src/app-gocardless/banks/integration-bank.ts
similarity index 90%
rename from packages/sync-server/src/app-gocardless/banks/integration-bank.js
rename to packages/sync-server/src/app-gocardless/banks/integration-bank.ts
index 694393e5be..ce1ecc6049 100644
--- a/packages/sync-server/src/app-gocardless/banks/integration-bank.js
+++ b/packages/sync-server/src/app-gocardless/banks/integration-bank.ts
@@ -7,6 +7,8 @@ import {
} from '#app-gocardless/utils';
import { formatPayeeName } from '#util/payee-name';
+import type { IBank } from './bank.interface';
+
const SORTED_BALANCE_TYPE_LIST = [
'closingBooked',
'expected',
@@ -17,7 +19,6 @@ const SORTED_BALANCE_TYPE_LIST = [
'openingBooked',
];
-/** @type {import('./bank.interface').IBank} */
export default {
institutionIds: ['IntegrationBank'],
@@ -39,7 +40,7 @@ export default {
};
},
- normalizeTransaction(transaction, _booked, editedTransaction = null) {
+ normalizeTransaction(transaction, _booked, editedTransaction?) {
const trans = editedTransaction ?? transaction;
const date =
@@ -59,7 +60,8 @@ export default {
const notes =
trans.notes ??
trans.remittanceInformationUnstructured ??
- trans.remittanceInformationUnstructuredArray?.join(' ');
+ trans.remittanceInformationUnstructuredArray?.join(' ') ??
+ '';
transaction.remittanceInformationUnstructuredArrayString =
transaction.remittanceInformationUnstructuredArray?.join(',');
@@ -90,7 +92,7 @@ export default {
(total, trans) => {
return total - amountToInteger(trans.transactionAmount.amount);
},
- amountToInteger(currentBalance?.balanceAmount?.amount || 0),
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/isybank_itbbitmm.js b/packages/sync-server/src/app-gocardless/banks/isybank_itbbitmm.ts
similarity index 87%
rename from packages/sync-server/src/app-gocardless/banks/isybank_itbbitmm.js
rename to packages/sync-server/src/app-gocardless/banks/isybank_itbbitmm.ts
index f1b20962db..99edf25985 100644
--- a/packages/sync-server/src/app-gocardless/banks/isybank_itbbitmm.js
+++ b/packages/sync-server/src/app-gocardless/banks/isybank_itbbitmm.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -15,4 +15,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.js b/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.ts
similarity index 88%
rename from packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.js
rename to packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.ts
index 793320febf..f498e6aa79 100644
--- a/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.js
+++ b/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.ts
@@ -1,7 +1,7 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
import { extractPayeeNameFromRemittanceInfo } from './util/extract-payeeName-from-remittanceInfo';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -23,11 +23,11 @@ export default {
editedTrans.payeeName =
transaction.creditorName ||
extractPayeeNameFromRemittanceInfo(
- transaction.remittanceInformationUnstructured,
+ transaction.remittanceInformationUnstructured ?? '',
['Betaling met', 'Domiciliëring', 'Overschrijving'],
);
}
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/lhv_lhvbee22.js b/packages/sync-server/src/app-gocardless/banks/lhv_lhvbee22.ts
similarity index 88%
rename from packages/sync-server/src/app-gocardless/banks/lhv_lhvbee22.js
rename to packages/sync-server/src/app-gocardless/banks/lhv_lhvbee22.ts
index 2eb117ca79..cea091c9d8 100644
--- a/packages/sync-server/src/app-gocardless/banks/lhv_lhvbee22.js
+++ b/packages/sync-server/src/app-gocardless/banks/lhv_lhvbee22.ts
@@ -1,8 +1,8 @@
import * as d from 'date-fns';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -18,7 +18,7 @@ export default {
const cardTxRegex =
/^\(\.\.(\d{4})\) (\d{4}-\d{2}-\d{2}) (\d{2}:\d{2}) (.+)$/g;
const cardTxMatch = cardTxRegex.exec(
- transaction?.remittanceInformationUnstructured,
+ transaction?.remittanceInformationUnstructured ?? '',
);
if (cardTxMatch) {
@@ -33,4 +33,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.js b/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.ts
similarity index 85%
rename from packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.js
rename to packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.ts
index 5f9086884d..ebe7d41461 100644
--- a/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.js
+++ b/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -49,8 +49,11 @@ export default {
balance => 'interimBooked' === balance.balanceType,
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/nationwide_naiagb21.js b/packages/sync-server/src/app-gocardless/banks/nationwide_naiagb21.ts
similarity index 84%
rename from packages/sync-server/src/app-gocardless/banks/nationwide_naiagb21.js
rename to packages/sync-server/src/app-gocardless/banks/nationwide_naiagb21.ts
index 2ccf1ea313..874c3ec5ca 100644
--- a/packages/sync-server/src/app-gocardless/banks/nationwide_naiagb21.js
+++ b/packages/sync-server/src/app-gocardless/banks/nationwide_naiagb21.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -17,7 +17,7 @@ export default {
if (!booked) {
const useDate = new Date(
Math.min(
- new Date(transaction.bookingDate).getTime(),
+ new Date(transaction.bookingDate ?? '').getTime(),
new Date().getTime(),
),
);
@@ -36,11 +36,11 @@ export default {
if (
transaction.transactionId?.match(debitCreditRegex) ||
- !validLengths.includes(transaction.transactionId?.length)
+ !validLengths.includes(transaction.transactionId?.length ?? -1)
) {
- transaction.transactionId = null;
+ transaction.transactionId = undefined;
}
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js b/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.ts
similarity index 73%
rename from packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js
rename to packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.ts
index 840de670ca..6da1783196 100644
--- a/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js
+++ b/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -18,14 +18,15 @@ export default {
if (
!transaction.transactionId &&
- transaction.remittanceInformationUnstructured.startsWith('ΑΓΟΡΑ ')
+ (transaction.remittanceInformationUnstructured ?? '').startsWith('ΑΓΟΡΑ ')
) {
transaction.transactionAmount = {
amount: '-' + transaction.transactionAmount.amount,
currency: transaction.transactionAmount.currency,
};
- editedTrans.remittanceInformationUnstructured =
- transaction.remittanceInformationUnstructured.substring(6);
+ editedTrans.remittanceInformationUnstructured = (
+ transaction.remittanceInformationUnstructured ?? ''
+ ).substring(6);
}
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
@@ -44,8 +45,11 @@ export default {
balance => 'interimAvailable' === balance.balanceType,
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.js b/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.ts
similarity index 88%
rename from packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.js
rename to packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.ts
index 205ecd2247..ae21101eaa 100644
--- a/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.js
+++ b/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -67,8 +67,11 @@ export default {
balance => 'expected' === balance.balanceType,
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/raiffeisen_at_rzbaatww.js b/packages/sync-server/src/app-gocardless/banks/raiffeisen_at_rzbaatww.ts
similarity index 85%
rename from packages/sync-server/src/app-gocardless/banks/raiffeisen_at_rzbaatww.js
rename to packages/sync-server/src/app-gocardless/banks/raiffeisen_at_rzbaatww.ts
index fd42ede7ab..6d847a2af6 100644
--- a/packages/sync-server/src/app-gocardless/banks/raiffeisen_at_rzbaatww.js
+++ b/packages/sync-server/src/app-gocardless/banks/raiffeisen_at_rzbaatww.ts
@@ -1,9 +1,10 @@
+import type { Transaction } from '#app-gocardless/gocardless-node.types';
import { formatPayeeName } from '#util/payee-name';
import { title } from '#util/title';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -27,14 +28,11 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
-
-/**
- * Extracts the payee name from the remittanceInformationStructured
- * @param {import('../gocardless-node.types').Transaction} transaction
- */
-function extractPayeeName(transaction) {
- const structured = transaction.remittanceInformationStructured;
+} satisfies IBank;
+
+// extracts the payee name from the remittanceInformationStructured
+function extractPayeeName(transaction: Transaction) {
+ const structured = transaction.remittanceInformationStructured ?? '';
// The payee name is at the beginning and has a max length of 12 characters
// (if structured information is actually structured ...).
const regex = /(.{12}) \d{4} .* \d{2}\.\d{2}\. \d{2}:\d{2}/;
diff --git a/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.js b/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.js
deleted file mode 100644
index 7807bea52d..0000000000
--- a/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import Fallback from './integration-bank';
-
-/** @type {import('./bank.interface').IBank} */
-export default {
- ...Fallback,
-
- institutionIds: ['REVOLUT_REVOLT21'],
-
- normalizeTransaction(transaction, booked) {
- const editedTrans = { ...transaction };
-
- if (
- transaction.remittanceInformationUnstructuredArray[0].startsWith(
- 'Bizum payment from: ',
- )
- ) {
- editedTrans.payeeName =
- transaction.remittanceInformationUnstructuredArray[0].replace(
- 'Bizum payment from: ',
- '',
- );
- editedTrans.remittanceInformationUnstructured =
- transaction.remittanceInformationUnstructuredArray[1];
- }
-
- if (
- transaction.remittanceInformationUnstructuredArray[0].startsWith(
- 'Bizum payment to: ',
- )
- ) {
- editedTrans.remittanceInformationUnstructured =
- transaction.remittanceInformationUnstructuredArray[1];
- }
-
- return Fallback.normalizeTransaction(transaction, booked, editedTrans);
- },
-};
diff --git a/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.ts b/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.ts
new file mode 100644
index 0000000000..c6150c9076
--- /dev/null
+++ b/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.ts
@@ -0,0 +1,25 @@
+import type { IBank } from './bank.interface';
+import Fallback from './integration-bank';
+
+export default {
+ ...Fallback,
+
+ institutionIds: ['REVOLUT_REVOLT21'],
+
+ normalizeTransaction(transaction, booked) {
+ const editedTrans = { ...transaction };
+
+ const infoArray = transaction.remittanceInformationUnstructuredArray ?? [];
+
+ if (infoArray[0]?.startsWith('Bizum payment from: ')) {
+ editedTrans.payeeName = infoArray[0].replace('Bizum payment from: ', '');
+ editedTrans.remittanceInformationUnstructured = infoArray[1];
+ }
+
+ if (infoArray[0]?.startsWith('Bizum payment to: ')) {
+ editedTrans.remittanceInformationUnstructured = infoArray[1];
+ }
+
+ return Fallback.normalizeTransaction(transaction, booked, editedTrans);
+ },
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js b/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.ts
similarity index 71%
rename from packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js
rename to packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.ts
index 7228c92f11..3f62a54f17 100644
--- a/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js
+++ b/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -21,8 +21,11 @@ export default {
balance => 'interimAvailable' === balance.balanceType,
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.js b/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.ts
similarity index 92%
rename from packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.js
rename to packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.ts
index 916acf96a3..0ab1e0c55e 100644
--- a/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.js
+++ b/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -72,8 +72,8 @@ export default {
(total, trans) => {
return total - amountToInteger(trans.transactionAmount.amount);
},
- -amountToInteger(currentBalance.balanceAmount.amount) +
- amountToInteger(nonInvoiced.balanceAmount.amount),
+ -amountToInteger(currentBalance?.balanceAmount.amount || 0) +
+ amountToInteger(nonInvoiced?.balanceAmount.amount || 0),
);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/seb_privat.js b/packages/sync-server/src/app-gocardless/banks/seb_privat.ts
similarity index 70%
rename from packages/sync-server/src/app-gocardless/banks/seb_privat.js
rename to packages/sync-server/src/app-gocardless/banks/seb_privat.ts
index f52fcb8b61..bc8d739546 100644
--- a/packages/sync-server/src/app-gocardless/banks/seb_privat.js
+++ b/packages/sync-server/src/app-gocardless/banks/seb_privat.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -22,8 +22,11 @@ export default {
balance => 'interimBooked' === balance.balanceType,
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.js b/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.ts
similarity index 89%
rename from packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.js
rename to packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.ts
index 6a82053864..83d3343de2 100644
--- a/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.js
+++ b/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -21,4 +21,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.js b/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.ts
similarity index 82%
rename from packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.js
rename to packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.ts
index 35bfd714ac..74b9859c56 100644
--- a/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.js
+++ b/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.ts
@@ -1,8 +1,8 @@
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -19,7 +19,9 @@ export default {
} else if (transaction.remittanceInformationStructured) {
remittanceInformationUnstructured =
transaction.remittanceInformationStructured;
- } else if (transaction.remittanceInformationStructuredArray?.length > 0) {
+ } else if (
+ (transaction.remittanceInformationStructuredArray?.length ?? 0) > 0
+ ) {
remittanceInformationUnstructured =
transaction.remittanceInformationStructuredArray?.join(' ');
}
@@ -54,8 +56,11 @@ export default {
balance => 'interimAvailable' === balance.balanceType,
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.js b/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.ts
similarity index 84%
rename from packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.js
rename to packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.ts
index b1343537f6..36f4351cec 100644
--- a/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.js
+++ b/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -17,7 +17,9 @@ export default {
} else if (transaction.remittanceInformationStructured) {
remittanceInformationUnstructured =
transaction.remittanceInformationStructured;
- } else if (transaction.remittanceInformationStructuredArray?.length > 0) {
+ } else if (
+ (transaction.remittanceInformationStructuredArray?.length ?? 0) > 0
+ ) {
remittanceInformationUnstructured =
transaction.remittanceInformationStructuredArray?.join(' ');
}
@@ -27,4 +29,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.js b/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.ts
similarity index 89%
rename from packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.js
rename to packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.ts
index fdc3e5dfb8..6967445c23 100644
--- a/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.js
+++ b/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -16,4 +16,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.js b/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.ts
similarity index 95%
rename from packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.js
rename to packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.ts
index 7457aa0c51..f5c42a9029 100644
--- a/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.js
+++ b/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -47,4 +47,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/ssk_munchen.js b/packages/sync-server/src/app-gocardless/banks/ssk_munchen.ts
similarity index 82%
rename from packages/sync-server/src/app-gocardless/banks/ssk_munchen.js
rename to packages/sync-server/src/app-gocardless/banks/ssk_munchen.ts
index 4a2656dd90..7f5e76b589 100644
--- a/packages/sync-server/src/app-gocardless/banks/ssk_munchen.js
+++ b/packages/sync-server/src/app-gocardless/banks/ssk_munchen.ts
@@ -3,8 +3,9 @@
*/
import { amountToInteger } from '#app-gocardless/utils';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
+
export default {
...Fallback,
institutionIds: ['SSK_MUNCHEN_SSKMDEMMXXX'],
@@ -17,7 +18,9 @@ export default {
} else if (transaction.remittanceInformationStructured) {
remittanceInformationUnstructured =
transaction.remittanceInformationStructured;
- } else if (transaction.remittanceInformationStructuredArray?.length > 0) {
+ } else if (
+ (transaction.remittanceInformationStructuredArray?.length ?? 0) > 0
+ ) {
remittanceInformationUnstructured =
transaction.remittanceInformationStructuredArray?.join(' ');
}
@@ -46,8 +49,11 @@ export default {
const currentBalance = balances.find(
balance => 'interimAvailable' === balance.balanceType,
);
- return sortedTransactions.reduce((total, trans) => {
- return total - amountToInteger(trans.transactionAmount.amount);
- }, amountToInteger(currentBalance.balanceAmount.amount));
+ return sortedTransactions.reduce(
+ (total, trans) => {
+ return total - amountToInteger(trans.transactionAmount.amount);
+ },
+ amountToInteger(currentBalance?.balanceAmount.amount || 0),
+ );
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/swedbank_habalv22.js b/packages/sync-server/src/app-gocardless/banks/swedbank_habalv22.ts
similarity index 95%
rename from packages/sync-server/src/app-gocardless/banks/swedbank_habalv22.js
rename to packages/sync-server/src/app-gocardless/banks/swedbank_habalv22.ts
index bb165ede43..c0b85ded94 100644
--- a/packages/sync-server/src/app-gocardless/banks/swedbank_habalv22.js
+++ b/packages/sync-server/src/app-gocardless/banks/swedbank_habalv22.ts
@@ -1,8 +1,8 @@
import * as d from 'date-fns';
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -44,4 +44,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.ts
similarity index 90%
rename from packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.ts
index fb321f61ec..b52c655888 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.ts
@@ -15,7 +15,7 @@ describe('Abanca', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Some-Creditor-Name');
+ expect(normalizedTransaction?.payeeName).toEqual('Some-Creditor-Name');
});
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/abnamro_abnanl2a.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/abnamro_abnanl2a.spec.ts
similarity index 86%
rename from packages/sync-server/src/app-gocardless/banks/tests/abnamro_abnanl2a.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/abnamro_abnanl2a.spec.ts
index dc65375fb5..4045ef15f8 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/abnamro_abnanl2a.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/abnamro_abnanl2a.spec.ts
@@ -24,10 +24,10 @@ describe('AbnamroAbnanl2a', () => {
false,
);
- expect(normalizedTransaction.notes).toEqual(
+ expect(normalizedTransaction?.notes).toEqual(
'BEA, Betaalpas, My Payee Name,PAS123, NR:123A4B, 09.12.23/15:43, CITY',
);
- expect(normalizedTransaction.payeeName).toEqual('My Payee Name');
+ expect(normalizedTransaction?.payeeName).toEqual('My Payee Name');
});
it('correctly extracts the payee for google pay', () => {
@@ -52,10 +52,10 @@ describe('AbnamroAbnanl2a', () => {
false,
);
- expect(normalizedTransaction.notes).toEqual(
+ expect(normalizedTransaction?.notes).toEqual(
'BEA, Google Pay, CCV*Other payee name,PAS123, NR:123A4B, 09.12.23/15:43, CITY',
);
- expect(normalizedTransaction.payeeName).toEqual('Other Payee Name');
+ expect(normalizedTransaction?.payeeName).toEqual('Other Payee Name');
});
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/bancsabadell_bsabesbbb.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/bancsabadell_bsabesbbb.spec.ts
similarity index 88%
rename from packages/sync-server/src/app-gocardless/banks/tests/bancsabadell_bsabesbbb.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/bancsabadell_bsabesbbb.spec.ts
index 76238a16c3..e0f6fed8ab 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/bancsabadell_bsabesbbb.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/bancsabadell_bsabesbbb.spec.ts
@@ -15,7 +15,7 @@ describe('BancSabadell', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Some-Creditor-Name');
+ expect(normalizedTransaction?.payeeName).toEqual('Some-Creditor-Name');
});
it('creditor role - amount > 0', () => {
@@ -30,7 +30,7 @@ describe('BancSabadell', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Some-Debtor-Name');
+ expect(normalizedTransaction?.payeeName).toEqual('Some-Debtor-Name');
});
});
@@ -47,7 +47,7 @@ describe('BancSabadell', () => {
transaction,
true,
);
- expect(normalizedTransaction.date).toEqual('2024-10-02');
+ expect(normalizedTransaction?.date).toEqual('2024-10-02');
});
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.ts
similarity index 91%
rename from packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.ts
index 7674067bc1..93fba63c9b 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.ts
@@ -14,7 +14,7 @@ describe('Belfius', () => {
transaction,
true,
);
- expect(normalizedTransaction.transactionId).toEqual(
+ expect(normalizedTransaction?.transactionId).toEqual(
transaction.internalTransactionId,
);
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/boursobank_bousfrppxxx.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/boursobank_bousfrppxxx.spec.ts
similarity index 97%
rename from packages/sync-server/src/app-gocardless/banks/tests/boursobank_bousfrppxxx.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/boursobank_bousfrppxxx.spec.ts
index 7cdb1dd4d8..25a5b3385e 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/boursobank_bousfrppxxx.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/boursobank_bousfrppxxx.spec.ts
@@ -181,8 +181,8 @@ describe('BoursoBank', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual(expectedPayeeName);
- expect(normalizedTransaction.notes).toEqual(expectedNotes);
+ expect(normalizedTransaction?.payeeName).toEqual(expectedPayeeName);
+ expect(normalizedTransaction?.notes).toEqual(expectedNotes);
},
);
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/bper_retail_bpmoit22.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/bper_retail_bpmoit22.spec.ts
similarity index 84%
rename from packages/sync-server/src/app-gocardless/banks/tests/bper_retail_bpmoit22.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/bper_retail_bpmoit22.spec.ts
index ae2fe928b2..792b0dcd6a 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/bper_retail_bpmoit22.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/bper_retail_bpmoit22.spec.ts
@@ -17,10 +17,10 @@ describe('BPER Retail BPMOIT22', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual(
+ expect(normalizedTransaction?.payeeName).toEqual(
'Healthcare District Zx042 Metropolis Ita',
);
- expect(normalizedTransaction.notes).toEqual(
+ expect(normalizedTransaction?.notes).toEqual(
'PAGAMENTO SU CIRCUITO INTERNAZIONALE HEALTHCARE DISTRICT ZX042 METROPOLIS ITA Operazione carta ****8005 del 15.09.2025',
);
});
@@ -38,8 +38,8 @@ describe('BPER Retail BPMOIT22', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Acme Consulting Srl');
- expect(normalizedTransaction.notes).toEqual(
+ expect(normalizedTransaction?.payeeName).toEqual('Acme Consulting Srl');
+ expect(normalizedTransaction?.notes).toEqual(
'BONIFICO o/c: ACME CONSULTING SRL ABI-CAB: 03015-03200 a favore di Example Recipient Num. Bon.Sepa 252531000195141 Note di cortesia',
);
});
@@ -57,8 +57,8 @@ describe('BPER Retail BPMOIT22', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Global Partners Ltd');
- expect(normalizedTransaction.notes).toEqual(
+ expect(normalizedTransaction?.payeeName).toEqual('Global Partners Ltd');
+ expect(normalizedTransaction?.notes).toEqual(
'BONIFICI ESTERI o/c: GLOBAL PARTNERS LTD BIC: EXAMPGB2L a favore di Example Recipient (BPER) Num. Bon.Sepa 252131000238275BE Memo casuale 1.000,00 EUR',
);
});
@@ -76,8 +76,8 @@ describe('BPER Retail BPMOIT22', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Cloud Hosting Ltd');
- expect(normalizedTransaction.notes).toEqual(
+ expect(normalizedTransaction?.payeeName).toEqual('Cloud Hosting Ltd');
+ expect(normalizedTransaction?.notes).toEqual(
'ADDEBITO SDD CLOUD HOSTING LTD N: 1057087621/48 ID:0210000049513 Cod.Cl. K309846700/ Fatt. 109993626070 Deb: Example Account Owner',
);
});
@@ -95,8 +95,10 @@ describe('BPER Retail BPMOIT22', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Utility Company S.P.A.');
- expect(normalizedTransaction.notes).toEqual(
+ expect(normalizedTransaction?.payeeName).toEqual(
+ 'Utility Company S.P.A.',
+ );
+ expect(normalizedTransaction?.notes).toEqual(
'PAGAMENTI DIVERSI DA INTERNET BANKING E CSA PAGAMENTO BOLLETTINO POSTALE 420251388002409360 DEL 22/06/2025 TRAMITE I.B. / CSA TIPO : 896 CCPOST : 000000000000 CREDITORE: UTILITY COMPANY S.P.A.',
);
});
@@ -113,10 +115,10 @@ describe('BPER Retail BPMOIT22', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual(
+ expect(normalizedTransaction?.payeeName).toEqual(
'Competenze Spese Ed Oneri',
);
- expect(normalizedTransaction.notes).toEqual('COMPETENZE SPESE ED ONERI');
+ expect(normalizedTransaction?.notes).toEqual('COMPETENZE SPESE ED ONERI');
});
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/cbc_cregbebb.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/cbc_cregbebb.spec.ts
similarity index 89%
rename from packages/sync-server/src/app-gocardless/banks/tests/cbc_cregbebb.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/cbc_cregbebb.spec.ts
index 09a698165d..8ea8c2c211 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/cbc_cregbebb.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/cbc_cregbebb.spec.ts
@@ -13,7 +13,7 @@ describe('cbc_cregbebb', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual('ONKART FR Viry');
+ expect(normalizedTransaction?.payeeName).toEqual('ONKART FR Viry');
});
it('returns the debtorName as payeeName when the amount is positive', () => {
@@ -28,7 +28,7 @@ describe('cbc_cregbebb', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual('ONKART FR Viry');
+ expect(normalizedTransaction?.payeeName).toEqual('ONKART FR Viry');
});
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.ts
similarity index 95%
rename from packages/sync-server/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.ts
index b0fda780b1..f1c7a65e7a 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.ts
@@ -28,7 +28,7 @@ describe('CommerzbankCobadeff', () => {
transaction,
false,
);
- expect(normalizedTransaction.notes).toEqual(
+ expect(normalizedTransaction?.notes).toEqual(
'2024-12-19T15:34:31 KFN 1 AB 1234, Kartenzahlung',
);
});
@@ -66,7 +66,7 @@ describe('CommerzbankCobadeff', () => {
transaction,
false,
);
- expect(normalizedTransaction.notes).toEqual(
+ expect(normalizedTransaction?.notes).toEqual(
'901234567890/. Long description tha t gets cut and is very long, did I mention it is long, End-to-End-Ref.: 901234567890, Mandatsref: ABC123DEF456, Gläubiger-ID: AB12CDE0000000000000000012, SEPA-BASISLASTSCHRIFT wiederholend',
);
});
@@ -102,7 +102,7 @@ describe('CommerzbankCobadeff', () => {
transaction,
false,
);
- expect(normalizedTransaction.notes).toEqual(
+ expect(normalizedTransaction?.notes).toEqual(
'CREDITOR00BIC CREDITOR000IBAN DESCRIPTION, Dauerauftrag',
);
});
@@ -127,7 +127,7 @@ describe('CommerzbankCobadeff', () => {
transaction,
false,
);
- expect(normalizedTransaction.notes).toEqual('Example');
+ expect(normalizedTransaction?.notes).toEqual('Example');
});
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.ts
similarity index 89%
rename from packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.ts
index 034055303b..31fdb8eb29 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.ts
@@ -16,7 +16,7 @@ describe('easybank', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Some Payee Name');
+ expect(normalizedTransaction?.payeeName).toEqual('Some Payee Name');
});
it('returns the expected payeeName from a transaction with payee name inside structuredInformation', () => {
@@ -31,7 +31,7 @@ describe('easybank', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Some Payee Name');
+ expect(normalizedTransaction?.payeeName).toEqual('Some Payee Name');
});
it('returns the full structured information as payeeName from a transaction with no payee name', () => {
@@ -46,7 +46,7 @@ describe('easybank', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual(
+ expect(normalizedTransaction?.payeeName).toEqual(
'Auszahlung Karte MC/000001234AUTOMAT 00012345 K001 31.12. 23:59',
);
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/fortuneo_ftnofrp1xxx.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/fortuneo_ftnofrp1xxx.spec.ts
similarity index 88%
rename from packages/sync-server/src/app-gocardless/banks/tests/fortuneo_ftnofrp1xxx.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/fortuneo_ftnofrp1xxx.spec.ts
index af707ec282..942028a798 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/fortuneo_ftnofrp1xxx.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/fortuneo_ftnofrp1xxx.spec.ts
@@ -140,14 +140,16 @@ describe('Fortuneo', () => {
true,
);
- expect(normalizedCreditorTransaction.payeeName).toBeDefined();
+ expect(normalizedCreditorTransaction?.payeeName).toBeDefined();
expect(
- parseFloat(normalizedCreditorTransaction.transactionAmount.amount),
+ parseFloat(
+ normalizedCreditorTransaction?.transactionAmount.amount ?? '',
+ ),
).toBeLessThan(0);
- expect(normalizedDebtorTransaction.payeeName).toBeDefined();
+ expect(normalizedDebtorTransaction?.payeeName).toBeDefined();
expect(
- parseFloat(normalizedDebtorTransaction.transactionAmount.amount),
+ parseFloat(normalizedDebtorTransaction?.transactionAmount.amount ?? ''),
).toBeGreaterThan(0);
});
@@ -158,7 +160,7 @@ describe('Fortuneo', () => {
true,
);
- expect(normalizedTransaction.payeeName).toBe('Ong');
+ expect(normalizedTransaction?.payeeName).toBe('Ong');
const transaction2 = transactionsRaw[2];
const normalizedTransaction2 = Fortuneo.normalizeTransaction(
@@ -166,7 +168,7 @@ describe('Fortuneo', () => {
true,
);
- expect(normalizedTransaction2.payeeName).toBe('Xxxyyyyzzz');
+ expect(normalizedTransaction2?.payeeName).toBe('Xxxyyyyzzz');
const transaction3 = transactionsRaw[3];
const normalizedTransaction3 = Fortuneo.normalizeTransaction(
@@ -174,7 +176,7 @@ describe('Fortuneo', () => {
true,
);
- expect(normalizedTransaction3.payeeName).toBe('Google Payment I Dublin');
+ expect(normalizedTransaction3?.payeeName).toBe('Google Payment I Dublin');
const transaction4 = transactionsRaw[4];
const normalizedTransaction4 = Fortuneo.normalizeTransaction(
@@ -182,7 +184,7 @@ describe('Fortuneo', () => {
true,
);
- expect(normalizedTransaction4.payeeName).toBe('Sport Market');
+ expect(normalizedTransaction4?.payeeName).toBe('Sport Market');
const transaction5 = transactionsRaw[5];
const normalizedTransaction5 = Fortuneo.normalizeTransaction(
@@ -190,7 +192,7 @@ describe('Fortuneo', () => {
true,
);
- expect(normalizedTransaction5.payeeName).toBe('Weezevent Someplace');
+ expect(normalizedTransaction5?.payeeName).toBe('Weezevent Someplace');
const transaction7 = transactionsRaw[7];
const normalizedTransaction7 = Fortuneo.normalizeTransaction(
@@ -198,7 +200,7 @@ describe('Fortuneo', () => {
true,
);
- expect(normalizedTransaction7.payeeName).toBe(
+ expect(normalizedTransaction7?.payeeName).toBe(
'Leclerc Xxxx Leclerc Xxxx 44321ixcrt211141232',
);
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/ing_ingddeff.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/ing_ingddeff.spec.ts
similarity index 95%
rename from packages/sync-server/src/app-gocardless/banks/tests/ing_ingddeff.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/ing_ingddeff.spec.ts
index 1623590c8b..dbf97253aa 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/ing_ingddeff.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/ing_ingddeff.spec.ts
@@ -1,8 +1,12 @@
import IngIngddeff from '#app-gocardless/banks/ing_ingddeff';
+import type {
+ Balance,
+ Transaction,
+} from '#app-gocardless/gocardless-node.types';
+import type { DetailedAccountWithInstitution } from '#app-gocardless/gocardless.types';
describe('IngIngddeff', () => {
describe('#normalizeAccount', () => {
- /** @type {import('../../gocardless.types').DetailedAccountWithInstitution} */
const accountRaw = {
resourceId: 'e896eec6-6096-4efc-a941-756bd9d74765',
iban: 'DE02500105170137075030',
@@ -36,7 +40,7 @@ describe('IngIngddeff', () => {
],
/*identification_codes: [],*/
},
- };
+ } as DetailedAccountWithInstitution;
it('returns normalized account data returned to Frontend', () => {
expect(IngIngddeff.normalizeAccount(accountRaw)).toEqual({
@@ -235,7 +239,7 @@ describe('IngIngddeff', () => {
describe('#sortTransactions', () => {
it('handles empty arrays', () => {
- const transactions = [];
+ const transactions: Transaction[] = [];
const sortedTransactions = IngIngddeff.sortTransactions(transactions);
expect(sortedTransactions).toEqual([]);
});
@@ -250,7 +254,7 @@ describe('IngIngddeff', () => {
IngIngddeff.normalizeTransaction(tx, true),
);
const originalOrder = Array.from(normalizeTransactions);
- const swap = (a, b) => {
+ const swap = (a: number, b: number) => {
const swap = normalizeTransactions[a];
normalizeTransactions[a] = normalizeTransactions[b];
normalizeTransactions[b] = swap;
@@ -259,15 +263,14 @@ describe('IngIngddeff', () => {
swap(3, 6);
swap(0, 7);
const sortedTransactions = IngIngddeff.sortTransactions(
- normalizeTransactions,
+ normalizeTransactions.filter(tx => tx != null),
);
expect(sortedTransactions).toEqual(originalOrder);
});
});
describe('#countStartingBalance', () => {
- /** @type {import('../../gocardless-node.types').Balance[]} */
- const balances = [
+ const balances: Balance[] = [
{
balanceAmount: { amount: '3596.87', currency: 'EUR' },
balanceType: 'interimBooked',
@@ -280,7 +283,7 @@ describe('IngIngddeff', () => {
IngIngddeff.normalizeTransaction(tx, true),
);
const sortedTransactions = IngIngddeff.sortTransactions(
- normalizeTransactions,
+ normalizeTransactions.filter(tx => tx != null),
);
const startingBalance = IngIngddeff.calculateStartingBalance(
@@ -292,7 +295,7 @@ describe('IngIngddeff', () => {
});
it('returns the same balance amount when no transactions', () => {
- const transactions = [];
+ const transactions: Transaction[] = [];
expect(
IngIngddeff.calculateStartingBalance(transactions, balances),
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.ts
similarity index 93%
rename from packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.ts
index 1152c3acbd..13240366f5 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.ts
@@ -1,9 +1,13 @@
import IngPlIngbplpw from '#app-gocardless/banks/ing_pl_ingbplpw';
+import type {
+ Balance,
+ Transaction,
+} from '#app-gocardless/gocardless-node.types';
+import type { DetailedAccountWithInstitution } from '#app-gocardless/gocardless.types';
import { mockTransactionAmount } from '#app-gocardless/services/tests/fixtures';
describe('IngPlIngbplpw', () => {
describe('#normalizeAccount', () => {
- /** @type {import('../../gocardless.types').DetailedAccountWithInstitution} */
const accountRaw = {
resourceId: 'PL00000000000000000987654321',
iban: 'PL00000000000000000987654321',
@@ -39,7 +43,7 @@ describe('IngPlIngbplpw', () => {
'private_accounts',
],
},
- };
+ } as DetailedAccountWithInstitution;
it('returns normalized account data returned to Frontend', () => {
const normalizedAccount = IngPlIngbplpw.normalizeAccount(accountRaw);
@@ -126,7 +130,7 @@ describe('IngPlIngbplpw', () => {
});
it('handles empty arrays', () => {
- const transactions = [];
+ const transactions: Transaction[] = [];
const sortedTransactions = IngPlIngbplpw.sortTransactions(transactions);
expect(sortedTransactions).toEqual([]);
});
@@ -139,8 +143,7 @@ describe('IngPlIngbplpw', () => {
describe('#countStartingBalance', () => {
it('should calculate the starting balance correctly', () => {
- /** @type {import('../../gocardless-node.types').Transaction[]} */
- const sortedTransactions = [
+ const sortedTransactions: Transaction[] = [
{
transactionAmount: { amount: '-100.00', currency: 'USD' },
balanceAfterTransaction: {
@@ -164,8 +167,7 @@ describe('IngPlIngbplpw', () => {
},
];
- /** @type {import('../../gocardless-node.types').Balance[]} */
- const balances = [
+ const balances: Balance[] = [
{
balanceType: 'interimBooked',
balanceAmount: { amount: '500.00', currency: 'USD' },
@@ -185,10 +187,9 @@ describe('IngPlIngbplpw', () => {
});
it('returns the same balance amount when no transactions', () => {
- const transactions = [];
+ const transactions: Transaction[] = [];
- /** @type {import('../../gocardless-node.types').Balance[]} */
- const balances = [
+ const balances: Balance[] = [
{
balanceType: 'interimBooked',
balanceAmount: { amount: '500.00', currency: 'USD' },
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.ts
similarity index 91%
rename from packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.ts
index d1f56a6384..abf469681e 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.ts
@@ -1,4 +1,9 @@
import IntegrationBank from '#app-gocardless/banks/integration-bank';
+import type {
+ Balance,
+ Transaction,
+} from '#app-gocardless/gocardless-node.types';
+import type { DetailedAccountWithInstitution } from '#app-gocardless/gocardless.types';
import {
mockExtendAccountsAboutInstitutions,
mockInstitution,
@@ -25,7 +30,7 @@ describe('IntegrationBank', () => {
const normalizedAccount = IntegrationBank.normalizeAccount({
...account,
iban: undefined,
- });
+ } as unknown as DetailedAccountWithInstitution);
expect(normalizedAccount).toEqual({
account_id: account.id,
institution: mockInstitution,
@@ -80,8 +85,7 @@ describe('IntegrationBank', () => {
});
describe('calculateStartingBalance', () => {
- /** @type {import('../../gocardless-node.types').Transaction[]} */
- const transactions = [
+ const transactions: Transaction[] = [
{
bookingDate: '2022-01-01',
transactionAmount: { amount: '100', currency: 'EUR' },
@@ -96,8 +100,7 @@ describe('IntegrationBank', () => {
},
];
- /** @type {import('../../gocardless-node.types').Balance[]} */
- const balances = [
+ const balances: Balance[] = [
{
balanceAmount: { amount: '1000.00', currency: 'EUR' },
balanceType: 'interimBooked',
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/kbc_kredbebb.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/kbc_kredbebb.spec.ts
similarity index 92%
rename from packages/sync-server/src/app-gocardless/banks/tests/kbc_kredbebb.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/kbc_kredbebb.spec.ts
index 96d6976d94..ced8e752a4 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/kbc_kredbebb.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/kbc_kredbebb.spec.ts
@@ -13,7 +13,7 @@ describe('kbc_kredbebb', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual(
+ expect(normalizedTransaction?.payeeName).toEqual(
'CARREFOUR ST GIL BE1060 BRUXELLES',
);
});
@@ -30,7 +30,7 @@ describe('kbc_kredbebb', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual(
+ expect(normalizedTransaction?.payeeName).toEqual(
'CARREFOUR ST GIL BE1060 BRUXELLES',
);
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/lhv_lhvbee22.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/lhv_lhvbee22.spec.ts
similarity index 89%
rename from packages/sync-server/src/app-gocardless/banks/tests/lhv_lhvbee22.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/lhv_lhvbee22.spec.ts
index 3d296cc45b..2df576ca5e 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/lhv_lhvbee22.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/lhv_lhvbee22.spec.ts
@@ -1,4 +1,5 @@
import LhvLhvbee22 from '#app-gocardless/banks/lhv_lhvbee22';
+import type { Transaction } from '#app-gocardless/gocardless-node.types';
describe('#normalizeTransaction', () => {
const bookedCardTransaction = {
@@ -14,17 +15,17 @@ describe('#normalizeTransaction', () => {
'(..1234) 2025-01-02 09:32 CrustumOU\\Poordi 3\\Tallinn\\10156 ESTEST',
bankTransactionCode: 'PMNT-CCRD-POSD',
internalTransactionId: 'fa000f86afb2cc7678bcff0000000000',
- };
+ } as unknown as Transaction;
it('extracts booked card transaction creditor name', () => {
expect(
- LhvLhvbee22.normalizeTransaction(bookedCardTransaction, true).payeeName,
+ LhvLhvbee22.normalizeTransaction(bookedCardTransaction, true)?.payeeName,
).toEqual('CrustumOU');
});
it('extracts booked card transaction date', () => {
expect(
- LhvLhvbee22.normalizeTransaction(bookedCardTransaction, true).date,
+ LhvLhvbee22.normalizeTransaction(bookedCardTransaction, true)?.date,
).toEqual('2025-01-02');
});
@@ -37,10 +38,10 @@ describe('#normalizeTransaction', () => {
const transaction = {
...bookedCardTransaction,
remittanceInformationUnstructured: remittanceInfo,
- };
+ } as Transaction;
const normalized = LhvLhvbee22.normalizeTransaction(transaction, true);
- expect(normalized.date).toEqual('2025-01-03');
+ expect(normalized?.date).toEqual('2025-01-03');
});
const pendingCardTransaction = {
@@ -56,13 +57,14 @@ describe('#normalizeTransaction', () => {
it('extracts pending card transaction creditor name', () => {
expect(
- LhvLhvbee22.normalizeTransaction(pendingCardTransaction, false).payeeName,
+ LhvLhvbee22.normalizeTransaction(pendingCardTransaction, false)
+ ?.payeeName,
).toEqual('CrustumOU');
});
it('extracts pending card transaction date', () => {
expect(
- LhvLhvbee22.normalizeTransaction(pendingCardTransaction, false).date,
+ LhvLhvbee22.normalizeTransaction(pendingCardTransaction, false)?.date,
).toEqual('2025-01-03');
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/mbank_retail_brexplpw.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/mbank_retail_brexplpw.spec.ts
similarity index 94%
rename from packages/sync-server/src/app-gocardless/banks/tests/mbank_retail_brexplpw.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/mbank_retail_brexplpw.spec.ts
index 16a137a0d1..7aef1e3040 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/mbank_retail_brexplpw.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/mbank_retail_brexplpw.spec.ts
@@ -1,8 +1,12 @@
import MbankRetailBrexplpw from '#app-gocardless/banks/mbank_retail_brexplpw';
+import type {
+ Balance,
+ Transaction,
+} from '#app-gocardless/gocardless-node.types';
+import type { DetailedAccountWithInstitution } from '#app-gocardless/gocardless.types';
describe('MbankRetailBrexplpw', () => {
describe('#normalizeAccount', () => {
- /** @type {import('../../gocardless.types').DetailedAccountWithInstitution} */
const accountRaw = {
iban: 'PL00000000000000000987654321',
currency: 'PLN',
@@ -39,7 +43,7 @@ describe('MbankRetailBrexplpw', () => {
'private_accounts',
],
},
- };
+ } as unknown as DetailedAccountWithInstitution;
it('returns normalized account data returned to Frontend', () => {
expect(MbankRetailBrexplpw.normalizeAccount(accountRaw))
.toMatchInlineSnapshot(`
@@ -137,8 +141,7 @@ describe('MbankRetailBrexplpw', () => {
});
describe('#countStartingBalance', () => {
- /** @type {import('../../gocardless-node.types').Balance[]} */
- const balances = [
+ const balances: Balance[] = [
{
balanceAmount: { amount: '1000.00', currency: 'PLN' },
balanceType: 'interimBooked',
@@ -146,7 +149,7 @@ describe('MbankRetailBrexplpw', () => {
];
it('returns the same balance amount when no transactions', () => {
- const transactions = [];
+ const transactions: Transaction[] = [];
expect(
MbankRetailBrexplpw.calculateStartingBalance(transactions, balances),
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.ts
similarity index 85%
rename from packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.ts
index 0f2b5b3412..a4aaaf76d4 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.ts
@@ -19,7 +19,7 @@ describe('Nationwide', () => {
true,
);
- expect(normalizedTransaction.date).toEqual(date);
+ expect(normalizedTransaction?.date).toEqual(date);
});
it('fixes date for pending transactions', () => {
@@ -36,9 +36,9 @@ describe('Nationwide', () => {
false,
);
- expect(new Date(normalizedTransaction.date).getTime()).toBeLessThan(
- d.getTime(),
- );
+ expect(
+ new Date(normalizedTransaction?.date ?? '').getTime(),
+ ).toBeLessThan(d.getTime());
});
it('keeps transactionId if in the correct format', () => {
@@ -54,7 +54,7 @@ describe('Nationwide', () => {
false,
);
- expect(normalizedTransaction.transactionId).toBe(transactionId);
+ expect(normalizedTransaction?.transactionId).toBe(transactionId);
});
it('unsets transactionId if not valid length', () => {
@@ -69,7 +69,7 @@ describe('Nationwide', () => {
false,
);
- expect(normalizedTransaction.transactionId).toBeNull();
+ expect(normalizedTransaction?.transactionId).toBeUndefined();
});
it('unsets transactionId if debit placeholder found', () => {
@@ -84,7 +84,7 @@ describe('Nationwide', () => {
false,
);
- expect(normalizedTransaction.transactionId).toBeNull();
+ expect(normalizedTransaction?.transactionId).toBeUndefined();
});
it('unsets transactionId if credit placeholder found', () => {
@@ -99,7 +99,7 @@ describe('Nationwide', () => {
false,
);
- expect(normalizedTransaction.transactionId).toBeNull();
+ expect(normalizedTransaction?.transactionId).toBeUndefined();
});
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/nbg_ethngraaxxx.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/nbg_ethngraaxxx.spec.ts
similarity index 78%
rename from packages/sync-server/src/app-gocardless/banks/tests/nbg_ethngraaxxx.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/nbg_ethngraaxxx.spec.ts
index ebf80b3ac5..2eb4f8a5e0 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/nbg_ethngraaxxx.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/nbg_ethngraaxxx.spec.ts
@@ -19,8 +19,10 @@ describe('NbgEthngraaxxx', () => {
false,
);
- expect(normalizedTransaction.transactionAmount.amount).toEqual('-100.00');
- expect(normalizedTransaction.payeeName).toEqual('Testingson');
+ expect(normalizedTransaction?.transactionAmount.amount).toEqual(
+ '-100.00',
+ );
+ expect(normalizedTransaction?.payeeName).toEqual('Testingson');
});
});
@@ -42,7 +44,7 @@ describe('NbgEthngraaxxx', () => {
true,
);
- expect(normalizedTransaction.transactionAmount.amount).toEqual('-100.00');
- expect(normalizedTransaction.payeeName).toEqual('Testingson');
+ expect(normalizedTransaction?.transactionAmount.amount).toEqual('-100.00');
+ expect(normalizedTransaction?.payeeName).toEqual('Testingson');
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/raiffeisen_at_rzbaatww.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/raiffeisen_at_rzbaatww.spec.ts
similarity index 90%
rename from packages/sync-server/src/app-gocardless/banks/tests/raiffeisen_at_rzbaatww.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/raiffeisen_at_rzbaatww.spec.ts
index 3c13f0a345..35cce8b6c5 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/raiffeisen_at_rzbaatww.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/raiffeisen_at_rzbaatww.spec.ts
@@ -18,7 +18,7 @@ describe('raiffeisen_at', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('NOTHING STRUCTURED');
+ expect(normalizedTransaction?.payeeName).toEqual('NOTHING STRUCTURED');
});
it('returns the expected payeeName from a transaction with payee name inside structuredInformation', () => {
@@ -36,7 +36,7 @@ describe('raiffeisen_at', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Company Abcd');
+ expect(normalizedTransaction?.payeeName).toEqual('Company Abcd');
});
it('returns the creditorName for transactions containing one', () => {
@@ -57,7 +57,7 @@ describe('raiffeisen_at', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual(
+ expect(normalizedTransaction?.payeeName).toEqual(
'Reci Pient (AT20 XXX 8935)',
);
});
@@ -77,7 +77,9 @@ describe('raiffeisen_at', () => {
transaction,
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Company Name City 1010');
+ expect(normalizedTransaction?.payeeName).toEqual(
+ 'Company Name City 1010',
+ );
});
it('returns the endToEndId in notes if no structured or unstructured remittance information is present', () => {
@@ -94,7 +96,7 @@ describe('raiffeisen_at', () => {
transaction,
true,
);
- expect(normalizedTransaction.notes).toEqual('Transaction 1234');
+ expect(normalizedTransaction?.notes).toEqual('Transaction 1234');
});
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/revolut_revolt21.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/revolut_revolt21.spec.ts
similarity index 84%
rename from packages/sync-server/src/app-gocardless/banks/tests/revolut_revolt21.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/revolut_revolt21.spec.ts
index 920b632931..cc9c626404 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/revolut_revolt21.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/revolut_revolt21.spec.ts
@@ -17,7 +17,7 @@ describe('RevolutRevolt21', () => {
true,
);
- expect(normalizedTransaction.notes).toEqual('Bizum description');
+ expect(normalizedTransaction?.notes).toEqual('Bizum description');
});
});
@@ -36,7 +36,7 @@ describe('RevolutRevolt21', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('DEBTOR NAME');
- expect(normalizedTransaction.notes).toEqual('Bizum description');
+ expect(normalizedTransaction?.payeeName).toEqual('DEBTOR NAME');
+ expect(normalizedTransaction?.notes).toEqual('Bizum description');
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/sandboxfinance_sfin0000.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/sandboxfinance_sfin0000.spec.ts
similarity index 90%
rename from packages/sync-server/src/app-gocardless/banks/tests/sandboxfinance_sfin0000.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/sandboxfinance_sfin0000.spec.ts
index 40c9ff1a02..0dddd1a1d3 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/sandboxfinance_sfin0000.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/sandboxfinance_sfin0000.spec.ts
@@ -1,8 +1,12 @@
import SandboxfinanceSfin0000 from '#app-gocardless/banks/sandboxfinance_sfin0000';
+import type {
+ Balance,
+ Transaction,
+} from '#app-gocardless/gocardless-node.types';
+import type { DetailedAccountWithInstitution } from '#app-gocardless/gocardless.types';
describe('SandboxfinanceSfin0000', () => {
describe('#normalizeAccount', () => {
- /** @type {import('../../gocardless.types').DetailedAccountWithInstitution} */
const accountRaw = {
resourceId: '01F3NS5ASCNMVCTEJDT0G215YE',
iban: 'GL0865354374424724',
@@ -28,7 +32,7 @@ describe('SandboxfinanceSfin0000', () => {
supported_payments: {},
supported_features: [],
},
- };
+ } as unknown as DetailedAccountWithInstitution;
it('returns normalized account data returned to Frontend', () => {
expect(SandboxfinanceSfin0000.normalizeAccount(accountRaw))
@@ -60,7 +64,7 @@ describe('SandboxfinanceSfin0000', () => {
describe('#sortTransactions', () => {
it('handles empty arrays', () => {
- const transactions = [];
+ const transactions: Transaction[] = [];
const sortedTransactions =
SandboxfinanceSfin0000.sortTransactions(transactions);
expect(sortedTransactions).toEqual([]);
@@ -74,8 +78,7 @@ describe('SandboxfinanceSfin0000', () => {
});
describe('#countStartingBalance', () => {
- /** @type {import('../../gocardless-node.types').Balance[]} */
- const balances = [
+ const balances: Balance[] = [
{
balanceAmount: { amount: '1000.00', currency: 'PLN' },
balanceType: 'interimAvailable',
@@ -107,7 +110,7 @@ describe('SandboxfinanceSfin0000', () => {
});
it('returns the same balance amount when no transactions', () => {
- const transactions = [];
+ const transactions: Transaction[] = [];
expect(
SandboxfinanceSfin0000.calculateStartingBalance(transactions, balances),
@@ -115,8 +118,7 @@ describe('SandboxfinanceSfin0000', () => {
});
it('returns the balance minus the available transactions', () => {
- /** @type {import('../../gocardless-node.types').Transaction[]} */
- const transactions = [
+ const transactions: Transaction[] = [
{
transactionAmount: { amount: '200.00', currency: 'PLN' },
},
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.ts
similarity index 92%
rename from packages/sync-server/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.ts
index e7f95589c7..26a81f9ba1 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.ts
@@ -1,8 +1,12 @@
import SpkMarburgBiedenkopfHeladef1mar from '#app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar';
+import type {
+ Balance,
+ Transaction,
+} from '#app-gocardless/gocardless-node.types';
+import type { DetailedAccountWithInstitution } from '#app-gocardless/gocardless.types';
describe('SpkMarburgBiedenkopfHeladef1mar', () => {
describe('#normalizeAccount', () => {
- /** @type {import('../../gocardless.types').DetailedAccountWithInstitution} */
const accountRaw = {
resourceId: 'e896eec6-6096-4efc-a941-756bd9d74765',
iban: 'DE50533500000123456789',
@@ -35,7 +39,7 @@ describe('SpkMarburgBiedenkopfHeladef1mar', () => {
],
/*"identification_codes": []*/
},
- };
+ } as DetailedAccountWithInstitution;
it('returns normalized account data returned to Frontend', () => {
expect(
@@ -148,7 +152,7 @@ describe('SpkMarburgBiedenkopfHeladef1mar', () => {
expect(
SpkMarburgBiedenkopfHeladef1mar.normalizeTransaction(transaction, true)
- .notes,
+ ?.notes,
).toEqual('AUTORISATION 28.12. 18:30');
});
@@ -172,14 +176,14 @@ describe('SpkMarburgBiedenkopfHeladef1mar', () => {
expect(
SpkMarburgBiedenkopfHeladef1mar.normalizeTransaction(transaction, true)
- .notes,
+ ?.notes,
).toEqual('Entgeltabrechnung siehe Anlage');
});
});
describe('#sortTransactions', () => {
it('handles empty arrays', () => {
- const transactions = [];
+ const transactions: Transaction[] = [];
const sortedTransactions =
SpkMarburgBiedenkopfHeladef1mar.sortTransactions(transactions);
expect(sortedTransactions).toEqual([]);
@@ -196,7 +200,7 @@ describe('SpkMarburgBiedenkopfHeladef1mar', () => {
SpkMarburgBiedenkopfHeladef1mar.normalizeTransaction(tx, true),
);
const originalOrder = Array.from(normalizeTransactions);
- const swap = (a, b) => {
+ const swap = (a: number, b: number) => {
const swap = normalizeTransactions[a];
normalizeTransactions[a] = normalizeTransactions[b];
normalizeTransactions[b] = swap;
@@ -204,14 +208,15 @@ describe('SpkMarburgBiedenkopfHeladef1mar', () => {
swap(1, 3);
swap(0, 2);
const sortedTransactions =
- SpkMarburgBiedenkopfHeladef1mar.sortTransactions(normalizeTransactions);
+ SpkMarburgBiedenkopfHeladef1mar.sortTransactions(
+ normalizeTransactions.filter(tx => tx != null),
+ );
expect(sortedTransactions).toEqual(originalOrder);
});
});
describe('#countStartingBalance', () => {
- /** @type {import('../../gocardless-node.types').Balance[]} */
- const balances = [
+ const balances: Balance[] = [
{
balanceAmount: { amount: '3596.87', currency: 'EUR' },
balanceType: 'closingBooked',
@@ -230,7 +235,9 @@ describe('SpkMarburgBiedenkopfHeladef1mar', () => {
SpkMarburgBiedenkopfHeladef1mar.normalizeTransaction(tx, true),
);
const sortedTransactions =
- SpkMarburgBiedenkopfHeladef1mar.sortTransactions(normalizeTransactions);
+ SpkMarburgBiedenkopfHeladef1mar.sortTransactions(
+ normalizeTransactions.filter(tx => tx != null),
+ );
const startingBalance =
SpkMarburgBiedenkopfHeladef1mar.calculateStartingBalance(
@@ -242,7 +249,7 @@ describe('SpkMarburgBiedenkopfHeladef1mar', () => {
});
it('returns the same balance amount when no transactions', () => {
- const transactions = [];
+ const transactions: Transaction[] = [];
expect(
SpkMarburgBiedenkopfHeladef1mar.calculateStartingBalance(
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.ts
similarity index 94%
rename from packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.ts
index a2e2eff5b0..87971b0e59 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.ts
@@ -1,7 +1,9 @@
+import type { MockInstance } from 'vitest';
+
import SskDusseldorfDussdeddxxx from '#app-gocardless/banks/ssk_dusseldorf_dussdeddxxx';
describe('ssk_dusseldorf_dussdeddxxx', () => {
- let consoleSpy;
+ let consoleSpy: MockInstance;
beforeEach(() => {
consoleSpy = vi.spyOn(console, 'debug');
@@ -45,14 +47,14 @@ describe('ssk_dusseldorf_dussdeddxxx', () => {
SskDusseldorfDussdeddxxx.normalizeTransaction(
bookedTransactionOne,
true,
- ).notes,
+ )?.notes,
).toEqual('unstructured information some additional information');
expect(
SskDusseldorfDussdeddxxx.normalizeTransaction(
bookedTransactionTwo,
true,
- ).notes,
+ )?.notes,
).toEqual('structured information some additional information');
});
@@ -61,14 +63,14 @@ describe('ssk_dusseldorf_dussdeddxxx', () => {
SskDusseldorfDussdeddxxx.normalizeTransaction(
bookedTransactionOne,
true,
- ).payeeName,
+ )?.payeeName,
).toEqual('A Useful Creditor Name');
expect(
SskDusseldorfDussdeddxxx.normalizeTransaction(
bookedTransactionTwo,
true,
- ).payeeName,
+ )?.payeeName,
).toEqual('Ultimate Creditor');
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/swedbank_habalv22.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/swedbank_habalv22.spec.ts
similarity index 87%
rename from packages/sync-server/src/app-gocardless/banks/tests/swedbank_habalv22.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/swedbank_habalv22.spec.ts
index be5e6f1a36..56667612bb 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/swedbank_habalv22.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/swedbank_habalv22.spec.ts
@@ -1,4 +1,5 @@
import SwedbankHabaLV22 from '#app-gocardless/banks/swedbank_habalv22';
+import type { Transaction } from '#app-gocardless/gocardless-node.types';
describe('#normalizeTransaction', () => {
const bookedCardTransaction = {
@@ -18,7 +19,7 @@ describe('#normalizeTransaction', () => {
it('extracts card transaction date', () => {
expect(
- SwedbankHabaLV22.normalizeTransaction(bookedCardTransaction, true).date,
+ SwedbankHabaLV22.normalizeTransaction(bookedCardTransaction, true)?.date,
).toEqual('2024-10-28');
});
@@ -30,11 +31,11 @@ describe('#normalizeTransaction', () => {
const transaction = {
...bookedCardTransaction,
remittanceInformationUnstructured: remittanceInfo,
- };
+ } as Transaction;
const normalized = SwedbankHabaLV22.normalizeTransaction(transaction, true);
- expect(normalized.bookingDate).toEqual('2024-10-29');
- expect(normalized.date).toEqual('2024-10-29');
+ expect(normalized?.bookingDate).toEqual('2024-10-29');
+ expect(normalized?.date).toEqual('2024-10-29');
});
const pendingCardTransaction = {
@@ -51,7 +52,7 @@ describe('#normalizeTransaction', () => {
it('extracts pending card transaction creditor name', () => {
expect(
SwedbankHabaLV22.normalizeTransaction(pendingCardTransaction, false)
- .payeeName,
+ ?.payeeName,
).toEqual('Some Creditor Name');
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.ts
similarity index 75%
rename from packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.js
rename to packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.ts
index b1c386fed8..a8fa24c3d9 100644
--- a/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.js
+++ b/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.ts
@@ -15,8 +15,8 @@ describe('Virgin', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Direct Debit Payment');
- expect(normalizedTransaction.notes).toEqual('DIRECT DEBIT PAYMENT');
+ expect(normalizedTransaction?.payeeName).toEqual('Direct Debit Payment');
+ expect(normalizedTransaction?.notes).toEqual('DIRECT DEBIT PAYMENT');
});
it('formats bank transfer payee and references', () => {
@@ -31,8 +31,8 @@ describe('Virgin', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Joe Bloggs');
- expect(normalizedTransaction.notes).toEqual('Food');
+ expect(normalizedTransaction?.payeeName).toEqual('Joe Bloggs');
+ expect(normalizedTransaction?.notes).toEqual('Food');
});
it('removes method information from payee name', () => {
@@ -47,8 +47,8 @@ describe('Virgin', () => {
true,
);
- expect(normalizedTransaction.payeeName).toEqual('Tesco Express');
- expect(normalizedTransaction.notes).toEqual('Card 99, Tesco Express');
+ expect(normalizedTransaction?.payeeName).toEqual('Tesco Express');
+ expect(normalizedTransaction?.notes).toEqual('Card 99, Tesco Express');
});
});
});
diff --git a/packages/sync-server/src/app-gocardless/banks/util/escape-regexp.js b/packages/sync-server/src/app-gocardless/banks/util/escape-regexp.js
deleted file mode 100644
index 1ffd309a12..0000000000
--- a/packages/sync-server/src/app-gocardless/banks/util/escape-regexp.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Escape special characters in the string to create a valid regular expression
-export function escapeRegExp(string) {
- return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
diff --git a/packages/sync-server/src/app-gocardless/banks/util/escape-regexp.ts b/packages/sync-server/src/app-gocardless/banks/util/escape-regexp.ts
new file mode 100644
index 0000000000..d9600d1401
--- /dev/null
+++ b/packages/sync-server/src/app-gocardless/banks/util/escape-regexp.ts
@@ -0,0 +1,4 @@
+// escape special characters in the string to create a valid regular expression
+export function escapeRegExp(string: string): string {
+ return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
diff --git a/packages/sync-server/src/app-gocardless/banks/util/extract-payeeName-from-remittanceInfo.js b/packages/sync-server/src/app-gocardless/banks/util/extract-payeeName-from-remittanceInfo.ts
similarity index 67%
rename from packages/sync-server/src/app-gocardless/banks/util/extract-payeeName-from-remittanceInfo.js
rename to packages/sync-server/src/app-gocardless/banks/util/extract-payeeName-from-remittanceInfo.ts
index 4dcb7fa2dd..87cbc8aa39 100644
--- a/packages/sync-server/src/app-gocardless/banks/util/extract-payeeName-from-remittanceInfo.js
+++ b/packages/sync-server/src/app-gocardless/banks/util/extract-payeeName-from-remittanceInfo.ts
@@ -1,4 +1,3 @@
-/**
/**
* Extracts the payee name from the unstructured remittance information string based on pattern detection.
*
@@ -6,11 +5,11 @@
* any of the specified patterns and removes the substring from the position of the last
* occurrence of the most relevant pattern. If no patterns are found, it returns the original string.
*
- * @param {string} [remittanceInformationUnstructured=''] - The unstructured remittance information from which to extract the payee name.
- * @param {string[]} [patterns=[]] - An array of patterns to look for within the remittance information.
- * These patterns are used to identify and remove unwanted parts of the remittance information.
- * @returns {string} - The extracted payee name, cleaned of any matched patterns, or the original
- * remittance information if no patterns are found.
+ * @param remittanceInformationUnstructured - The unstructured remittance information from which to extract the payee name.
+ * @param patterns - An array of patterns to look for within the remittance information.
+ * These patterns are used to identify and remove unwanted parts of the remittance information.
+ * @returns The extracted payee name, cleaned of any matched patterns, or the original
+ * remittance information if no patterns are found.
*
* @example
* const remittanceInfo = 'John Doe Paiement Maestro par Carte de débit CBC 05-09-2024 à 15.43 heures 6703 19XX XXXX X...';
@@ -18,9 +17,9 @@
* const payeeName = extractPayeeNameFromRemittanceInfo(remittanceInfo, patterns); // --> 'John Doe'
*/
export function extractPayeeNameFromRemittanceInfo(
- remittanceInformationUnstructured,
- patterns,
-) {
+ remittanceInformationUnstructured: string,
+ patterns: string[],
+): string {
if (!remittanceInformationUnstructured || !patterns.length) {
return remittanceInformationUnstructured;
}
diff --git a/packages/sync-server/src/app-gocardless/banks/virgin_nrnbgb22.js b/packages/sync-server/src/app-gocardless/banks/virgin_nrnbgb22.ts
similarity index 87%
rename from packages/sync-server/src/app-gocardless/banks/virgin_nrnbgb22.js
rename to packages/sync-server/src/app-gocardless/banks/virgin_nrnbgb22.ts
index 2b1d586540..528de4e4b9 100644
--- a/packages/sync-server/src/app-gocardless/banks/virgin_nrnbgb22.js
+++ b/packages/sync-server/src/app-gocardless/banks/virgin_nrnbgb22.ts
@@ -1,6 +1,6 @@
+import type { IBank } from './bank.interface';
import Fallback from './integration-bank';
-/** @type {import('./bank.interface').IBank} */
export default {
...Fallback,
@@ -12,7 +12,9 @@ export default {
const transferPrefixes = ['MOB', 'FPS'];
const methodRegex = /^(Card|WLT)\s\d+/;
- const parts = transaction.remittanceInformationUnstructured.split(', ');
+ const parts = (transaction.remittanceInformationUnstructured ?? '').split(
+ ', ',
+ );
if (transferPrefixes.includes(parts[0])) {
// Transfer remittance information begins with either "MOB" or "FPS"
@@ -36,4 +38,4 @@ export default {
return Fallback.normalizeTransaction(transaction, booked, editedTrans);
},
-};
+} satisfies IBank;
diff --git a/packages/sync-server/src/app-gocardless/gocardless.types.ts b/packages/sync-server/src/app-gocardless/gocardless.types.ts
index dfb669a525..99e449dd51 100644
--- a/packages/sync-server/src/app-gocardless/gocardless.types.ts
+++ b/packages/sync-server/src/app-gocardless/gocardless.types.ts
@@ -35,7 +35,7 @@ export type NormalizedAccountDetails = {
/**
* the account iban
*/
- iban: string;
+ iban: string | null;
/**
* Name displayed on the UI of Actual app
@@ -67,7 +67,7 @@ export type GetTransactionsParams = {
/**
* Begin date of the period from which we want to download transactions
*/
- startDate: string;
+ startDate?: string;
/**
* End date of the period from which we want to download transactions
diff --git a/packages/sync-server/src/app-gocardless/services/gocardless-service.ts b/packages/sync-server/src/app-gocardless/services/gocardless-service.ts
index 4637278952..8b182178c9 100644
--- a/packages/sync-server/src/app-gocardless/services/gocardless-service.ts
+++ b/packages/sync-server/src/app-gocardless/services/gocardless-service.ts
@@ -177,8 +177,8 @@ export const goCardlessService = {
getTransactionsWithBalance: async (
requisitionId: GoCardlessRequisitionId,
accountId: GoCardlessAccountId,
- startDate: string,
- endDate: string,
+ startDate: string | undefined,
+ endDate: string | undefined,
): Promise<{
balances: Balance[];
institutionId: GoCardlessInstitutionId;
@@ -226,8 +226,8 @@ export const goCardlessService = {
getNormalizedTransactions: async (
requisitionId: GoCardlessRequisitionId,
accountId: GoCardlessAccountId,
- startDate: string,
- endDate: string,
+ startDate: string | undefined,
+ endDate: string | undefined,
): Promise<{
institutionId: GoCardlessInstitutionId;
transactions: {
@@ -252,10 +252,10 @@ export const goCardlessService = {
const bank: IBank = BankFactory(institution_id);
const sortedBookedTransactions = bank.sortTransactions(
- transactions.transactions?.booked,
+ transactions.transactions.booked,
);
const sortedPendingTransactions = bank.sortTransactions(
- transactions.transactions?.pending,
+ transactions.transactions.pending,
);
const allTransactions: TransactionWithBookedStatus[] =
sortedBookedTransactions.map(t => ({
@@ -442,10 +442,10 @@ export const goCardlessService = {
const bank: IBank = BankFactory(institutionId);
response.transactions.booked = response.transactions.booked
.map(transaction => bank.normalizeTransaction(transaction, true))
- .filter((t): t is Transaction => t != null);
+ .filter(t => t != null);
response.transactions.pending = response.transactions.pending
.map(transaction => bank.normalizeTransaction(transaction, false))
- .filter((t): t is Transaction => t != null);
+ .filter(t => t != null);
return response;
},
diff --git a/packages/sync-server/src/app-gocardless/services/tests/fixtures.js b/packages/sync-server/src/app-gocardless/services/tests/fixtures.ts
similarity index 78%
rename from packages/sync-server/src/app-gocardless/services/tests/fixtures.js
rename to packages/sync-server/src/app-gocardless/services/tests/fixtures.ts
index 369f01f3d3..dacae3a0ae 100644
--- a/packages/sync-server/src/app-gocardless/services/tests/fixtures.js
+++ b/packages/sync-server/src/app-gocardless/services/tests/fixtures.ts
@@ -1,5 +1,17 @@
-/** @type {{balances: import('../../gocardless-node.types').Balance[]}} */
-export const mockedBalances = {
+import type {
+ Balance,
+ GoCardlessAccountDetails,
+ GoCardlessAccountMetadata,
+ Institution,
+ Requisition,
+ Transactions,
+} from '#app-gocardless/gocardless-node.types';
+import type {
+ DetailedAccount,
+ DetailedAccountWithInstitution,
+} from '#app-gocardless/gocardless.types';
+
+export const mockedBalances: { balances: Balance[] } = {
balances: [
{
balanceAmount: {
@@ -20,8 +32,7 @@ export const mockedBalances = {
],
};
-/** @type {{transactions: import('../../gocardless-node.types').Transactions}} */
-export const mockTransactions = {
+export const mockTransactions: { transactions: Transactions } = {
transactions: {
booked: [
{
@@ -68,8 +79,7 @@ export const mockUnknownError = {
status_code: 500,
};
-/** @type {{account: import('../../gocardless-node.types').GoCardlessAccountDetails}} */
-export const mockAccountDetails = {
+export const mockAccountDetails: { account: GoCardlessAccountDetails } = {
account: {
resourceId: 'PL00000000000000000987654321',
iban: 'PL00000000000000000987654321',
@@ -81,7 +91,6 @@ export const mockAccountDetails = {
},
};
-/** @type {import('../../gocardless-node.types').GoCardlessAccountMetadata} */
export const mockAccountMetaData = {
id: 'f0e49aa6-f6db-48fc-94ca-4a62372fadf4',
created: '2022-07-24T20:45:47.847062Z',
@@ -90,15 +99,13 @@ export const mockAccountMetaData = {
institution_id: 'SANDBOXFINANCE_SFIN0000',
status: 'READY',
owner_name: 'JOHN EXAMPLE',
-};
+} as GoCardlessAccountMetadata;
-/** @type {import('../../gocardless.types').DetailedAccount} */
export const mockDetailedAccount = {
...mockAccountDetails.account,
...mockAccountMetaData,
-};
+} as DetailedAccount;
-/** @type {import('../../gocardless-node.types').Institution} */
export const mockInstitution = {
id: 'N26_NTSBDEB1',
name: 'N26 Bank',
@@ -107,9 +114,8 @@ export const mockInstitution = {
max_access_valid_for_days: '90',
countries: ['GB', 'NO', 'SE'],
logo: 'https://cdn.nordigen.com/ais/N26_SANDBOX_NTSBDEB1.png',
-};
+} as Institution;
-/** @type {import('../../gocardless-node.types').Requisition} */
export const mockRequisition = {
id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
created: '2023-01-31T18:15:50.172Z',
@@ -124,7 +130,7 @@ export const mockRequisition = {
ssn: 'string',
account_selection: false,
redirect_immediate: false,
-};
+} as unknown as Requisition;
export const mockDeleteRequisition = {
summary: 'Requisition deleted',
@@ -146,31 +152,29 @@ export const mockCreateRequisition = {
ssn: 'string',
account_selection: false,
redirect_immediate: false,
-};
+} as unknown as Requisition;
-/** @type {import('../../gocardless.types').DetailedAccount} */
export const mockDetailedAccountExample1 = {
...mockDetailedAccount,
name: 'account-example-one',
-};
+} as DetailedAccount;
-/** @type {import('../../gocardless.types').DetailedAccount} */
export const mockDetailedAccountExample2 = {
...mockDetailedAccount,
name: 'account-example-two',
-};
+} as DetailedAccount;
-/** @type {import('../../gocardless.types').DetailedAccountWithInstitution[]} */
-export const mockExtendAccountsAboutInstitutions = [
- {
- ...mockDetailedAccountExample1,
- institution: mockInstitution,
- },
- {
- ...mockDetailedAccountExample2,
- institution: mockInstitution,
- },
-];
+export const mockExtendAccountsAboutInstitutions: DetailedAccountWithInstitution[] =
+ [
+ {
+ ...mockDetailedAccountExample1,
+ institution: mockInstitution,
+ },
+ {
+ ...mockDetailedAccountExample2,
+ institution: mockInstitution,
+ },
+ ];
export const mockRequisitionWithExampleAccounts = {
...mockRequisition,
diff --git a/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js b/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.ts
similarity index 86%
rename from packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js
rename to packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.ts
index 289d141059..2fd024be3a 100644
--- a/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js
+++ b/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.ts
@@ -1,3 +1,5 @@
+import type { MockInstance } from 'vitest';
+
import {
AccessDeniedError,
AccountNotLinkedToRequisition,
@@ -11,6 +13,11 @@ import {
ServiceError,
UnknownError,
} from '#app-gocardless/errors';
+import type {
+ GoCardlessAccountId,
+ GoCardlessInstitutionId,
+ GoCardlessRequisitionId,
+} from '#app-gocardless/gocardless-node.types';
import { GoCardlessApiError } from '#app-gocardless/services/gocardless-api';
import {
client,
@@ -38,16 +45,16 @@ describe('goCardlessService', () => {
const accountId = mockAccountMetaData.id;
const requisitionId = mockRequisition.id;
- let getBalancesSpy;
- let getTransactionsSpy;
- let getDetailsSpy;
- let getMetadataSpy;
- let getInstitutionsSpy;
- let getInstitutionSpy;
- let getRequisitionsSpy;
- let deleteRequisitionsSpy;
- let createRequisitionSpy;
- let setTokenSpy;
+ let getBalancesSpy: MockInstance;
+ let getTransactionsSpy: MockInstance;
+ let getDetailsSpy: MockInstance;
+ let getMetadataSpy: MockInstance;
+ let getInstitutionsSpy: MockInstance;
+ let getInstitutionSpy: MockInstance;
+ let getRequisitionsSpy: MockInstance;
+ let deleteRequisitionsSpy: MockInstance;
+ let createRequisitionSpy: MockInstance;
+ let setTokenSpy: MockInstance;
beforeEach(() => {
getInstitutionsSpy = vi.spyOn(client, 'getInstitutions');
@@ -68,7 +75,7 @@ describe('goCardlessService', () => {
describe('#getLinkedRequisition', () => {
it('returns requisition', async () => {
- setTokenSpy.mockResolvedValue();
+ setTokenSpy.mockResolvedValue(undefined);
vi.spyOn(goCardlessService, 'getRequisition').mockResolvedValue(
mockRequisition,
@@ -80,7 +87,7 @@ describe('goCardlessService', () => {
});
it('throws RequisitionNotLinked error if requisition status is different than LN', async () => {
- setTokenSpy.mockResolvedValue();
+ setTokenSpy.mockResolvedValue(undefined);
vi.spyOn(goCardlessService, 'getRequisition').mockResolvedValue({
...mockRequisition,
@@ -113,11 +120,11 @@ describe('goCardlessService', () => {
).mockResolvedValue([
{
...mockExtendAccountsAboutInstitutions[0],
- institution_id: 'NEWONE',
+ institution_id: 'NEWONE' as GoCardlessInstitutionId,
},
{
...mockExtendAccountsAboutInstitutions[1],
- institution_id: 'NEWONE',
+ institution_id: 'NEWONE' as GoCardlessInstitutionId,
},
]);
@@ -222,18 +229,18 @@ describe('goCardlessService', () => {
);
await expect(() =>
- goCardlessService.getTransactionsWithBalance({
+ goCardlessService.getTransactionsWithBalance(
requisitionId,
- accountId: 'some-unknown-account-id',
- startDate: undefined,
- endDate: undefined,
- }),
+ 'some-unknown-account-id' as GoCardlessAccountId,
+ undefined,
+ undefined,
+ ),
).rejects.toThrow(AccountNotLinkedToRequisition);
});
});
describe('#createRequisition', () => {
- const institutionId = 'some-institution-id';
+ const institutionId = 'some-institution-id' as GoCardlessInstitutionId;
const params = {
host: 'https://exemple.com',
institutionId,
@@ -241,7 +248,7 @@ describe('goCardlessService', () => {
};
it('calls goCardlessClient and delete requisition', async () => {
- setTokenSpy.mockResolvedValue();
+ setTokenSpy.mockResolvedValue(undefined);
getInstitutionSpy.mockResolvedValue(mockInstitution);
createRequisitionSpy.mockResolvedValue(mockCreateRequisition);
@@ -255,7 +262,7 @@ describe('goCardlessService', () => {
});
it('uses institution transaction_total_days for maxHistoricalDays by default', async () => {
- setTokenSpy.mockResolvedValue();
+ setTokenSpy.mockResolvedValue(undefined);
getInstitutionSpy.mockResolvedValue({
...mockInstitution,
transaction_total_days: '730',
@@ -270,7 +277,7 @@ describe('goCardlessService', () => {
});
it('caps maxHistoricalDays at 90 for banks with separate_continuous_history_consent', async () => {
- setTokenSpy.mockResolvedValue();
+ setTokenSpy.mockResolvedValue(undefined);
getInstitutionSpy.mockResolvedValue({
...mockInstitution,
transaction_total_days: '730',
@@ -287,10 +294,10 @@ describe('goCardlessService', () => {
});
describe('#deleteRequisition', () => {
- const requisitionId = 'some-requisition-id';
+ const requisitionId = 'some-requisition-id' as GoCardlessRequisitionId;
it('calls goCardlessClient and delete requisition', async () => {
- setTokenSpy.mockResolvedValue();
+ setTokenSpy.mockResolvedValue(undefined);
getRequisitionsSpy.mockResolvedValue(mockRequisition);
deleteRequisitionsSpy.mockResolvedValue(mockDeleteRequisition);
@@ -305,10 +312,10 @@ describe('goCardlessService', () => {
});
describe('#getRequisition', () => {
- const requisitionId = 'some-requisition-id';
+ const requisitionId = 'some-requisition-id' as GoCardlessRequisitionId;
it('calls goCardlessClient and fetch requisition', async () => {
- setTokenSpy.mockResolvedValue();
+ setTokenSpy.mockResolvedValue(undefined);
getRequisitionsSpy.mockResolvedValue(mockRequisition);
expect(await goCardlessService.getRequisition(requisitionId)).toEqual(
@@ -360,7 +367,7 @@ describe('goCardlessService', () => {
it('calls goCardlessClient and fetch institution details', async () => {
getInstitutionsSpy.mockResolvedValue([mockInstitution]);
- expect(await goCardlessService.getInstitutions({ country })).toEqual([
+ expect(await goCardlessService.getInstitutions(country)).toEqual([
mockInstitution,
]);
expect(getInstitutionsSpy).toBeCalledTimes(1);
@@ -368,7 +375,7 @@ describe('goCardlessService', () => {
});
describe('#getInstitution', () => {
- const institutionId = 'fake-institution-id';
+ const institutionId = 'fake-institution-id' as GoCardlessInstitutionId;
it('calls goCardlessClient and fetch institution details', async () => {
getInstitutionSpy.mockResolvedValue(mockInstitution);
@@ -381,17 +388,23 @@ describe('goCardlessService', () => {
describe('#extendAccountsAboutInstitutions', () => {
it('extends accounts with the corresponding institution', async () => {
- const institutionA = { ...mockInstitution, id: 'INSTITUTION_A' };
- const institutionB = { ...mockInstitution, id: 'INSTITUTION_B' };
+ const institutionA = {
+ ...mockInstitution,
+ id: 'INSTITUTION_A' as GoCardlessInstitutionId,
+ };
+ const institutionB = {
+ ...mockInstitution,
+ id: 'INSTITUTION_B' as GoCardlessInstitutionId,
+ };
const accountAA = {
...mockDetailedAccount,
- id: 'AA',
- institution_id: 'INSTITUTION_A',
+ id: 'AA' as GoCardlessAccountId,
+ institution_id: 'INSTITUTION_A' as GoCardlessInstitutionId,
};
const accountBB = {
...mockDetailedAccount,
- id: 'BB',
- institution_id: 'INSTITUTION_B',
+ id: 'BB' as GoCardlessAccountId,
+ institution_id: 'INSTITUTION_B' as GoCardlessInstitutionId,
};
const accounts = [accountAA, accountBB];
@@ -419,18 +432,21 @@ describe('goCardlessService', () => {
it('returns accounts with missing institutions as null', async () => {
const accountAA = {
...mockDetailedAccount,
- id: 'AA',
- institution_id: 'INSTITUTION_A',
+ id: 'AA' as GoCardlessAccountId,
+ institution_id: 'INSTITUTION_A' as GoCardlessInstitutionId,
};
const accountBB = {
...mockDetailedAccount,
- id: 'BB',
- institution_id: 'INSTITUTION_B',
+ id: 'BB' as GoCardlessAccountId,
+ institution_id: 'INSTITUTION_B' as GoCardlessInstitutionId,
};
const accounts = [accountAA, accountBB];
- const institutionA = { ...mockInstitution, id: 'INSTITUTION_A' };
+ const institutionA = {
+ ...mockInstitution,
+ id: 'INSTITUTION_A' as GoCardlessInstitutionId,
+ };
const institutions = [institutionA];
const expected = [
@@ -459,7 +475,7 @@ describe('goCardlessService', () => {
expect(
await goCardlessService.getTransactions({
- institutionId: 'SANDBOXFINANCE_SFIN0000',
+ institutionId: 'SANDBOXFINANCE_SFIN0000' as GoCardlessInstitutionId,
accountId,
startDate: '',
endDate: '',
@@ -476,7 +492,7 @@ describe('goCardlessService', () => {
"iban": "string",
},
"debtorName": "string",
- "notes": undefined,
+ "notes": "",
"payeeName": "String (stri XXX ring)",
"remittanceInformationStructuredArrayString": undefined,
"remittanceInformationUnstructuredArrayString": undefined,
@@ -491,7 +507,7 @@ describe('goCardlessService', () => {
"bankTransactionCode": "string",
"bookingDate": "2000-01-01",
"date": "2000-01-01",
- "notes": undefined,
+ "notes": "",
"payeeName": "",
"remittanceInformationStructuredArrayString": undefined,
"remittanceInformationUnstructuredArrayString": undefined,
@@ -506,7 +522,7 @@ describe('goCardlessService', () => {
"pending": [
{
"date": "2000-01-01",
- "notes": undefined,
+ "notes": "",
"payeeName": "",
"remittanceInformationStructuredArrayString": undefined,
"remittanceInformationUnstructuredArrayString": undefined,
@@ -537,7 +553,7 @@ describe('goCardlessService', () => {
});
describe('#handleGoCardlessError', () => {
- const apiError = status =>
+ const apiError = (status: number) =>
new GoCardlessApiError(`error: ${status}`, status, {});
it('throws InvalidInputDataError for status code 400', () => {
diff --git a/packages/sync-server/src/app-gocardless/tests/bank-factory.spec.js b/packages/sync-server/src/app-gocardless/tests/bank-factory.spec.ts
similarity index 100%
rename from packages/sync-server/src/app-gocardless/tests/bank-factory.spec.js
rename to packages/sync-server/src/app-gocardless/tests/bank-factory.spec.ts
diff --git a/packages/sync-server/src/app-gocardless/tests/utils.spec.js b/packages/sync-server/src/app-gocardless/tests/utils.spec.ts
similarity index 100%
rename from packages/sync-server/src/app-gocardless/tests/utils.spec.js
rename to packages/sync-server/src/app-gocardless/tests/utils.spec.ts
diff --git a/packages/sync-server/src/app-gocardless/util/handle-error.js b/packages/sync-server/src/app-gocardless/util/handle-error.ts
similarity index 62%
rename from packages/sync-server/src/app-gocardless/util/handle-error.js
rename to packages/sync-server/src/app-gocardless/util/handle-error.ts
index 1ba75d9967..4cc90d3988 100644
--- a/packages/sync-server/src/app-gocardless/util/handle-error.js
+++ b/packages/sync-server/src/app-gocardless/util/handle-error.ts
@@ -1,5 +1,9 @@
-export function handleError(func) {
- return (req, res) => {
+import type { Request, Response } from 'express';
+
+export function handleError(
+ func: (req: Request, res: Response) => Promise<unknown>,
+) {
+ return (req: Request, res: Response) => {
func(req, res).catch(err => {
console.log('Error', req.originalUrl, err.message || String(err));
res.send({
diff --git a/packages/sync-server/src/app-gocardless/utils.js b/packages/sync-server/src/app-gocardless/utils.ts
similarity index 59%
rename from packages/sync-server/src/app-gocardless/utils.js
rename to packages/sync-server/src/app-gocardless/utils.ts
index 51ab923dee..3c39e5364e 100644
--- a/packages/sync-server/src/app-gocardless/utils.js
+++ b/packages/sync-server/src/app-gocardless/utils.ts
@@ -1,4 +1,6 @@
-export const printIban = account => {
+import type { Transaction } from './gocardless-node.types';
+
+export const printIban = (account: { iban?: string | null }): string => {
if (account.iban) {
return '(XXX ' + account.iban.slice(-4) + ')';
} else {
@@ -7,9 +9,9 @@ export const printIban = account => {
};
const compareDates = (
- /** @type {string | number | Date | undefined} */ a,
- /** @type {string | number | Date | undefined} */ b,
-) => {
+ a: string | number | Date | undefined,
+ b: string | number | Date | undefined,
+): number => {
if (a == null && b == null) {
return 0;
} else if (a == null) {
@@ -21,17 +23,16 @@ const compareDates = (
return +new Date(a) - +new Date(b);
};
-/**
- * @type {(function(*, *): number)[]}
- */
-const compareFunctions = [
+const compareFunctions: ((a: Transaction, b: Transaction) => number)[] = [
(a, b) => compareDates(a.bookingDate, b.bookingDate),
(a, b) => compareDates(a.bookingDateTime, b.bookingDateTime),
(a, b) => compareDates(a.valueDate, b.valueDate),
(a, b) => compareDates(a.valueDateTime, b.valueDateTime),
];
-export const sortByBookingDateOrValueDate = (transactions = []) =>
+export const sortByBookingDateOrValueDate = <T extends Transaction>(
+ transactions: T[] = [],
+): T[] =>
transactions.sort((a, b) => {
for (const sortFunction of compareFunctions) {
const result = sortFunction(b, a);
@@ -42,4 +43,5 @@ export const sortByBookingDateOrValueDate = (transactions = []) =>
return 0;
});
-export const amountToInteger = n => Math.round(n * 100);
+export const amountToInteger = (n: string | number): number =>
+ Math.round(Number(n) * 100);
diff --git a/upcoming-release-notes/7904.md b/upcoming-release-notes/7904.md
new file mode 100644
index 0000000000..80fa84af7e
--- /dev/null
+++ b/upcoming-release-notes/7904.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [matt-fidd]
+---
+
+Convert GoCardless sync-server code to Typescript