@develit-services/bank 0.8.1 → 0.8.3

package/dist/export/worker.d.cts

@@ -1,7 +1,7 @@
-import { A as AccountSelectType, P as PaymentSelectType, B as BatchSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, a as ConnectorKey, I as IBankConnector } from '../shared/bank.BJ7LqYtJ.cjs';
+import { A as AccountSelectType, P as PaymentSelectType, B as BatchSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, a as ConnectorKey, I as IBankConnector } from '../shared/bank.DDveEfub.cjs';
+import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput, F as FinbricksSupportedBanksResponse } from '../shared/bank.gl4dlxWy.cjs';
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { WorkflowInstanceStatus, IRPCResponse } from '@develit-io/backend-sdk';
-import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput } from '../shared/bank.C0p-hLzn.cjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
 import { z } from 'zod';
@@ -802,18 +802,18 @@ declare const getBatchesInputSchema: z.ZodObject<{
     }, z.core.$strip>;
     filterBatchAccountId: z.ZodOptional<z.ZodUnion<readonly [z.ZodUUID, z.ZodArray<z.ZodUUID>]>>;
     filterBatchStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
+        SIGNED: "SIGNED";
         FAILED: "FAILED";
         OPEN: "OPEN";
         PROCESSING: "PROCESSING";
         READY_TO_SIGN: "READY_TO_SIGN";
-        SIGNED: "SIGNED";
         SIGNATURE_FAILED: "SIGNATURE_FAILED";
     }>, z.ZodArray<z.ZodEnum<{
+        SIGNED: "SIGNED";
         FAILED: "FAILED";
         OPEN: "OPEN";
         PROCESSING: "PROCESSING";
         READY_TO_SIGN: "READY_TO_SIGN";
-        SIGNED: "SIGNED";
         SIGNATURE_FAILED: "SIGNATURE_FAILED";
     }>>]>>;
 }, z.core.$strip>;
@@ -1059,17 +1059,19 @@ declare const getPaymentsInputSchema: z.ZodObject<{
     filterPaymentDateFrom: z.ZodOptional<z.ZodDate>;
     filterPaymentDateTo: z.ZodOptional<z.ZodDate>;
     filterPaymentStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
+        CREATED: "CREATED";
         PREPARED: "PREPARED";
-        FAILED: "FAILED";
+        SIGNED: "SIGNED";
         PENDING: "PENDING";
         COMPLETED: "COMPLETED";
-        CREATED: "CREATED";
+        FAILED: "FAILED";
     }>, z.ZodArray<z.ZodEnum<{
+        CREATED: "CREATED";
         PREPARED: "PREPARED";
-        FAILED: "FAILED";
+        SIGNED: "SIGNED";
         PENDING: "PENDING";
         COMPLETED: "COMPLETED";
-        CREATED: "CREATED";
+        FAILED: "FAILED";
     }>>]>>;
 }, z.core.$strip>;
 type GetPaymentsInput = z.input<typeof getPaymentsInputSchema>;
@@ -1757,6 +1759,17 @@ interface DisconnectAccountInput extends z.infer<typeof disconnectAccountInputSc
 interface DisconnectAccountOutput extends AccountSelectType {
 }
 
+declare const handleAuthorizationCallbackInputSchema: z.ZodObject<{
+    paymentId: z.ZodOptional<z.ZodString>;
+    batchId: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+type HandleAuthorizationCallbackInput = z.infer<typeof handleAuthorizationCallbackInputSchema>;
+type HandleAuthorizationCallbackOutput = {
+    paymentsUpdated: number;
+    batchId: string | null;
+    batchSigned: boolean;
+};
+
 declare const BankServiceBase_base: (abstract new (ctx: ExecutionContext, env: BankEnv) => WorkerEntrypoint<BankEnv, {}>) & (abstract new (...args: any[]) => _develit_io_backend_sdk.DevelitWorkerMethods);
 declare class BankServiceBase extends BankServiceBase_base {
     readonly db: DrizzleD1Database<typeof tables>;
@@ -1848,6 +1861,7 @@ declare class BankServiceBase extends BankServiceBase_base {
         statusChanged: boolean;
     } | null>;
     updateBatchStatuses(input?: UpdateBatchStatusesInput): Promise<IRPCResponse<UpdateBatchStatusesOutput>>;
+    handleAuthorizationCallback(input: HandleAuthorizationCallbackInput): Promise<IRPCResponse<HandleAuthorizationCallbackOutput>>;
     addPaymentsToBatch({ paymentsToBatch, }: {
         paymentsToBatch: SendPaymentInput[];
     }): Promise<IRPCResponse<void>>;
@@ -1899,6 +1913,7 @@ declare class BankServiceBase extends BankServiceBase_base {
     updateAccount(input: UpdateAccountInput): Promise<IRPCResponse<UpdateAccountOutput>>;
     disconnectAccount(input: DisconnectAccountInput): Promise<IRPCResponse<DisconnectAccountOutput>>;
     getBatches(input: GetBatchesInput): Promise<IRPCResponse<GetBatchesOutput>>;
+    getFinbricksSupportedBanks(): Promise<FinbricksSupportedBanksResponse>;
 }
 declare function defineBankService({ config, }: {
     config: ConfigEnvironmentBank;

package/dist/export/worker.d.mts

@@ -1,7 +1,7 @@
-import { A as AccountSelectType, P as PaymentSelectType, B as BatchSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, a as ConnectorKey, I as IBankConnector } from '../shared/bank.BJ7LqYtJ.mjs';
+import { A as AccountSelectType, P as PaymentSelectType, B as BatchSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, a as ConnectorKey, I as IBankConnector } from '../shared/bank.DDveEfub.mjs';
+import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput, F as FinbricksSupportedBanksResponse } from '../shared/bank.BE9bK1n7.mjs';
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { WorkflowInstanceStatus, IRPCResponse } from '@develit-io/backend-sdk';
-import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput } from '../shared/bank.C0p-hLzn.mjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
 import { z } from 'zod';
@@ -802,18 +802,18 @@ declare const getBatchesInputSchema: z.ZodObject<{
     }, z.core.$strip>;
     filterBatchAccountId: z.ZodOptional<z.ZodUnion<readonly [z.ZodUUID, z.ZodArray<z.ZodUUID>]>>;
     filterBatchStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
+        SIGNED: "SIGNED";
         FAILED: "FAILED";
         OPEN: "OPEN";
         PROCESSING: "PROCESSING";
         READY_TO_SIGN: "READY_TO_SIGN";
-        SIGNED: "SIGNED";
         SIGNATURE_FAILED: "SIGNATURE_FAILED";
     }>, z.ZodArray<z.ZodEnum<{
+        SIGNED: "SIGNED";
         FAILED: "FAILED";
         OPEN: "OPEN";
         PROCESSING: "PROCESSING";
         READY_TO_SIGN: "READY_TO_SIGN";
-        SIGNED: "SIGNED";
         SIGNATURE_FAILED: "SIGNATURE_FAILED";
     }>>]>>;
 }, z.core.$strip>;
@@ -1059,17 +1059,19 @@ declare const getPaymentsInputSchema: z.ZodObject<{
     filterPaymentDateFrom: z.ZodOptional<z.ZodDate>;
     filterPaymentDateTo: z.ZodOptional<z.ZodDate>;
     filterPaymentStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
+        CREATED: "CREATED";
         PREPARED: "PREPARED";
-        FAILED: "FAILED";
+        SIGNED: "SIGNED";
         PENDING: "PENDING";
         COMPLETED: "COMPLETED";
-        CREATED: "CREATED";
+        FAILED: "FAILED";
     }>, z.ZodArray<z.ZodEnum<{
+        CREATED: "CREATED";
         PREPARED: "PREPARED";
-        FAILED: "FAILED";
+        SIGNED: "SIGNED";
         PENDING: "PENDING";
         COMPLETED: "COMPLETED";
-        CREATED: "CREATED";
+        FAILED: "FAILED";
     }>>]>>;
 }, z.core.$strip>;
 type GetPaymentsInput = z.input<typeof getPaymentsInputSchema>;
@@ -1757,6 +1759,17 @@ interface DisconnectAccountInput extends z.infer<typeof disconnectAccountInputSc
 interface DisconnectAccountOutput extends AccountSelectType {
 }
 
+declare const handleAuthorizationCallbackInputSchema: z.ZodObject<{
+    paymentId: z.ZodOptional<z.ZodString>;
+    batchId: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+type HandleAuthorizationCallbackInput = z.infer<typeof handleAuthorizationCallbackInputSchema>;
+type HandleAuthorizationCallbackOutput = {
+    paymentsUpdated: number;
+    batchId: string | null;
+    batchSigned: boolean;
+};
+
 declare const BankServiceBase_base: (abstract new (ctx: ExecutionContext, env: BankEnv) => WorkerEntrypoint<BankEnv, {}>) & (abstract new (...args: any[]) => _develit_io_backend_sdk.DevelitWorkerMethods);
 declare class BankServiceBase extends BankServiceBase_base {
     readonly db: DrizzleD1Database<typeof tables>;
@@ -1848,6 +1861,7 @@ declare class BankServiceBase extends BankServiceBase_base {
         statusChanged: boolean;
     } | null>;
     updateBatchStatuses(input?: UpdateBatchStatusesInput): Promise<IRPCResponse<UpdateBatchStatusesOutput>>;
+    handleAuthorizationCallback(input: HandleAuthorizationCallbackInput): Promise<IRPCResponse<HandleAuthorizationCallbackOutput>>;
     addPaymentsToBatch({ paymentsToBatch, }: {
         paymentsToBatch: SendPaymentInput[];
     }): Promise<IRPCResponse<void>>;
@@ -1899,6 +1913,7 @@ declare class BankServiceBase extends BankServiceBase_base {
     updateAccount(input: UpdateAccountInput): Promise<IRPCResponse<UpdateAccountOutput>>;
     disconnectAccount(input: DisconnectAccountInput): Promise<IRPCResponse<DisconnectAccountOutput>>;
     getBatches(input: GetBatchesInput): Promise<IRPCResponse<GetBatchesOutput>>;
+    getFinbricksSupportedBanks(): Promise<FinbricksSupportedBanksResponse>;
 }
 declare function defineBankService({ config, }: {
     config: ConfigEnvironmentBank;

package/dist/export/worker.d.ts

@@ -1,7 +1,7 @@
-import { A as AccountSelectType, P as PaymentSelectType, B as BatchSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, a as ConnectorKey, I as IBankConnector } from '../shared/bank.BJ7LqYtJ.js';
+import { A as AccountSelectType, P as PaymentSelectType, B as BatchSelectType, L as LastSyncMetadata, C as ConfigEnvironmentBank, t as tables, a as ConnectorKey, I as IBankConnector } from '../shared/bank.DDveEfub.js';
+import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput, F as FinbricksSupportedBanksResponse } from '../shared/bank.pngKIcOl.js';
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { WorkflowInstanceStatus, IRPCResponse } from '@develit-io/backend-sdk';
-import { S as SendPaymentInput, a as SendPaymentOutput, b as SendPaymentSyncInput, c as SendPaymentSyncOutput } from '../shared/bank.C0p-hLzn.js';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
 import { z } from 'zod';
@@ -802,18 +802,18 @@ declare const getBatchesInputSchema: z.ZodObject<{
     }, z.core.$strip>;
     filterBatchAccountId: z.ZodOptional<z.ZodUnion<readonly [z.ZodUUID, z.ZodArray<z.ZodUUID>]>>;
     filterBatchStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
+        SIGNED: "SIGNED";
         FAILED: "FAILED";
         OPEN: "OPEN";
         PROCESSING: "PROCESSING";
         READY_TO_SIGN: "READY_TO_SIGN";
-        SIGNED: "SIGNED";
         SIGNATURE_FAILED: "SIGNATURE_FAILED";
     }>, z.ZodArray<z.ZodEnum<{
+        SIGNED: "SIGNED";
         FAILED: "FAILED";
         OPEN: "OPEN";
         PROCESSING: "PROCESSING";
         READY_TO_SIGN: "READY_TO_SIGN";
-        SIGNED: "SIGNED";
         SIGNATURE_FAILED: "SIGNATURE_FAILED";
     }>>]>>;
 }, z.core.$strip>;
@@ -1059,17 +1059,19 @@ declare const getPaymentsInputSchema: z.ZodObject<{
     filterPaymentDateFrom: z.ZodOptional<z.ZodDate>;
     filterPaymentDateTo: z.ZodOptional<z.ZodDate>;
     filterPaymentStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
+        CREATED: "CREATED";
         PREPARED: "PREPARED";
-        FAILED: "FAILED";
+        SIGNED: "SIGNED";
         PENDING: "PENDING";
         COMPLETED: "COMPLETED";
-        CREATED: "CREATED";
+        FAILED: "FAILED";
     }>, z.ZodArray<z.ZodEnum<{
+        CREATED: "CREATED";
         PREPARED: "PREPARED";
-        FAILED: "FAILED";
+        SIGNED: "SIGNED";
         PENDING: "PENDING";
         COMPLETED: "COMPLETED";
-        CREATED: "CREATED";
+        FAILED: "FAILED";
     }>>]>>;
 }, z.core.$strip>;
 type GetPaymentsInput = z.input<typeof getPaymentsInputSchema>;
@@ -1757,6 +1759,17 @@ interface DisconnectAccountInput extends z.infer<typeof disconnectAccountInputSc
 interface DisconnectAccountOutput extends AccountSelectType {
 }
 
+declare const handleAuthorizationCallbackInputSchema: z.ZodObject<{
+    paymentId: z.ZodOptional<z.ZodString>;
+    batchId: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+type HandleAuthorizationCallbackInput = z.infer<typeof handleAuthorizationCallbackInputSchema>;
+type HandleAuthorizationCallbackOutput = {
+    paymentsUpdated: number;
+    batchId: string | null;
+    batchSigned: boolean;
+};
+
 declare const BankServiceBase_base: (abstract new (ctx: ExecutionContext, env: BankEnv) => WorkerEntrypoint<BankEnv, {}>) & (abstract new (...args: any[]) => _develit_io_backend_sdk.DevelitWorkerMethods);
 declare class BankServiceBase extends BankServiceBase_base {
     readonly db: DrizzleD1Database<typeof tables>;
@@ -1848,6 +1861,7 @@ declare class BankServiceBase extends BankServiceBase_base {
         statusChanged: boolean;
     } | null>;
     updateBatchStatuses(input?: UpdateBatchStatusesInput): Promise<IRPCResponse<UpdateBatchStatusesOutput>>;
+    handleAuthorizationCallback(input: HandleAuthorizationCallbackInput): Promise<IRPCResponse<HandleAuthorizationCallbackOutput>>;
     addPaymentsToBatch({ paymentsToBatch, }: {
         paymentsToBatch: SendPaymentInput[];
     }): Promise<IRPCResponse<void>>;
@@ -1899,6 +1913,7 @@ declare class BankServiceBase extends BankServiceBase_base {
     updateAccount(input: UpdateAccountInput): Promise<IRPCResponse<UpdateAccountOutput>>;
     disconnectAccount(input: DisconnectAccountInput): Promise<IRPCResponse<DisconnectAccountOutput>>;
     getBatches(input: GetBatchesInput): Promise<IRPCResponse<GetBatchesOutput>>;
+    getFinbricksSupportedBanks(): Promise<FinbricksSupportedBanksResponse>;
 }
 declare function defineBankService({ config, }: {
     config: ConfigEnvironmentBank;

package/dist/export/worker.mjs

@@ -1,16 +1,16 @@
 import { uuidv4, first, buildMultiFilterConditions as buildMultiFilterConditions$1, bankAccountMetadataSchema, workflowInstanceStatusSchema, develitWorker, createInternalError, action, service } from '@develit-io/backend-sdk';
-import { t as tables, e as encrypt, b as createCredentialsResolver, u as upsertBatchCommand, g as getBatchByIdQuery, i as importAesKey, d as createPaymentCommand, a as getAccountByIdQuery } from '../shared/bank.CGIeLo8U.mjs';
+import { t as tables, h as encrypt, d as createCredentialsResolver, u as upsertBatchCommand, a as getPaymentRequestsByBatchIdQuery, e as updatePaymentRequestStatusCommand, g as getBatchByIdQuery, i as importAesKey, f as createPaymentCommand, b as getAccountByIdQuery } from '../shared/bank.Cpy9PULF.mjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { drizzle } from 'drizzle-orm/d1';
+import { k as initiateConnector, m as mapFinbricksTransactionStatus, h as toIncomingPayment, d as assignAccount, i as toPaymentRequestInsert, t as toBatchedPayment, a as FinbricksClient, F as FINBRICKS_ENDPOINTS } from '../shared/bank.DRrBrAdI.mjs';
+import 'jose';
 import { z } from 'zod';
-import { I as INSTRUCTION_PRIORITIES, C as CHARGE_BEARERS, e as PAYMENT_TYPES, a as CONNECTOR_KEYS, B as BATCH_STATUSES, d as PAYMENT_STATUSES, P as PAYMENT_DIRECTIONS, i as accountInsertSchema } from '../shared/bank.993UA65l.mjs';
+import { I as INSTRUCTION_PRIORITIES, C as CHARGE_BEARERS, e as PAYMENT_TYPES, a as CONNECTOR_KEYS, B as BATCH_STATUSES, d as PAYMENT_STATUSES, P as PAYMENT_DIRECTIONS, i as accountInsertSchema } from '../shared/bank.C4VOdIx1.mjs';
 import { CURRENCY_CODES } from '@develit-io/general-codes';
 import 'date-fns';
-import 'jose';
 import { eq, sql, and, inArray, asc, desc, gte, lte } from 'drizzle-orm';
 import 'node:crypto';
-import { i as initiateConnector, g as toIncomingPayment, d as assignAccount, t as toBatchedPayment } from '../shared/bank.CeRbuycV.mjs';
-import '../shared/bank.fIGTiPnp.mjs';
+import '../shared/bank.DDHrdFgy.mjs';
 import 'drizzle-orm/relations';
 import 'drizzle-orm/sqlite-core';
 import 'drizzle-zod';
@@ -92,6 +92,16 @@ const deletePaymentsByAccountCommand = (db, { accountId }) => {
   };
 };
 
+const createPaymentRequestCommand = (db, { paymentRequest }) => {
+  return {
+    command: db.insert(tables.paymentRequest).values({
+      ...paymentRequest,
+      creditorIban: paymentRequest.creditor.iban,
+      debtorIban: paymentRequest.debtor.iban
+    }).returning()
+  };
+};
+
 const getAccountBatchCountsQuery = async (db, { accountId }) => {
   const result = await db.select({
     totalCount: sql`COUNT(*)`.as("totalCount"),
@@ -142,7 +152,7 @@ const getAllAccountsQuery = async (db, filters) => {
 };
 
 const getAllPendingBatchesQuery = (db) => {
-  return db.select().from(tables.batch).where(inArray(tables.batch.status, ["READY_TO_SIGN"]));
+  return db.select().from(tables.batch).where(inArray(tables.batch.status, ["READY_TO_SIGN", "SIGNED"]));
 };
 
 const buildMultiFilterConditions = (column, value) => {
@@ -247,6 +257,11 @@ const getOttQuery = async (db, { ott }) => {
   return await db.select().from(tables.ott).where(eq(tables.ott.oneTimeToken, ott)).get();
 };
 
+const getPaymentRequestByIdQuery = async (db, { paymentId }) => {
+  const results = await db.select().from(tables.paymentRequest).where(eq(tables.paymentRequest.id, paymentId)).limit(1);
+  return results[0] ?? null;
+};
+
 const seperateSupportedPayments = (incomingPayments, accounts) => {
   const [supportedPayments, unsupportedPayments] = incomingPayments.reduce(
     ([valid, invalid], payment) => {
@@ -270,7 +285,7 @@ const seperateSupportedPayments = (incomingPayments, accounts) => {
 
 const sendPaymentInputSchema = z.object({
   correlationId: z.string().min(1),
-  refId: z.string(),
+  refId: z.string().optional(),
   amount: z.number().positive(),
   paymentType: z.enum(PAYMENT_TYPES),
   chargeBearer: z.enum(CHARGE_BEARERS).optional(),
@@ -432,6 +447,13 @@ const disconnectAccountInputSchema = z.object({
   accountId: z.uuid()
 });
 
+const handleAuthorizationCallbackInputSchema = z.object({
+  paymentId: z.string().uuid().optional(),
+  batchId: z.string().uuid().optional()
+}).refine((data) => data.paymentId || data.batchId, {
+  message: "Either paymentId or batchId is required"
+});
+
 const sendPaymentSyncInputSchema = sendPaymentInputSchema;
 
 var __defProp = Object.defineProperty;
@@ -591,12 +613,45 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
       }).command.execute();
       statusChanged = true;
     }
+    if (statusChanged) {
+      const paymentRequests = await getPaymentRequestsByBatchIdQuery(this.db, {
+        batchId: batch.id
+      });
+      const perPaymentStatuses = "payments" in apiResponse ? apiResponse.payments : null;
+      const batchStatusToPaymentStatus = {
+        SIGNED: "SIGNED",
+        COMPLETED: "COMPLETED",
+        FAILED: "FAILED",
+        SIGNATURE_FAILED: "FAILED"
+      };
+      for (const pr of paymentRequests) {
+        let newStatus = pr.status;
+        if (perPaymentStatuses) {
+          const match = perPaymentStatuses.find(
+            (p) => p.merchantTransactionId === pr.id
+          );
+          if (match) {
+            newStatus = mapFinbricksTransactionStatus(
+              match.resultCode
+            );
+          }
+        } else {
+          newStatus = batchStatusToPaymentStatus[currentStatus] ?? pr.status;
+        }
+        if (newStatus !== pr.status) {
+          await updatePaymentRequestStatusCommand(this.db, {
+            id: pr.id,
+            status: newStatus,
+            processedAt: newStatus === "COMPLETED" || newStatus === "FAILED" ? /* @__PURE__ */ new Date() : void 0
+          }).command.execute();
+        }
+      }
+    }
     return {
       batchId: batch.id,
       previousStatus,
       currentStatus,
       statusChanged
-      // eventSent,
     };
   }
   async updateBatchStatuses(input) {
@@ -668,6 +723,77 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
       }
     );
   }
+  async handleAuthorizationCallback(input) {
+    return this.handleAction(
+      { data: input, schema: handleAuthorizationCallbackInputSchema },
+      { successMessage: "Authorization callback processed" },
+      async ({ paymentId, batchId }) => {
+        let targetBatchId = null;
+        let paymentsUpdated = 0;
+        if (paymentId) {
+          const pr = await getPaymentRequestByIdQuery(this.db, { paymentId });
+          if (!pr) {
+            throw createInternalError(null, {
+              message: `Payment request not found: ${paymentId}`,
+              code: "DB-B-008",
+              status: 404
+            });
+          }
+          if (pr.status !== "SIGNED" && pr.status !== "COMPLETED") {
+            await updatePaymentRequestStatusCommand(this.db, {
+              id: paymentId,
+              status: "SIGNED"
+            }).command.execute();
+            paymentsUpdated = 1;
+          }
+          targetBatchId = pr.batchId;
+        }
+        if (batchId) {
+          targetBatchId = batchId;
+          const batchPayments = await getPaymentRequestsByBatchIdQuery(
+            this.db,
+            {
+              batchId
+            }
+          );
+          for (const pr of batchPayments) {
+            if (pr.status !== "SIGNED" && pr.status !== "COMPLETED") {
+              await updatePaymentRequestStatusCommand(this.db, {
+                id: pr.id,
+                status: "SIGNED"
+              }).command.execute();
+              paymentsUpdated++;
+            }
+          }
+        }
+        let batchSigned = false;
+        if (targetBatchId) {
+          const allPayments = await getPaymentRequestsByBatchIdQuery(this.db, {
+            batchId: targetBatchId
+          });
+          const allDone = allPayments.every(
+            (p) => p.status === "SIGNED" || p.status === "COMPLETED"
+          );
+          if (allDone) {
+            const batch = await getBatchByIdQuery(this.db, {
+              batchId: targetBatchId
+            });
+            if (batch && batch.status !== "SIGNED") {
+              await upsertBatchCommand(this.db, {
+                batch: { ...batch, status: "SIGNED" }
+              }).command.execute();
+              batchSigned = true;
+            }
+          }
+        }
+        return {
+          paymentsUpdated,
+          batchId: targetBatchId,
+          batchSigned
+        };
+      }
+    );
+  }
   async addPaymentsToBatch({
     paymentsToBatch
   }) {
@@ -713,21 +839,24 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
           (p) => p.sendAsSinglePayment !== true
         );
         for (const singlePayment of singlePayments) {
-          const batchedPayment = toBatchedPayment(singlePayment);
-          const { command } = upsertBatchCommand(this.db, {
+          const batchId = uuidv4();
+          const { command: upsertBatch } = upsertBatchCommand(this.db, {
             batch: {
-              id: uuidv4(),
+              id: batchId,
               authorizationUrls: [],
               accountId: acc.id,
               paymentType: singlePayment.paymentType,
-              payments: [batchedPayment],
               status: "OPEN",
-              metadata: {
-                sizeLimit: 1
-              }
+              metadata: { sizeLimit: 1 }
             }
           });
-          await command.execute();
+          const { command: insertPaymentRequest } = createPaymentRequestCommand(
+            this.db,
+            {
+              paymentRequest: toPaymentRequestInsert(singlePayment, batchId)
+            }
+          );
+          await this.db.batch([upsertBatch, insertPaymentRequest]);
           this.log({
             message: `\u2728 Created single payment batch (${singlePayment.paymentType}) for account ${acc.id}`
           });
@@ -742,30 +871,48 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
               accountId: acc.id,
               paymentType
             });
-            const availableBatch = openBatches.find(
-              (batch) => batch.payments.length < (batch.metadata?.sizeLimit ?? acc.batchSizeLimit)
-            );
-            this.log({
-              message: availableBatch ? `\u{1F504} Found existing OPEN batch (${paymentType}) for account ${acc.id}, merging ${availableBatch.payments.length} existing + ${paymentsOfType.length} new payments` : `\u2728 Creating new batch (${paymentType}) for account ${acc.id} with ${paymentsOfType.length} payments`
-            });
-            const batchedPayments = paymentsOfType.map(toBatchedPayment);
-            const { command } = upsertBatchCommand(this.db, {
-              batch: availableBatch ? {
-                ...availableBatch,
-                payments: [...availableBatch.payments, ...batchedPayments]
-              } : {
-                id: uuidv4(),
+            let batchId;
+            let availableCount = 0;
+            let availableBatch;
+            for (const ob of openBatches) {
+              const existingPayments = await getPaymentRequestsByBatchIdQuery(
+                this.db,
+                { batchId: ob.id }
+              );
+              const limit = ob.metadata?.sizeLimit ?? acc.batchSizeLimit;
+              if (existingPayments.length < limit) {
+                availableBatch = ob;
+                availableCount = existingPayments.length;
+                break;
+              }
+            }
+            if (availableBatch) {
+              batchId = availableBatch.id;
+              this.log({
+                message: `\u{1F504} Found existing OPEN batch (${paymentType}) for account ${acc.id}, merging ${availableCount} existing + ${paymentsOfType.length} new payments`
+              });
+            } else {
+              batchId = uuidv4();
+              this.log({
+                message: `\u2728 Creating new batch (${paymentType}) for account ${acc.id} with ${paymentsOfType.length} payments`
+              });
+            }
+            const { command: upsertBatch } = upsertBatchCommand(this.db, {
+              batch: availableBatch ? { ...availableBatch } : {
+                id: batchId,
                 authorizationUrls: [],
                 accountId: acc.id,
                 paymentType,
-                payments: batchedPayments,
                 status: "OPEN",
-                metadata: {
-                  sizeLimit: acc.batchSizeLimit
-                }
+                metadata: { sizeLimit: acc.batchSizeLimit }
               }
             });
-            await command.execute();
+            const paymentRequestCommands = paymentsOfType.map(
+              (p) => createPaymentRequestCommand(this.db, {
+                paymentRequest: toPaymentRequestInsert(p, batchId)
+              }).command
+            );
+            await this.db.batch([upsertBatch, ...paymentRequestCommands]);
             this.log({
               message: `\u2705 Batch (${paymentType}) upserted successfully for account ${acc.id}`
             });
@@ -1254,6 +1401,24 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
       }
     );
   }
+  async getFinbricksSupportedBanks() {
+    const privateKeyPem = (await this.env.SECRETS_STORE.get({
+      secretName: "BANK_SERVICE_FINBRICKS_PRIVATE_KEY_PEM"
+    })).data?.secretValue || "";
+    const client = new FinbricksClient(
+      this.env.FINBRICKS_BASE_URI,
+      this.env.FINBRICKS_MERCHANT_ID,
+      privateKeyPem,
+      this.env.REDIRECT_URI
+    );
+    return client.request({
+      endpoint: FINBRICKS_ENDPOINTS.BANK_INFO,
+      method: "GET",
+      query: {
+        merchantId: this.env.FINBRICKS_MERCHANT_ID
+      }
+    });
+  }
 };
 __decorateClass([
   action("get-payments")
@@ -1270,6 +1435,9 @@ __decorateClass([
 __decorateClass([
   action("update-batch-statuses")
 ], BankServiceBase.prototype, "updateBatchStatuses", 1);
+__decorateClass([
+  action("handle-authorization-callback")
+], BankServiceBase.prototype, "handleAuthorizationCallback", 1);
 __decorateClass([
   action("add-payments-to-batch")
 ], BankServiceBase.prototype, "addPaymentsToBatch", 1);