@develit-services/bank 5.0.1 → 5.2.0

package/dist/export/workflows.mjs

@@ -1,8 +1,8 @@
 import { first, uuidv4, asNonEmpty } from '@develit-io/backend-sdk';
-import { G as tables, H as relations, v as toBatchedPaymentFromPaymentRequest, z as toPreparedPayment, J as initiateConnector, m as isPaymentCompleted } from '../shared/bank.CZ8MQDPa.mjs';
+import { G as tables, H as relations, v as toBatchedPaymentFromPaymentRequest, z as toPreparedPayment, J as initiateConnector, m as isPaymentCompleted } from '../shared/bank.Bkxo76q4.mjs';
 import { i as isBatchAuthorized, b as isBatchFailed, d as isBatchProcessing } from '../shared/bank.XqSw509X.mjs';
 import { eq, and, inArray } from 'drizzle-orm';
-import { 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.BdTj54NO.mjs';
+import { 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.BRD2WfnT.mjs';
 import { WorkflowEntrypoint } from 'cloudflare:workers';
 import { NonRetryableError } from 'cloudflare:workflows';
 import { drizzle } from 'drizzle-orm/d1';
@@ -304,6 +304,7 @@ function createWorkflowLogger(instanceId) {
 }
 
 function getStepCount(ctx) {
+  if (!ctx) return 0;
   return ctx.step?.count ?? 0;
 }
 
@@ -312,12 +313,16 @@ async function pushToQueue(queue, message) {
     await queue.send(message, { contentType: "v8" });
     return;
   }
-  await queue.sendBatch(
-    message.map((m) => ({
-      body: m,
-      contentType: "v8"
-    }))
-  );
+  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"
+      }))
+    );
+  }
 }
 class BankSyncAccountPayments extends WorkflowEntrypoint {
   async run(event, step) {
@@ -343,13 +348,13 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
       if (!account.lastSyncAt) {
         throw new Error(`lastSyncedAt is not set for account: ${accountId}`);
       }
-      const payments = await step.do(
-        "fetch bank payments",
+      await step.do(
+        "fetch and process payments",
         {
           retries: { limit: 5, delay: "2 minutes", backoff: "exponential" },
-          timeout: "2 minutes"
+          timeout: "5 minutes"
         },
-        async () => {
+        async (ctx) => {
           try {
             logger.info("payments.fetch.started", {
               accountId,
@@ -372,19 +377,192 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
                 }
               ]
             });
-            const result = await connector.getAllAccountPayments({
+            const payments = await connector.getAllAccountPayments({
               account,
               filter: { dateFrom: account.lastSyncAt }
             });
             logger.info("payments.fetch.completed", {
               accountId,
               connectorKey: account.connectorKey,
-              paymentsCount: result.length
+              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
             });
-            return result;
+            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
+            };
           } 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.fetch.failed", {
+            logger.error("payments.process.failed", {
               accountId,
               connectorKey: account.connectorKey,
               error: message
@@ -393,109 +571,6 @@ 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/dist/shared/{bank.BdTj54NO.mjs → bank.BRD2WfnT.mjs}

@@ -1,5 +1,5 @@
 import { sql, and, eq, isNull } from 'drizzle-orm';
-import { G as tables } from './bank.CZ8MQDPa.mjs';
+import { G as tables } from './bank.Bkxo76q4.mjs';
 import { uuidv4 } from '@develit-io/backend-sdk';
 import './bank.BzDNLxB_.mjs';
 import 'date-fns';

package/dist/shared/{bank.CibQRM2D.cjs → bank.Bgz1SSIP.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 const drizzleOrm = require('drizzle-orm');
-const ott_zod = require('./bank.BSX82jhx.cjs');
+const bank = require('./bank.BkctD4hR.cjs');
 const backendSdk = require('@develit-io/backend-sdk');
 require('./bank.9Yw4KHyl.cjs');
 require('date-fns');
@@ -11,16 +11,16 @@ const node_crypto = require('node:crypto');
 
 const createPaymentCommand = (db, { payment }) => {
   return {
-    command: db.insert(ott_zod.tables.payment).values({
+    command: db.insert(bank.tables.payment).values({
       ...payment,
       creditorIban: payment.creditor.iban,
       debtorIban: payment.debtor.iban
     }).onConflictDoUpdate({
       // Unique index: (connector_key, account_id, bank_ref_id)
       target: [
-        ott_zod.tables.payment.connectorKey,
-        ott_zod.tables.payment.accountId,
-        ott_zod.tables.payment.bankRefId
+        bank.tables.payment.connectorKey,
+        bank.tables.payment.accountId,
+        bank.tables.payment.bankRefId
       ],
       set: {
         status: drizzleOrm.sql`excluded.status`,
@@ -38,11 +38,11 @@ const createPaymentCommand = (db, { payment }) => {
 
 const upsertBatchCommand = (db, { batch }) => {
   const id = batch.id || backendSdk.uuidv4();
-  const command = db.insert(ott_zod.tables.batch).values({
+  const command = db.insert(bank.tables.batch).values({
     ...batch,
     id
   }).onConflictDoUpdate({
-    target: ott_zod.tables.batch.id,
+    target: bank.tables.batch.id,
     set: {
       ...batch
     }
@@ -56,25 +56,25 @@ const upsertBatchCommand = (db, { batch }) => {
 const updatePaymentRequestStatusCommand = (db, values) => {
   const { id, ...set } = values;
   return {
-    command: db.update(ott_zod.tables.paymentRequest).set(set).where(
+    command: db.update(bank.tables.paymentRequest).set(set).where(
       drizzleOrm.and(
-        drizzleOrm.eq(ott_zod.tables.paymentRequest.id, id),
-        drizzleOrm.isNull(ott_zod.tables.paymentRequest.deletedAt)
+        drizzleOrm.eq(bank.tables.paymentRequest.id, id),
+        drizzleOrm.isNull(bank.tables.paymentRequest.deletedAt)
       )
     ).returning()
   };
 };
 
 const getAccountByIdQuery = async (db, { accountId }) => {
-  return await db.select().from(ott_zod.tables.account).where(drizzleOrm.eq(ott_zod.tables.account.id, accountId)).get();
+  return await db.select().from(bank.tables.account).where(drizzleOrm.eq(bank.tables.account.id, accountId)).get();
 };
 
 const getBatchByIdQuery = async (db, { batchId }) => {
-  return await db.select().from(ott_zod.tables.batch).where(drizzleOrm.eq(ott_zod.tables.batch.id, batchId)).get();
+  return await db.select().from(bank.tables.batch).where(drizzleOrm.eq(bank.tables.batch.id, batchId)).get();
 };
 
 const getCredentialsByAccountId = async (db, encryptionKey, { accountId }) => {
-  const cred = await db.select().from(ott_zod.tables.accountCredentials).where(drizzleOrm.eq(ott_zod.tables.accountCredentials.accountId, accountId)).get();
+  const cred = await db.select().from(bank.tables.accountCredentials).where(drizzleOrm.eq(bank.tables.accountCredentials.accountId, accountId)).get();
   return cred ? {
     ...cred,
     value: await decrypt(cred.value, encryptionKey)
@@ -82,10 +82,10 @@ const getCredentialsByAccountId = async (db, encryptionKey, { accountId }) => {
 };
 
 const getPaymentRequestsByBatchIdQuery = async (db, { batchId }) => {
-  return await db.select().from(ott_zod.tables.paymentRequest).where(
+  return await db.select().from(bank.tables.paymentRequest).where(
     drizzleOrm.and(
-      drizzleOrm.eq(ott_zod.tables.paymentRequest.batchId, batchId),
-      drizzleOrm.isNull(ott_zod.tables.paymentRequest.deletedAt)
+      drizzleOrm.eq(bank.tables.paymentRequest.batchId, batchId),
+      drizzleOrm.isNull(bank.tables.paymentRequest.deletedAt)
     )
   );
 };