@develit-services/bank 0.2.3 → 0.3.0

package/dist/database/schema.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const database_schema = require('../shared/bank.AJrHfGNj.cjs');
+const database_schema = require('../shared/bank.CpcK1Dse.cjs');
 require('@develit-io/backend-sdk');
 require('drizzle-orm/sqlite-core');
 require('date-fns');
@@ -9,6 +9,7 @@ require('jose');
 require('@develit-io/general-codes');
 require('drizzle-zod');
 require('drizzle-orm/relations');
+require('node:crypto');
 
 
 

package/dist/database/schema.d.cts

@@ -1,4 +1,4 @@
-export { a9 as account, aa as accountCredentials, a5 as batch, a8 as ott, a6 as payment, a7 as paymentRelations } from '../shared/bank.eVSSL0hq.cjs';
+export { a9 as account, aa as accountCredentials, a5 as batch, a8 as ott, a6 as payment, a7 as paymentRelations } from '../shared/bank.xrXNjWCo.cjs';
 import 'zod';
 import 'drizzle-zod';
 import 'drizzle-orm/sqlite-core';

package/dist/database/schema.d.mts

@@ -1,4 +1,4 @@
-export { a9 as account, aa as accountCredentials, a5 as batch, a8 as ott, a6 as payment, a7 as paymentRelations } from '../shared/bank.eVSSL0hq.mjs';
+export { a9 as account, aa as accountCredentials, a5 as batch, a8 as ott, a6 as payment, a7 as paymentRelations } from '../shared/bank.xrXNjWCo.mjs';
 import 'zod';
 import 'drizzle-zod';
 import 'drizzle-orm/sqlite-core';

package/dist/database/schema.d.ts

@@ -1,4 +1,4 @@
-export { a9 as account, aa as accountCredentials, a5 as batch, a8 as ott, a6 as payment, a7 as paymentRelations } from '../shared/bank.eVSSL0hq.js';
+export { a9 as account, aa as accountCredentials, a5 as batch, a8 as ott, a6 as payment, a7 as paymentRelations } from '../shared/bank.xrXNjWCo.js';
 import 'zod';
 import 'drizzle-zod';
 import 'drizzle-orm/sqlite-core';

package/dist/database/schema.mjs

@@ -1,4 +1,4 @@
-export { y as account, z as accountCredentials, r as batch, x as ott, v as payment, w as paymentRelations } from '../shared/bank.CsAnzmYN.mjs';
+export { y as account, z as accountCredentials, r as batch, x as ott, v as payment, w as paymentRelations } from '../shared/bank.lZMrqjVR.mjs';
 import '@develit-io/backend-sdk';
 import 'drizzle-orm/sqlite-core';
 import 'date-fns';
@@ -7,3 +7,4 @@ import 'jose';
 import '@develit-io/general-codes';
 import 'drizzle-zod';
 import 'drizzle-orm/relations';
+import 'node:crypto';

package/dist/export/worker.cjs

@@ -3,17 +3,19 @@
 const backendSdk = require('@develit-io/backend-sdk');
 const cloudflare_workers = require('cloudflare:workers');
 const d1 = require('drizzle-orm/d1');
-const database_schema = require('../shared/bank.AJrHfGNj.cjs');
+const database_schema = require('../shared/bank.CpcK1Dse.cjs');
 require('jose');
 const generalCodes = require('@develit-io/general-codes');
 const zod = require('zod');
-const bank = require('../shared/bank.B8vgpVU6.cjs');
+const processBatch_workflow = require('../shared/bank.CIJDq7GL.cjs');
 const drizzleOrm = require('drizzle-orm');
 require('drizzle-orm/sqlite-core');
 require('date-fns');
 require('drizzle-zod');
 require('drizzle-orm/relations');
-require('../shared/bank.Bz_9Rd77.cjs');
+require('node:crypto');
+require('cloudflare:workflows');
+require('../shared/bank.BGuS_o9V.cjs');
 
 const upsertAccountCommand = (db, { account }) => {
   const id = account.id || backendSdk.uuidv4();
@@ -29,29 +31,6 @@ const upsertAccountCommand = (db, { account }) => {
   };
 };
 
-const updatePaymentCommand = (db, { payment }) => {
-  return {
-    command: db.update(database_schema.tables.payment).set(payment).where(drizzleOrm.eq(database_schema.tables.payment.id, payment.id)).returning()
-  };
-};
-
-const upsertBatchCommand = (db, { batch }) => {
-  const id = batch.id || backendSdk.uuidv4();
-  const command = db.insert(database_schema.tables.batch).values({
-    ...batch,
-    id
-  }).onConflictDoUpdate({
-    target: database_schema.tables.batch.id,
-    set: {
-      ...batch
-    }
-  }).returning();
-  return {
-    id,
-    command
-  };
-};
-
 const createOneTimeTokenCommand = (db, {
   ott,
   refId,
@@ -69,6 +48,12 @@ const createOneTimeTokenCommand = (db, {
   return { id, command };
 };
 
+const updateAccountCommand = (db, { account }) => {
+  return {
+    command: db.update(database_schema.tables.account).set({ ...account }).where(drizzleOrm.eq(database_schema.tables.account.id, account.id)).returning()
+  };
+};
+
 const expireOneTimeTokenCommand = (db, {
   ott
 }) => {
@@ -79,9 +64,14 @@ const expireOneTimeTokenCommand = (db, {
   };
 };
 
-const createAccountCredentialsCommand = (db, { credentials }) => {
+const createAccountCredentialsCommand = async (db, encryptionKey, { credentials }) => {
   const id = credentials.id || backendSdk.uuidv4();
-  const command = db.insert(database_schema.tables.accountCredentials).values({ ...credentials, id }).returning();
+  const encryptedValue = await processBatch_workflow.encrypt(credentials.value, encryptionKey);
+  const command = db.insert(database_schema.tables.accountCredentials).values({
+    ...credentials,
+    id,
+    value: encryptedValue
+  }).returning();
   return {
     id,
     command
@@ -95,6 +85,15 @@ const deleteAccountCredentialsCommand = (db, { accountId }) => {
   };
 };
 
+const deletePaymentsByAccountCommand = (db, { accountId }) => {
+  const command = db.update(database_schema.tables.payment).set({
+    deletedAt: /* @__PURE__ */ new Date()
+  }).where(drizzleOrm.eq(database_schema.tables.payment.accountId, accountId));
+  return {
+    command
+  };
+};
+
 const getAccountByIbanQuery = async (db, { iban }) => {
   return await db.select().from(database_schema.tables.account).where(drizzleOrm.eq(database_schema.tables.account.iban, iban)).get();
 };
@@ -113,13 +112,7 @@ const getAllAccountsQuery = async (db) => {
 };
 
 const getAllPendingBatchesQuery = (db) => {
-  return db.select().from(database_schema.tables.batch).where(
-    drizzleOrm.inArray(database_schema.tables.batch.status, [
-      "PROCESSING",
-      "READY_TO_SIGN",
-      "WAITING_FOR_PROCESSING"
-    ])
-  );
+  return db.select().from(database_schema.tables.batch).where(drizzleOrm.inArray(database_schema.tables.batch.status, ["READY_TO_SIGN"]));
 };
 
 const buildMultiFilterConditions = (column, value) => {
@@ -149,6 +142,7 @@ const getPaymentsWithPaginationQuery = async (db, {
   limit,
   page,
   sort,
+  ids,
   filterPaymentAccountId,
   filterPaymentAmount,
   filterPaymentCurrency,
@@ -173,7 +167,8 @@ const getPaymentsWithPaginationQuery = async (db, {
     buildMultiFilterConditions(
       database_schema.tables.payment.direction,
       filterPaymentyDirection
-    )
+    ),
+    buildMultiFilterConditions(database_schema.tables.payment.id, ids)
   );
   const sortColumn = resolveColumn(database_schema.tables.payment, sort.column);
   const [{ totalCount }] = await db.select({
@@ -221,11 +216,6 @@ const getOttQuery = async (db, { ott }) => {
   return await db.select().from(database_schema.tables.ott).where(drizzleOrm.eq(database_schema.tables.ott.oneTimeToken, ott)).get();
 };
 
-const getPaymentByRefIdQuery = async (db, { refId }) => {
-  const payment = await db.select().from(database_schema.tables.payment).where(drizzleOrm.eq(database_schema.tables.payment.refId, refId)).limit(1).get();
-  return payment;
-};
-
 const seperateSupportedPayments = (mappedPayments, accounts) => {
   const [supportedPayments, unsupportedPayments] = mappedPayments.reduce(
     ([valid, invalid], payment) => {
@@ -302,8 +292,43 @@ const getBatchesInputSchema = zod.z.object({
 });
 
 const processBatchInputSchema = zod.z.object({
-  connectorKey: zod.z.enum(database_schema.CONNECTOR_KEYS),
-  batch: zod.z.custom()
+  batchId: zod.z.uuid()
+});
+zod.z.object({
+  instanceId: zod.z.string(),
+  details: backendSdk.workflowInstanceStatusSchema
+});
+
+const processBatchStatusInputSchema = zod.z.object({
+  batchId: zod.z.uuid()
+});
+zod.z.object({
+  instanceId: zod.z.string(),
+  details: backendSdk.workflowInstanceStatusSchema
+});
+
+const processBatchRestartInputSchema = zod.z.object({
+  batchId: zod.z.uuid()
+});
+zod.z.object({
+  instanceId: zod.z.string(),
+  details: backendSdk.workflowInstanceStatusSchema
+});
+
+const batchAuthorizedEventPayloadSchema = zod.z.object({
+  authorized: zod.z.boolean()
+});
+const processBatchEventInputSchema = zod.z.discriminatedUnion("eventType", [
+  zod.z.object({
+    batchId: zod.z.uuid(),
+    eventType: zod.z.literal(processBatch_workflow.PROCESS_BATCH_WORKFLOW_EVENTS.batchAuthorized),
+    payload: batchAuthorizedEventPayloadSchema
+  })
+  // Future event types can be added here as new objects in the array
+]);
+zod.z.object({
+  success: zod.z.boolean(),
+  message: zod.z.string()
 });
 
 const ALLOWED_PAYMENT_FILTERS = {
@@ -322,6 +347,7 @@ const getPaymentsInputSchema = zod.z.object({
     column: zod.z.enum(["createdAt", "updatedAt", "amount"]),
     direction: zod.z.enum(["asc", "desc"])
   }),
+  ids: zod.z.array(zod.z.uuid()).optional(),
   [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(),
@@ -366,6 +392,10 @@ const updateAccountInputSchema = zod.z.object({
   account: database_schema.accountInsertSchema
 });
 
+const disconnectAccountInputSchema = zod.z.object({
+  accountId: zod.z.uuid()
+});
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -399,11 +429,16 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
     const accountsForConnector = accounts.filter(
       (acc) => acc.connectorKey === connectorKey
     );
+    const encryptionKey = await processBatch_workflow.importAesKey(this.env.ENCRYPTION_KEY);
     const accountsWithCredentials = await Promise.all(
       accountsForConnector.map(async (acc) => {
-        const credentials = await bank.getCredentialsByAccountId(this.db, {
-          accountId: acc.id
-        });
+        const credentials = await processBatch_workflow.getCredentialsByAccountId(
+          this.db,
+          encryptionKey,
+          {
+            accountId: acc.id
+          }
+        );
         if (!credentials) {
           throw backendSdk.createInternalError(null, {
             message: `No credentials found for account ${acc.id}`
@@ -418,7 +453,7 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
         };
       })
     );
-    this.bankConnector = bank.initiateConnector({
+    this.bankConnector = processBatch_workflow.initiateConnector({
       bank: connectorKey,
       connectedAccounts: accountsWithCredentials,
       env: this.env
@@ -552,18 +587,34 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
       finalBatches.push(...updatedBatches);
     }
     const updateBatchesCommands = finalBatches.map((batch) => {
-      const { command } = upsertBatchCommand(this.db, {
+      const { command } = processBatch_workflow.upsertBatchCommand(this.db, {
         batch: {
           ...batch
         }
       });
       return command;
     });
-    console.log("Updated batches", finalBatches);
     await this.db.batch([
       updateBatchesCommands[0],
       ...updateBatchesCommands.slice(1)
     ]);
+    for (const batch of finalBatches) {
+      try {
+        const instance = await this.env.PROCESS_BATCH_WORKFLOW.get(batch.id);
+        if (batch.status === "SIGNED" || batch.status === "SIGNATURE_FAILED") {
+          instance.sendEvent({
+            type: processBatch_workflow.PROCESS_BATCH_WORKFLOW_EVENTS.batchAuthorized,
+            payload: {
+              authorized: batch.status === "SIGNED"
+            }
+          });
+        }
+      } catch (_) {
+        console.log(
+          `No workflow instance found for batch ${batch.id}, skipping.`
+        );
+      }
+    }
     console.log("Batch update completed");
   }
   async addPaymentsToBatch({
@@ -642,7 +693,7 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
         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, {
+        const { command } = processBatch_workflow.upsertBatchCommand(this.db, {
           batch: availableBatch ? {
             ...availableBatch,
             payments: [...availableBatch.payments, ...newPayments]
@@ -665,122 +716,62 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
   async processBatch(input) {
     return this.handleAction(
       { data: input, schema: processBatchInputSchema },
-      {},
-      async ({ batch, connectorKey }) => {
-        await upsertBatchCommand(this.db, {
-          batch: {
-            ...batch,
-            status: "PROCESSING"
+      { successMessage: "Batch processing workflow started" },
+      async ({ batchId }) => {
+        const instance = await this.env.PROCESS_BATCH_WORKFLOW.create({
+          id: batchId,
+          params: {
+            batchId
           }
-        }).command.execute();
-        await this._initiateBankConnector({ connectorKey });
-        if (!this.bankConnector) {
-          await upsertBatchCommand(this.db, {
-            batch: {
-              ...batch,
-              status: "FAILED"
-            }
-          }).command.execute();
-          throw backendSdk.createInternalError(null, {
-            message: `\u274C Failed to initialize ${connectorKey} bank connector`
-          });
-        }
-        this.log({
-          message: `\u2705 Bank connector initialized successfully for account ${connectorKey}`
         });
-        const preparedBatch = {
-          retriedPayments: [],
-          newlyPreparedPayments: [],
-          failedPayments: []
+        return {
+          instanceId: instance.id,
+          details: await instance.status()
         };
-        for (const payment of batch.payments) {
-          const existingPayment = await getPaymentByRefIdQuery(this.db, {
-            refId: payment.refId
-          });
-          if (existingPayment) {
-            preparedBatch.retriedPayments.push({
-              ...existingPayment,
-              status: "PREPARED"
-            });
-            this.log({
-              message: `\u2705 Payment ${existingPayment.id} already exists`
-            });
-            continue;
-          }
-          const newlyPreparedPayment = await this.bankConnector.preparePayment(payment);
-          if (!newlyPreparedPayment) {
-            preparedBatch.failedPayments.push({ ...payment, status: "FAILED" });
-            continue;
-          }
-          preparedBatch.newlyPreparedPayments.push(newlyPreparedPayment);
-        }
-        await Promise.all([
-          [
-            ...preparedBatch.failedPayments,
-            ...preparedBatch.newlyPreparedPayments
-          ].map(
-            (p) => bank.createPaymentCommand(this.db, { payment: p }).command.execute()
-          )
-        ]);
-        await upsertBatchCommand(this.db, {
-          batch: {
-            ...batch,
-            status: "PREPARED"
-          }
-        }).command.execute();
-        const { authorizationUrls, payments, metadata } = await this.bankConnector.initiateBatchFromPayments({
-          payments: [
-            ...preparedBatch.newlyPreparedPayments,
-            ...preparedBatch.retriedPayments
-          ]
-        });
-        console.log(authorizationUrls, "AUTH URIS FROM BANK");
-        if (!authorizationUrls.length) {
-          this.logError({ message: "Failed to retrieve signing URI" });
-          await upsertBatchCommand(this.db, {
-            batch: {
-              ...batch,
-              status: "FAILED"
-            }
-          }).command.execute();
-          return;
-        }
-        const { command: upsertBatch } = upsertBatchCommand(this.db, {
-          batch: {
-            ...batch,
-            payments,
-            metadata,
-            status: "READY_TO_SIGN",
-            authorizationUrls,
-            batchPaymentInitiatedAt: /* @__PURE__ */ new Date()
-          }
-        });
-        const updatePayments = payments.map(
-          (payment) => updatePaymentCommand(this.db, {
-            payment: { ...payment, status: "INITIALIZED" }
-          }).command
-        );
-        await this.db.batch([upsertBatch, ...updatePayments]);
-        this.log({
-          message: "Authorization Urls for batch to create",
-          authorizationUrl: authorizationUrls[0]
-        });
-        await this.pushToQueue(this.env.NOTIFICATIONS_QUEUE, {
-          type: "email",
-          payload: {
-            email: {
-              to: [this.env.BANK_AUTH_RECIPIENT],
-              subject: "Payment Authorization",
-              text: authorizationUrls[0] || "No Authorization Url"
-            }
-          },
-          metadata: {
-            initiator: {
-              service: this.name
-            }
-          }
+      }
+    );
+  }
+  async processBatchStatus(input) {
+    return this.handleAction(
+      { data: input, schema: processBatchStatusInputSchema },
+      { successMessage: "Batch processing workflow status retrieved" },
+      async ({ batchId }) => {
+        const instance = await this.env.PROCESS_BATCH_WORKFLOW.get(batchId);
+        return {
+          instanceId: instance.id,
+          details: await instance.status()
+        };
+      }
+    );
+  }
+  async processBatchRestart(input) {
+    return this.handleAction(
+      { data: input, schema: processBatchRestartInputSchema },
+      { successMessage: "Batch processing workflow restarted" },
+      async ({ batchId }) => {
+        const instance = await this.env.PROCESS_BATCH_WORKFLOW.get(batchId);
+        await instance.restart();
+        return {
+          instanceId: instance.id,
+          details: await instance.status()
+        };
+      }
+    );
+  }
+  async processBatchEvent(input) {
+    return this.handleAction(
+      { data: input, schema: processBatchEventInputSchema },
+      { successMessage: "Event sent to batch processing workflow" },
+      async ({ batchId, eventType, payload }) => {
+        const instance = await this.env.PROCESS_BATCH_WORKFLOW.get(batchId);
+        await instance.sendEvent({
+          type: eventType,
+          payload
         });
-        this.logOutput({ message: "Batch successfully processed" });
+        return {
+          success: true,
+          message: `Event '${eventType}' sent to workflow instance ${batchId}`
+        };
       }
     );
   }
@@ -860,11 +851,14 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
             accountId: acc.id
           }).command
         );
-        const createAccountCredentials = credentials.map(
-          (cr) => createAccountCredentialsCommand(this.db, {
-            credentials: cr
-          }).command
-        );
+        const encryptionKey = await processBatch_workflow.importAesKey(this.env.ENCRYPTION_KEY);
+        const createAccountCredentials = (await Promise.all(
+          credentials.map(
+            async (cr) => createAccountCredentialsCommand(this.db, encryptionKey, {
+              credentials: cr
+            })
+          )
+        )).map((cmd) => cmd.command);
         const { command: updateOtt } = expireOneTimeTokenCommand(this.db, {
           ott
         });
@@ -934,7 +928,7 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
           debtor,
           debtorIban: debtor.iban
         };
-        const { command } = bank.createPaymentCommand(this.db, { payment });
+        const { command } = processBatch_workflow.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, {
@@ -1016,6 +1010,64 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
       }
     );
   }
+  async disconnectAccount(input) {
+    return this.handleAction(
+      { data: input, schema: disconnectAccountInputSchema },
+      { successMessage: "Account disconnected successfully" },
+      async ({ accountId }) => {
+        const account = await processBatch_workflow.getAccountByIdQuery(this.db, { accountId });
+        if (!account) {
+          throw backendSdk.createInternalError(null, {
+            message: "Account not found",
+            code: "ACCOUNT_NOT_FOUND",
+            status: 404
+          });
+        }
+        try {
+          const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(accountId);
+          await instance.terminate();
+        } catch (error) {
+          this.log({
+            message: "No workflow instance found for account, skipping termination.",
+            error
+          });
+        }
+        const { command: updateAccount } = updateAccountCommand(this.db, {
+          account: {
+            ...account,
+            id: accountId,
+            status: "DISABLED"
+          }
+        });
+        const { command: deleteCredentials } = deleteAccountCredentialsCommand(
+          this.db,
+          {
+            accountId
+          }
+        );
+        const { command: deletePayments } = deletePaymentsByAccountCommand(
+          this.db,
+          {
+            accountId
+          }
+        );
+        const [updatedAccountResult] = await this.db.batch([
+          updateAccount,
+          deleteCredentials,
+          deletePayments
+        ]);
+        const updatedAccount = backendSdk.first(updatedAccountResult);
+        if (!updatedAccount) {
+          throw backendSdk.createInternalError(null, {
+            message: "Account not updated",
+            code: "DB-B-0?",
+            status: 404
+          });
+        }
+        return updatedAccount;
+      }
+    );
+  }
   async getBatches(input) {
     return this.handleAction(
       { data: input, schema: getBatchesInputSchema },
@@ -1068,6 +1120,9 @@ __decorateClass([
 __decorateClass([
   backendSdk.action("update-account")
 ], BankServiceBase.prototype, "updateAccount", 1);
+__decorateClass([
+  backendSdk.action("disconnectAccount")
+], BankServiceBase.prototype, "disconnectAccount", 1);
 __decorateClass([
   backendSdk.action("getBatches")
 ], BankServiceBase.prototype, "getBatches", 1);