@develit-services/bank 0.0.36 → 0.0.37

package/dist/export/worker.cjs

@@ -233,14 +233,13 @@ const getCredentialsByAccountId = async (db, { accountId }) => {
   return cred;
 };
 
-const getOpenBatchByAccountIdQuery = async (db, { accountId }) => {
-  const batch = await db.select().from(database_schema.tables.batch).where(
+const getAccountOpenBatchesQuery = async (db, { accountId }) => {
+  return await db.select().from(database_schema.tables.batch).where(
     drizzleOrm.and(
       drizzleOrm.eq(database_schema.tables.batch.accountId, accountId),
       drizzleOrm.eq(database_schema.tables.batch.status, "OPEN")
     )
-  ).limit(1).get();
-  return batch;
+  );
 };
 
 const getOttQuery = async (db, { ott }) => {
@@ -637,35 +636,40 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
       }
     );
   }
+  batchLimit(connectorKey) {
+    return 50;
+  }
   async addPaymentsToBatch({
     paymentsToBatch
   }) {
     return this.handleAction(null, {}, async () => {
       this.logInput({ paymentsToBatch });
       const mappedPayments = paymentsToBatch.map(
-        (payment) => ({
-          id: backendSdk.uuidv4(),
-          accountId: "",
-          refId: payment.refId,
-          connectorKey: "MOCK",
-          amount: payment.amount,
-          direction: "OUTGOING",
-          paymentType: payment.paymentType,
-          currency: payment.currency,
-          status: "CREATED",
-          initiatedAt: /* @__PURE__ */ new Date(),
-          processedAt: null,
-          vs: payment.vs || null,
-          ss: payment.ss || null,
-          ks: payment.ks || null,
-          message: payment.message || null,
-          creditorHolderName: payment.creditorHolderName,
-          creditorAccountNumberWithBankCode: payment.creditorAccountNumberWithBankCode,
-          creditorIban: payment.creditorIban,
-          debtorHolderName: payment.debtorHolderName,
-          debtorAccountNumberWithBankCode: payment.debtorAccountNumberWithBankCode,
-          debtorIban: payment.debtorIban
-        })
+        (payment) => {
+          return {
+            id: backendSdk.uuidv4(),
+            accountId: "",
+            refId: payment.refId,
+            connectorKey: "MOCK",
+            amount: payment.amount,
+            direction: "OUTGOING",
+            paymentType: payment.paymentType,
+            currency: payment.currency,
+            status: "CREATED",
+            initiatedAt: /* @__PURE__ */ new Date(),
+            processedAt: null,
+            vs: payment.vs || null,
+            ss: payment.ss || null,
+            ks: payment.ks || null,
+            message: payment.message || null,
+            creditorHolderName: payment.creditorHolderName,
+            creditorAccountNumberWithBankCode: payment.creditorAccountNumberWithBankCode,
+            creditorIban: payment.creditorIban,
+            debtorHolderName: payment.debtorHolderName,
+            debtorAccountNumberWithBankCode: payment.debtorAccountNumberWithBankCode,
+            debtorIban: payment.debtorIban
+          };
+        }
       );
       const { supportedPayments, unsupportedPayments } = seperateSupportedPayments(
         mappedPayments,
@@ -710,22 +714,19 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
         this.log({
           message: `\u{1F4B0} Processing ${newPayments.length} payments for account (${acc.iban}, ${acc.currency})`
         });
-        const existingBatch = await getOpenBatchByAccountIdQuery(this.db, {
+        const openBatches = await getAccountOpenBatchesQuery(this.db, {
           accountId: acc.id
         });
-        if (existingBatch) {
-          this.log({
-            message: `\u{1F504} Found existing OPEN batch for account ${acc.id}, merging ${existingBatch.payments.length} existing + ${newPayments.length} new payments`
-          });
-        } else {
-          this.log({
-            message: `\u2728 Creating new batch for account ${acc.id} with ${newPayments.length} payments`
-          });
-        }
+        const availableBatch = openBatches.find(
+          (batch) => batch.payments.length >= this.batchLimit(acc.connectorKey)
+        );
+        this.log({
+          message: availableBatch ? `\u{1F504} Found existing OPEN batches for account ${acc.id}, merging ${availableBatch.payments.length} existing + ${newPayments.length} new payments` : `\u2728 Creating new batch for account ${acc.id} with ${newPayments.length} payments`
+        });
         const { command } = upsertBatchCommand(this.db, {
-          batch: existingBatch ? {
-            ...existingBatch,
-            payments: [...existingBatch.payments, ...newPayments]
+          batch: availableBatch ? {
+            ...availableBatch,
+            payments: [...availableBatch.payments, ...newPayments]
           } : {
             id: backendSdk.uuidv4(),
             authorizationUrls: [],

package/dist/export/worker.d.cts

@@ -225,9 +225,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";
@@ -475,17 +475,18 @@ declare class BankServiceBase extends BankServiceBase_base {
     scheduled(controller: ScheduledController): Promise<void>;
     updateBatchStatuses(): Promise<void>;
     initiateBankConnector(input: initiateConnectorInput): Promise<initiateConnectorOutput>;
+    batchLimit(connectorKey: ConnectorKey): number;
     addPaymentsToBatch({ paymentsToBatch, }: {
         paymentsToBatch: SendPaymentInput[];
     }): Promise<IRPCResponse<{
+        batchPaymentInitiatedAt: Date | null;
+        authorizationUrls: string | string[] | null;
         status: "OPEN" | "PROCESSING" | "READY_TO_SIGN" | "WAITING_FOR_PROCESSING" | "PREPARED" | "COMPLETED" | "FAILED" | null;
         id: string;
         createdAt: Date | null;
         updatedAt: Date | null;
         deletedAt: Date | null;
         accountId: string | null;
-        batchPaymentInitiatedAt: Date | null;
-        authorizationUrls: string | string[] | null;
         payments: PaymentInsertType[];
         metadata: object | null;
     }[] | undefined>>;

package/dist/export/worker.d.mts

@@ -225,9 +225,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";
@@ -475,17 +475,18 @@ declare class BankServiceBase extends BankServiceBase_base {
     scheduled(controller: ScheduledController): Promise<void>;
     updateBatchStatuses(): Promise<void>;
     initiateBankConnector(input: initiateConnectorInput): Promise<initiateConnectorOutput>;
+    batchLimit(connectorKey: ConnectorKey): number;
     addPaymentsToBatch({ paymentsToBatch, }: {
         paymentsToBatch: SendPaymentInput[];
     }): Promise<IRPCResponse<{
+        batchPaymentInitiatedAt: Date | null;
+        authorizationUrls: string | string[] | null;
         status: "OPEN" | "PROCESSING" | "READY_TO_SIGN" | "WAITING_FOR_PROCESSING" | "PREPARED" | "COMPLETED" | "FAILED" | null;
         id: string;
         createdAt: Date | null;
         updatedAt: Date | null;
         deletedAt: Date | null;
         accountId: string | null;
-        batchPaymentInitiatedAt: Date | null;
-        authorizationUrls: string | string[] | null;
         payments: PaymentInsertType[];
         metadata: object | null;
     }[] | undefined>>;

package/dist/export/worker.d.ts

@@ -225,9 +225,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";
@@ -475,17 +475,18 @@ declare class BankServiceBase extends BankServiceBase_base {
     scheduled(controller: ScheduledController): Promise<void>;
     updateBatchStatuses(): Promise<void>;
     initiateBankConnector(input: initiateConnectorInput): Promise<initiateConnectorOutput>;
+    batchLimit(connectorKey: ConnectorKey): number;
     addPaymentsToBatch({ paymentsToBatch, }: {
         paymentsToBatch: SendPaymentInput[];
     }): Promise<IRPCResponse<{
+        batchPaymentInitiatedAt: Date | null;
+        authorizationUrls: string | string[] | null;
         status: "OPEN" | "PROCESSING" | "READY_TO_SIGN" | "WAITING_FOR_PROCESSING" | "PREPARED" | "COMPLETED" | "FAILED" | null;
         id: string;
         createdAt: Date | null;
         updatedAt: Date | null;
         deletedAt: Date | null;
         accountId: string | null;
-        batchPaymentInitiatedAt: Date | null;
-        authorizationUrls: string | string[] | null;
         payments: PaymentInsertType[];
         metadata: object | null;
     }[] | undefined>>;

package/dist/export/worker.mjs

@@ -229,14 +229,13 @@ const getCredentialsByAccountId = async (db, { accountId }) => {
   return cred;
 };
 
-const getOpenBatchByAccountIdQuery = async (db, { accountId }) => {
-  const batch = await db.select().from(tables.batch).where(
+const getAccountOpenBatchesQuery = async (db, { accountId }) => {
+  return await db.select().from(tables.batch).where(
     and(
       eq(tables.batch.accountId, accountId),
       eq(tables.batch.status, "OPEN")
     )
-  ).limit(1).get();
-  return batch;
+  );
 };
 
 const getOttQuery = async (db, { ott }) => {
@@ -633,35 +632,40 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
       }
     );
   }
+  batchLimit(connectorKey) {
+    return 50;
+  }
   async addPaymentsToBatch({
     paymentsToBatch
   }) {
     return this.handleAction(null, {}, async () => {
       this.logInput({ paymentsToBatch });
       const mappedPayments = paymentsToBatch.map(
-        (payment) => ({
-          id: uuidv4(),
-          accountId: "",
-          refId: payment.refId,
-          connectorKey: "MOCK",
-          amount: payment.amount,
-          direction: "OUTGOING",
-          paymentType: payment.paymentType,
-          currency: payment.currency,
-          status: "CREATED",
-          initiatedAt: /* @__PURE__ */ new Date(),
-          processedAt: null,
-          vs: payment.vs || null,
-          ss: payment.ss || null,
-          ks: payment.ks || null,
-          message: payment.message || null,
-          creditorHolderName: payment.creditorHolderName,
-          creditorAccountNumberWithBankCode: payment.creditorAccountNumberWithBankCode,
-          creditorIban: payment.creditorIban,
-          debtorHolderName: payment.debtorHolderName,
-          debtorAccountNumberWithBankCode: payment.debtorAccountNumberWithBankCode,
-          debtorIban: payment.debtorIban
-        })
+        (payment) => {
+          return {
+            id: uuidv4(),
+            accountId: "",
+            refId: payment.refId,
+            connectorKey: "MOCK",
+            amount: payment.amount,
+            direction: "OUTGOING",
+            paymentType: payment.paymentType,
+            currency: payment.currency,
+            status: "CREATED",
+            initiatedAt: /* @__PURE__ */ new Date(),
+            processedAt: null,
+            vs: payment.vs || null,
+            ss: payment.ss || null,
+            ks: payment.ks || null,
+            message: payment.message || null,
+            creditorHolderName: payment.creditorHolderName,
+            creditorAccountNumberWithBankCode: payment.creditorAccountNumberWithBankCode,
+            creditorIban: payment.creditorIban,
+            debtorHolderName: payment.debtorHolderName,
+            debtorAccountNumberWithBankCode: payment.debtorAccountNumberWithBankCode,
+            debtorIban: payment.debtorIban
+          };
+        }
       );
       const { supportedPayments, unsupportedPayments } = seperateSupportedPayments(
         mappedPayments,
@@ -706,22 +710,19 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
         this.log({
           message: `\u{1F4B0} Processing ${newPayments.length} payments for account (${acc.iban}, ${acc.currency})`
         });
-        const existingBatch = await getOpenBatchByAccountIdQuery(this.db, {
+        const openBatches = await getAccountOpenBatchesQuery(this.db, {
           accountId: acc.id
         });
-        if (existingBatch) {
-          this.log({
-            message: `\u{1F504} Found existing OPEN batch for account ${acc.id}, merging ${existingBatch.payments.length} existing + ${newPayments.length} new payments`
-          });
-        } else {
-          this.log({
-            message: `\u2728 Creating new batch for account ${acc.id} with ${newPayments.length} payments`
-          });
-        }
+        const availableBatch = openBatches.find(
+          (batch) => batch.payments.length >= this.batchLimit(acc.connectorKey)
+        );
+        this.log({
+          message: availableBatch ? `\u{1F504} Found existing OPEN batches for account ${acc.id}, merging ${availableBatch.payments.length} existing + ${newPayments.length} new payments` : `\u2728 Creating new batch for account ${acc.id} with ${newPayments.length} payments`
+        });
         const { command } = upsertBatchCommand(this.db, {
-          batch: existingBatch ? {
-            ...existingBatch,
-            payments: [...existingBatch.payments, ...newPayments]
+          batch: availableBatch ? {
+            ...availableBatch,
+            payments: [...availableBatch.payments, ...newPayments]
           } : {
             id: uuidv4(),
             authorizationUrls: [],

package/package.json

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