@develit-services/bank 0.8.6 → 0.8.8

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

@@ -3,7 +3,7 @@
 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.JVlyPAAb.cjs');
 require('drizzle-orm');
 const jose = require('jose');
 require('node:crypto');
@@ -62,9 +62,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 +83,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 +117,9 @@ function toBatchedPaymentFromPaymentRequest(sp) {
 }
 
 class IBankConnector {
+  supportsPaymentType(paymentType) {
+    return paymentType === "DOMESTIC";
+  }
   // ── Deprecated methods (backward compatibility) ────────────────────
   /**
    * @deprecated Use initiateDomesticBatch, initiateSEPABatch, or initiateForeignBatch instead.
@@ -206,6 +207,17 @@ class IBankConnector {
   }
 }
 
+function buildEndToEndId(payment) {
+  const parts = [];
+  if (payment.vs) parts.push(`VS${payment.vs}`);
+  if (payment.ss) parts.push(`SS${payment.ss}`);
+  if (payment.ks) parts.push(`KS${payment.ks}`);
+  if (parts.length === 0) {
+    return payment.id.replace(/-/g, "");
+  }
+  return `/${parts.join("/")}`;
+}
+
 async function signFinbricksJws({
   privateKeyPem,
   merchantId,
@@ -262,6 +274,18 @@ const useFinbricksFetch = async (config, init) => {
   if (correlationId) {
     headers["Correlation-ID"] = correlationId;
   }
+  console.log(
+    "[Finbricks] request",
+    JSON.stringify(
+      {
+        method,
+        url: url.toString(),
+        body: body ?? null
+      },
+      null,
+      2
+    )
+  );
   const res = await fetch(url.toString(), {
     method,
     headers,
@@ -269,11 +293,30 @@ const useFinbricksFetch = async (config, init) => {
   });
   if (!res.ok) {
     const text = await res.text().catch(() => "unknown error");
+    console.error("[Finbricks] error response", {
+      status: res.status,
+      statusText: res.statusText,
+      url: url.toString(),
+      body: text
+    });
     throw new Error(
       `Finbricks API error: ${res.status} ${res.statusText} \u2013 ${text}`
     );
   }
-  return await res.json();
+  const json = await res.json();
+  console.log(
+    "[Finbricks] response",
+    JSON.stringify(
+      {
+        status: res.status,
+        url: url.toString(),
+        body: json
+      },
+      null,
+      2
+    )
+  );
+  return json;
 };
 class FinbricksClient {
   constructor(baseUrl, merchantId, privateKeyPem, redirectUri) {
@@ -328,16 +371,16 @@ const mapFinbricksStatus = (status) => {
       return "PENDING";
   }
 };
-const mapFinbricksTransactionStatus = (status) => {
+const mapFinbricksTransactionStatus = (status, finalBankStatus) => {
   switch (status) {
     case "OPENED":
-      return "CREATED";
+      return "PREPARED";
     case "AUTHORIZED":
-      return "PENDING";
+      return finalBankStatus ? "COMPLETED" : "PENDING";
     case "COMPLETED":
-      return "COMPLETED";
+      return finalBankStatus ? "COMPLETED" : "PENDING";
     case "BOOKED":
-      return "PENDING";
+      return finalBankStatus ? "COMPLETED" : "PENDING";
     case "SETTLED":
       return "COMPLETED";
     case "REJECTED":
@@ -391,24 +434,81 @@ const mapReferencesToPayment = (reference) => {
   return symbols;
 };
 
+const SEPA_COUNTRIES = /* @__PURE__ */ new Set([
+  "AT",
+  "BE",
+  "BG",
+  "CY",
+  "CZ",
+  "DE",
+  "DK",
+  "EE",
+  "ES",
+  "FI",
+  "FR",
+  "GR",
+  "HR",
+  "HU",
+  "IE",
+  "IT",
+  "LT",
+  "LU",
+  "LV",
+  "MT",
+  "NL",
+  "PL",
+  "PT",
+  "RO",
+  "SE",
+  "SI",
+  "SK",
+  "IS",
+  "LI",
+  "NO",
+  "CH",
+  "GB",
+  "MC",
+  "SM",
+  "VA",
+  "AD",
+  "GI",
+  "XK"
+]);
+function detectPaymentType(tx, isIncoming) {
+  const related = tx.entryDetails?.transactionDetails?.relatedParties;
+  const otherParty = isIncoming ? related?.debtorAccount : related?.creditorAccount;
+  if (otherParty?.identification?.other?.identification) return "DOMESTIC";
+  const otherIban = otherParty?.identification?.iban;
+  const otherCountry = otherIban?.slice(0, 2);
+  if (otherCountry === "CZ") return "DOMESTIC";
+  if (otherIban && otherCountry) {
+    if (SEPA_COUNTRIES.has(otherCountry) && tx.amount?.currency === "EUR")
+      return "SEPA";
+    return "SWIFT";
+  }
+  if (tx.amount?.currency === "EUR") return "SEPA";
+  if (tx.amount?.currency !== "CZK") return "SWIFT";
+  return "DOMESTIC";
+}
 const mapFinbricksTransactionToPayment = (tx, account) => {
   const isIncoming = tx.creditDebitIndicator === "CRDT";
   const related = tx.entryDetails?.transactionDetails?.relatedParties;
+  const endToEndId = tx.entryDetails.transactionDetails?.references?.endToEndIdentification;
+  const symbolsRegex = /^\/VS\d+/;
   const base = {
     id: backendSdk.uuidv4(),
     correlationId: backendSdk.uuidv4(),
-    //TODO(kleinpetr): use real correlationId once available
     connectorKey: account.connectorKey,
     accountId: account.id,
     bankRefId: tx.fbxReference,
     amount: tx.amount?.value || 0,
     currency: tx.amount?.currency || "CZK",
-    paymentType: "DOMESTIC",
+    paymentType: detectPaymentType(tx, isIncoming),
     status: mapFinbricksStatus(tx.status),
     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 || (endToEndId && symbolsRegex.test(endToEndId) ? endToEndId : void 0)
     ),
     creditor: {
       holderName: related?.creditorAccount?.name || related?.creditor?.name || "Unknown",
@@ -435,6 +535,13 @@ const mapFinbricksTransactionToPayment = (tx, account) => {
   return base;
 };
 
+function autoVariableSymbol(paymentId) {
+  let hash = 0;
+  for (let i = 0; i < paymentId.length; i++) {
+    hash = (hash << 5) - hash + paymentId.charCodeAt(i) | 0;
+  }
+  return String(Math.abs(hash) % 1e10).padStart(10, "0");
+}
 class FinbricksConnector extends IBankConnector {
   constructor(provider, {
     BASE_URI,
@@ -446,6 +553,7 @@ class FinbricksConnector extends IBankConnector {
   }) {
     super();
     this.connectorKey = "FINBRICKS";
+    this.lifecycleMode = "batch";
     this.connectedAccounts = [];
     this.PROVIDER = provider;
     this.finbricks = new FinbricksClient(
@@ -457,6 +565,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, {
@@ -646,7 +757,7 @@ class FinbricksConnector extends IBankConnector {
             merchantTransactionId: p.id,
             creditorAccountIban: p.creditor.iban,
             amount: p.amount,
-            variableSymbol: p.vs,
+            variableSymbol: p.vs ?? (p.ss ? void 0 : autoVariableSymbol(p.id)),
             specificSymbol: p.ss,
             constantSymbol: p.ks,
             description: p.message
@@ -754,7 +865,7 @@ class FinbricksConnector extends IBankConnector {
           },
           paymentIdentification: {
             merchantTransactionId: bankRefId,
-            endToEndIdentification: payment.id
+            endToEndIdentification: buildEndToEndId(payment)
           },
           amount: payment.amount,
           debtor: {
@@ -804,7 +915,7 @@ class FinbricksConnector extends IBankConnector {
           creditorAccountIban: payment.creditor.iban,
           creditorName: payment.creditor.holderName,
           description: payment.message,
-          variableSymbol: payment.vs,
+          variableSymbol: payment.vs ?? (payment.ss ? void 0 : autoVariableSymbol(payment.id)),
           callbackUrl: `${this.finbricks.REDIRECT_URI}?type=payment&paymentId=${payment.id}`,
           paymentProvider: this.PROVIDER
         }
@@ -895,7 +1006,10 @@ class FinbricksConnector extends IBankConnector {
         message: "Finbricks: failed to fetch payment status"
       });
     }
-    return mapFinbricksTransactionStatus(response.resultCode);
+    return mapFinbricksTransactionStatus(
+      response.resultCode,
+      response.finalBankStatus ?? false
+    );
   }
   async getBatchStatus({
     batchId,
@@ -948,6 +1062,7 @@ class AirBankConnector extends FinbricksConnector {
 class CreditasConnector extends FinbricksConnector {
   constructor(config) {
     super("CREDITAS", config);
+    this.lifecycleMode = "per-payment";
   }
   /**
    * Creditas bank doesn't support batch payments at all.
@@ -1147,24 +1262,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,
@@ -1177,6 +1332,7 @@ class DbuConnector extends IBankConnector {
   }) {
     super();
     this.connectorKey = "DBU";
+    this.lifecycleMode = "per-payment";
     this.connectedAccounts = [];
     this.baseUrl = BASE_URL;
     this.username = USERNAME;
@@ -1425,11 +1581,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 +1631,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 +1654,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 +1715,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 +1741,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,
@@ -1623,6 +1789,7 @@ class ErsteConnector extends IBankConnector {
   constructor(config) {
     super();
     this.connectorKey = "ERSTE";
+    this.lifecycleMode = "batch";
     this.accessToken = null;
     this.API_KEY = config.API_KEY;
     this.CLIENT_ID = config.CLIENT_ID;
@@ -1728,7 +1895,7 @@ class ErsteConnector extends IBankConnector {
     }
     const paymentBody = {
       paymentIdentification: {
-        endToEndIdentification: payment.id,
+        endToEndIdentification: buildEndToEndId(payment),
         instructionIdentification: payment.id
       },
       paymentTypeInformation: { instructionPriority: "NORM" },
@@ -1954,6 +2121,7 @@ class MockConnector extends IBankConnector {
   constructor() {
     super();
     this.connectorKey = "MOCK";
+    this.lifecycleMode = "batch";
     this.connectedAccounts = [];
   }
   supportsBatch(_paymentType) {
@@ -2040,7 +2208,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/shared/{bank.C-T1FQxg.cjs → bank.DJnDSYqE.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-const paymentRequest_schema = require('./bank.SQ4Mmr8u.cjs');
+const paymentRequest_schema = require('./bank.JVlyPAAb.cjs');
 
 const schema = {
 	__proto__: null,

package/dist/shared/{bank.B6U8sUZn.d.mts → bank.DRTuKO8S.d.ts}

@@ -1,4 +1,4 @@
-import { X as CurrencyCode, H as BankCode, U as CountryCode } from './bank.BliD3oCT.mjs';
+import { d as CurrencyCode, J as BankCode, V as CountryCode } from './bank.B-NJB8GB.js';
 import { z } from 'zod';
 
 type ReferenceType = `${'VS' | 'SS' | 'KS'}:${number}`;
@@ -210,6 +210,18 @@ type FinbricksAccountTransactionsResponse = {
     transactions: FinbricksTransaction[];
 };
 
+/**
+ * @deprecated Use IncomingPayment from './payment-lifecycle' instead
+ * This type is kept for backward compatibility during migration
+ */
+
+/**
+ * Message pushed to PAYMENTS_READY_TO_BATCH_QUEUE after payment_request is created in DB
+ */
+type PaymentQueueMessage = {
+    paymentId: string;
+};
+
 declare const sendPaymentInputSchema: z.ZodObject<{
     correlationId: z.ZodString;
     refId: z.ZodOptional<z.ZodString>;
@@ -225,7 +237,6 @@ declare const sendPaymentInputSchema: z.ZodObject<{
         OUR: "OUR";
         BEN: "BEN";
     }>>;
-    executionDate: z.ZodOptional<z.ZodString>;
     instructionPriority: z.ZodOptional<z.ZodEnum<{
         NORM: "NORM";
         HIGH: "HIGH";
@@ -980,12 +991,13 @@ declare const sendPaymentInputSchema: z.ZodObject<{
         bsb: z.ZodOptional<z.ZodString>;
         brBankNumber: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>;
-    purpose: z.ZodOptional<z.ZodString>;
     sendAsSinglePayment: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
 interface SendPaymentInput extends z.infer<typeof sendPaymentInputSchema> {
 }
-type SendPaymentOutput = void;
+type SendPaymentOutput = {
+    paymentId: string;
+};
 
 declare const sendPaymentSyncInputSchema: z.ZodObject<{
     correlationId: z.ZodString;
@@ -1002,7 +1014,6 @@ declare const sendPaymentSyncInputSchema: z.ZodObject<{
         OUR: "OUR";
         BEN: "BEN";
     }>>;
-    executionDate: z.ZodOptional<z.ZodString>;
     instructionPriority: z.ZodOptional<z.ZodEnum<{
         NORM: "NORM";
         HIGH: "HIGH";
@@ -1757,7 +1768,6 @@ declare const sendPaymentSyncInputSchema: z.ZodObject<{
         bsb: z.ZodOptional<z.ZodString>;
         brBankNumber: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>;
-    purpose: z.ZodOptional<z.ZodString>;
     sendAsSinglePayment: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
 interface SendPaymentSyncInput extends z.infer<typeof sendPaymentSyncInputSchema> {
@@ -1767,4 +1777,4 @@ type SendPaymentSyncOutput = {
     authorizationUrl: string;
 };
 
-export type { FinbricksSupportedBanksResponse as F, ReferenceType as R, SendPaymentInput as S, SendPaymentOutput as a, SendPaymentSyncInput as b, SendPaymentSyncOutput as c, FinbricksAccount as d, FinbricksAccountTransactionsResponse as e, FinbricksAccountsListResponse as f, FinbricksAuthTokenResponse as g, FinbricksBatchResponse as h, FinbricksConnectAccountResponse as i, FinbricksPaymentResponse as j, FinbricksSupportedBank as k };
+export type { FinbricksSupportedBanksResponse as F, PaymentQueueMessage as P, ReferenceType as R, SendPaymentInput as S, SendPaymentOutput as a, SendPaymentSyncInput as b, SendPaymentSyncOutput as c, FinbricksAccount as d, FinbricksAccountTransactionsResponse as e, FinbricksAccountsListResponse as f, FinbricksAuthTokenResponse as g, FinbricksBatchResponse as h, FinbricksConnectAccountResponse as i, FinbricksPaymentResponse as j, FinbricksSupportedBank as k };

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

@@ -1,13 +1,13 @@
 '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.JVlyPAAb.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.DJnDSYqE.cjs');
 
 const createPaymentCommand = (db, { payment }) => {
   return {
@@ -15,6 +15,19 @@ 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 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 +52,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 +78,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.SQ4Mmr8u.cjs → bank.JVlyPAAb.cjs}

@@ -28,7 +28,8 @@ const BATCH_STATUSES = [
   "READY_TO_SIGN",
   "SIGNED",
   "SIGNATURE_FAILED",
-  "FAILED"
+  "FAILED",
+  "COMPLETED"
 ];
 const ACCOUNT_STATUSES = ["AUTHORIZED", "DISABLED", "EXPIRED"];
 const COUNTRY_CODES = generalCodes.COUNTRY_CODES_2;
@@ -174,7 +175,17 @@ const payment = sqliteCore.sqliteTable(
     debtor: sqliteCore.text("debtor", { mode: "json" }).$type().notNull(),
     debtorIban: sqliteCore.text("debtor_iban")
   },
-  (t) => [sqliteCore.unique().on(t.connectorKey, t.bankRefId)]
+  (t) => [
+    sqliteCore.unique().on(t.connectorKey, t.bankRefId),
+    sqliteCore.index("payment_account_id_idx").on(t.accountId),
+    sqliteCore.index("payment_account_id_status_idx").on(t.accountId, t.status),
+    sqliteCore.index("payment_account_id_created_at_idx").on(t.accountId, t.createdAt),
+    sqliteCore.index("payment_created_at_idx").on(t.createdAt),
+    sqliteCore.index("payment_direction_idx").on(t.direction),
+    sqliteCore.index("payment_batch_id_idx").on(t.batchId),
+    sqliteCore.index("payment_creditor_iban_idx").on(t.creditorIban),
+    sqliteCore.index("payment_debtor_iban_idx").on(t.debtorIban)
+  ]
 );
 const paymentRelations = relations.relations(payment, ({ one }) => ({
   batch: one(batch, { fields: [payment.batchId], references: [batch.id] })
@@ -217,9 +228,26 @@ const paymentRequest = sqliteCore.sqliteTable(
     creditor: sqliteCore.text("creditor", { mode: "json" }).$type().notNull(),
     creditorIban: sqliteCore.text("creditor_iban"),
     debtor: sqliteCore.text("debtor", { mode: "json" }).$type().notNull(),
-    debtorIban: sqliteCore.text("debtor_iban")
+    debtorIban: sqliteCore.text("debtor_iban"),
+    sendAsSinglePayment: sqliteCore.integer("send_as_single_payment", {
+      mode: "boolean"
+    })
   },
-  (t) => [sqliteCore.index("payment_request_batch_id_idx").on(t.batchId)]
+  (t) => [
+    sqliteCore.index("payment_request_batch_id_idx").on(t.batchId),
+    sqliteCore.index("payment_request_account_id_idx").on(t.accountId),
+    sqliteCore.index("payment_request_creditor_iban_idx").on(t.creditorIban),
+    sqliteCore.index("payment_request_debtor_iban_idx").on(t.debtorIban),
+    sqliteCore.index("payment_request_status_idx").on(t.status),
+    sqliteCore.index("payment_request_created_at_idx").on(t.createdAt),
+    sqliteCore.index("payment_request_account_status_idx").on(t.accountId, t.status),
+    sqliteCore.index("payment_request_status_created_at_idx").on(t.status, t.createdAt),
+    sqliteCore.index("payment_request_account_status_created_at_idx").on(
+      t.accountId,
+      t.status,
+      t.createdAt
+    )
+  ]
 );
 const paymentRequestRelations = relations.relations(paymentRequest, ({ one }) => ({
   batch: one(batch, {