@develit-services/bank 0.8.18 → 0.8.20

package/dist/export/worker.d.cts

@@ -1,5 +1,5 @@
-import { A as AccountSelectType, P as PaymentSelectType, B as BatchSelectType, a as PaymentRequestSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, b as ConnectorKey, I as IBankConnector, c as PaymentType, d as CurrencyCode, H as HandleAuthorizationCallbackInput, e as HandleAuthorizationCallbackOutput } from '../shared/bank.Cj2Goq7s.cjs';
-import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput, F as FinbricksSupportedBanksResponse } from '../shared/bank.DzFAA6Gp.cjs';
+import { B as BatchSelectType, P as PaymentRequestSelectType, A as AccountSelectType, a as PaymentSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, b as ConnectorKey, I as IBankConnector, c as PaymentType, d as CurrencyCode, H as HandleAuthorizationCallbackInput, e as HandleAuthorizationCallbackOutput } from '../shared/bank.BOY6AI1t.cjs';
+import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput, F as FinbricksSupportedBanksResponse } from '../shared/bank.Bo01T_MM.cjs';
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { WorkflowInstanceStatus, IRPCResponse } from '@develit-io/backend-sdk';
 import { WorkerEntrypoint } from 'cloudflare:workers';
@@ -785,9 +785,8 @@ declare const sendBatchInputSchema: z.ZodObject<{
 }, z.core.$strip>;
 interface SendBatchInput extends z.infer<typeof sendBatchInputSchema> {
 }
-type SendBatchOutput = {
-    batchId: string;
-    authorizationUrls: string[];
+type SendBatchOutput = BatchSelectType & {
+    paymentRequests: PaymentRequestSelectType[];
 };
 
 declare const getAuthUriInputSchema: z.ZodObject<{

package/dist/export/worker.d.mts

@@ -1,5 +1,5 @@
-import { A as AccountSelectType, P as PaymentSelectType, B as BatchSelectType, a as PaymentRequestSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, b as ConnectorKey, I as IBankConnector, c as PaymentType, d as CurrencyCode, H as HandleAuthorizationCallbackInput, e as HandleAuthorizationCallbackOutput } from '../shared/bank.Cj2Goq7s.mjs';
-import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput, F as FinbricksSupportedBanksResponse } from '../shared/bank.t3wDtBAy.mjs';
+import { B as BatchSelectType, P as PaymentRequestSelectType, A as AccountSelectType, a as PaymentSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, b as ConnectorKey, I as IBankConnector, c as PaymentType, d as CurrencyCode, H as HandleAuthorizationCallbackInput, e as HandleAuthorizationCallbackOutput } from '../shared/bank.BOY6AI1t.mjs';
+import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput, F as FinbricksSupportedBanksResponse } from '../shared/bank.jRGa7MKk.mjs';
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { WorkflowInstanceStatus, IRPCResponse } from '@develit-io/backend-sdk';
 import { WorkerEntrypoint } from 'cloudflare:workers';
@@ -785,9 +785,8 @@ declare const sendBatchInputSchema: z.ZodObject<{
 }, z.core.$strip>;
 interface SendBatchInput extends z.infer<typeof sendBatchInputSchema> {
 }
-type SendBatchOutput = {
-    batchId: string;
-    authorizationUrls: string[];
+type SendBatchOutput = BatchSelectType & {
+    paymentRequests: PaymentRequestSelectType[];
 };
 
 declare const getAuthUriInputSchema: z.ZodObject<{

package/dist/export/worker.d.ts

@@ -1,5 +1,5 @@
-import { A as AccountSelectType, P as PaymentSelectType, B as BatchSelectType, a as PaymentRequestSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, b as ConnectorKey, I as IBankConnector, c as PaymentType, d as CurrencyCode, H as HandleAuthorizationCallbackInput, e as HandleAuthorizationCallbackOutput } from '../shared/bank.Cj2Goq7s.js';
-import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput, F as FinbricksSupportedBanksResponse } from '../shared/bank.BInWezKM.js';
+import { B as BatchSelectType, P as PaymentRequestSelectType, A as AccountSelectType, a as PaymentSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, b as ConnectorKey, I as IBankConnector, c as PaymentType, d as CurrencyCode, H as HandleAuthorizationCallbackInput, e as HandleAuthorizationCallbackOutput } from '../shared/bank.BOY6AI1t.js';
+import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput, F as FinbricksSupportedBanksResponse } from '../shared/bank.DfTdMAi9.js';
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { WorkflowInstanceStatus, IRPCResponse } from '@develit-io/backend-sdk';
 import { WorkerEntrypoint } from 'cloudflare:workers';
@@ -785,9 +785,8 @@ declare const sendBatchInputSchema: z.ZodObject<{
 }, z.core.$strip>;
 interface SendBatchInput extends z.infer<typeof sendBatchInputSchema> {
 }
-type SendBatchOutput = {
-    batchId: string;
-    authorizationUrls: string[];
+type SendBatchOutput = BatchSelectType & {
+    paymentRequests: PaymentRequestSelectType[];
 };
 
 declare const getAuthUriInputSchema: z.ZodObject<{

package/dist/export/worker.mjs

@@ -1,18 +1,17 @@
 import { uuidv4, first, buildMultiFilterConditions as buildMultiFilterConditions$1, bankAccountMetadataSchema, workflowInstanceStatusSchema, develitWorker, createInternalError, action, service } from '@develit-io/backend-sdk';
-import { t as tables, h as encrypt, d as createCredentialsResolver, e as updatePaymentRequestStatusCommand, a as getPaymentRequestsByBatchIdQuery, g as getBatchByIdQuery, u as upsertBatchCommand, i as importAesKey, f as createPaymentCommand, b as getAccountByIdQuery } from '../shared/bank.xB9eTN77.mjs';
-import { eq, sql, and, like, asc, desc, inArray, gte, lte, isNull, count, not } from 'drizzle-orm';
+import { v as tables, I as INSTRUCTION_PRIORITIES, C as CHARGE_BEARERS, g as PAYMENT_TYPES, b as CONNECTOR_KEYS, a as BATCH_STATUSES, f as PAYMENT_STATUSES, P as PAYMENT_DIRECTIONS, k as accountInsertSchema, e as PAYMENT_REQUEST_STATUSES, q as isProcessedStatus, r as isTerminalStatus, w as getNonTerminalPaymentRequestsQuery } from '../shared/bank.ESTBT4J6.mjs';
+import { eq, sql, and, like, asc, desc, inArray, gte, lte, isNull, count } from 'drizzle-orm';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { drizzle } from 'drizzle-orm/d1';
-import { j as initiateConnector, g as toIncomingPayment, d as assignAccount, t as toBatchedPayment, h as toPaymentRequestInsert, a as FinbricksClient, F as FINBRICKS_ENDPOINTS } from '../shared/bank.B6dkPRYF.mjs';
+import { j as initiateConnector, g as toIncomingPayment, d as assignAccount, t as toBatchedPayment, h as toPaymentRequestInsert, a as FinbricksClient, F as FINBRICKS_ENDPOINTS } from '../shared/bank.Cwg6oHMM.mjs';
 import 'jose';
 import { z } from 'zod';
-import { I as INSTRUCTION_PRIORITIES, C as CHARGE_BEARERS, g as PAYMENT_TYPES, b as CONNECTOR_KEYS, a as BATCH_STATUSES, f as PAYMENT_STATUSES, P as PAYMENT_DIRECTIONS, k as accountInsertSchema, e as PAYMENT_REQUEST_STATUSES } from '../shared/bank.CXBeULUL.mjs';
 import { CURRENCY_CODES } from '@develit-io/general-codes';
 import 'date-fns';
 import 'node:crypto';
-import '../shared/bank.CR0UlyRi.mjs';
-import 'drizzle-orm/relations';
+import { h as encrypt, d as createCredentialsResolver, e as updatePaymentRequestStatusCommand, a as getPaymentRequestsByBatchIdQuery, g as getBatchByIdQuery, u as upsertBatchCommand, i as importAesKey, f as createPaymentCommand, b as getAccountByIdQuery } from '../shared/bank.CPLR0Ul7.mjs';
 import 'drizzle-orm/sqlite-core';
+import 'drizzle-orm/relations';
 import 'drizzle-zod';
 
 const upsertAccountCommand = (db, { account }) => {
@@ -335,17 +334,27 @@ const getPaymentRequestsQuery = async (db, params) => {
   return { paymentRequests, totalCount };
 };
 
-const TERMINAL_STATUSES = [
-  "SETTLED",
-  "REJECTED",
-  "CLOSED"
-];
-const getNonTerminalPaymentRequestsQuery = (db) => db.select().from(tables.paymentRequest).where(
-  and(
-    not(inArray(tables.paymentRequest.status, TERMINAL_STATUSES)),
-    isNull(tables.paymentRequest.deletedAt)
-  )
-);
+const SIGNAL_MAP = {
+  OPENED: "paymentRequestOpened",
+  AUTHORIZED: "paymentRequestAuthorized",
+  COMPLETED: "paymentRequestCompleted",
+  BOOKED: "paymentRequestBooked",
+  SETTLED: "paymentRequestSettled",
+  REJECTED: "paymentRequestRejected",
+  CLOSED: "paymentRequestClosed"
+};
+function buildPaymentRequestEvent(pr) {
+  return {
+    eventType: "BANK_PAYMENT_REQUEST",
+    eventSignal: SIGNAL_MAP[pr.status],
+    paymentRequest: pr,
+    metadata: {
+      correlationId: pr.correlationId,
+      entityId: pr.id,
+      timestamp: (/* @__PURE__ */ new Date()).toISOString()
+    }
+  };
+}
 
 const sendPaymentInputSchema = z.object({
   correlationId: z.string().min(1),
@@ -761,28 +770,12 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
             await updatePaymentRequestStatusCommand(this.db, {
               id: pr.id,
               status: newStatus,
-              processedAt: newStatus === "COMPLETED" ? /* @__PURE__ */ new Date() : void 0
+              processedAt: isProcessedStatus(newStatus) ? /* @__PURE__ */ new Date() : void 0
             }).command.execute();
             statusChanged++;
-            const signalMap = {
-              OPENED: "paymentRequestOpened",
-              AUTHORIZED: "paymentRequestAuthorized",
-              COMPLETED: "paymentRequestCompleted",
-              BOOKED: "paymentRequestBooked",
-              SETTLED: "paymentRequestSettled",
-              REJECTED: "paymentRequestRejected",
-              CLOSED: "paymentRequestClosed"
-            };
-            eventsToEmit.push({
-              eventType: "BANK_PAYMENT_REQUEST",
-              eventSignal: signalMap[newStatus],
-              paymentRequest: { ...pr, status: newStatus },
-              metadata: {
-                correlationId: pr.correlationId,
-                entityId: pr.id,
-                timestamp: (/* @__PURE__ */ new Date()).toISOString()
-              }
-            });
+            eventsToEmit.push(
+              buildPaymentRequestEvent({ ...pr, status: newStatus })
+            );
           }
           processed++;
         } catch (err) {
@@ -819,25 +812,10 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
     if (!batch || batch.status === "COMPLETED" || batch.status === "FAILED")
       return;
     if (allPRs.length === 0) return;
-    const terminalStatuses = [
-      "SETTLED",
-      "REJECTED",
-      "CLOSED"
-    ];
-    const authorizedOrHigher = [
-      "AUTHORIZED",
-      "COMPLETED",
-      "BOOKED",
-      "SETTLED"
-    ];
     const allTerminal = allPRs.every(
-      (pr) => terminalStatuses.includes(pr.status)
-    );
-    const allAuthorizedOrHigher = allPRs.every(
-      (pr) => [...authorizedOrHigher, ...terminalStatuses].includes(
-        pr.status
-      )
+      (pr) => isTerminalStatus(pr.status)
     );
+    const allAuthorizedOrHigher = allPRs.every((pr) => pr.status !== "OPENED");
     if (allTerminal) {
       const hasFailed = allPRs.some(
         (pr) => pr.status === "REJECTED" || pr.status === "CLOSED"
@@ -1297,9 +1275,11 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
         }
         await updatePaymentRequestStatusCommand(this.db, {
           id: incomingPayment.id,
+          status: initiated.payment.status,
           bankRefId: initiated.payment.bankRefId,
           initiatedAt: initiated.payment.initiatedAt,
-          authorizationUrl: initiated.authorizationUrl
+          authorizationUrl: initiated.authorizationUrl,
+          processedAt: isProcessedStatus(initiated.payment.status) ? /* @__PURE__ */ new Date() : void 0
         }).command.execute();
         const paymentRequest = await getPaymentRequestByIdQuery(this.db, {
           paymentRequestId: incomingPayment.id
@@ -1311,6 +1291,12 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
             status: 500
           });
         }
+        if (initiated.payment.status !== "OPENED") {
+          await this.pushToQueue(
+            this.env.QUEUE_BUS_QUEUE,
+            buildPaymentRequestEvent(paymentRequest)
+          );
+        }
         return {
           paymentRequest,
           authorizationUrl: initiated.authorizationUrl
@@ -1462,9 +1448,11 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
         const updatePrCmds = preparedPayments.map(
           (pp, i) => updatePaymentRequestStatusCommand(this.db, {
             id: pp.id,
+            status: pp.status,
             bankRefId: pp.bankRefId,
             initiatedAt: pp.initiatedAt,
-            authorizationUrl: isPerPaymentFallback ? authorizationUrls[i] : authorizationUrls[0]
+            authorizationUrl: isPerPaymentFallback ? authorizationUrls[i] : authorizationUrls[0],
+            processedAt: isProcessedStatus(pp.status) ? /* @__PURE__ */ new Date() : void 0
           }).command
         );
         const updateBatchCmd = upsertBatchCommand(this.db, {
@@ -1479,7 +1467,25 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
           }
         }).command;
         await this.db.batch([updateBatchCmd, ...updatePrCmds]);
-        return { batchId, authorizationUrls };
+        const [updatedBatch, paymentRequests] = await Promise.all([
+          getBatchByIdQuery(this.db, { batchId }),
+          getPaymentRequestsByBatchIdQuery(this.db, { batchId })
+        ]);
+        if (!updatedBatch) {
+          throw createInternalError(null, {
+            message: `Batch ${batchId} not found after creation`,
+            code: "DB-B-010",
+            status: 500
+          });
+        }
+        const prEvents = paymentRequests.filter((pr) => pr.status !== "OPENED").map((pr) => buildPaymentRequestEvent(pr));
+        if (prEvents.length > 0) {
+          await this.pushToQueue(
+            this.env.QUEUE_BUS_QUEUE,
+            prEvents
+          );
+        }
+        return { ...updatedBatch, paymentRequests };
       }
     );
   }

package/dist/export/workflows.cjs

@@ -1,32 +1,31 @@
 'use strict';
 
 const backendSdk = require('@develit-io/backend-sdk');
-const drizzle = require('../shared/bank.Cev1E9sk.cjs');
-const batchLifecycle = require('../shared/bank.BsIiXsFH.cjs');
-const mock_connector = require('../shared/bank.C75Z9vML.cjs');
+const database_schema = require('../shared/bank.o95cOH_P.cjs');
+const batchLifecycle = require('../shared/bank.NF8bZBy0.cjs');
+const mock_connector = require('../shared/bank.DWsHTK_n.cjs');
 const drizzleOrm = require('drizzle-orm');
+const credentialsResolver = require('../shared/bank.vGCuP898.cjs');
 const cloudflare_workers = require('cloudflare:workers');
 const cloudflare_workflows = require('cloudflare:workflows');
 const d1 = require('drizzle-orm/d1');
 require('node:crypto');
-require('../shared/bank.BBXoZ5QU.cjs');
-require('drizzle-orm/relations');
 require('drizzle-orm/sqlite-core');
 require('date-fns');
 require('jose');
 require('@develit-io/general-codes');
+require('drizzle-orm/relations');
 require('drizzle-zod');
-require('../shared/bank.CVi6R7fr.cjs');
 
 const updateAccountLastSyncCommand = (db, {
   lastSyncAt,
   accountId,
   lastSyncMetadata
 }) => {
-  const command = db.update(drizzle.tables.account).set({
+  const command = db.update(database_schema.tables.account).set({
     lastSyncAt,
     lastSyncMetadata
-  }).where(drizzleOrm.eq(drizzle.tables.account.id, accountId)).returning();
+  }).where(drizzleOrm.eq(database_schema.tables.account.id, accountId)).returning();
   return {
     command
   };
@@ -43,14 +42,14 @@ function pushToQueue$1(queue, message) {
 }
 async function failBatchAndPayments(db, batch, paymentRequests, reason) {
   const prCmds = paymentRequests.filter((p) => p.status !== "REJECTED").map(
-    (p) => drizzle.updatePaymentRequestStatusCommand(db, {
+    (p) => credentialsResolver.updatePaymentRequestStatusCommand(db, {
       id: p.id,
       status: "REJECTED",
       statusReason: reason,
       processedAt: /* @__PURE__ */ new Date()
     }).command
   );
-  const batchCmd = drizzle.upsertBatchCommand(db, {
+  const batchCmd = credentialsResolver.upsertBatchCommand(db, {
     batch: { ...batch, status: "FAILED" }
   }).command;
   const allCmds = [batchCmd, ...prCmds];
@@ -61,9 +60,9 @@ async function failBatchAndPayments(db, batch, paymentRequests, reason) {
 class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
   async run(event, step) {
     const { batchId } = event.payload;
-    const db = d1.drizzle(this.env.BANK_D1, { schema: drizzle.tables });
+    const db = d1.drizzle(this.env.BANK_D1, { schema: database_schema.tables });
     const batch = await step.do("load batch", async () => {
-      const batch2 = await drizzle.getBatchByIdQuery(db, { batchId });
+      const batch2 = await credentialsResolver.getBatchByIdQuery(db, { batchId });
       if (!batch2) {
         throw new cloudflare_workflows.NonRetryableError(`Batch not found`);
       }
@@ -72,13 +71,13 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
       return batch2;
     });
     const paymentRequests = await step.do("load payment requests", async () => {
-      return await drizzle.getPaymentRequestsByBatchIdQuery(db, { batchId });
+      return await credentialsResolver.getPaymentRequestsByBatchIdQuery(db, { batchId });
     });
     if (paymentRequests.length === 0) {
       throw new cloudflare_workflows.NonRetryableError("No payments found for batch");
     }
     await step.do("lock batch", async () => {
-      const paymentsChecksum = drizzle.checksum(paymentRequests);
+      const paymentsChecksum = credentialsResolver.checksum(paymentRequests);
       if (batch.paymentsChecksum && batch.paymentsChecksum !== paymentsChecksum)
         throw new cloudflare_workflows.NonRetryableError(
           `Batch payments have been modified externally, manual review needed`
@@ -88,7 +87,7 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
           `Batch is in FAILED status and cannot be processed, manual review needed`
         );
       if (batchLifecycle.isBatchProcessing(batch)) {
-        const updatedBatch = await drizzle.upsertBatchCommand(db, {
+        const updatedBatch = await credentialsResolver.upsertBatchCommand(db, {
           batch: {
             ...batch,
             status: "PROCESSING",
@@ -109,7 +108,7 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
         const batchedPayments = paymentRequests.map(
           mock_connector.toBatchedPaymentFromPaymentRequest
         );
-        const currentBatch = await drizzle.getBatchByIdQuery(db, { batchId });
+        const currentBatch = await credentialsResolver.getBatchByIdQuery(db, { batchId });
         if (currentBatch?.batchPaymentInitiatedAt) {
           return {
             authorizationUrls: currentBatch.authorizationUrls,
@@ -123,7 +122,7 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
             metadata: currentBatch.metadata
           };
         }
-        const account = await drizzle.getAccountByIdQuery(db, {
+        const account = await credentialsResolver.getAccountByIdQuery(db, {
           accountId: batch.accountId
         });
         if (!account) {
@@ -131,7 +130,7 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
           await failBatchAndPayments(db, batch, paymentRequests, msg);
           throw new cloudflare_workflows.NonRetryableError(msg);
         }
-        const resolveCredentials = await drizzle.createCredentialsResolver(db, this.env);
+        const resolveCredentials = await credentialsResolver.createCredentialsResolver(db, this.env);
         const connector = await mock_connector.initiateConnector({
           env: this.env,
           bank: account.connectorKey,
@@ -188,7 +187,7 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
       const { preparedPayments, authorizationUrls } = batchResult;
       const isPaymentRequestFallback = authorizationUrls.length === preparedPayments.length;
       const updateCommands = preparedPayments.map(
-        (pp, i) => drizzle.updatePaymentRequestStatusCommand(db, {
+        (pp, i) => credentialsResolver.updatePaymentRequestStatusCommand(db, {
           id: pp.id,
           status: "OPENED",
           bankRefId: pp.bankRefId,
@@ -202,7 +201,7 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
       return { updated: updateCommands.length };
     });
     await step.do("update batch to ready to sign", async () => {
-      const upsertBatch = drizzle.upsertBatchCommand(db, {
+      const upsertBatch = credentialsResolver.upsertBatchCommand(db, {
         batch: {
           ...batch,
           authorizationUrls: batchResult.authorizationUrls,
@@ -224,14 +223,14 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
       await step.do("mock: complete payments and update batch", async () => {
         const processedAt = /* @__PURE__ */ new Date();
         const updateCommands = batchResult.preparedPayments.map(
-          (p) => drizzle.updatePaymentRequestStatusCommand(db, {
+          (p) => credentialsResolver.updatePaymentRequestStatusCommand(db, {
             id: p.id,
             status: "SETTLED",
             bankRefId: `MOCK-${backendSdk.uuidv4()}`,
             processedAt
           }).command
         );
-        const updateBatchCommand = drizzle.upsertBatchCommand(db, {
+        const updateBatchCommand = credentialsResolver.upsertBatchCommand(db, {
           batch: {
             ...batch,
             status: "COMPLETED",
@@ -296,14 +295,14 @@ function pushToQueue(queue, message) {
 class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
   async run(event, step) {
     const { accountId } = event.payload;
-    const db = d1.drizzle(this.env.BANK_D1, { schema: drizzle.tables });
+    const db = d1.drizzle(this.env.BANK_D1, { schema: database_schema.tables });
     if (!accountId) {
       throw new cloudflare_workflows.NonRetryableError(`Haven't obtained accountId to load.`);
     }
     while (true) {
       const now = /* @__PURE__ */ new Date();
       const account = await step.do("load account", async () => {
-        const account2 = await drizzle.getAccountByIdQuery(db, { accountId });
+        const account2 = await credentialsResolver.getAccountByIdQuery(db, { accountId });
         if (!account2) {
           throw new cloudflare_workflows.NonRetryableError(`Bank account not found: ${accountId}`);
         }
@@ -320,7 +319,7 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
         },
         async () => {
           try {
-            const resolveCredentials = await drizzle.createCredentialsResolver(
+            const resolveCredentials = await credentialsResolver.createCredentialsResolver(
               db,
               this.env
             );
@@ -346,7 +345,7 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
         }
       );
       const paymentsToProcess = payments.filter(
-        (p) => batchLifecycle.isPaymentCompleted(p.parsed)
+        (p) => database_schema.isPaymentCompleted(p.parsed)
       );
       if (paymentsToProcess.length) {
         const lastSyncBankRefIds = account.lastSyncMetadata?.lastSyncBankRefIds || [];
@@ -358,12 +357,12 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
           async () => {
             const eventsToEmit = [];
             const bankRefIds = paymentsToInsert.map((p) => p.parsed.bankRefId).filter((id) => id != null);
-            const matchingRequests = bankRefIds.length > 0 ? await db.select().from(drizzle.tables.paymentRequest).where(
+            const matchingRequests = bankRefIds.length > 0 ? await db.select().from(database_schema.tables.paymentRequest).where(
               drizzleOrm.and(
-                drizzleOrm.inArray(drizzle.tables.paymentRequest.bankRefId, bankRefIds),
-                drizzleOrm.eq(drizzle.tables.paymentRequest.accountId, account.id),
+                drizzleOrm.inArray(database_schema.tables.paymentRequest.bankRefId, bankRefIds),
+                drizzleOrm.eq(database_schema.tables.paymentRequest.accountId, account.id),
                 drizzleOrm.eq(
-                  drizzle.tables.paymentRequest.connectorKey,
+                  database_schema.tables.paymentRequest.connectorKey,
                   account.connectorKey
                 )
               )
@@ -398,16 +397,7 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
               };
             });
             const createCommands = enrichedPayments.map(
-              (p) => drizzle.createPaymentCommand(db, { payment: p.parsed }).command
-            );
-            const prCompleteCommands = matchingRequests.filter(
-              (req) => req.status !== "SETTLED" && req.status !== "REJECTED"
-            ).map(
-              (req) => drizzle.updatePaymentRequestStatusCommand(db, {
-                id: req.id,
-                status: "SETTLED",
-                processedAt: /* @__PURE__ */ new Date()
-              }).command
+              (p) => credentialsResolver.createPaymentCommand(db, { payment: p.parsed }).command
             );
             eventsToEmit.push(
               ...enrichedPayments.map((p) => ({
@@ -436,11 +426,7 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
             }).command;
             if (eventsToEmit.length) {
               await db.batch(
-                backendSdk.asNonEmpty([
-                  updateLastSyncCommand,
-                  ...createCommands,
-                  ...prCompleteCommands
-                ])
+                backendSdk.asNonEmpty([updateLastSyncCommand, ...createCommands])
               );
               await pushToQueue(
                 this.env.QUEUE_BUS_QUEUE,

package/dist/export/workflows.mjs

@@ -1,20 +1,19 @@
 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.xB9eTN77.mjs';
-import { i as isBatchAuthorized, b as isBatchFailed, d as isBatchProcessing, f as isPaymentCompleted } from '../shared/bank.vz1uqEYa.mjs';
-import { e as toBatchedPaymentFromPaymentRequest, i as toPreparedPayment, j as initiateConnector } from '../shared/bank.B6dkPRYF.mjs';
+import { v as tables, o as isPaymentCompleted } from '../shared/bank.ESTBT4J6.mjs';
+import { i as isBatchAuthorized, b as isBatchFailed, d as isBatchProcessing } from '../shared/bank.XqSw509X.mjs';
+import { e as toBatchedPaymentFromPaymentRequest, i as toPreparedPayment, j as initiateConnector } from '../shared/bank.Cwg6oHMM.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.CPLR0Ul7.mjs';
 import { WorkflowEntrypoint } from 'cloudflare:workers';
 import { NonRetryableError } from 'cloudflare:workflows';
 import { drizzle } from 'drizzle-orm/d1';
 import 'node:crypto';
-import '../shared/bank.CXBeULUL.mjs';
-import 'drizzle-orm/relations';
 import 'drizzle-orm/sqlite-core';
 import 'date-fns';
 import 'jose';
 import '@develit-io/general-codes';
+import 'drizzle-orm/relations';
 import 'drizzle-zod';
-import '../shared/bank.CR0UlyRi.mjs';
 
 const updateAccountLastSyncCommand = (db, {
   lastSyncAt,
@@ -398,15 +397,6 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
             const createCommands = enrichedPayments.map(
               (p) => createPaymentCommand(db, { payment: p.parsed }).command
             );
-            const prCompleteCommands = matchingRequests.filter(
-              (req) => req.status !== "SETTLED" && req.status !== "REJECTED"
-            ).map(
-              (req) => updatePaymentRequestStatusCommand(db, {
-                id: req.id,
-                status: "SETTLED",
-                processedAt: /* @__PURE__ */ new Date()
-              }).command
-            );
             eventsToEmit.push(
               ...enrichedPayments.map((p) => ({
                 eventType: "BANK_PAYMENT",
@@ -434,11 +424,7 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
             }).command;
             if (eventsToEmit.length) {
               await db.batch(
-                asNonEmpty([
-                  updateLastSyncCommand,
-                  ...createCommands,
-                  ...prCompleteCommands
-                ])
+                asNonEmpty([updateLastSyncCommand, ...createCommands])
               );
               await pushToQueue(
                 this.env.QUEUE_BUS_QUEUE,

package/dist/shared/{bank.Cj2Goq7s.d.cts → bank.BOY6AI1t.d.cts}

@@ -5147,6 +5147,9 @@ declare const tables: typeof schema;
  * 5. CompletedPayment - Fully processed (status: COMPLETED/BOOKED/SETTLED/REJECTED/CLOSED, has bankRefId)
  */
 
+declare function isTerminalStatus(status: PaymentRequestStatus): boolean;
+declare function isPendingStatus(status: PaymentRequestStatus): boolean;
+declare function isProcessedStatus(status: PaymentRequestStatus): boolean;
 /**
  * Stage 1: Incoming Payment
  */
@@ -5176,7 +5179,7 @@ type BatchedPayment = Omit<PaymentRequestInsertType, 'bankRefId' | 'status'> & {
  * Stage 4: Prepared Payment
  */
 type PreparedPayment = Omit<PaymentRequestInsertType, 'status' | 'bankRefId'> & {
-    status: 'OPENED';
+    status: PaymentRequestStatus;
     bankRefId?: string;
 };
 /**
@@ -5294,5 +5297,5 @@ declare function isBatchFailed(batch: {
     status?: string | null;
 }): batch is CompletedBatch;
 
-export { IBankConnector as I, BATCH_MODES as K, BATCH_STATUSES as M, CHARGE_BEARERS as V, CONNECTOR_KEYS as W, COUNTRY_CODES as X, CREDENTIALS_TYPES as Y, INSTRUCTION_PRIORITIES as a1, PAYMENT_DIRECTIONS as a3, PAYMENT_REQUEST_STATUSES as a4, PAYMENT_STATUSES as a5, PAYMENT_TYPES as a6, payment as aA, paymentRelations as aB, paymentRequest as aC, paymentRequestRelations as aD, TOKEN_TYPES as ag, accountCredentialsInsertSchema as ai, accountCredentialsSelectSchema as aj, accountCredentialsUpdateSchema as ak, accountInsertSchema as al, accountSelectSchema as am, accountUpdateSchema as an, hasPaymentAccountAssigned as ao, isBatchAuthorized as ap, isBatchCompleted as aq, isBatchFailed as ar, isBatchInitiated as as, isBatchProcessing as at, isBatchReadyToSign as au, isPaymentCompleted as av, account as aw, accountCredentials as ax, batch as ay, ott as az, tables as t, ACCOUNT_STATUSES as x };
-export type { CountryCode as $, AccountSelectType as A, BatchSelectType as B, ConfigEnvironmentBank as C, AccountCredentialsUpdateType as D, AccountPatchType as E, AccountStatus as F, AccountUpdateType as G, HandleAuthorizationCallbackInput as H, AuthorizedBatch as J, LastSyncMetadata as L, BankAccountWithLastSync as N, BankCode as O, PaymentSelectType as P, BatchInsertType as Q, BatchLifecycle as R, BatchMode as S, BatchPayment as T, BatchStatus as U, ChargeBearer as Z, CompletedBatch as _, PaymentRequestSelectType as a, CredentialsType as a0, InstructionPriority as a2, PaymentDirection as a7, PaymentFailedInsertType as a8, PaymentInsertType as a9, PaymentLifecycle as aa, PaymentPreparedInsertType as ab, PaymentStatus as ac, ProcessingBatch as ad, ReadyToSignBatch as ae, ResolvedCredentials as af, TokenType as ah, ConnectorKey as b, PaymentType as c, CurrencyCode as d, HandleAuthorizationCallbackOutput as e, ConnectedAccount as f, CredentialsResolver as g, AccountCredentialsInsertType as h, AccountInsertType as i, BatchedPayment as j, InitiatedBatch as k, IncomingPayment as l, InitiatedPayment as m, ParsedBankPayment as n, PaymentRequestStatus as o, AuthorizationCallbackResult as p, BatchMetadata as q, Currency as r, AccountAssignedPayment as s, PreparedPayment as u, CompletedPayment as v, PaymentRequestInsertType as w, AccountCredentialsPatchType as y, AccountCredentialsSelectType as z };
+export { IBankConnector as I, BATCH_MODES as K, BATCH_STATUSES as M, CHARGE_BEARERS as V, CONNECTOR_KEYS as W, COUNTRY_CODES as X, CREDENTIALS_TYPES as Y, INSTRUCTION_PRIORITIES as a1, PAYMENT_DIRECTIONS as a3, PAYMENT_REQUEST_STATUSES as a4, PAYMENT_STATUSES as a5, PAYMENT_TYPES as a6, accountCredentials as aA, batch as aB, ott as aC, payment as aD, paymentRelations as aE, paymentRequest as aF, paymentRequestRelations as aG, TOKEN_TYPES as ag, accountCredentialsInsertSchema as ai, accountCredentialsSelectSchema as aj, accountCredentialsUpdateSchema as ak, accountInsertSchema as al, accountSelectSchema as am, accountUpdateSchema as an, hasPaymentAccountAssigned as ao, isBatchAuthorized as ap, isBatchCompleted as aq, isBatchFailed as ar, isBatchInitiated as as, isBatchProcessing as at, isBatchReadyToSign as au, isPaymentCompleted as av, isPendingStatus as aw, isProcessedStatus as ax, isTerminalStatus as ay, account as az, tables as t, ACCOUNT_STATUSES as x };
+export type { CountryCode as $, AccountSelectType as A, BatchSelectType as B, ConfigEnvironmentBank as C, AccountCredentialsUpdateType as D, AccountPatchType as E, AccountStatus as F, AccountUpdateType as G, HandleAuthorizationCallbackInput as H, AuthorizedBatch as J, LastSyncMetadata as L, BankAccountWithLastSync as N, BankCode as O, PaymentRequestSelectType as P, BatchInsertType as Q, BatchLifecycle as R, BatchMode as S, BatchPayment as T, BatchStatus as U, ChargeBearer as Z, CompletedBatch as _, PaymentSelectType as a, CredentialsType as a0, InstructionPriority as a2, PaymentDirection as a7, PaymentFailedInsertType as a8, PaymentInsertType as a9, PaymentLifecycle as aa, PaymentPreparedInsertType as ab, PaymentStatus as ac, ProcessingBatch as ad, ReadyToSignBatch as ae, ResolvedCredentials as af, TokenType as ah, ConnectorKey as b, PaymentType as c, CurrencyCode as d, HandleAuthorizationCallbackOutput as e, ConnectedAccount as f, CredentialsResolver as g, AccountCredentialsInsertType as h, AccountInsertType as i, BatchedPayment as j, InitiatedBatch as k, IncomingPayment as l, InitiatedPayment as m, ParsedBankPayment as n, PaymentRequestStatus as o, AuthorizationCallbackResult as p, BatchMetadata as q, Currency as r, AccountAssignedPayment as s, PreparedPayment as u, CompletedPayment as v, PaymentRequestInsertType as w, AccountCredentialsPatchType as y, AccountCredentialsSelectType as z };

package/dist/shared/{bank.Cj2Goq7s.d.mts → bank.BOY6AI1t.d.mts}

@@ -5147,6 +5147,9 @@ declare const tables: typeof schema;
  * 5. CompletedPayment - Fully processed (status: COMPLETED/BOOKED/SETTLED/REJECTED/CLOSED, has bankRefId)
  */
 
+declare function isTerminalStatus(status: PaymentRequestStatus): boolean;
+declare function isPendingStatus(status: PaymentRequestStatus): boolean;
+declare function isProcessedStatus(status: PaymentRequestStatus): boolean;
 /**
  * Stage 1: Incoming Payment
  */
@@ -5176,7 +5179,7 @@ type BatchedPayment = Omit<PaymentRequestInsertType, 'bankRefId' | 'status'> & {
  * Stage 4: Prepared Payment
  */
 type PreparedPayment = Omit<PaymentRequestInsertType, 'status' | 'bankRefId'> & {
-    status: 'OPENED';
+    status: PaymentRequestStatus;
     bankRefId?: string;
 };
 /**
@@ -5294,5 +5297,5 @@ declare function isBatchFailed(batch: {
     status?: string | null;
 }): batch is CompletedBatch;
 
-export { IBankConnector as I, BATCH_MODES as K, BATCH_STATUSES as M, CHARGE_BEARERS as V, CONNECTOR_KEYS as W, COUNTRY_CODES as X, CREDENTIALS_TYPES as Y, INSTRUCTION_PRIORITIES as a1, PAYMENT_DIRECTIONS as a3, PAYMENT_REQUEST_STATUSES as a4, PAYMENT_STATUSES as a5, PAYMENT_TYPES as a6, payment as aA, paymentRelations as aB, paymentRequest as aC, paymentRequestRelations as aD, TOKEN_TYPES as ag, accountCredentialsInsertSchema as ai, accountCredentialsSelectSchema as aj, accountCredentialsUpdateSchema as ak, accountInsertSchema as al, accountSelectSchema as am, accountUpdateSchema as an, hasPaymentAccountAssigned as ao, isBatchAuthorized as ap, isBatchCompleted as aq, isBatchFailed as ar, isBatchInitiated as as, isBatchProcessing as at, isBatchReadyToSign as au, isPaymentCompleted as av, account as aw, accountCredentials as ax, batch as ay, ott as az, tables as t, ACCOUNT_STATUSES as x };
-export type { CountryCode as $, AccountSelectType as A, BatchSelectType as B, ConfigEnvironmentBank as C, AccountCredentialsUpdateType as D, AccountPatchType as E, AccountStatus as F, AccountUpdateType as G, HandleAuthorizationCallbackInput as H, AuthorizedBatch as J, LastSyncMetadata as L, BankAccountWithLastSync as N, BankCode as O, PaymentSelectType as P, BatchInsertType as Q, BatchLifecycle as R, BatchMode as S, BatchPayment as T, BatchStatus as U, ChargeBearer as Z, CompletedBatch as _, PaymentRequestSelectType as a, CredentialsType as a0, InstructionPriority as a2, PaymentDirection as a7, PaymentFailedInsertType as a8, PaymentInsertType as a9, PaymentLifecycle as aa, PaymentPreparedInsertType as ab, PaymentStatus as ac, ProcessingBatch as ad, ReadyToSignBatch as ae, ResolvedCredentials as af, TokenType as ah, ConnectorKey as b, PaymentType as c, CurrencyCode as d, HandleAuthorizationCallbackOutput as e, ConnectedAccount as f, CredentialsResolver as g, AccountCredentialsInsertType as h, AccountInsertType as i, BatchedPayment as j, InitiatedBatch as k, IncomingPayment as l, InitiatedPayment as m, ParsedBankPayment as n, PaymentRequestStatus as o, AuthorizationCallbackResult as p, BatchMetadata as q, Currency as r, AccountAssignedPayment as s, PreparedPayment as u, CompletedPayment as v, PaymentRequestInsertType as w, AccountCredentialsPatchType as y, AccountCredentialsSelectType as z };
+export { IBankConnector as I, BATCH_MODES as K, BATCH_STATUSES as M, CHARGE_BEARERS as V, CONNECTOR_KEYS as W, COUNTRY_CODES as X, CREDENTIALS_TYPES as Y, INSTRUCTION_PRIORITIES as a1, PAYMENT_DIRECTIONS as a3, PAYMENT_REQUEST_STATUSES as a4, PAYMENT_STATUSES as a5, PAYMENT_TYPES as a6, accountCredentials as aA, batch as aB, ott as aC, payment as aD, paymentRelations as aE, paymentRequest as aF, paymentRequestRelations as aG, TOKEN_TYPES as ag, accountCredentialsInsertSchema as ai, accountCredentialsSelectSchema as aj, accountCredentialsUpdateSchema as ak, accountInsertSchema as al, accountSelectSchema as am, accountUpdateSchema as an, hasPaymentAccountAssigned as ao, isBatchAuthorized as ap, isBatchCompleted as aq, isBatchFailed as ar, isBatchInitiated as as, isBatchProcessing as at, isBatchReadyToSign as au, isPaymentCompleted as av, isPendingStatus as aw, isProcessedStatus as ax, isTerminalStatus as ay, account as az, tables as t, ACCOUNT_STATUSES as x };
+export type { CountryCode as $, AccountSelectType as A, BatchSelectType as B, ConfigEnvironmentBank as C, AccountCredentialsUpdateType as D, AccountPatchType as E, AccountStatus as F, AccountUpdateType as G, HandleAuthorizationCallbackInput as H, AuthorizedBatch as J, LastSyncMetadata as L, BankAccountWithLastSync as N, BankCode as O, PaymentRequestSelectType as P, BatchInsertType as Q, BatchLifecycle as R, BatchMode as S, BatchPayment as T, BatchStatus as U, ChargeBearer as Z, CompletedBatch as _, PaymentSelectType as a, CredentialsType as a0, InstructionPriority as a2, PaymentDirection as a7, PaymentFailedInsertType as a8, PaymentInsertType as a9, PaymentLifecycle as aa, PaymentPreparedInsertType as ab, PaymentStatus as ac, ProcessingBatch as ad, ReadyToSignBatch as ae, ResolvedCredentials as af, TokenType as ah, ConnectorKey as b, PaymentType as c, CurrencyCode as d, HandleAuthorizationCallbackOutput as e, ConnectedAccount as f, CredentialsResolver as g, AccountCredentialsInsertType as h, AccountInsertType as i, BatchedPayment as j, InitiatedBatch as k, IncomingPayment as l, InitiatedPayment as m, ParsedBankPayment as n, PaymentRequestStatus as o, AuthorizationCallbackResult as p, BatchMetadata as q, Currency as r, AccountAssignedPayment as s, PreparedPayment as u, CompletedPayment as v, PaymentRequestInsertType as w, AccountCredentialsPatchType as y, AccountCredentialsSelectType as z };