@develit-services/bank 0.3.60 → 0.4.1

package/dist/database/schema.cjs

@@ -1,21 +1,21 @@
 'use strict';
 
-const database_schema = require('../shared/bank.CMbfx0u7.cjs');
+const payment_schema = require('../shared/bank.BeIpkWR-.cjs');
 require('@develit-io/backend-sdk');
+require('drizzle-orm/relations');
 require('drizzle-orm/sqlite-core');
 require('date-fns');
-require('drizzle-orm/relations');
 require('@develit-io/general-codes');
-require('drizzle-orm');
 require('jose');
+require('drizzle-orm');
 require('node:crypto');
 require('drizzle-zod');
 
 
 
-exports.account = database_schema.account;
-exports.accountCredentials = database_schema.accountCredentials;
-exports.batch = database_schema.batch;
-exports.ott = database_schema.ott;
-exports.payment = database_schema.payment;
-exports.paymentRelations = database_schema.paymentRelations;
+exports.account = payment_schema.account;
+exports.accountCredentials = payment_schema.accountCredentials;
+exports.batch = payment_schema.batch;
+exports.ott = payment_schema.ott;
+exports.payment = payment_schema.payment;
+exports.paymentRelations = payment_schema.paymentRelations;

package/dist/database/schema.d.cts

@@ -1,8 +1,7 @@
-export { aa as account, ab as accountCredentials, a6 as batch, a9 as ott, a7 as payment, a8 as paymentRelations } from '../shared/bank.XJJV8p4b.cjs';
-import 'zod';
-import 'drizzle-zod';
+export { as as account, at as accountCredentials, ao as batch, ar as ott, ap as payment, aq as paymentRelations } from '../shared/bank.CsJuzqZH.cjs';
 import 'drizzle-orm/sqlite-core';
-import '@develit-io/backend-sdk';
-import 'drizzle-orm/d1';
 import 'drizzle-orm';
+import '@develit-io/backend-sdk';
+import 'drizzle-zod';
+import 'zod';
 import '@develit-io/general-codes';

package/dist/database/schema.d.mts

@@ -1,8 +1,7 @@
-export { aa as account, ab as accountCredentials, a6 as batch, a9 as ott, a7 as payment, a8 as paymentRelations } from '../shared/bank.XJJV8p4b.mjs';
-import 'zod';
-import 'drizzle-zod';
+export { as as account, at as accountCredentials, ao as batch, ar as ott, ap as payment, aq as paymentRelations } from '../shared/bank.CsJuzqZH.mjs';
 import 'drizzle-orm/sqlite-core';
-import '@develit-io/backend-sdk';
-import 'drizzle-orm/d1';
 import 'drizzle-orm';
+import '@develit-io/backend-sdk';
+import 'drizzle-zod';
+import 'zod';
 import '@develit-io/general-codes';

package/dist/database/schema.d.ts

@@ -1,8 +1,7 @@
-export { aa as account, ab as accountCredentials, a6 as batch, a9 as ott, a7 as payment, a8 as paymentRelations } from '../shared/bank.XJJV8p4b.js';
-import 'zod';
-import 'drizzle-zod';
+export { as as account, at as accountCredentials, ao as batch, ar as ott, ap as payment, aq as paymentRelations } from '../shared/bank.CsJuzqZH.js';
 import 'drizzle-orm/sqlite-core';
-import '@develit-io/backend-sdk';
-import 'drizzle-orm/d1';
 import 'drizzle-orm';
+import '@develit-io/backend-sdk';
+import 'drizzle-zod';
+import 'zod';
 import '@develit-io/general-codes';

package/dist/database/schema.mjs

@@ -1,10 +1,10 @@
-export { t as account, u as accountCredentials, n as batch, r as ott, p as payment, q as paymentRelations } from '../shared/bank.BqGzJNC6.mjs';
+export { n as account, p as accountCredentials, q as batch, r as ott, s as payment, t as paymentRelations } from '../shared/bank.qc8ALZwm.mjs';
 import '@develit-io/backend-sdk';
+import 'drizzle-orm/relations';
 import 'drizzle-orm/sqlite-core';
 import 'date-fns';
-import 'drizzle-orm/relations';
 import '@develit-io/general-codes';
-import 'drizzle-orm';
 import 'jose';
+import 'drizzle-orm';
 import 'node:crypto';
 import 'drizzle-zod';

package/dist/export/worker.cjs

@@ -3,17 +3,18 @@
 const backendSdk = require('@develit-io/backend-sdk');
 const cloudflare_workers = require('cloudflare:workers');
 const d1 = require('drizzle-orm/d1');
-const drizzle = require('../shared/bank.CNEv3Rac.cjs');
+const drizzle = require('../shared/bank.DEvSNsEs.cjs');
+const mock_connector = require('../shared/bank.CfSZTfWS.cjs');
 const zod = require('zod');
-const database_schema = require('../shared/bank.CMbfx0u7.cjs');
+const payment_schema = require('../shared/bank.BeIpkWR-.cjs');
 const generalCodes = require('@develit-io/general-codes');
 require('date-fns');
-const drizzleOrm = require('drizzle-orm');
 require('jose');
+const drizzleOrm = require('drizzle-orm');
 require('node:crypto');
-const encryption = require('../shared/bank.CXpc8168.cjs');
-require('drizzle-orm/sqlite-core');
+require('../shared/bank.c38V_FCq.cjs');
 require('drizzle-orm/relations');
+require('drizzle-orm/sqlite-core');
 require('drizzle-zod');
 
 const upsertAccountCommand = (db, { account }) => {
@@ -65,7 +66,7 @@ const expireOneTimeTokenCommand = (db, {
 
 const createAccountCredentialsCommand = async (db, encryptionKey, { credentials }) => {
   const id = credentials.id || backendSdk.uuidv4();
-  const encryptedValue = await encryption.encrypt(credentials.value, encryptionKey);
+  const encryptedValue = await drizzle.encrypt(credentials.value, encryptionKey);
   const command = db.insert(drizzle.tables.accountCredentials).values({
     ...credentials,
     id,
@@ -236,8 +237,8 @@ const getOttQuery = async (db, { ott }) => {
   return await db.select().from(drizzle.tables.ott).where(drizzleOrm.eq(drizzle.tables.ott.oneTimeToken, ott)).get();
 };
 
-const seperateSupportedPayments = (mappedPayments, accounts) => {
-  const [supportedPayments, unsupportedPayments] = mappedPayments.reduce(
+const seperateSupportedPayments = (incomingPayments, accounts) => {
+  const [supportedPayments, unsupportedPayments] = incomingPayments.reduce(
     ([valid, invalid], payment) => {
       const isValid = accounts.some(
         (acc) => acc.iban === payment.debtorIban && acc.currency === payment.currency
@@ -261,10 +262,10 @@ const sendPaymentInputSchema = zod.z.object({
   correlationId: zod.z.string().min(1),
   refId: zod.z.string(),
   amount: zod.z.number().positive(),
-  paymentType: zod.z.enum(database_schema.PAYMENT_TYPES),
-  chargeBearer: zod.z.enum(database_schema.CHARGE_BEARERS).optional(),
+  paymentType: zod.z.enum(payment_schema.PAYMENT_TYPES),
+  chargeBearer: zod.z.enum(payment_schema.CHARGE_BEARERS).optional(),
   executionDate: zod.z.string().optional(),
-  instructionPriority: zod.z.enum(database_schema.INSTRUCTION_PRIORITIES).optional(),
+  instructionPriority: zod.z.enum(payment_schema.INSTRUCTION_PRIORITIES).optional(),
   currency: zod.z.enum(generalCodes.CURRENCY_CODES),
   vs: zod.z.string().optional(),
   ss: zod.z.string().optional(),
@@ -272,11 +273,12 @@ const sendPaymentInputSchema = zod.z.object({
   message: zod.z.string().optional(),
   creditor: backendSdk.bankAccountMetadataSchema,
   debtor: backendSdk.bankAccountMetadataSchema,
-  purpose: zod.z.string().optional()
+  purpose: zod.z.string().optional(),
+  sendAsSinglePayment: zod.z.boolean().optional()
 });
 
 const getAuthUriInputSchema = zod.z.object({
-  connectorKey: zod.z.enum(database_schema.CONNECTOR_KEYS)
+  connectorKey: zod.z.enum(payment_schema.CONNECTOR_KEYS)
 });
 
 const authorizeAccountInputSchema = zod.z.object({
@@ -296,7 +298,7 @@ const simulateDepositInputSchema = zod.z.object({
   message: zod.z.string(),
   creditor: backendSdk.bankAccountMetadataSchema,
   debtor: backendSdk.bankAccountMetadataSchema,
-  connectorKey: zod.z.enum(database_schema.CONNECTOR_KEYS)
+  connectorKey: zod.z.enum(payment_schema.CONNECTOR_KEYS)
 });
 
 const ALLOWED_BATCH_FILTERS = {
@@ -311,7 +313,7 @@ const getBatchesInputSchema = zod.z.object({
     direction: zod.z.enum(["asc", "desc"])
   }),
   [ALLOWED_BATCH_FILTERS.ACCOUNT_ID]: zod.z.union([zod.z.uuid(), zod.z.uuid().array()]).optional(),
-  [ALLOWED_BATCH_FILTERS.STATUS]: zod.z.union([zod.z.enum(database_schema.BATCH_STATUSES), zod.z.enum(database_schema.BATCH_STATUSES).array()]).optional()
+  [ALLOWED_BATCH_FILTERS.STATUS]: zod.z.union([zod.z.enum(payment_schema.BATCH_STATUSES), zod.z.enum(payment_schema.BATCH_STATUSES).array()]).optional()
 });
 
 const processBatchInputSchema = zod.z.object({
@@ -366,10 +368,10 @@ const getPaymentsInputSchema = zod.z.object({
   [ALLOWED_PAYMENT_FILTERS.ACCOUNT_ID]: zod.z.union([zod.z.uuid(), zod.z.uuid().array()]).optional(),
   [ALLOWED_PAYMENT_FILTERS.AMOUNT]: zod.z.union([zod.z.number(), zod.z.number().array()]).optional(),
   [ALLOWED_PAYMENT_FILTERS.CURRENCY]: zod.z.union([zod.z.enum(generalCodes.CURRENCY_CODES), zod.z.enum(generalCodes.CURRENCY_CODES).array()]).optional(),
-  [ALLOWED_PAYMENT_FILTERS.DIRECTION]: zod.z.union([zod.z.enum(database_schema.PAYMENT_DIRECTIONS), zod.z.enum(database_schema.PAYMENT_DIRECTIONS).array()]).optional(),
+  [ALLOWED_PAYMENT_FILTERS.DIRECTION]: zod.z.union([zod.z.enum(payment_schema.PAYMENT_DIRECTIONS), zod.z.enum(payment_schema.PAYMENT_DIRECTIONS).array()]).optional(),
   [ALLOWED_PAYMENT_FILTERS.FROM]: zod.z.date().optional(),
   [ALLOWED_PAYMENT_FILTERS.TO]: zod.z.date().optional(),
-  [ALLOWED_PAYMENT_FILTERS.STATUS]: zod.z.union([zod.z.enum(database_schema.PAYMENT_STATUSES), zod.z.enum(database_schema.PAYMENT_STATUSES).array()]).optional()
+  [ALLOWED_PAYMENT_FILTERS.STATUS]: zod.z.union([zod.z.enum(payment_schema.PAYMENT_STATUSES), zod.z.enum(payment_schema.PAYMENT_STATUSES).array()]).optional()
 });
 
 const syncAccountInputSchema = zod.z.object({
@@ -404,7 +406,7 @@ zod.z.object({
 });
 
 const updateAccountInputSchema = zod.z.object({
-  account: database_schema.accountInsertSchema
+  account: payment_schema.accountInsertSchema
 });
 
 const getBankAccountsInputSchema = zod.z.object({
@@ -453,14 +455,14 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
     }
     let connectedAccounts = [];
     if (!skipAccounts) {
-      const encryptionKey = await encryption.importAesKey(this.env.ENCRYPTION_KEY);
+      const encryptionKey = await drizzle.importAesKey(this.env.ENCRYPTION_KEY);
       const accounts = await this._getConnectedAccounts();
       const accountsForConnector = accounts.filter(
         (acc) => acc.connectorKey === connectorKey
       );
       connectedAccounts = await Promise.all(
         accountsForConnector.map(async (acc) => {
-          const credentials = await encryption.getCredentialsByAccountId(
+          const credentials = await drizzle.getCredentialsByAccountId(
             this.db,
             encryptionKey,
             {
@@ -484,7 +486,7 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
         })
       );
     }
-    const connector = encryption.initiateConnector({
+    const connector = mock_connector.initiateConnector({
       bank: connectorKey,
       connectedAccounts,
       env: this.env
@@ -584,7 +586,7 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
     });
     let statusChanged = false;
     if (previousStatus !== currentStatus || !batch.statusResponse) {
-      await encryption.upsertBatchCommand(this.db, {
+      await drizzle.upsertBatchCommand(this.db, {
         batch: {
           ...batch,
           status: currentStatus,
@@ -608,7 +610,7 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
       async (validatedInput) => {
         let pendingBatches;
         if (validatedInput?.batchId) {
-          const batch = await encryption.getBatchByIdQuery(this.db, {
+          const batch = await drizzle.getBatchByIdQuery(this.db, {
             batchId: validatedInput.batchId
           });
           if (!batch) {
@@ -631,7 +633,7 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
             this.logError({
               message: `Account not found for batch ${batch.id}, skipping`
             });
-            await encryption.upsertBatchCommand(this.db, {
+            await drizzle.upsertBatchCommand(this.db, {
               batch: {
                 ...batch,
                 status: "FAILED",
@@ -675,32 +677,9 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
   }) {
     return this.handleAction(null, {}, async () => {
       this.logInput({ paymentsToBatch });
-      const mappedPayments = paymentsToBatch.map(
-        (payment) => {
-          return {
-            id: backendSdk.uuidv4(),
-            correlationId: payment.correlationId,
-            refId: payment.refId,
-            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,
-            creditor: payment.creditor,
-            creditorIban: payment.creditor.iban || null,
-            debtor: payment.debtor,
-            debtorIban: payment.debtor.iban || null
-          };
-        }
-      );
+      const incomingPayments = paymentsToBatch.map(mock_connector.toIncomingPayment);
       const accounts = await this._getAccounts();
-      const { supportedPayments, unsupportedPayments } = seperateSupportedPayments(mappedPayments, accounts);
+      const { supportedPayments, unsupportedPayments } = seperateSupportedPayments(incomingPayments, accounts);
       if (unsupportedPayments.length > 0) {
         this.logError({ unsupportedPayments });
         await this.pushToQueue(
@@ -722,45 +701,72 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
         );
       }
       for (const acc of accounts) {
-        const newPayments = supportedPayments.filter(
+        const accountAssignedPayments = supportedPayments.filter(
           (payment) => payment.debtorIban === acc.iban && payment.currency === acc.currency
-        ).map((payment) => ({
-          ...payment,
-          connectorKey: acc.connectorKey,
-          accountId: acc.id
-        }));
-        if (newPayments.length === 0) {
+        ).map((payment) => mock_connector.assignAccount(payment, acc));
+        if (accountAssignedPayments.length === 0) {
           continue;
         }
         this.log({
-          message: `\u{1F4B0} Processing ${newPayments.length} payments for account (${acc.iban}, ${acc.currency})`
-        });
-        const openBatches = await getAccountOpenBatchesQuery(this.db, {
-          accountId: acc.id
+          message: `\u{1F4B0} Processing ${accountAssignedPayments.length} payments for account (${acc.iban}, ${acc.currency})`
         });
-        const availableBatch = openBatches.find(
-          (batch) => batch.payments.length < acc.batchSizeLimit
+        const singlePayments = accountAssignedPayments.filter(
+          (p) => p.sendAsSinglePayment === true
         );
-        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 } = encryption.upsertBatchCommand(this.db, {
-          batch: availableBatch ? {
-            ...availableBatch,
-            payments: [...availableBatch.payments, ...newPayments]
-          } : {
-            id: backendSdk.uuidv4(),
-            authorizationUrls: [],
-            accountId: acc.id,
-            payments: newPayments,
-            status: "OPEN"
-          }
-        });
-        const upsertedBatch = await command.execute();
-        this.log({
-          message: `\u2705 Batch upserted successfully for account ${acc.id}`
-        });
-        return upsertedBatch;
+        const regularPayments = accountAssignedPayments.filter(
+          (p) => p.sendAsSinglePayment !== true
+        );
+        for (const singlePayment of singlePayments) {
+          const batchedPayment = mock_connector.toBatchedPayment(singlePayment);
+          const { command } = drizzle.upsertBatchCommand(this.db, {
+            batch: {
+              id: backendSdk.uuidv4(),
+              authorizationUrls: [],
+              accountId: acc.id,
+              payments: [batchedPayment],
+              status: "OPEN",
+              metadata: {
+                sizeLimit: 1
+              }
+            }
+          });
+          await command.execute();
+          this.log({
+            message: `\u2728 Created single payment batch for account ${acc.id}`
+          });
+        }
+        if (regularPayments.length > 0) {
+          const openBatches = await getAccountOpenBatchesQuery(this.db, {
+            accountId: acc.id
+          });
+          const availableBatch = openBatches.find(
+            (batch) => batch.payments.length < (batch.metadata?.sizeLimit ?? acc.batchSizeLimit)
+          );
+          this.log({
+            message: availableBatch ? `\u{1F504} Found existing OPEN batch for account ${acc.id}, merging ${availableBatch.payments.length} existing + ${regularPayments.length} new payments` : `\u2728 Creating new batch for account ${acc.id} with ${regularPayments.length} payments`
+          });
+          const batchedPayments = regularPayments.map(mock_connector.toBatchedPayment);
+          const { command } = drizzle.upsertBatchCommand(this.db, {
+            batch: availableBatch ? {
+              ...availableBatch,
+              payments: [...availableBatch.payments, ...batchedPayments]
+            } : {
+              id: backendSdk.uuidv4(),
+              authorizationUrls: [],
+              accountId: acc.id,
+              payments: batchedPayments,
+              status: "OPEN",
+              metadata: {
+                sizeLimit: acc.batchSizeLimit
+              }
+            }
+          });
+          const upsertedBatch = await command.execute();
+          this.log({
+            message: `\u2705 Batch upserted successfully for account ${acc.id}`
+          });
+          return upsertedBatch;
+        }
       }
     });
   }
@@ -900,7 +906,7 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
             accountId: acc.id
           }).command
         );
-        const encryptionKey = await encryption.importAesKey(this.env.ENCRYPTION_KEY);
+        const encryptionKey = await drizzle.importAesKey(this.env.ENCRYPTION_KEY);
         const createAccountCredentials = (await Promise.all(
           credentials.map(
             async (cr) => createAccountCredentialsCommand(this.db, encryptionKey, {
@@ -990,7 +996,7 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
           debtor,
           debtorIban: debtor.iban
         };
-        const { command } = encryption.createPaymentCommand(this.db, { payment });
+        const { command } = drizzle.createPaymentCommand(this.db, { payment });
         const createdPayment = await command.execute().then(backendSdk.first);
         this.logQueuePush({ payment, isPaymentExecuted: true });
         await this.pushToQueue(this.env.QUEUE_BUS_QUEUE, {
@@ -1089,7 +1095,7 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
       { data: input, schema: disconnectAccountInputSchema },
       { successMessage: "Account disconnected successfully" },
       async ({ accountId }) => {
-        const account = await encryption.getAccountByIdQuery(this.db, { accountId });
+        const account = await drizzle.getAccountByIdQuery(this.db, { accountId });
         if (!account) {
           throw backendSdk.createInternalError(null, {
             message: "Account not found",