@develit-services/bank 0.8.6 → 0.8.7

package/dist/shared/{bank.DRrBrAdI.mjs → bank.D1jqaHaF.mjs}

@@ -1,8 +1,9 @@
 import { uuidv4, createInternalError, useResult } from '@develit-io/backend-sdk';
 import { format, parseISO } from 'date-fns';
 import { CURRENCY_CODES } from '@develit-io/general-codes';
-import './bank.C4VOdIx1.mjs';
+import './bank.C0UN6luZ.mjs';
 import 'drizzle-orm';
+import 'drizzle-orm/sqlite-core';
 import { importPKCS8, SignJWT } from 'jose';
 import 'node:crypto';
 
@@ -60,9 +61,6 @@ function toCompletedPayment(payment, status, bankRefId, processedAt) {
     processedAt: processedAt ?? /* @__PURE__ */ new Date()
   };
 }
-function batchTransform(payments, transformer) {
-  return payments.map(transformer);
-}
 function toPaymentRequestInsert(payment, batchId) {
   return {
     id: payment.id,
@@ -84,7 +82,8 @@ function toPaymentRequestInsert(payment, batchId) {
     creditor: payment.creditor,
     creditorIban: payment.creditorIban ?? null,
     debtor: payment.debtor,
-    debtorIban: payment.debtorIban ?? null
+    debtorIban: payment.debtorIban ?? null,
+    sendAsSinglePayment: payment.sendAsSinglePayment ?? null
   };
 }
 function toBatchedPaymentFromPaymentRequest(sp) {
@@ -117,6 +116,9 @@ function toBatchedPaymentFromPaymentRequest(sp) {
 }
 
 class IBankConnector {
+  supportsPaymentType(paymentType) {
+    return paymentType === "DOMESTIC";
+  }
   // ── Deprecated methods (backward compatibility) ────────────────────
   /**
    * @deprecated Use initiateDomesticBatch, initiateSEPABatch, or initiateForeignBatch instead.
@@ -392,10 +394,13 @@ const mapReferencesToPayment = (reference) => {
 const mapFinbricksTransactionToPayment = (tx, account) => {
   const isIncoming = tx.creditDebitIndicator === "CRDT";
   const related = tx.entryDetails?.transactionDetails?.relatedParties;
+  const endToEndId = tx.entryDetails.transactionDetails?.references?.endToEndIdentification;
+  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  const paymentRequestId = endToEndId && uuidRegex.test(endToEndId) ? endToEndId : null;
   const base = {
     id: uuidv4(),
     correlationId: uuidv4(),
-    //TODO(kleinpetr): use real correlationId once available
+    paymentRequestId,
     connectorKey: account.connectorKey,
     accountId: account.id,
     bankRefId: tx.fbxReference,
@@ -406,7 +411,7 @@ const mapFinbricksTransactionToPayment = (tx, account) => {
     message: tx.entryDetails.transactionDetails?.remittanceInformation?.unstructured || tx.entryDetails.transactionDetails?.additionalRemittanceInformation || tx.entryDetails.transactionDetails?.additionalTransactionInformation || null,
     processedAt: new Date(tx.bookingDate.date),
     ...mapReferencesToPayment(
-      tx.entryDetails.transactionDetails?.remittanceInformation?.structured?.creditorReferenceInformation?.reference || tx.entryDetails.transactionDetails?.references?.endToEndIdentification
+      tx.entryDetails.transactionDetails?.remittanceInformation?.structured?.creditorReferenceInformation?.reference || (!paymentRequestId ? endToEndId : void 0)
     ),
     creditor: {
       holderName: related?.creditorAccount?.name || related?.creditor?.name || "Unknown",
@@ -455,6 +460,9 @@ class FinbricksConnector extends IBankConnector {
     this.connectedAccounts = connectedAccounts;
     this.resolveCredentials = resolveCredentials;
   }
+  supportsPaymentType(paymentType) {
+    return paymentType === "DOMESTIC" || paymentType === "SEPA" || paymentType === "SWIFT";
+  }
   async getClientId(accountId) {
     if (!this.resolveCredentials) {
       throw createInternalError(null, {
@@ -1145,24 +1153,64 @@ function mod97(string) {
   }
   return parseInt(checksum, 10);
 }
+const parseCzechIban = (iban) => {
+  const stripped = iban.replace(/\s/g, "").toUpperCase();
+  if (!stripped.startsWith("CZ") || stripped.length !== 24) {
+    throw new Error(`Invalid Czech IBAN: ${iban}`);
+  }
+  const bankCode = stripped.slice(4, 8);
+  const prefix = stripped.slice(8, 14).replace(/^0+/, "");
+  const main = stripped.slice(14, 24).replace(/^0+/, "");
+  const accountNumber = prefix ? `${prefix}-${main}` : main;
+  return { bankCode, accountNumber };
+};
 const calculateCzechIban = (accountNumber, bankCode) => {
   const paddedBankCode = bankCode.padStart(4, "0");
   let prefix = "";
   let mainAccount = accountNumber;
   if (accountNumber.includes("-")) {
     const parts = accountNumber.split("-");
+    if (parts.length !== 2) {
+      throw new Error(
+        `Invalid account number format: expected "prefix-main" or "main", got "${accountNumber}"`
+      );
+    }
     prefix = parts[0];
     mainAccount = parts[1];
   }
   const paddedPrefix = prefix.padStart(6, "0");
   const paddedAccount = mainAccount.padStart(10, "0");
   const basicIban = paddedBankCode + paddedPrefix + paddedAccount;
-  const rearranged = basicIban + "1215";
+  const rearranged = basicIban + "123500";
   const remainder = mod97(rearranged);
   const checkDigits = (98 - remainder).toString().padStart(2, "0");
   return `CZ${checkDigits}${basicIban}`;
 };
 
+function parseFlatAddress(addr, fallbackCountry) {
+  if (!addr) {
+    return {
+      streetName: null,
+      buildingNumber: null,
+      city: null,
+      zip: null,
+      countryCode: fallbackCountry
+    };
+  }
+  const parts = addr.split(",").map((p) => p.trim());
+  const streetPart = parts[0];
+  const cityPart = parts[1];
+  const countryCode = parts[2]?.trim() || fallbackCountry;
+  const streetMatch = streetPart?.match(/^(.+?)\s+(\d+\w*)$/);
+  const cityMatch = cityPart?.match(/^(\d[\d ]*?)\s+(.+)$/);
+  return {
+    streetName: streetMatch?.[1] ?? streetPart ?? null,
+    buildingNumber: streetMatch?.[2] ?? null,
+    city: cityMatch?.[2] ?? cityPart ?? null,
+    zip: cityMatch?.[1]?.replace(/\s/g, "") ?? null,
+    countryCode
+  };
+}
 class DbuConnector extends IBankConnector {
   constructor({
     BASE_URL,
@@ -1258,6 +1306,7 @@ class DbuConnector extends IBankConnector {
     const parsed = {
       id: uuidv4(),
       correlationId: uuidv4(),
+      paymentRequestId: transaction.uniqueExternalId ?? null,
       connectorKey: "DBU",
       accountId: account.id,
       bankRefId: transaction.idRequiredTransaction.toString(),
@@ -1423,11 +1472,25 @@ class DbuConnector extends IBankConnector {
     }
     return Number(account.bankRefId);
   }
+  resolveAccountDetails(account) {
+    if (account.number && account.bankCode) {
+      return { number: account.number, bankCode: account.bankCode };
+    }
+    if (account.iban) {
+      const { bankCode, accountNumber } = parseCzechIban(account.iban);
+      return { number: accountNumber, bankCode };
+    }
+    throw createInternalError(null, {
+      message: "DBU: account has neither number+bankCode nor iban",
+      code: "DBU_MISSING_ACCOUNT_DETAILS"
+    });
+  }
   async initiateInstantPayment(payment) {
+    const creditor = this.resolveAccountDetails(payment.creditor);
     const body = {
-      accountNumberCredit: payment.creditor.number,
+      accountNumberCredit: creditor.number,
       idAccountDebit: this.resolveIdAccountDebit(payment),
-      bankCodeCredit: payment.creditor.bankCode,
+      bankCodeCredit: creditor.bankCode,
       amount: payment.amount,
       currencyCode: "CZK",
       channelCode: "WWW",
@@ -1459,11 +1522,13 @@ class DbuConnector extends IBankConnector {
     if (payment.instructionPriority === "INST") {
       return this.initiateInstantPayment(payment);
     }
+    const debtor = this.resolveAccountDetails(payment.debtor);
+    const creditor = this.resolveAccountDetails(payment.creditor);
     const body = {
-      accountNumberDebit: payment.debtor.number,
-      accountNumberCredit: payment.creditor.number,
-      bankCodeDebit: payment.debtor.bankCode,
-      bankCodeCredit: payment.creditor.bankCode,
+      accountNumberDebit: debtor.number,
+      accountNumberCredit: creditor.number,
+      bankCodeDebit: debtor.bankCode,
+      bankCodeCredit: creditor.bankCode,
       amount: payment.amount,
       currencyCode: "CZK",
       actionTypeCode: "TRANSFER",
@@ -1480,20 +1545,14 @@ class DbuConnector extends IBankConnector {
       constSymbol: payment.ks,
       uniqueExternalId: payment.id,
       with4EyeApproval: "Y",
-      debtorAddress: {
-        streetName: null,
-        buildingNumber: null,
-        city: null,
-        zip: null,
-        countryCode: payment.debtor.countryCode || "CZ"
-      },
-      creditorAddress: {
-        streetName: null,
-        buildingNumber: null,
-        city: null,
-        zip: null,
-        countryCode: payment.creditor.countryCode || "CZ"
-      }
+      debtorAddress: parseFlatAddress(
+        payment.debtor.address,
+        payment.debtor.countryCode || "CZ"
+      ),
+      creditorAddress: parseFlatAddress(
+        payment.creditor.address,
+        payment.creditor.countryCode || "CZ"
+      )
     };
     const response = await this.makeRequest(
       "/required-transactions",
@@ -1547,7 +1606,7 @@ class DbuConnector extends IBankConnector {
       const limit = 10;
       let hasMoreData = true;
       let pageNumber = 1;
-      const baseRequestId = uuidv4();
+      const baseRequestId = uuidv4().replace(/-/g, "");
       while (hasMoreData) {
         const response = await this.makeRequest(
           "/required-transactions",
@@ -1573,7 +1632,7 @@ class DbuConnector extends IBankConnector {
         }
         for (const transaction of response.transactions.transaction) {
           const status = transaction.status.trim();
-          if (status === "0" || status === "50") continue;
+          if (status === "0" || status === "50" || status === "51") continue;
           try {
             const payment = this.mapDbuTransactionToPayment(
               transaction,
@@ -1886,6 +1945,7 @@ class ErsteConnector extends IBankConnector {
       const paymentInsert = {
         id: uuidv4(),
         correlationId: uuidv4(),
+        paymentRequestId: payment.entryDetails.transactionDetails.references.endToEndIdentification ?? null,
         connectorKey: "ERSTE",
         accountId: account.id,
         bankRefId: payment.entryReference,
@@ -2027,4 +2087,4 @@ class MockConnector extends IBankConnector {
   }
 }
 
-export { CsobConnector as C, DbuConnector as D, ErsteConnector as E, FINBRICKS_ENDPOINTS as F, IBankConnector as I, KBConnector as K, MockCobsConnector as M, FinbricksClient as a, FinbricksConnector as b, MockConnector as c, assignAccount as d, batchTransform as e, toBatchedPaymentFromPaymentRequest as f, toCompletedPayment as g, toIncomingPayment as h, toPaymentRequestInsert as i, toPreparedPayment as j, initiateConnector as k, mapFinbricksTransactionStatus as m, signFinbricksJws as s, toBatchedPayment as t, useFinbricksFetch as u };
+export { CsobConnector as C, DbuConnector as D, ErsteConnector as E, FINBRICKS_ENDPOINTS as F, IBankConnector as I, KBConnector as K, MockCobsConnector as M, FinbricksClient as a, FinbricksConnector as b, MockConnector as c, assignAccount as d, toBatchedPaymentFromPaymentRequest as e, toCompletedPayment as f, toIncomingPayment as g, toPaymentRequestInsert as h, toPreparedPayment as i, initiateConnector as j, mapFinbricksTransactionStatus as m, signFinbricksJws as s, toBatchedPayment as t, useFinbricksFetch as u };

package/dist/shared/{bank.Cpy9PULF.mjs → bank.DEmzZGZW.mjs}

@@ -1,11 +1,12 @@
+import { sql, and, eq, isNull } from 'drizzle-orm';
 import { uuidv4 } from '@develit-io/backend-sdk';
-import { eq } from 'drizzle-orm';
-import './bank.C4VOdIx1.mjs';
+import './bank.C0UN6luZ.mjs';
 import 'date-fns';
 import 'jose';
 import '@develit-io/general-codes';
 import { createHash } from 'node:crypto';
-import { s as schema } from './bank.DDHrdFgy.mjs';
+import { s as schema } from './bank.CA5ytXxp.mjs';
+import 'drizzle-orm/sqlite-core';
 
 const createPaymentCommand = (db, { payment }) => {
   return {
@@ -13,6 +14,21 @@ const createPaymentCommand = (db, { payment }) => {
       ...payment,
       creditorIban: payment.creditor.iban,
       debtorIban: payment.debtor.iban
+    }).onConflictDoUpdate({
+      // Unique index: (connector_key, bank_ref_id)
+      target: [tables.payment.connectorKey, tables.payment.bankRefId],
+      set: {
+        status: sql`excluded.status`,
+        statusReason: sql`excluded.status_reason`,
+        processedAt: sql`excluded.processed_at`,
+        updatedAt: sql`excluded.updated_at`,
+        // Keep existing paymentRequestId if already set, otherwise use new value
+        paymentRequestId: sql`coalesce(payment.payment_request_id, excluded.payment_request_id)`,
+        // Keep existing refId if already set, otherwise use enriched value
+        refId: sql`coalesce(payment.ref_id, excluded.ref_id)`,
+        // Keep existing batchId if already set, otherwise use enriched value
+        batchId: sql`coalesce(payment.bank_execution_batch_id, excluded.bank_execution_batch_id)`
+      }
     }).returning()
   };
 };
@@ -37,7 +53,12 @@ const upsertBatchCommand = (db, { batch }) => {
 const updatePaymentRequestStatusCommand = (db, values) => {
   const { id, ...set } = values;
   return {
-    command: db.update(tables.paymentRequest).set(set).where(eq(tables.paymentRequest.id, id)).returning()
+    command: db.update(tables.paymentRequest).set(set).where(
+      and(
+        eq(tables.paymentRequest.id, id),
+        isNull(tables.paymentRequest.deletedAt)
+      )
+    ).returning()
   };
 };
 
@@ -58,7 +79,12 @@ const getCredentialsByAccountId = async (db, encryptionKey, { accountId }) => {
 };
 
 const getPaymentRequestsByBatchIdQuery = async (db, { batchId }) => {
-  return await db.select().from(tables.paymentRequest).where(eq(tables.paymentRequest.batchId, batchId));
+  return await db.select().from(tables.paymentRequest).where(
+    and(
+      eq(tables.paymentRequest.batchId, batchId),
+      isNull(tables.paymentRequest.deletedAt)
+    )
+  );
 };
 
 async function importAesKey(base64Key) {

package/dist/shared/{bank.BOnP9p9Y.cjs → bank.Dm8GHThw.cjs}

@@ -1,13 +1,14 @@
 'use strict';
 
-const backendSdk = require('@develit-io/backend-sdk');
 const drizzleOrm = require('drizzle-orm');
-require('./bank.SQ4Mmr8u.cjs');
+const backendSdk = require('@develit-io/backend-sdk');
+require('./bank.BS7fFjGA.cjs');
 require('date-fns');
 require('jose');
 require('@develit-io/general-codes');
 const node_crypto = require('node:crypto');
-const database_schema = require('./bank.C-T1FQxg.cjs');
+const database_schema = require('./bank.62VzK9Aj.cjs');
+require('drizzle-orm/sqlite-core');
 
 const createPaymentCommand = (db, { payment }) => {
   return {
@@ -15,6 +16,21 @@ const createPaymentCommand = (db, { payment }) => {
       ...payment,
       creditorIban: payment.creditor.iban,
       debtorIban: payment.debtor.iban
+    }).onConflictDoUpdate({
+      // Unique index: (connector_key, bank_ref_id)
+      target: [tables.payment.connectorKey, tables.payment.bankRefId],
+      set: {
+        status: drizzleOrm.sql`excluded.status`,
+        statusReason: drizzleOrm.sql`excluded.status_reason`,
+        processedAt: drizzleOrm.sql`excluded.processed_at`,
+        updatedAt: drizzleOrm.sql`excluded.updated_at`,
+        // Keep existing paymentRequestId if already set, otherwise use new value
+        paymentRequestId: drizzleOrm.sql`coalesce(payment.payment_request_id, excluded.payment_request_id)`,
+        // Keep existing refId if already set, otherwise use enriched value
+        refId: drizzleOrm.sql`coalesce(payment.ref_id, excluded.ref_id)`,
+        // Keep existing batchId if already set, otherwise use enriched value
+        batchId: drizzleOrm.sql`coalesce(payment.bank_execution_batch_id, excluded.bank_execution_batch_id)`
+      }
     }).returning()
   };
 };
@@ -39,7 +55,12 @@ const upsertBatchCommand = (db, { batch }) => {
 const updatePaymentRequestStatusCommand = (db, values) => {
   const { id, ...set } = values;
   return {
-    command: db.update(tables.paymentRequest).set(set).where(drizzleOrm.eq(tables.paymentRequest.id, id)).returning()
+    command: db.update(tables.paymentRequest).set(set).where(
+      drizzleOrm.and(
+        drizzleOrm.eq(tables.paymentRequest.id, id),
+        drizzleOrm.isNull(tables.paymentRequest.deletedAt)
+      )
+    ).returning()
   };
 };
 
@@ -60,7 +81,12 @@ const getCredentialsByAccountId = async (db, encryptionKey, { accountId }) => {
 };
 
 const getPaymentRequestsByBatchIdQuery = async (db, { batchId }) => {
-  return await db.select().from(tables.paymentRequest).where(drizzleOrm.eq(tables.paymentRequest.batchId, batchId));
+  return await db.select().from(tables.paymentRequest).where(
+    drizzleOrm.and(
+      drizzleOrm.eq(tables.paymentRequest.batchId, batchId),
+      drizzleOrm.isNull(tables.paymentRequest.deletedAt)
+    )
+  );
 };
 
 async function importAesKey(base64Key) {

package/dist/shared/{bank.CQURey1E.cjs → bank.DwyCCyd0.cjs}

@@ -3,8 +3,9 @@
 const backendSdk = require('@develit-io/backend-sdk');
 const dateFns = require('date-fns');
 const generalCodes = require('@develit-io/general-codes');
-require('./bank.SQ4Mmr8u.cjs');
+require('./bank.BS7fFjGA.cjs');
 require('drizzle-orm');
+require('drizzle-orm/sqlite-core');
 const jose = require('jose');
 require('node:crypto');
 
@@ -62,9 +63,6 @@ function toCompletedPayment(payment, status, bankRefId, processedAt) {
     processedAt: processedAt ?? /* @__PURE__ */ new Date()
   };
 }
-function batchTransform(payments, transformer) {
-  return payments.map(transformer);
-}
 function toPaymentRequestInsert(payment, batchId) {
   return {
     id: payment.id,
@@ -86,7 +84,8 @@ function toPaymentRequestInsert(payment, batchId) {
     creditor: payment.creditor,
     creditorIban: payment.creditorIban ?? null,
     debtor: payment.debtor,
-    debtorIban: payment.debtorIban ?? null
+    debtorIban: payment.debtorIban ?? null,
+    sendAsSinglePayment: payment.sendAsSinglePayment ?? null
   };
 }
 function toBatchedPaymentFromPaymentRequest(sp) {
@@ -119,6 +118,9 @@ function toBatchedPaymentFromPaymentRequest(sp) {
 }
 
 class IBankConnector {
+  supportsPaymentType(paymentType) {
+    return paymentType === "DOMESTIC";
+  }
   // ── Deprecated methods (backward compatibility) ────────────────────
   /**
    * @deprecated Use initiateDomesticBatch, initiateSEPABatch, or initiateForeignBatch instead.
@@ -394,10 +396,13 @@ const mapReferencesToPayment = (reference) => {
 const mapFinbricksTransactionToPayment = (tx, account) => {
   const isIncoming = tx.creditDebitIndicator === "CRDT";
   const related = tx.entryDetails?.transactionDetails?.relatedParties;
+  const endToEndId = tx.entryDetails.transactionDetails?.references?.endToEndIdentification;
+  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  const paymentRequestId = endToEndId && uuidRegex.test(endToEndId) ? endToEndId : null;
   const base = {
     id: backendSdk.uuidv4(),
     correlationId: backendSdk.uuidv4(),
-    //TODO(kleinpetr): use real correlationId once available
+    paymentRequestId,
     connectorKey: account.connectorKey,
     accountId: account.id,
     bankRefId: tx.fbxReference,
@@ -408,7 +413,7 @@ const mapFinbricksTransactionToPayment = (tx, account) => {
     message: tx.entryDetails.transactionDetails?.remittanceInformation?.unstructured || tx.entryDetails.transactionDetails?.additionalRemittanceInformation || tx.entryDetails.transactionDetails?.additionalTransactionInformation || null,
     processedAt: new Date(tx.bookingDate.date),
     ...mapReferencesToPayment(
-      tx.entryDetails.transactionDetails?.remittanceInformation?.structured?.creditorReferenceInformation?.reference || tx.entryDetails.transactionDetails?.references?.endToEndIdentification
+      tx.entryDetails.transactionDetails?.remittanceInformation?.structured?.creditorReferenceInformation?.reference || (!paymentRequestId ? endToEndId : void 0)
     ),
     creditor: {
       holderName: related?.creditorAccount?.name || related?.creditor?.name || "Unknown",
@@ -457,6 +462,9 @@ class FinbricksConnector extends IBankConnector {
     this.connectedAccounts = connectedAccounts;
     this.resolveCredentials = resolveCredentials;
   }
+  supportsPaymentType(paymentType) {
+    return paymentType === "DOMESTIC" || paymentType === "SEPA" || paymentType === "SWIFT";
+  }
   async getClientId(accountId) {
     if (!this.resolveCredentials) {
       throw backendSdk.createInternalError(null, {
@@ -1147,24 +1155,64 @@ function mod97(string) {
   }
   return parseInt(checksum, 10);
 }
+const parseCzechIban = (iban) => {
+  const stripped = iban.replace(/\s/g, "").toUpperCase();
+  if (!stripped.startsWith("CZ") || stripped.length !== 24) {
+    throw new Error(`Invalid Czech IBAN: ${iban}`);
+  }
+  const bankCode = stripped.slice(4, 8);
+  const prefix = stripped.slice(8, 14).replace(/^0+/, "");
+  const main = stripped.slice(14, 24).replace(/^0+/, "");
+  const accountNumber = prefix ? `${prefix}-${main}` : main;
+  return { bankCode, accountNumber };
+};
 const calculateCzechIban = (accountNumber, bankCode) => {
   const paddedBankCode = bankCode.padStart(4, "0");
   let prefix = "";
   let mainAccount = accountNumber;
   if (accountNumber.includes("-")) {
     const parts = accountNumber.split("-");
+    if (parts.length !== 2) {
+      throw new Error(
+        `Invalid account number format: expected "prefix-main" or "main", got "${accountNumber}"`
+      );
+    }
     prefix = parts[0];
     mainAccount = parts[1];
   }
   const paddedPrefix = prefix.padStart(6, "0");
   const paddedAccount = mainAccount.padStart(10, "0");
   const basicIban = paddedBankCode + paddedPrefix + paddedAccount;
-  const rearranged = basicIban + "1215";
+  const rearranged = basicIban + "123500";
   const remainder = mod97(rearranged);
   const checkDigits = (98 - remainder).toString().padStart(2, "0");
   return `CZ${checkDigits}${basicIban}`;
 };
 
+function parseFlatAddress(addr, fallbackCountry) {
+  if (!addr) {
+    return {
+      streetName: null,
+      buildingNumber: null,
+      city: null,
+      zip: null,
+      countryCode: fallbackCountry
+    };
+  }
+  const parts = addr.split(",").map((p) => p.trim());
+  const streetPart = parts[0];
+  const cityPart = parts[1];
+  const countryCode = parts[2]?.trim() || fallbackCountry;
+  const streetMatch = streetPart?.match(/^(.+?)\s+(\d+\w*)$/);
+  const cityMatch = cityPart?.match(/^(\d[\d ]*?)\s+(.+)$/);
+  return {
+    streetName: streetMatch?.[1] ?? streetPart ?? null,
+    buildingNumber: streetMatch?.[2] ?? null,
+    city: cityMatch?.[2] ?? cityPart ?? null,
+    zip: cityMatch?.[1]?.replace(/\s/g, "") ?? null,
+    countryCode
+  };
+}
 class DbuConnector extends IBankConnector {
   constructor({
     BASE_URL,
@@ -1260,6 +1308,7 @@ class DbuConnector extends IBankConnector {
     const parsed = {
       id: backendSdk.uuidv4(),
       correlationId: backendSdk.uuidv4(),
+      paymentRequestId: transaction.uniqueExternalId ?? null,
       connectorKey: "DBU",
       accountId: account.id,
       bankRefId: transaction.idRequiredTransaction.toString(),
@@ -1425,11 +1474,25 @@ class DbuConnector extends IBankConnector {
     }
     return Number(account.bankRefId);
   }
+  resolveAccountDetails(account) {
+    if (account.number && account.bankCode) {
+      return { number: account.number, bankCode: account.bankCode };
+    }
+    if (account.iban) {
+      const { bankCode, accountNumber } = parseCzechIban(account.iban);
+      return { number: accountNumber, bankCode };
+    }
+    throw backendSdk.createInternalError(null, {
+      message: "DBU: account has neither number+bankCode nor iban",
+      code: "DBU_MISSING_ACCOUNT_DETAILS"
+    });
+  }
   async initiateInstantPayment(payment) {
+    const creditor = this.resolveAccountDetails(payment.creditor);
     const body = {
-      accountNumberCredit: payment.creditor.number,
+      accountNumberCredit: creditor.number,
       idAccountDebit: this.resolveIdAccountDebit(payment),
-      bankCodeCredit: payment.creditor.bankCode,
+      bankCodeCredit: creditor.bankCode,
       amount: payment.amount,
       currencyCode: "CZK",
       channelCode: "WWW",
@@ -1461,11 +1524,13 @@ class DbuConnector extends IBankConnector {
     if (payment.instructionPriority === "INST") {
       return this.initiateInstantPayment(payment);
     }
+    const debtor = this.resolveAccountDetails(payment.debtor);
+    const creditor = this.resolveAccountDetails(payment.creditor);
     const body = {
-      accountNumberDebit: payment.debtor.number,
-      accountNumberCredit: payment.creditor.number,
-      bankCodeDebit: payment.debtor.bankCode,
-      bankCodeCredit: payment.creditor.bankCode,
+      accountNumberDebit: debtor.number,
+      accountNumberCredit: creditor.number,
+      bankCodeDebit: debtor.bankCode,
+      bankCodeCredit: creditor.bankCode,
       amount: payment.amount,
       currencyCode: "CZK",
       actionTypeCode: "TRANSFER",
@@ -1482,20 +1547,14 @@ class DbuConnector extends IBankConnector {
       constSymbol: payment.ks,
       uniqueExternalId: payment.id,
       with4EyeApproval: "Y",
-      debtorAddress: {
-        streetName: null,
-        buildingNumber: null,
-        city: null,
-        zip: null,
-        countryCode: payment.debtor.countryCode || "CZ"
-      },
-      creditorAddress: {
-        streetName: null,
-        buildingNumber: null,
-        city: null,
-        zip: null,
-        countryCode: payment.creditor.countryCode || "CZ"
-      }
+      debtorAddress: parseFlatAddress(
+        payment.debtor.address,
+        payment.debtor.countryCode || "CZ"
+      ),
+      creditorAddress: parseFlatAddress(
+        payment.creditor.address,
+        payment.creditor.countryCode || "CZ"
+      )
     };
     const response = await this.makeRequest(
       "/required-transactions",
@@ -1549,7 +1608,7 @@ class DbuConnector extends IBankConnector {
       const limit = 10;
       let hasMoreData = true;
       let pageNumber = 1;
-      const baseRequestId = backendSdk.uuidv4();
+      const baseRequestId = backendSdk.uuidv4().replace(/-/g, "");
       while (hasMoreData) {
         const response = await this.makeRequest(
           "/required-transactions",
@@ -1575,7 +1634,7 @@ class DbuConnector extends IBankConnector {
         }
         for (const transaction of response.transactions.transaction) {
           const status = transaction.status.trim();
-          if (status === "0" || status === "50") continue;
+          if (status === "0" || status === "50" || status === "51") continue;
           try {
             const payment = this.mapDbuTransactionToPayment(
               transaction,
@@ -1888,6 +1947,7 @@ class ErsteConnector extends IBankConnector {
       const paymentInsert = {
         id: backendSdk.uuidv4(),
         correlationId: backendSdk.uuidv4(),
+        paymentRequestId: payment.entryDetails.transactionDetails.references.endToEndIdentification ?? null,
         connectorKey: "ERSTE",
         accountId: account.id,
         bankRefId: payment.entryReference,
@@ -2040,7 +2100,6 @@ exports.KBConnector = KBConnector;
 exports.MockCobsConnector = MockCobsConnector;
 exports.MockConnector = MockConnector;
 exports.assignAccount = assignAccount;
-exports.batchTransform = batchTransform;
 exports.initiateConnector = initiateConnector;
 exports.mapFinbricksTransactionStatus = mapFinbricksTransactionStatus;
 exports.signFinbricksJws = signFinbricksJws;

package/dist/types.cjs

@@ -1,16 +1,16 @@
 'use strict';
 
-const mock_connector = require('./shared/bank.CQURey1E.cjs');
-const paymentRequest_schema = require('./shared/bank.SQ4Mmr8u.cjs');
+const mock_connector = require('./shared/bank.DwyCCyd0.cjs');
+const paymentRequest_schema = require('./shared/bank.BS7fFjGA.cjs');
 const batchLifecycle = require('./shared/bank.Bg3Pdwm4.cjs');
 const generalCodes = require('@develit-io/general-codes');
 require('@develit-io/backend-sdk');
 require('date-fns');
 require('drizzle-orm');
+require('drizzle-orm/sqlite-core');
 require('jose');
 require('node:crypto');
 require('drizzle-orm/relations');
-require('drizzle-orm/sqlite-core');
 require('drizzle-zod');
 
 
@@ -26,7 +26,6 @@ exports.KBConnector = mock_connector.KBConnector;
 exports.MockCobsConnector = mock_connector.MockCobsConnector;
 exports.MockConnector = mock_connector.MockConnector;
 exports.assignAccount = mock_connector.assignAccount;
-exports.batchTransform = mock_connector.batchTransform;
 exports.signFinbricksJws = mock_connector.signFinbricksJws;
 exports.toBatchedPayment = mock_connector.toBatchedPayment;
 exports.toBatchedPaymentFromPaymentRequest = mock_connector.toBatchedPaymentFromPaymentRequest;