@develit-services/bank 0.3.47 → 0.3.49

package/dist/export/worker.cjs

@@ -93,6 +93,27 @@ const deletePaymentsByAccountCommand = (db, { accountId }) => {
   };
 };
 
+const getAccountBatchCountsQuery = async (db, { accountId }) => {
+  const result = await db.select({
+    totalCount: drizzleOrm.sql`COUNT(*)`.as("totalCount"),
+    openCount: drizzleOrm.sql`SUM(CASE WHEN ${drizzle.tables.batch.status} = 'OPEN' THEN 1 ELSE 0 END)`.as(
+      "openCount"
+    ),
+    readyToSignCount: drizzleOrm.sql`SUM(CASE WHEN ${drizzle.tables.batch.status} = 'READY_TO_SIGN' THEN 1 ELSE 0 END)`.as(
+      "readyToSignCount"
+    ),
+    failedCount: drizzleOrm.sql`SUM(CASE WHEN ${drizzle.tables.batch.status} = 'FAILED' THEN 1 ELSE 0 END)`.as(
+      "failedCount"
+    )
+  }).from(drizzle.tables.batch).where(drizzleOrm.eq(drizzle.tables.batch.accountId, accountId)).then(backendSdk.first);
+  return result || {
+    totalCount: 0,
+    openCount: 0,
+    readyToSignCount: 0,
+    failedCount: 0
+  };
+};
+
 const getAccountByIbanQuery = async (db, { iban }) => {
   return await db.select().from(drizzle.tables.account).where(drizzleOrm.eq(drizzle.tables.account.iban, iban)).get();
 };
@@ -385,6 +406,13 @@ const updateAccountInputSchema = zod.z.object({
   account: database_schema.accountInsertSchema
 });
 
+const getBankAccountsInputSchema = zod.z.object({
+  includes: zod.z.object({
+    workflow: zod.z.boolean().optional(),
+    batchCounts: zod.z.boolean().optional()
+  }).optional()
+});
+
 const disconnectAccountInputSchema = zod.z.object({
   accountId: zod.z.uuid()
 });
@@ -981,32 +1009,45 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
       }
     );
   }
-  async getBankAccounts() {
+  async getBankAccounts(input) {
     return this.handleAction(
-      null,
+      { data: input, schema: getBankAccountsInputSchema },
       { successMessage: "Bank accounts retrieved successfully" },
-      async () => {
+      async ({ includes }) => {
         const accounts = await this._getAccounts();
-        const accountsWithWorkflows = await Promise.all(
+        const includeWorkflow = includes?.workflow ?? true;
+        const includeBatchCounts = includes?.batchCounts ?? false;
+        const accountsWithOptionalFields = await Promise.all(
           accounts.map(async (a) => {
-            let status;
-            try {
-              const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(a.id);
-              status = await instance.status();
-            } catch (_) {
-              status = null;
-            }
-            return {
+            const result = {
               ...a,
-              workflow: status ? {
+              workflow: null,
+              batches: null
+            };
+            if (includeWorkflow) {
+              let status;
+              try {
+                const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(a.id);
+                status = await instance.status();
+              } catch (_) {
+                status = null;
+              }
+              result.workflow = status ? {
                 instanceId: a.id,
                 details: status
-              } : null
-            };
+              } : null;
+            }
+            if (includeBatchCounts) {
+              const batchCounts = await getAccountBatchCountsQuery(this.db, {
+                accountId: a.id
+              });
+              result.batches = batchCounts;
+            }
+            return result;
           })
         );
         return {
-          accounts: accountsWithWorkflows,
+          accounts: accountsWithOptionalFields,
           totalCount: accounts.length
         };
       }

package/dist/export/worker.d.cts

@@ -2394,14 +2394,29 @@ declare const updateAccountInputSchema: z.ZodObject<{
 type UpdateAccountInput = z.infer<typeof updateAccountInputSchema>;
 type UpdateAccountOutput = AccountSelectType;
 
-type AccountWithWorkflow = AccountSelectType & {
-    workflow: {
-        instanceId: string;
-        details: WorkflowInstanceStatus;
-    } | null;
+declare const getBankAccountsInputSchema: z.ZodObject<{
+    includes: z.ZodOptional<z.ZodObject<{
+        workflow: z.ZodOptional<z.ZodBoolean>;
+        batchCounts: z.ZodOptional<z.ZodBoolean>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
+type GetBankAccountsInput = z.infer<typeof getBankAccountsInputSchema>;
+type WorkflowInfo = {
+    instanceId: string;
+    details: WorkflowInstanceStatus;
+} | null;
+type BatchCounts = {
+    totalCount: number;
+    openCount: number;
+    readyToSignCount: number;
+    failedCount: number;
+} | null;
+type AccountWithOptionalFields = AccountSelectType & {
+    workflow: WorkflowInfo;
+    batches: BatchCounts;
 };
-type GetAccountsOutput = {
-    accounts: AccountWithWorkflow[];
+type GetBankAccountsOutput = {
+    accounts: AccountWithOptionalFields[];
     totalCount: number;
 };
 
@@ -2518,7 +2533,7 @@ declare class BankServiceBase extends BankServiceBase_base {
     authorizeAccount(input: AuthorizeAccountInput): Promise<IRPCResponse<AuthorizeAccountOutput>>;
     simulateDeposit(input: SimulateDepositInput): Promise<IRPCResponse<SimulateDepositOutput>>;
     sendPayment(input: SendPaymentInput): Promise<IRPCResponse<SendPaymentOutput>>;
-    getBankAccounts(): Promise<IRPCResponse<GetAccountsOutput>>;
+    getBankAccounts(input: GetBankAccountsInput): Promise<IRPCResponse<GetBankAccountsOutput>>;
     updateAccount(input: UpdateAccountInput): Promise<IRPCResponse<UpdateAccountOutput>>;
     disconnectAccount(input: DisconnectAccountInput): Promise<IRPCResponse<DisconnectAccountOutput>>;
     getBatches(input: GetBatchesInput): Promise<IRPCResponse<GetBatchesOutput>>;

package/dist/export/worker.d.mts

@@ -2394,14 +2394,29 @@ declare const updateAccountInputSchema: z.ZodObject<{
 type UpdateAccountInput = z.infer<typeof updateAccountInputSchema>;
 type UpdateAccountOutput = AccountSelectType;
 
-type AccountWithWorkflow = AccountSelectType & {
-    workflow: {
-        instanceId: string;
-        details: WorkflowInstanceStatus;
-    } | null;
+declare const getBankAccountsInputSchema: z.ZodObject<{
+    includes: z.ZodOptional<z.ZodObject<{
+        workflow: z.ZodOptional<z.ZodBoolean>;
+        batchCounts: z.ZodOptional<z.ZodBoolean>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
+type GetBankAccountsInput = z.infer<typeof getBankAccountsInputSchema>;
+type WorkflowInfo = {
+    instanceId: string;
+    details: WorkflowInstanceStatus;
+} | null;
+type BatchCounts = {
+    totalCount: number;
+    openCount: number;
+    readyToSignCount: number;
+    failedCount: number;
+} | null;
+type AccountWithOptionalFields = AccountSelectType & {
+    workflow: WorkflowInfo;
+    batches: BatchCounts;
 };
-type GetAccountsOutput = {
-    accounts: AccountWithWorkflow[];
+type GetBankAccountsOutput = {
+    accounts: AccountWithOptionalFields[];
     totalCount: number;
 };
 
@@ -2518,7 +2533,7 @@ declare class BankServiceBase extends BankServiceBase_base {
     authorizeAccount(input: AuthorizeAccountInput): Promise<IRPCResponse<AuthorizeAccountOutput>>;
     simulateDeposit(input: SimulateDepositInput): Promise<IRPCResponse<SimulateDepositOutput>>;
     sendPayment(input: SendPaymentInput): Promise<IRPCResponse<SendPaymentOutput>>;
-    getBankAccounts(): Promise<IRPCResponse<GetAccountsOutput>>;
+    getBankAccounts(input: GetBankAccountsInput): Promise<IRPCResponse<GetBankAccountsOutput>>;
     updateAccount(input: UpdateAccountInput): Promise<IRPCResponse<UpdateAccountOutput>>;
     disconnectAccount(input: DisconnectAccountInput): Promise<IRPCResponse<DisconnectAccountOutput>>;
     getBatches(input: GetBatchesInput): Promise<IRPCResponse<GetBatchesOutput>>;

package/dist/export/worker.d.ts

@@ -2394,14 +2394,29 @@ declare const updateAccountInputSchema: z.ZodObject<{
 type UpdateAccountInput = z.infer<typeof updateAccountInputSchema>;
 type UpdateAccountOutput = AccountSelectType;
 
-type AccountWithWorkflow = AccountSelectType & {
-    workflow: {
-        instanceId: string;
-        details: WorkflowInstanceStatus;
-    } | null;
+declare const getBankAccountsInputSchema: z.ZodObject<{
+    includes: z.ZodOptional<z.ZodObject<{
+        workflow: z.ZodOptional<z.ZodBoolean>;
+        batchCounts: z.ZodOptional<z.ZodBoolean>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
+type GetBankAccountsInput = z.infer<typeof getBankAccountsInputSchema>;
+type WorkflowInfo = {
+    instanceId: string;
+    details: WorkflowInstanceStatus;
+} | null;
+type BatchCounts = {
+    totalCount: number;
+    openCount: number;
+    readyToSignCount: number;
+    failedCount: number;
+} | null;
+type AccountWithOptionalFields = AccountSelectType & {
+    workflow: WorkflowInfo;
+    batches: BatchCounts;
 };
-type GetAccountsOutput = {
-    accounts: AccountWithWorkflow[];
+type GetBankAccountsOutput = {
+    accounts: AccountWithOptionalFields[];
     totalCount: number;
 };
 
@@ -2518,7 +2533,7 @@ declare class BankServiceBase extends BankServiceBase_base {
     authorizeAccount(input: AuthorizeAccountInput): Promise<IRPCResponse<AuthorizeAccountOutput>>;
     simulateDeposit(input: SimulateDepositInput): Promise<IRPCResponse<SimulateDepositOutput>>;
     sendPayment(input: SendPaymentInput): Promise<IRPCResponse<SendPaymentOutput>>;
-    getBankAccounts(): Promise<IRPCResponse<GetAccountsOutput>>;
+    getBankAccounts(input: GetBankAccountsInput): Promise<IRPCResponse<GetBankAccountsOutput>>;
     updateAccount(input: UpdateAccountInput): Promise<IRPCResponse<UpdateAccountOutput>>;
     disconnectAccount(input: DisconnectAccountInput): Promise<IRPCResponse<DisconnectAccountOutput>>;
     getBatches(input: GetBatchesInput): Promise<IRPCResponse<GetBatchesOutput>>;

package/dist/export/worker.mjs

@@ -1,4 +1,4 @@
-import { uuidv4, bankAccountMetadataSchema, workflowInstanceStatusSchema, develitWorker, createInternalError, first, action, service } from '@develit-io/backend-sdk';
+import { uuidv4, first, bankAccountMetadataSchema, workflowInstanceStatusSchema, develitWorker, createInternalError, action, service } from '@develit-io/backend-sdk';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { drizzle } from 'drizzle-orm/d1';
 import { t as tables } from '../shared/bank.D7JSg_d9.mjs';
@@ -6,7 +6,7 @@ import { z } from 'zod';
 import { I as INSTRUCTION_PRIORITIES, C as CHARGE_BEARERS, P as PAYMENT_TYPES, d as CONNECTOR_KEYS, B as BATCH_STATUSES, a as PAYMENT_STATUSES, b as PAYMENT_DIRECTIONS, f as accountInsertSchema } from '../shared/bank.m2X4FSvr.mjs';
 import { CURRENCY_CODES } from '@develit-io/general-codes';
 import 'date-fns';
-import { eq, inArray, and, sql, asc, desc, gte, lte } from 'drizzle-orm';
+import { eq, sql, inArray, and, asc, desc, gte, lte } from 'drizzle-orm';
 import 'jose';
 import 'node:crypto';
 import { f as encrypt, i as importAesKey, a as getCredentialsByAccountId, b as initiateConnector, u as upsertBatchCommand, d as getBatchByIdQuery, c as createPaymentCommand, g as getAccountByIdQuery } from '../shared/bank.DYJuicD-.mjs';
@@ -91,6 +91,27 @@ const deletePaymentsByAccountCommand = (db, { accountId }) => {
   };
 };
 
+const getAccountBatchCountsQuery = async (db, { accountId }) => {
+  const result = await db.select({
+    totalCount: sql`COUNT(*)`.as("totalCount"),
+    openCount: sql`SUM(CASE WHEN ${tables.batch.status} = 'OPEN' THEN 1 ELSE 0 END)`.as(
+      "openCount"
+    ),
+    readyToSignCount: sql`SUM(CASE WHEN ${tables.batch.status} = 'READY_TO_SIGN' THEN 1 ELSE 0 END)`.as(
+      "readyToSignCount"
+    ),
+    failedCount: sql`SUM(CASE WHEN ${tables.batch.status} = 'FAILED' THEN 1 ELSE 0 END)`.as(
+      "failedCount"
+    )
+  }).from(tables.batch).where(eq(tables.batch.accountId, accountId)).then(first);
+  return result || {
+    totalCount: 0,
+    openCount: 0,
+    readyToSignCount: 0,
+    failedCount: 0
+  };
+};
+
 const getAccountByIbanQuery = async (db, { iban }) => {
   return await db.select().from(tables.account).where(eq(tables.account.iban, iban)).get();
 };
@@ -383,6 +404,13 @@ const updateAccountInputSchema = z.object({
   account: accountInsertSchema
 });
 
+const getBankAccountsInputSchema = z.object({
+  includes: z.object({
+    workflow: z.boolean().optional(),
+    batchCounts: z.boolean().optional()
+  }).optional()
+});
+
 const disconnectAccountInputSchema = z.object({
   accountId: z.uuid()
 });
@@ -979,32 +1007,45 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
       }
     );
   }
-  async getBankAccounts() {
+  async getBankAccounts(input) {
     return this.handleAction(
-      null,
+      { data: input, schema: getBankAccountsInputSchema },
       { successMessage: "Bank accounts retrieved successfully" },
-      async () => {
+      async ({ includes }) => {
         const accounts = await this._getAccounts();
-        const accountsWithWorkflows = await Promise.all(
+        const includeWorkflow = includes?.workflow ?? true;
+        const includeBatchCounts = includes?.batchCounts ?? false;
+        const accountsWithOptionalFields = await Promise.all(
           accounts.map(async (a) => {
-            let status;
-            try {
-              const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(a.id);
-              status = await instance.status();
-            } catch (_) {
-              status = null;
-            }
-            return {
+            const result = {
               ...a,
-              workflow: status ? {
+              workflow: null,
+              batches: null
+            };
+            if (includeWorkflow) {
+              let status;
+              try {
+                const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(a.id);
+                status = await instance.status();
+              } catch (_) {
+                status = null;
+              }
+              result.workflow = status ? {
                 instanceId: a.id,
                 details: status
-              } : null
-            };
+              } : null;
+            }
+            if (includeBatchCounts) {
+              const batchCounts = await getAccountBatchCountsQuery(this.db, {
+                accountId: a.id
+              });
+              result.batches = batchCounts;
+            }
+            return result;
           })
         );
         return {
-          accounts: accountsWithWorkflows,
+          accounts: accountsWithOptionalFields,
           totalCount: accounts.length
         };
       }

package/package.json

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