@develit-services/bank 0.8.10 → 0.8.12

package/dist/export/worker.cjs

@@ -1212,17 +1212,29 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
       { successMessage: "Payment initiated successfully" },
       async (data) => {
         const incomingPayment = mock_connector.toIncomingPayment(data);
+        this._validatePaymentTypeAndCurrency(
+          data.paymentType,
+          data.currency,
+          data.creditor
+        );
         const { accounts } = await this._getAccounts();
         const account = accounts.find(
-          (acc) => acc.iban === incomingPayment.debtorIban && acc.currency === incomingPayment.currency
+          (acc) => acc.iban === incomingPayment.debtorIban
         );
         if (!account) {
           throw backendSdk.createInternalError(null, {
-            message: `No account found for IBAN ${incomingPayment.debtorIban} with currency ${incomingPayment.currency}`,
+            message: `No account found for IBAN ${incomingPayment.debtorIban}`,
             code: "VALID-B-004",
             status: 422
           });
         }
+        if (account.currency !== data.currency) {
+          throw backendSdk.createInternalError(null, {
+            message: `Account ${account.iban} has currency ${account.currency}, but payment requires ${data.currency}`,
+            code: "VALID-B-010",
+            status: 422
+          });
+        }
         if (account.status !== "AUTHORIZED") {
           throw backendSdk.createInternalError(null, {
             message: `Account ${account.iban} is not authorized (status: ${account.status})`,
@@ -1240,11 +1252,6 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
             status: 422
           });
         }
-        this._validatePaymentTypeAndCurrency(
-          data.paymentType,
-          data.currency,
-          data.creditor
-        );
         const accountAssigned = mock_connector.assignAccount(incomingPayment, account);
         const batchedPayment = mock_connector.toBatchedPayment(accountAssigned);
         const { command: insertPaymentRequest } = createPaymentRequestCommand(
@@ -1323,17 +1330,29 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
             });
           }
         }
+        for (const p of paymentInputs) {
+          this._validatePaymentTypeAndCurrency(
+            p.paymentType,
+            p.currency,
+            p.creditor
+          );
+        }
         const { accounts } = await this._getAccounts();
-        const account = accounts.find(
-          (acc) => acc.iban === debtorIban && acc.currency === currency
-        );
+        const account = accounts.find((acc) => acc.iban === debtorIban);
         if (!account) {
           throw backendSdk.createInternalError(null, {
-            message: `No account found for IBAN ${debtorIban} with currency ${currency}`,
+            message: `No account found for IBAN ${debtorIban}`,
             code: "VALID-B-004",
             status: 422
           });
         }
+        if (account.currency !== currency) {
+          throw backendSdk.createInternalError(null, {
+            message: `Account ${account.iban} has currency ${account.currency}, but payments require ${currency}`,
+            code: "VALID-B-010",
+            status: 422
+          });
+        }
         if (account.status !== "AUTHORIZED") {
           throw backendSdk.createInternalError(null, {
             message: `Account ${account.iban} is not authorized (status: ${account.status})`,
@@ -1358,13 +1377,6 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
             status: 422
           });
         }
-        for (const p of paymentInputs) {
-          this._validatePaymentTypeAndCurrency(
-            p.paymentType,
-            p.currency,
-            p.creditor
-          );
-        }
         const incomingPayments = paymentInputs.map(mock_connector.toIncomingPayment);
         const batchedPayments = incomingPayments.map(
           (p) => mock_connector.toBatchedPayment(mock_connector.assignAccount(p, account))

package/dist/export/worker.mjs

@@ -1210,17 +1210,29 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
       { successMessage: "Payment initiated successfully" },
       async (data) => {
         const incomingPayment = toIncomingPayment(data);
+        this._validatePaymentTypeAndCurrency(
+          data.paymentType,
+          data.currency,
+          data.creditor
+        );
         const { accounts } = await this._getAccounts();
         const account = accounts.find(
-          (acc) => acc.iban === incomingPayment.debtorIban && acc.currency === incomingPayment.currency
+          (acc) => acc.iban === incomingPayment.debtorIban
         );
         if (!account) {
           throw createInternalError(null, {
-            message: `No account found for IBAN ${incomingPayment.debtorIban} with currency ${incomingPayment.currency}`,
+            message: `No account found for IBAN ${incomingPayment.debtorIban}`,
             code: "VALID-B-004",
             status: 422
           });
         }
+        if (account.currency !== data.currency) {
+          throw createInternalError(null, {
+            message: `Account ${account.iban} has currency ${account.currency}, but payment requires ${data.currency}`,
+            code: "VALID-B-010",
+            status: 422
+          });
+        }
         if (account.status !== "AUTHORIZED") {
           throw createInternalError(null, {
             message: `Account ${account.iban} is not authorized (status: ${account.status})`,
@@ -1238,11 +1250,6 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
             status: 422
           });
         }
-        this._validatePaymentTypeAndCurrency(
-          data.paymentType,
-          data.currency,
-          data.creditor
-        );
         const accountAssigned = assignAccount(incomingPayment, account);
         const batchedPayment = toBatchedPayment(accountAssigned);
         const { command: insertPaymentRequest } = createPaymentRequestCommand(
@@ -1321,17 +1328,29 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
             });
           }
         }
+        for (const p of paymentInputs) {
+          this._validatePaymentTypeAndCurrency(
+            p.paymentType,
+            p.currency,
+            p.creditor
+          );
+        }
         const { accounts } = await this._getAccounts();
-        const account = accounts.find(
-          (acc) => acc.iban === debtorIban && acc.currency === currency
-        );
+        const account = accounts.find((acc) => acc.iban === debtorIban);
         if (!account) {
           throw createInternalError(null, {
-            message: `No account found for IBAN ${debtorIban} with currency ${currency}`,
+            message: `No account found for IBAN ${debtorIban}`,
             code: "VALID-B-004",
             status: 422
           });
         }
+        if (account.currency !== currency) {
+          throw createInternalError(null, {
+            message: `Account ${account.iban} has currency ${account.currency}, but payments require ${currency}`,
+            code: "VALID-B-010",
+            status: 422
+          });
+        }
         if (account.status !== "AUTHORIZED") {
           throw createInternalError(null, {
             message: `Account ${account.iban} is not authorized (status: ${account.status})`,
@@ -1356,13 +1375,6 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
             status: 422
           });
         }
-        for (const p of paymentInputs) {
-          this._validatePaymentTypeAndCurrency(
-            p.paymentType,
-            p.currency,
-            p.creditor
-          );
-        }
         const incomingPayments = paymentInputs.map(toIncomingPayment);
         const batchedPayments = incomingPayments.map(
           (p) => toBatchedPayment(assignAccount(p, account))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@develit-services/bank",
-  "version": "0.8.10",
+  "version": "0.8.12",
   "author": "Develit.io s.r.o.",
   "type": "module",
   "exports": {