@develit-services/bank 0.8.6 → 0.8.7

package/dist/export/workflows.cjs

@@ -1,22 +1,22 @@
 'use strict';
 
 const backendSdk = require('@develit-io/backend-sdk');
-const drizzle = require('../shared/bank.BOnP9p9Y.cjs');
+const drizzle = require('../shared/bank.Dm8GHThw.cjs');
 const batchLifecycle = require('../shared/bank.Bg3Pdwm4.cjs');
-const mock_connector = require('../shared/bank.CQURey1E.cjs');
+const mock_connector = require('../shared/bank.DwyCCyd0.cjs');
 const drizzleOrm = require('drizzle-orm');
+require('drizzle-orm/sqlite-core');
 const cloudflare_workers = require('cloudflare:workers');
 const cloudflare_workflows = require('cloudflare:workflows');
 const d1 = require('drizzle-orm/d1');
 require('node:crypto');
-require('../shared/bank.SQ4Mmr8u.cjs');
+require('../shared/bank.BS7fFjGA.cjs');
 require('drizzle-orm/relations');
-require('drizzle-orm/sqlite-core');
 require('date-fns');
 require('jose');
 require('@develit-io/general-codes');
 require('drizzle-zod');
-require('../shared/bank.C-T1FQxg.cjs');
+require('../shared/bank.62VzK9Aj.cjs');
 
 const updateAccountLastSyncCommand = (db, {
   lastSyncAt,
@@ -92,13 +92,18 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
         const batchedPayments = paymentRequests.map(
           mock_connector.toBatchedPaymentFromPaymentRequest
         );
-        if (batch.batchPaymentInitiatedAt) {
+        const currentBatch = await drizzle.getBatchByIdQuery(db, { batchId });
+        if (currentBatch?.batchPaymentInitiatedAt) {
           return {
-            authorizationUrls: batch.authorizationUrls,
+            authorizationUrls: currentBatch.authorizationUrls,
             preparedPayments: batchedPayments.map(
-              (p) => mock_connector.toPreparedPayment(p, void 0, batch.batchPaymentInitiatedAt)
+              (p) => mock_connector.toPreparedPayment(
+                p,
+                void 0,
+                currentBatch.batchPaymentInitiatedAt
+              )
             ),
-            metadata: batch.metadata
+            metadata: currentBatch.metadata
           };
         }
         const account = await drizzle.getAccountByIdQuery(db, {
@@ -138,6 +143,17 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
           const message = err instanceof Error ? err.message : typeof err === "object" && err !== null && "message" in err ? String(err.message) : String(err);
           const status = typeof err === "object" && err !== null && "status" in err ? Number(err.status) : 0;
           if (status >= 400 && status < 500) {
+            const updateCommands = paymentRequests.map(
+              (p) => drizzle.updatePaymentRequestStatusCommand(db, {
+                id: p.id,
+                status: "FAILED",
+                statusReason: message,
+                processedAt: /* @__PURE__ */ new Date()
+              }).command
+            );
+            if (updateCommands.length > 0) {
+              await db.batch(updateCommands);
+            }
             throw new cloudflare_workflows.NonRetryableError(message);
           }
           throw new Error(message);
@@ -201,7 +217,8 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
             id: p.id,
             status: "COMPLETED",
             bankRefId: `MOCK-${backendSdk.uuidv4()}`,
-            processedAt
+            processedAt,
+            deletedAt: /* @__PURE__ */ new Date()
           }).command
         );
         const updateBatchCommand = drizzle.upsertBatchCommand(db, {
@@ -330,11 +347,87 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
           "process new payments and update lastSyncAt",
           async () => {
             const eventsToEmit = [];
-            const createCommands = paymentsToInsert.map(
+            const prIds = paymentsToInsert.map((p) => p.parsed.paymentRequestId).filter((id) => id != null);
+            const bankRefIds = paymentsToInsert.filter((p) => p.parsed.paymentRequestId == null).map((p) => p.parsed.bankRefId);
+            const [matchingByPrId, matchingByBankRefId] = await Promise.all([
+              prIds.length > 0 ? db.select().from(drizzle.tables.paymentRequest).where(drizzleOrm.inArray(drizzle.tables.paymentRequest.id, prIds)) : Promise.resolve([]),
+              bankRefIds.length > 0 ? db.select().from(drizzle.tables.paymentRequest).where(
+                drizzleOrm.and(
+                  drizzleOrm.inArray(drizzle.tables.paymentRequest.bankRefId, bankRefIds),
+                  drizzleOrm.eq(drizzle.tables.paymentRequest.accountId, account.id),
+                  drizzleOrm.eq(
+                    drizzle.tables.paymentRequest.connectorKey,
+                    account.connectorKey
+                  ),
+                  drizzleOrm.isNull(drizzle.tables.paymentRequest.deletedAt)
+                )
+              ) : Promise.resolve([])
+            ]);
+            const requestById = Object.fromEntries(
+              matchingByPrId.map((r) => [r.id, r])
+            );
+            const requestByBankRefId = Object.fromEntries(
+              matchingByBankRefId.map((r) => [r.bankRefId, r])
+            );
+            const enrichedPayments = paymentsToInsert.map((p) => {
+              const req = p.parsed.paymentRequestId ? requestById[p.parsed.paymentRequestId] : requestByBankRefId[p.parsed.bankRefId];
+              if (!req) return p;
+              return {
+                ...p,
+                parsed: {
+                  ...p.parsed,
+                  // Set paymentRequestId if missing (bankRefId fallback match)
+                  paymentRequestId: p.parsed.paymentRequestId ?? req.id,
+                  createdAt: req.createdAt ?? p.parsed.createdAt,
+                  batchId: p.parsed.batchId ?? req.batchId,
+                  refId: p.parsed.refId ?? req.refId,
+                  chargeBearer: p.parsed.chargeBearer ?? req.chargeBearer,
+                  instructionPriority: p.parsed.instructionPriority ?? req.instructionPriority,
+                  message: p.parsed.message ?? req.message,
+                  vs: p.parsed.vs ?? req.vs,
+                  ss: p.parsed.ss ?? req.ss,
+                  ks: p.parsed.ks ?? req.ks,
+                  creditor: {
+                    ...p.parsed.creditor,
+                    holderName: p.parsed.creditor?.holderName ?? req.creditor?.holderName,
+                    address: p.parsed.creditor?.address ?? req.creditor?.address,
+                    swiftBic: p.parsed.creditor?.swiftBic ?? req.creditor?.swiftBic
+                  },
+                  debtor: {
+                    ...p.parsed.debtor,
+                    holderName: p.parsed.debtor?.holderName ?? req.debtor?.holderName
+                  }
+                }
+              };
+            });
+            const createCommands = enrichedPayments.map(
               (p) => drizzle.createPaymentCommand(db, { payment: p.parsed }).command
             );
+            const softDeleteCommands = enrichedPayments.map(
+              (p) => db.update(drizzle.tables.paymentRequest).set({
+                deletedAt: now,
+                status: p.parsed.status,
+                statusReason: p.parsed.statusReason ?? null
+              }).where(
+                drizzleOrm.or(
+                  // Primary: match via paymentRequestId (our ID echoed back by bank)
+                  p.parsed.paymentRequestId ? drizzleOrm.eq(drizzle.tables.paymentRequest.id, p.parsed.paymentRequestId) : void 0,
+                  // Fallback: match via bankRefId (set during processBatch)
+                  drizzleOrm.and(
+                    drizzleOrm.isNotNull(drizzle.tables.paymentRequest.bankRefId),
+                    drizzleOrm.eq(drizzle.tables.paymentRequest.bankRefId, p.parsed.bankRefId),
+                    drizzleOrm.eq(drizzle.tables.paymentRequest.accountId, account.id),
+                    drizzleOrm.eq(
+                      drizzle.tables.paymentRequest.connectorKey,
+                      account.connectorKey
+                    ),
+                    drizzleOrm.isNull(drizzle.tables.paymentRequest.deletedAt)
+                  )
+                )
+              )
+            );
             eventsToEmit.push(
-              ...paymentsToInsert.map((p) => ({
+              ...enrichedPayments.map((p) => ({
                 eventType: "BANK_PAYMENT",
                 eventSignal: "paymentCreated",
                 bankPayment: p.parsed,
@@ -349,9 +442,7 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
               payments: payments.length,
               paymentsToProcess: paymentsToProcess.length,
               paymentsInserted: paymentsToInsert.length,
-              lastSyncBankRefIds: paymentsToProcess.map(
-                (p) => p.parsed.bankRefId
-              ),
+              lastSyncBankRefIds: paymentsToProcess.filter((p) => p.parsed.status === "COMPLETED").map((p) => p.parsed.bankRefId),
               lastSyncPayments: lastSyncBankRefIds.length,
               eventsEmitted: eventsToEmit.length
             };
@@ -362,13 +453,38 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
             }).command;
             if (eventsToEmit.length) {
               await db.batch(
-                backendSdk.asNonEmpty([updateLastSyncCommand, ...createCommands])
+                backendSdk.asNonEmpty([
+                  updateLastSyncCommand,
+                  ...createCommands,
+                  ...softDeleteCommands
+                ])
               );
               await pushToQueue(
                 this.env.QUEUE_BUS_QUEUE,
                 eventsToEmit
               );
             }
+            const paymentRequestIds = enrichedPayments.map((p) => p.parsed.paymentRequestId).filter((id) => id != null);
+            if (paymentRequestIds.length > 0) {
+              const processedPRs = await db.select({ batchId: drizzle.tables.paymentRequest.batchId }).from(drizzle.tables.paymentRequest).where(drizzleOrm.inArray(drizzle.tables.paymentRequest.id, paymentRequestIds));
+              const batchIds = [
+                ...new Set(
+                  processedPRs.map((pr) => pr.batchId).filter((id) => id != null)
+                )
+              ];
+              for (const batchId of batchIds) {
+                const allPRsInBatch = await db.select({ deletedAt: drizzle.tables.paymentRequest.deletedAt }).from(drizzle.tables.paymentRequest).where(drizzleOrm.eq(drizzle.tables.paymentRequest.batchId, batchId));
+                const allDone = allPRsInBatch.length > 0 && allPRsInBatch.every((pr) => pr.deletedAt != null);
+                if (allDone) {
+                  const batch = await drizzle.getBatchByIdQuery(db, { batchId });
+                  if (batch && batch.status !== "COMPLETED" && batch.status !== "FAILED") {
+                    await drizzle.upsertBatchCommand(db, {
+                      batch: { ...batch, status: "COMPLETED" }
+                    }).command.execute();
+                  }
+                }
+              }
+            }
             return {
               ...lastSyncMetadata,
               newLastSyncAt: now

package/dist/export/workflows.mjs

@@ -1,20 +1,20 @@
 import { first, uuidv4, asNonEmpty } from '@develit-io/backend-sdk';
-import { t as tables, g as getBatchByIdQuery, a as getPaymentRequestsByBatchIdQuery, c as checksum, u as upsertBatchCommand, b as getAccountByIdQuery, d as createCredentialsResolver, e as updatePaymentRequestStatusCommand, f as createPaymentCommand } from '../shared/bank.Cpy9PULF.mjs';
+import { t as tables, g as getBatchByIdQuery, a as getPaymentRequestsByBatchIdQuery, c as checksum, u as upsertBatchCommand, b as getAccountByIdQuery, d as createCredentialsResolver, e as updatePaymentRequestStatusCommand, f as createPaymentCommand } from '../shared/bank.DEmzZGZW.mjs';
 import { f as isBatchSigned, a as isBatchFailed, c as isBatchOpen, g as isPaymentCompleted } from '../shared/bank.CbAwwIhZ.mjs';
-import { f as toBatchedPaymentFromPaymentRequest, j as toPreparedPayment, k as initiateConnector } from '../shared/bank.DRrBrAdI.mjs';
-import { eq } from 'drizzle-orm';
+import { e as toBatchedPaymentFromPaymentRequest, i as toPreparedPayment, j as initiateConnector } from '../shared/bank.D1jqaHaF.mjs';
+import { eq, inArray, and, isNull, or, isNotNull } from 'drizzle-orm';
+import 'drizzle-orm/sqlite-core';
 import { WorkflowEntrypoint } from 'cloudflare:workers';
 import { NonRetryableError } from 'cloudflare:workflows';
 import { drizzle } from 'drizzle-orm/d1';
 import 'node:crypto';
-import '../shared/bank.C4VOdIx1.mjs';
+import '../shared/bank.C0UN6luZ.mjs';
 import 'drizzle-orm/relations';
-import 'drizzle-orm/sqlite-core';
 import 'date-fns';
 import 'jose';
 import '@develit-io/general-codes';
 import 'drizzle-zod';
-import '../shared/bank.DDHrdFgy.mjs';
+import '../shared/bank.CA5ytXxp.mjs';
 
 const updateAccountLastSyncCommand = (db, {
   lastSyncAt,
@@ -90,13 +90,18 @@ class BankProcessBatch extends WorkflowEntrypoint {
         const batchedPayments = paymentRequests.map(
           toBatchedPaymentFromPaymentRequest
         );
-        if (batch.batchPaymentInitiatedAt) {
+        const currentBatch = await getBatchByIdQuery(db, { batchId });
+        if (currentBatch?.batchPaymentInitiatedAt) {
           return {
-            authorizationUrls: batch.authorizationUrls,
+            authorizationUrls: currentBatch.authorizationUrls,
             preparedPayments: batchedPayments.map(
-              (p) => toPreparedPayment(p, void 0, batch.batchPaymentInitiatedAt)
+              (p) => toPreparedPayment(
+                p,
+                void 0,
+                currentBatch.batchPaymentInitiatedAt
+              )
             ),
-            metadata: batch.metadata
+            metadata: currentBatch.metadata
           };
         }
         const account = await getAccountByIdQuery(db, {
@@ -136,6 +141,17 @@ class BankProcessBatch extends WorkflowEntrypoint {
           const message = err instanceof Error ? err.message : typeof err === "object" && err !== null && "message" in err ? String(err.message) : String(err);
           const status = typeof err === "object" && err !== null && "status" in err ? Number(err.status) : 0;
           if (status >= 400 && status < 500) {
+            const updateCommands = paymentRequests.map(
+              (p) => updatePaymentRequestStatusCommand(db, {
+                id: p.id,
+                status: "FAILED",
+                statusReason: message,
+                processedAt: /* @__PURE__ */ new Date()
+              }).command
+            );
+            if (updateCommands.length > 0) {
+              await db.batch(updateCommands);
+            }
             throw new NonRetryableError(message);
           }
           throw new Error(message);
@@ -199,7 +215,8 @@ class BankProcessBatch extends WorkflowEntrypoint {
             id: p.id,
             status: "COMPLETED",
             bankRefId: `MOCK-${uuidv4()}`,
-            processedAt
+            processedAt,
+            deletedAt: /* @__PURE__ */ new Date()
           }).command
         );
         const updateBatchCommand = upsertBatchCommand(db, {
@@ -328,11 +345,87 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
           "process new payments and update lastSyncAt",
           async () => {
             const eventsToEmit = [];
-            const createCommands = paymentsToInsert.map(
+            const prIds = paymentsToInsert.map((p) => p.parsed.paymentRequestId).filter((id) => id != null);
+            const bankRefIds = paymentsToInsert.filter((p) => p.parsed.paymentRequestId == null).map((p) => p.parsed.bankRefId);
+            const [matchingByPrId, matchingByBankRefId] = await Promise.all([
+              prIds.length > 0 ? db.select().from(tables.paymentRequest).where(inArray(tables.paymentRequest.id, prIds)) : Promise.resolve([]),
+              bankRefIds.length > 0 ? db.select().from(tables.paymentRequest).where(
+                and(
+                  inArray(tables.paymentRequest.bankRefId, bankRefIds),
+                  eq(tables.paymentRequest.accountId, account.id),
+                  eq(
+                    tables.paymentRequest.connectorKey,
+                    account.connectorKey
+                  ),
+                  isNull(tables.paymentRequest.deletedAt)
+                )
+              ) : Promise.resolve([])
+            ]);
+            const requestById = Object.fromEntries(
+              matchingByPrId.map((r) => [r.id, r])
+            );
+            const requestByBankRefId = Object.fromEntries(
+              matchingByBankRefId.map((r) => [r.bankRefId, r])
+            );
+            const enrichedPayments = paymentsToInsert.map((p) => {
+              const req = p.parsed.paymentRequestId ? requestById[p.parsed.paymentRequestId] : requestByBankRefId[p.parsed.bankRefId];
+              if (!req) return p;
+              return {
+                ...p,
+                parsed: {
+                  ...p.parsed,
+                  // Set paymentRequestId if missing (bankRefId fallback match)
+                  paymentRequestId: p.parsed.paymentRequestId ?? req.id,
+                  createdAt: req.createdAt ?? p.parsed.createdAt,
+                  batchId: p.parsed.batchId ?? req.batchId,
+                  refId: p.parsed.refId ?? req.refId,
+                  chargeBearer: p.parsed.chargeBearer ?? req.chargeBearer,
+                  instructionPriority: p.parsed.instructionPriority ?? req.instructionPriority,
+                  message: p.parsed.message ?? req.message,
+                  vs: p.parsed.vs ?? req.vs,
+                  ss: p.parsed.ss ?? req.ss,
+                  ks: p.parsed.ks ?? req.ks,
+                  creditor: {
+                    ...p.parsed.creditor,
+                    holderName: p.parsed.creditor?.holderName ?? req.creditor?.holderName,
+                    address: p.parsed.creditor?.address ?? req.creditor?.address,
+                    swiftBic: p.parsed.creditor?.swiftBic ?? req.creditor?.swiftBic
+                  },
+                  debtor: {
+                    ...p.parsed.debtor,
+                    holderName: p.parsed.debtor?.holderName ?? req.debtor?.holderName
+                  }
+                }
+              };
+            });
+            const createCommands = enrichedPayments.map(
               (p) => createPaymentCommand(db, { payment: p.parsed }).command
             );
+            const softDeleteCommands = enrichedPayments.map(
+              (p) => db.update(tables.paymentRequest).set({
+                deletedAt: now,
+                status: p.parsed.status,
+                statusReason: p.parsed.statusReason ?? null
+              }).where(
+                or(
+                  // Primary: match via paymentRequestId (our ID echoed back by bank)
+                  p.parsed.paymentRequestId ? eq(tables.paymentRequest.id, p.parsed.paymentRequestId) : void 0,
+                  // Fallback: match via bankRefId (set during processBatch)
+                  and(
+                    isNotNull(tables.paymentRequest.bankRefId),
+                    eq(tables.paymentRequest.bankRefId, p.parsed.bankRefId),
+                    eq(tables.paymentRequest.accountId, account.id),
+                    eq(
+                      tables.paymentRequest.connectorKey,
+                      account.connectorKey
+                    ),
+                    isNull(tables.paymentRequest.deletedAt)
+                  )
+                )
+              )
+            );
             eventsToEmit.push(
-              ...paymentsToInsert.map((p) => ({
+              ...enrichedPayments.map((p) => ({
                 eventType: "BANK_PAYMENT",
                 eventSignal: "paymentCreated",
                 bankPayment: p.parsed,
@@ -347,9 +440,7 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
               payments: payments.length,
               paymentsToProcess: paymentsToProcess.length,
               paymentsInserted: paymentsToInsert.length,
-              lastSyncBankRefIds: paymentsToProcess.map(
-                (p) => p.parsed.bankRefId
-              ),
+              lastSyncBankRefIds: paymentsToProcess.filter((p) => p.parsed.status === "COMPLETED").map((p) => p.parsed.bankRefId),
               lastSyncPayments: lastSyncBankRefIds.length,
               eventsEmitted: eventsToEmit.length
             };
@@ -360,13 +451,38 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
             }).command;
             if (eventsToEmit.length) {
               await db.batch(
-                asNonEmpty([updateLastSyncCommand, ...createCommands])
+                asNonEmpty([
+                  updateLastSyncCommand,
+                  ...createCommands,
+                  ...softDeleteCommands
+                ])
               );
               await pushToQueue(
                 this.env.QUEUE_BUS_QUEUE,
                 eventsToEmit
               );
             }
+            const paymentRequestIds = enrichedPayments.map((p) => p.parsed.paymentRequestId).filter((id) => id != null);
+            if (paymentRequestIds.length > 0) {
+              const processedPRs = await db.select({ batchId: tables.paymentRequest.batchId }).from(tables.paymentRequest).where(inArray(tables.paymentRequest.id, paymentRequestIds));
+              const batchIds = [
+                ...new Set(
+                  processedPRs.map((pr) => pr.batchId).filter((id) => id != null)
+                )
+              ];
+              for (const batchId of batchIds) {
+                const allPRsInBatch = await db.select({ deletedAt: tables.paymentRequest.deletedAt }).from(tables.paymentRequest).where(eq(tables.paymentRequest.batchId, batchId));
+                const allDone = allPRsInBatch.length > 0 && allPRsInBatch.every((pr) => pr.deletedAt != null);
+                if (allDone) {
+                  const batch = await getBatchByIdQuery(db, { batchId });
+                  if (batch && batch.status !== "COMPLETED" && batch.status !== "FAILED") {
+                    await upsertBatchCommand(db, {
+                      batch: { ...batch, status: "COMPLETED" }
+                    }).command.execute();
+                  }
+                }
+              }
+            }
             return {
               ...lastSyncMetadata,
               newLastSyncAt: now

package/dist/shared/{bank.C-T1FQxg.cjs → bank.62VzK9Aj.cjs}

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

package/dist/shared/{bank.SQ4Mmr8u.cjs → bank.BS7fFjGA.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;
@@ -139,6 +140,7 @@ const payment = sqliteCore.sqliteTable(
   {
     ...backendSdk.base,
     correlationId: sqliteCore.text("correlation_id").notNull(),
+    paymentRequestId: sqliteCore.text("payment_request_id"),
     refId: sqliteCore.text("ref_id"),
     bankRefId: sqliteCore.text("bank_ref_id").notNull(),
     accountId: sqliteCore.text("account_id").references(() => account.id, {
@@ -174,7 +176,18 @@ 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_payment_request_id_idx").on(t.paymentRequestId),
+    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 +230,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, {

package/dist/shared/{bank.B6U8sUZn.d.mts → bank.BYRq3yJf.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.Cns5ss41.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.C4VOdIx1.mjs → bank.C0UN6luZ.mjs}

@@ -26,7 +26,8 @@ const BATCH_STATUSES = [
   "READY_TO_SIGN",
   "SIGNED",
   "SIGNATURE_FAILED",
-  "FAILED"
+  "FAILED",
+  "COMPLETED"
 ];
 const ACCOUNT_STATUSES = ["AUTHORIZED", "DISABLED", "EXPIRED"];
 const COUNTRY_CODES = COUNTRY_CODES_2;
@@ -137,6 +138,7 @@ const payment = sqliteTable(
   {
     ...base,
     correlationId: text("correlation_id").notNull(),
+    paymentRequestId: text("payment_request_id"),
     refId: text("ref_id"),
     bankRefId: text("bank_ref_id").notNull(),
     accountId: text("account_id").references(() => account.id, {
@@ -172,7 +174,18 @@ const payment = sqliteTable(
     debtor: text("debtor", { mode: "json" }).$type().notNull(),
     debtorIban: text("debtor_iban")
   },
-  (t) => [unique().on(t.connectorKey, t.bankRefId)]
+  (t) => [
+    unique().on(t.connectorKey, t.bankRefId),
+    index("payment_account_id_idx").on(t.accountId),
+    index("payment_account_id_status_idx").on(t.accountId, t.status),
+    index("payment_account_id_created_at_idx").on(t.accountId, t.createdAt),
+    index("payment_created_at_idx").on(t.createdAt),
+    index("payment_payment_request_id_idx").on(t.paymentRequestId),
+    index("payment_direction_idx").on(t.direction),
+    index("payment_batch_id_idx").on(t.batchId),
+    index("payment_creditor_iban_idx").on(t.creditorIban),
+    index("payment_debtor_iban_idx").on(t.debtorIban)
+  ]
 );
 const paymentRelations = relations(payment, ({ one }) => ({
   batch: one(batch, { fields: [payment.batchId], references: [batch.id] })
@@ -215,9 +228,26 @@ const paymentRequest = sqliteTable(
     creditor: text("creditor", { mode: "json" }).$type().notNull(),
     creditorIban: text("creditor_iban"),
     debtor: text("debtor", { mode: "json" }).$type().notNull(),
-    debtorIban: text("debtor_iban")
+    debtorIban: text("debtor_iban"),
+    sendAsSinglePayment: integer("send_as_single_payment", {
+      mode: "boolean"
+    })
   },
-  (t) => [index("payment_request_batch_id_idx").on(t.batchId)]
+  (t) => [
+    index("payment_request_batch_id_idx").on(t.batchId),
+    index("payment_request_account_id_idx").on(t.accountId),
+    index("payment_request_creditor_iban_idx").on(t.creditorIban),
+    index("payment_request_debtor_iban_idx").on(t.debtorIban),
+    index("payment_request_status_idx").on(t.status),
+    index("payment_request_created_at_idx").on(t.createdAt),
+    index("payment_request_account_status_idx").on(t.accountId, t.status),
+    index("payment_request_status_created_at_idx").on(t.status, t.createdAt),
+    index("payment_request_account_status_created_at_idx").on(
+      t.accountId,
+      t.status,
+      t.createdAt
+    )
+  ]
 );
 const paymentRequestRelations = relations(paymentRequest, ({ one }) => ({
   batch: one(batch, {

package/dist/shared/{bank.DDHrdFgy.mjs → bank.CA5ytXxp.mjs}

@@ -1,4 +1,4 @@
-import { n as account, p as accountCredentials, q as batch, r as ott, s as payment, t as paymentRelations, u as paymentRequest, v as paymentRequestRelations } from './bank.C4VOdIx1.mjs';
+import { n as account, p as accountCredentials, q as batch, r as ott, s as payment, t as paymentRelations, u as paymentRequest, v as paymentRequestRelations } from './bank.C0UN6luZ.mjs';
 
 const schema = {
 	__proto__: null,