@develit-services/bank 5.2.1 → 5.2.2

package/dist/base.d.cts

@@ -2699,9 +2699,9 @@ declare const getBatchesInputSchema: z.ZodObject<{
     limit: z.ZodNumber;
     sort: z.ZodObject<{
         column: z.ZodEnum<{
+            batchPaymentInitiatedAt: "batchPaymentInitiatedAt";
             createdAt: "createdAt";
             updatedAt: "updatedAt";
-            batchPaymentInitiatedAt: "batchPaymentInitiatedAt";
         }>;
         direction: z.ZodEnum<{
             asc: "asc";
@@ -2825,9 +2825,9 @@ declare const getPaymentsInputSchema: z.ZodObject<{
     limit: z.ZodNumber;
     sort: z.ZodObject<{
         column: z.ZodEnum<{
+            amount: "amount";
             createdAt: "createdAt";
             updatedAt: "updatedAt";
-            amount: "amount";
         }>;
         direction: z.ZodEnum<{
             asc: "asc";
@@ -3875,9 +3875,9 @@ declare const getPaymentRequestsInputSchema: z.ZodObject<{
     limit: z.ZodNumber;
     sort: z.ZodObject<{
         column: z.ZodEnum<{
+            amount: "amount";
             createdAt: "createdAt";
             updatedAt: "updatedAt";
-            amount: "amount";
         }>;
         direction: z.ZodEnum<{
             asc: "asc";

package/dist/base.d.mts

@@ -2699,9 +2699,9 @@ declare const getBatchesInputSchema: z.ZodObject<{
     limit: z.ZodNumber;
     sort: z.ZodObject<{
         column: z.ZodEnum<{
+            batchPaymentInitiatedAt: "batchPaymentInitiatedAt";
             createdAt: "createdAt";
             updatedAt: "updatedAt";
-            batchPaymentInitiatedAt: "batchPaymentInitiatedAt";
         }>;
         direction: z.ZodEnum<{
             asc: "asc";
@@ -2825,9 +2825,9 @@ declare const getPaymentsInputSchema: z.ZodObject<{
     limit: z.ZodNumber;
     sort: z.ZodObject<{
         column: z.ZodEnum<{
+            amount: "amount";
             createdAt: "createdAt";
             updatedAt: "updatedAt";
-            amount: "amount";
         }>;
         direction: z.ZodEnum<{
             asc: "asc";
@@ -3875,9 +3875,9 @@ declare const getPaymentRequestsInputSchema: z.ZodObject<{
     limit: z.ZodNumber;
     sort: z.ZodObject<{
         column: z.ZodEnum<{
+            amount: "amount";
             createdAt: "createdAt";
             updatedAt: "updatedAt";
-            amount: "amount";
         }>;
         direction: z.ZodEnum<{
             asc: "asc";

package/dist/base.d.ts

@@ -2699,9 +2699,9 @@ declare const getBatchesInputSchema: z.ZodObject<{
     limit: z.ZodNumber;
     sort: z.ZodObject<{
         column: z.ZodEnum<{
+            batchPaymentInitiatedAt: "batchPaymentInitiatedAt";
             createdAt: "createdAt";
             updatedAt: "updatedAt";
-            batchPaymentInitiatedAt: "batchPaymentInitiatedAt";
         }>;
         direction: z.ZodEnum<{
             asc: "asc";
@@ -2825,9 +2825,9 @@ declare const getPaymentsInputSchema: z.ZodObject<{
     limit: z.ZodNumber;
     sort: z.ZodObject<{
         column: z.ZodEnum<{
+            amount: "amount";
             createdAt: "createdAt";
             updatedAt: "updatedAt";
-            amount: "amount";
         }>;
         direction: z.ZodEnum<{
             asc: "asc";
@@ -3875,9 +3875,9 @@ declare const getPaymentRequestsInputSchema: z.ZodObject<{
     limit: z.ZodNumber;
     sort: z.ZodObject<{
         column: z.ZodEnum<{
+            amount: "amount";
             createdAt: "createdAt";
             updatedAt: "updatedAt";
-            amount: "amount";
         }>;
         direction: z.ZodEnum<{
             asc: "asc";

package/dist/export/workflows.cjs

@@ -315,16 +315,12 @@ async function pushToQueue(queue, message) {
     await queue.send(message, { contentType: "v8" });
     return;
   }
-  const QUEUE_BATCH_SIZE = 100;
-  for (let i = 0; i < message.length; i += QUEUE_BATCH_SIZE) {
-    const chunk = message.slice(i, i + QUEUE_BATCH_SIZE);
-    await queue.sendBatch(
-      chunk.map((m) => ({
-        body: m,
-        contentType: "v8"
-      }))
-    );
-  }
+  await queue.sendBatch(
+    message.map((m) => ({
+      body: m,
+      contentType: "v8"
+    }))
+  );
 }
 class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
   async run(event, step) {
@@ -350,13 +346,13 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
       if (!account.lastSyncAt) {
         throw new Error(`lastSyncedAt is not set for account: ${accountId}`);
       }
-      await step.do(
-        "fetch and process payments",
+      const payments = await step.do(
+        "fetch bank payments",
         {
           retries: { limit: 5, delay: "2 minutes", backoff: "exponential" },
-          timeout: "5 minutes"
+          timeout: "2 minutes"
         },
-        async (ctx) => {
+        async () => {
           try {
             logger.info("payments.fetch.started", {
               accountId,
@@ -379,192 +375,19 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
                 }
               ]
             });
-            const payments = await connector.getAllAccountPayments({
+            const result = await connector.getAllAccountPayments({
               account,
               filter: { dateFrom: account.lastSyncAt }
             });
             logger.info("payments.fetch.completed", {
               accountId,
               connectorKey: account.connectorKey,
-              paymentsCount: payments.length
-            });
-            const paymentsToProcess = payments.filter(
-              (p) => bank.isPaymentCompleted(p.parsed)
-            );
-            logger.info("payments.filtered.toProcess", {
-              accountId,
-              totalFetched: payments.length,
-              paymentsToProcess: paymentsToProcess.length,
-              sampleStatuses: payments.slice(0, 5).map((p) => ({
-                bankRefId: p.parsed.bankRefId,
-                status: p.parsed.status,
-                isCompleted: bank.isPaymentCompleted(p.parsed)
-              }))
-            });
-            const lastSyncBankRefIds = account.lastSyncMetadata?.lastSyncBankRefIds || [];
-            const paymentsToInsert = paymentsToProcess.filter(
-              (p) => !lastSyncBankRefIds.includes(p.parsed.bankRefId)
-            );
-            logger.info("payments.filtered.toInsert", {
-              accountId,
-              paymentsToProcess: paymentsToProcess.length,
-              paymentsToInsert: paymentsToInsert.length,
-              lastSyncBankRefIdsCount: lastSyncBankRefIds.length,
-              sampleLastSyncBankRefIds: lastSyncBankRefIds.slice(0, 10),
-              sampleToInsert: paymentsToInsert.slice(0, 5).map((p) => p.parsed.bankRefId)
-            });
-            const eventsToEmit = [];
-            const bankRefIds = paymentsToInsert.map((p) => p.parsed.bankRefId).filter((id) => id != null);
-            const BANK_REF_ID_CHUNK_SIZE = 90;
-            const matchingRequests = [];
-            for (let i = 0; i < bankRefIds.length; i += BANK_REF_ID_CHUNK_SIZE) {
-              const chunkIds = bankRefIds.slice(i, i + BANK_REF_ID_CHUNK_SIZE);
-              const rows = await db.select().from(bank.tables.paymentRequest).where(
-                drizzleOrm.and(
-                  drizzleOrm.inArray(bank.tables.paymentRequest.bankRefId, chunkIds),
-                  drizzleOrm.eq(bank.tables.paymentRequest.accountId, account.id),
-                  drizzleOrm.eq(
-                    bank.tables.paymentRequest.connectorKey,
-                    account.connectorKey
-                  )
-                )
-              );
-              matchingRequests.push(...rows);
-            }
-            const requestByBankRefId = Object.fromEntries(
-              matchingRequests.map((r) => [r.bankRefId, r])
-            );
-            const enrichedPayments = paymentsToInsert.map((p) => {
-              const req = p.parsed.bankRefId && requestByBankRefId[p.parsed.bankRefId] || null;
-              if (!req) return p;
-              return {
-                ...p,
-                parsed: {
-                  ...p.parsed,
-                  // queue-bus: transaction matching (DBU doesn't echo these in statements)
-                  vs: p.parsed.vs ?? req.vs,
-                  ss: p.parsed.ss ?? req.ss,
-                  ks: p.parsed.ks ?? req.ks,
-                  message: p.parsed.message ?? req.message,
-                  // queue-bus: party creation
-                  creditor: {
-                    ...p.parsed.creditor,
-                    holderName: p.parsed.creditor?.holderName ?? req.creditor?.holderName
-                  },
-                  debtor: {
-                    ...p.parsed.debtor,
-                    holderName: p.parsed.debtor?.holderName ?? req.debtor?.holderName
-                  }
-                  // NOT enriched: chargeBearer, instructionPriority, refId, batchId,
-                  //               createdAt, address, swiftBic — no downstream consumer in payment table
-                }
-              };
-            });
-            const createCommands = enrichedPayments.map(
-              (p) => credentialsResolver.createPaymentCommand(db, { payment: p.parsed }).command
-            );
-            logger.info("payments.commands.created", {
-              accountId,
-              createCommandsCount: createCommands.length,
-              enrichedPaymentsCount: enrichedPayments.length
-            });
-            eventsToEmit.push(
-              ...enrichedPayments.map((p) => ({
-                eventType: "BANK_PAYMENT",
-                eventSignal: "paymentFetched",
-                bankPayment: p.parsed,
-                metadata: {
-                  correlationId: p.parsed.correlationId,
-                  entityId: p.parsed.id,
-                  timestamp: /* @__PURE__ */ new Date()
-                }
-              }))
-            );
-            const lastSyncMetadata = {
-              payments: payments.length,
-              paymentsToProcess: paymentsToProcess.length,
-              paymentsInserted: paymentsToInsert.length,
-              lastSyncBankRefIds: paymentsToProcess.filter((p) => p.parsed.status === "BOOKED").map((p) => p.parsed.bankRefId),
-              lastSyncPayments: lastSyncBankRefIds.length,
-              eventsEmitted: eventsToEmit.length,
-              iterationCount: getStepCount(ctx),
-              workflowStartedAt
-            };
-            const updateLastSyncCommand = updateAccountLastSyncCommand(db, {
-              accountId: account.id,
-              lastSyncAt: now,
-              lastSyncMetadata
-            }).command;
-            logger.info("payments.database.beforeBatch", {
-              accountId,
-              createCommandsCount: createCommands.length,
-              willUseBatch: createCommands.length > 0
+              paymentsCount: result.length
             });
-            if (createCommands.length) {
-              logger.info("payments.database.batchStart", {
-                accountId,
-                totalCommands: createCommands.length + 1,
-                paymentsToInsert: createCommands.length
-              });
-              const BATCH_CHUNK_SIZE = 90;
-              let totalInserted = 0;
-              for (let i = 0; i < createCommands.length; i += BATCH_CHUNK_SIZE) {
-                const chunkCommands = createCommands.slice(
-                  i,
-                  i + BATCH_CHUNK_SIZE
-                );
-                const isLastChunk = i + BATCH_CHUNK_SIZE >= createCommands.length;
-                const batchCommands = isLastChunk ? backendSdk.asNonEmpty([updateLastSyncCommand, ...chunkCommands]) : backendSdk.asNonEmpty(chunkCommands);
-                logger.info("payments.database.batchChunk", {
-                  accountId,
-                  chunkIndex: Math.floor(i / BATCH_CHUNK_SIZE),
-                  chunkSize: chunkCommands.length,
-                  isLastChunk
-                });
-                await db.batch(batchCommands);
-                totalInserted += chunkCommands.length;
-              }
-              logger.info("payments.database.batchComplete", {
-                accountId,
-                inserted: totalInserted,
-                chunks: Math.ceil(createCommands.length / BATCH_CHUNK_SIZE)
-              });
-            } else {
-              logger.info("payments.database.updateOnly", {
-                accountId,
-                reason: "no new payments to insert"
-              });
-              await updateLastSyncCommand.execute();
-              logger.info("payments.database.updateComplete", {
-                accountId
-              });
-            }
-            if (eventsToEmit.length) {
-              logger.info("payments.queue.sending", {
-                accountId,
-                eventsCount: eventsToEmit.length
-              });
-              await pushToQueue(
-                this.env.QUEUE_BUS_QUEUE,
-                eventsToEmit
-              );
-              logger.info("payments.queue.sent", {
-                accountId,
-                eventsCount: eventsToEmit.length
-              });
-            }
-            logger.info("payments.process.complete", {
-              accountId,
-              ...lastSyncMetadata,
-              newLastSyncAt: now
-            });
-            return {
-              ...lastSyncMetadata,
-              newLastSyncAt: now
-            };
+            return result;
           } catch (err) {
             const message = err instanceof Error ? err.message : typeof err === "object" && err !== null && "message" in err ? String(err.message) : JSON.stringify(err);
-            logger.error("payments.process.failed", {
+            logger.error("payments.fetch.failed", {
               accountId,
               connectorKey: account.connectorKey,
               error: message
@@ -573,6 +396,109 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
           }
         }
       );
+      const paymentsToProcess = payments.filter(
+        (p) => bank.isPaymentCompleted(p.parsed)
+      );
+      const lastSyncBankRefIds = account.lastSyncMetadata?.lastSyncBankRefIds || [];
+      const paymentsToInsert = paymentsToProcess.filter(
+        (p) => !lastSyncBankRefIds.includes(p.parsed.bankRefId)
+      );
+      await step.do(
+        "process new payments and update lastSyncAt",
+        async (ctx) => {
+          const eventsToEmit = [];
+          const bankRefIds = paymentsToInsert.map((p) => p.parsed.bankRefId).filter((id) => id != null);
+          const BANK_REF_ID_CHUNK_SIZE = 90;
+          const matchingRequests = [];
+          for (let i = 0; i < bankRefIds.length; i += BANK_REF_ID_CHUNK_SIZE) {
+            const chunkIds = bankRefIds.slice(i, i + BANK_REF_ID_CHUNK_SIZE);
+            const rows = await db.select().from(bank.tables.paymentRequest).where(
+              drizzleOrm.and(
+                drizzleOrm.inArray(bank.tables.paymentRequest.bankRefId, chunkIds),
+                drizzleOrm.eq(bank.tables.paymentRequest.accountId, account.id),
+                drizzleOrm.eq(bank.tables.paymentRequest.connectorKey, account.connectorKey)
+              )
+            );
+            matchingRequests.push(...rows);
+          }
+          const requestByBankRefId = Object.fromEntries(
+            matchingRequests.map((r) => [r.bankRefId, r])
+          );
+          const enrichedPayments = paymentsToInsert.map((p) => {
+            const req = p.parsed.bankRefId && requestByBankRefId[p.parsed.bankRefId] || null;
+            if (!req) return p;
+            return {
+              ...p,
+              parsed: {
+                ...p.parsed,
+                // queue-bus: transaction matching (DBU doesn't echo these in statements)
+                vs: p.parsed.vs ?? req.vs,
+                ss: p.parsed.ss ?? req.ss,
+                ks: p.parsed.ks ?? req.ks,
+                message: p.parsed.message ?? req.message,
+                // queue-bus: party creation
+                creditor: {
+                  ...p.parsed.creditor,
+                  holderName: p.parsed.creditor?.holderName ?? req.creditor?.holderName
+                },
+                debtor: {
+                  ...p.parsed.debtor,
+                  holderName: p.parsed.debtor?.holderName ?? req.debtor?.holderName
+                }
+                // NOT enriched: chargeBearer, instructionPriority, refId, batchId,
+                //               createdAt, address, swiftBic — no downstream consumer in payment table
+              }
+            };
+          });
+          const createCommands = enrichedPayments.map(
+            (p) => credentialsResolver.createPaymentCommand(db, { payment: p.parsed }).command
+          );
+          eventsToEmit.push(
+            ...enrichedPayments.map((p) => ({
+              eventType: "BANK_PAYMENT",
+              eventSignal: "paymentFetched",
+              bankPayment: p.parsed,
+              metadata: {
+                correlationId: p.parsed.correlationId,
+                entityId: p.parsed.id,
+                timestamp: /* @__PURE__ */ new Date()
+              }
+            }))
+          );
+          const lastSyncMetadata = {
+            payments: payments.length,
+            paymentsToProcess: paymentsToProcess.length,
+            paymentsInserted: paymentsToInsert.length,
+            lastSyncBankRefIds: paymentsToProcess.filter((p) => p.parsed.status === "BOOKED").map((p) => p.parsed.bankRefId),
+            lastSyncPayments: lastSyncBankRefIds.length,
+            eventsEmitted: eventsToEmit.length,
+            iterationCount: getStepCount(ctx),
+            workflowStartedAt
+          };
+          const updateLastSyncCommand = updateAccountLastSyncCommand(db, {
+            accountId: account.id,
+            lastSyncAt: now,
+            lastSyncMetadata
+          }).command;
+          if (createCommands.length) {
+            await db.batch(
+              backendSdk.asNonEmpty([updateLastSyncCommand, ...createCommands])
+            );
+          } else {
+            await updateLastSyncCommand;
+          }
+          if (eventsToEmit.length) {
+            await pushToQueue(
+              this.env.QUEUE_BUS_QUEUE,
+              eventsToEmit
+            );
+          }
+          return {
+            ...lastSyncMetadata,
+            newLastSyncAt: now
+          };
+        }
+      );
       await step.sleep(
         "Sleep for next sync",
         `${account.syncIntervalS} seconds`

package/dist/export/workflows.mjs

@@ -313,16 +313,12 @@ async function pushToQueue(queue, message) {
     await queue.send(message, { contentType: "v8" });
     return;
   }
-  const QUEUE_BATCH_SIZE = 100;
-  for (let i = 0; i < message.length; i += QUEUE_BATCH_SIZE) {
-    const chunk = message.slice(i, i + QUEUE_BATCH_SIZE);
-    await queue.sendBatch(
-      chunk.map((m) => ({
-        body: m,
-        contentType: "v8"
-      }))
-    );
-  }
+  await queue.sendBatch(
+    message.map((m) => ({
+      body: m,
+      contentType: "v8"
+    }))
+  );
 }
 class BankSyncAccountPayments extends WorkflowEntrypoint {
   async run(event, step) {
@@ -348,13 +344,13 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
       if (!account.lastSyncAt) {
         throw new Error(`lastSyncedAt is not set for account: ${accountId}`);
       }
-      await step.do(
-        "fetch and process payments",
+      const payments = await step.do(
+        "fetch bank payments",
         {
           retries: { limit: 5, delay: "2 minutes", backoff: "exponential" },
-          timeout: "5 minutes"
+          timeout: "2 minutes"
         },
-        async (ctx) => {
+        async () => {
           try {
             logger.info("payments.fetch.started", {
               accountId,
@@ -377,192 +373,19 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
                 }
               ]
             });
-            const payments = await connector.getAllAccountPayments({
+            const result = await connector.getAllAccountPayments({
               account,
               filter: { dateFrom: account.lastSyncAt }
             });
             logger.info("payments.fetch.completed", {
               accountId,
               connectorKey: account.connectorKey,
-              paymentsCount: payments.length
-            });
-            const paymentsToProcess = payments.filter(
-              (p) => isPaymentCompleted(p.parsed)
-            );
-            logger.info("payments.filtered.toProcess", {
-              accountId,
-              totalFetched: payments.length,
-              paymentsToProcess: paymentsToProcess.length,
-              sampleStatuses: payments.slice(0, 5).map((p) => ({
-                bankRefId: p.parsed.bankRefId,
-                status: p.parsed.status,
-                isCompleted: isPaymentCompleted(p.parsed)
-              }))
-            });
-            const lastSyncBankRefIds = account.lastSyncMetadata?.lastSyncBankRefIds || [];
-            const paymentsToInsert = paymentsToProcess.filter(
-              (p) => !lastSyncBankRefIds.includes(p.parsed.bankRefId)
-            );
-            logger.info("payments.filtered.toInsert", {
-              accountId,
-              paymentsToProcess: paymentsToProcess.length,
-              paymentsToInsert: paymentsToInsert.length,
-              lastSyncBankRefIdsCount: lastSyncBankRefIds.length,
-              sampleLastSyncBankRefIds: lastSyncBankRefIds.slice(0, 10),
-              sampleToInsert: paymentsToInsert.slice(0, 5).map((p) => p.parsed.bankRefId)
-            });
-            const eventsToEmit = [];
-            const bankRefIds = paymentsToInsert.map((p) => p.parsed.bankRefId).filter((id) => id != null);
-            const BANK_REF_ID_CHUNK_SIZE = 90;
-            const matchingRequests = [];
-            for (let i = 0; i < bankRefIds.length; i += BANK_REF_ID_CHUNK_SIZE) {
-              const chunkIds = bankRefIds.slice(i, i + BANK_REF_ID_CHUNK_SIZE);
-              const rows = await db.select().from(tables.paymentRequest).where(
-                and(
-                  inArray(tables.paymentRequest.bankRefId, chunkIds),
-                  eq(tables.paymentRequest.accountId, account.id),
-                  eq(
-                    tables.paymentRequest.connectorKey,
-                    account.connectorKey
-                  )
-                )
-              );
-              matchingRequests.push(...rows);
-            }
-            const requestByBankRefId = Object.fromEntries(
-              matchingRequests.map((r) => [r.bankRefId, r])
-            );
-            const enrichedPayments = paymentsToInsert.map((p) => {
-              const req = p.parsed.bankRefId && requestByBankRefId[p.parsed.bankRefId] || null;
-              if (!req) return p;
-              return {
-                ...p,
-                parsed: {
-                  ...p.parsed,
-                  // queue-bus: transaction matching (DBU doesn't echo these in statements)
-                  vs: p.parsed.vs ?? req.vs,
-                  ss: p.parsed.ss ?? req.ss,
-                  ks: p.parsed.ks ?? req.ks,
-                  message: p.parsed.message ?? req.message,
-                  // queue-bus: party creation
-                  creditor: {
-                    ...p.parsed.creditor,
-                    holderName: p.parsed.creditor?.holderName ?? req.creditor?.holderName
-                  },
-                  debtor: {
-                    ...p.parsed.debtor,
-                    holderName: p.parsed.debtor?.holderName ?? req.debtor?.holderName
-                  }
-                  // NOT enriched: chargeBearer, instructionPriority, refId, batchId,
-                  //               createdAt, address, swiftBic — no downstream consumer in payment table
-                }
-              };
-            });
-            const createCommands = enrichedPayments.map(
-              (p) => createPaymentCommand(db, { payment: p.parsed }).command
-            );
-            logger.info("payments.commands.created", {
-              accountId,
-              createCommandsCount: createCommands.length,
-              enrichedPaymentsCount: enrichedPayments.length
-            });
-            eventsToEmit.push(
-              ...enrichedPayments.map((p) => ({
-                eventType: "BANK_PAYMENT",
-                eventSignal: "paymentFetched",
-                bankPayment: p.parsed,
-                metadata: {
-                  correlationId: p.parsed.correlationId,
-                  entityId: p.parsed.id,
-                  timestamp: /* @__PURE__ */ new Date()
-                }
-              }))
-            );
-            const lastSyncMetadata = {
-              payments: payments.length,
-              paymentsToProcess: paymentsToProcess.length,
-              paymentsInserted: paymentsToInsert.length,
-              lastSyncBankRefIds: paymentsToProcess.filter((p) => p.parsed.status === "BOOKED").map((p) => p.parsed.bankRefId),
-              lastSyncPayments: lastSyncBankRefIds.length,
-              eventsEmitted: eventsToEmit.length,
-              iterationCount: getStepCount(ctx),
-              workflowStartedAt
-            };
-            const updateLastSyncCommand = updateAccountLastSyncCommand(db, {
-              accountId: account.id,
-              lastSyncAt: now,
-              lastSyncMetadata
-            }).command;
-            logger.info("payments.database.beforeBatch", {
-              accountId,
-              createCommandsCount: createCommands.length,
-              willUseBatch: createCommands.length > 0
+              paymentsCount: result.length
             });
-            if (createCommands.length) {
-              logger.info("payments.database.batchStart", {
-                accountId,
-                totalCommands: createCommands.length + 1,
-                paymentsToInsert: createCommands.length
-              });
-              const BATCH_CHUNK_SIZE = 90;
-              let totalInserted = 0;
-              for (let i = 0; i < createCommands.length; i += BATCH_CHUNK_SIZE) {
-                const chunkCommands = createCommands.slice(
-                  i,
-                  i + BATCH_CHUNK_SIZE
-                );
-                const isLastChunk = i + BATCH_CHUNK_SIZE >= createCommands.length;
-                const batchCommands = isLastChunk ? asNonEmpty([updateLastSyncCommand, ...chunkCommands]) : asNonEmpty(chunkCommands);
-                logger.info("payments.database.batchChunk", {
-                  accountId,
-                  chunkIndex: Math.floor(i / BATCH_CHUNK_SIZE),
-                  chunkSize: chunkCommands.length,
-                  isLastChunk
-                });
-                await db.batch(batchCommands);
-                totalInserted += chunkCommands.length;
-              }
-              logger.info("payments.database.batchComplete", {
-                accountId,
-                inserted: totalInserted,
-                chunks: Math.ceil(createCommands.length / BATCH_CHUNK_SIZE)
-              });
-            } else {
-              logger.info("payments.database.updateOnly", {
-                accountId,
-                reason: "no new payments to insert"
-              });
-              await updateLastSyncCommand.execute();
-              logger.info("payments.database.updateComplete", {
-                accountId
-              });
-            }
-            if (eventsToEmit.length) {
-              logger.info("payments.queue.sending", {
-                accountId,
-                eventsCount: eventsToEmit.length
-              });
-              await pushToQueue(
-                this.env.QUEUE_BUS_QUEUE,
-                eventsToEmit
-              );
-              logger.info("payments.queue.sent", {
-                accountId,
-                eventsCount: eventsToEmit.length
-              });
-            }
-            logger.info("payments.process.complete", {
-              accountId,
-              ...lastSyncMetadata,
-              newLastSyncAt: now
-            });
-            return {
-              ...lastSyncMetadata,
-              newLastSyncAt: now
-            };
+            return result;
           } catch (err) {
             const message = err instanceof Error ? err.message : typeof err === "object" && err !== null && "message" in err ? String(err.message) : JSON.stringify(err);
-            logger.error("payments.process.failed", {
+            logger.error("payments.fetch.failed", {
               accountId,
               connectorKey: account.connectorKey,
               error: message
@@ -571,6 +394,109 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
           }
         }
       );
+      const paymentsToProcess = payments.filter(
+        (p) => isPaymentCompleted(p.parsed)
+      );
+      const lastSyncBankRefIds = account.lastSyncMetadata?.lastSyncBankRefIds || [];
+      const paymentsToInsert = paymentsToProcess.filter(
+        (p) => !lastSyncBankRefIds.includes(p.parsed.bankRefId)
+      );
+      await step.do(
+        "process new payments and update lastSyncAt",
+        async (ctx) => {
+          const eventsToEmit = [];
+          const bankRefIds = paymentsToInsert.map((p) => p.parsed.bankRefId).filter((id) => id != null);
+          const BANK_REF_ID_CHUNK_SIZE = 90;
+          const matchingRequests = [];
+          for (let i = 0; i < bankRefIds.length; i += BANK_REF_ID_CHUNK_SIZE) {
+            const chunkIds = bankRefIds.slice(i, i + BANK_REF_ID_CHUNK_SIZE);
+            const rows = await db.select().from(tables.paymentRequest).where(
+              and(
+                inArray(tables.paymentRequest.bankRefId, chunkIds),
+                eq(tables.paymentRequest.accountId, account.id),
+                eq(tables.paymentRequest.connectorKey, account.connectorKey)
+              )
+            );
+            matchingRequests.push(...rows);
+          }
+          const requestByBankRefId = Object.fromEntries(
+            matchingRequests.map((r) => [r.bankRefId, r])
+          );
+          const enrichedPayments = paymentsToInsert.map((p) => {
+            const req = p.parsed.bankRefId && requestByBankRefId[p.parsed.bankRefId] || null;
+            if (!req) return p;
+            return {
+              ...p,
+              parsed: {
+                ...p.parsed,
+                // queue-bus: transaction matching (DBU doesn't echo these in statements)
+                vs: p.parsed.vs ?? req.vs,
+                ss: p.parsed.ss ?? req.ss,
+                ks: p.parsed.ks ?? req.ks,
+                message: p.parsed.message ?? req.message,
+                // queue-bus: party creation
+                creditor: {
+                  ...p.parsed.creditor,
+                  holderName: p.parsed.creditor?.holderName ?? req.creditor?.holderName
+                },
+                debtor: {
+                  ...p.parsed.debtor,
+                  holderName: p.parsed.debtor?.holderName ?? req.debtor?.holderName
+                }
+                // NOT enriched: chargeBearer, instructionPriority, refId, batchId,
+                //               createdAt, address, swiftBic — no downstream consumer in payment table
+              }
+            };
+          });
+          const createCommands = enrichedPayments.map(
+            (p) => createPaymentCommand(db, { payment: p.parsed }).command
+          );
+          eventsToEmit.push(
+            ...enrichedPayments.map((p) => ({
+              eventType: "BANK_PAYMENT",
+              eventSignal: "paymentFetched",
+              bankPayment: p.parsed,
+              metadata: {
+                correlationId: p.parsed.correlationId,
+                entityId: p.parsed.id,
+                timestamp: /* @__PURE__ */ new Date()
+              }
+            }))
+          );
+          const lastSyncMetadata = {
+            payments: payments.length,
+            paymentsToProcess: paymentsToProcess.length,
+            paymentsInserted: paymentsToInsert.length,
+            lastSyncBankRefIds: paymentsToProcess.filter((p) => p.parsed.status === "BOOKED").map((p) => p.parsed.bankRefId),
+            lastSyncPayments: lastSyncBankRefIds.length,
+            eventsEmitted: eventsToEmit.length,
+            iterationCount: getStepCount(ctx),
+            workflowStartedAt
+          };
+          const updateLastSyncCommand = updateAccountLastSyncCommand(db, {
+            accountId: account.id,
+            lastSyncAt: now,
+            lastSyncMetadata
+          }).command;
+          if (createCommands.length) {
+            await db.batch(
+              asNonEmpty([updateLastSyncCommand, ...createCommands])
+            );
+          } else {
+            await updateLastSyncCommand;
+          }
+          if (eventsToEmit.length) {
+            await pushToQueue(
+              this.env.QUEUE_BUS_QUEUE,
+              eventsToEmit
+            );
+          }
+          return {
+            ...lastSyncMetadata,
+            newLastSyncAt: now
+          };
+        }
+      );
       await step.sleep(
         "Sleep for next sync",
         `${account.syncIntervalS} seconds`

package/package.json

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