@develit-services/bank 0.0.32 → 0.0.34

package/dist/database/schema.cjs

@@ -1,13 +1,13 @@
 'use strict';
 
-const database_schema = require('../shared/bank.Dx7kRjFL.cjs');
+const database_schema = require('../shared/bank.D4BlThGx.cjs');
 require('@develit-io/backend-sdk');
+require('drizzle-orm/sqlite-core');
 require('drizzle-orm');
 require('@develit-io/general-codes');
 require('zod');
 require('jose');
 require('drizzle-zod');
-require('drizzle-orm/sqlite-core');
 require('date-fns');
 require('drizzle-orm/relations');
 

package/dist/database/schema.mjs

@@ -1,10 +1,10 @@
-export { y as account, z as accountCredentials, r as batch, x as ott, v as payment, w as paymentRelations } from '../shared/bank.uJ3YtInA.mjs';
+export { y as account, z as accountCredentials, r as batch, x as ott, v as payment, w as paymentRelations } from '../shared/bank.ClfukJ-T.mjs';
 import '@develit-io/backend-sdk';
+import 'drizzle-orm/sqlite-core';
 import 'drizzle-orm';
 import '@develit-io/general-codes';
 import 'zod';
 import 'jose';
 import 'drizzle-zod';
-import 'drizzle-orm/sqlite-core';
 import 'date-fns';
 import 'drizzle-orm/relations';

package/dist/export/worker.cjs

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const backendSdk = require('@develit-io/backend-sdk');
-const database_schema = require('../shared/bank.Dx7kRjFL.cjs');
 const cloudflare_workers = require('cloudflare:workers');
 const d1 = require('drizzle-orm/d1');
-const zod = require('zod');
-const generalCodes = require('@develit-io/general-codes');
+const database_schema = require('../shared/bank.D4BlThGx.cjs');
 require('jose');
+const generalCodes = require('@develit-io/general-codes');
+const zod = require('zod');
 const drizzleOrm = require('drizzle-orm');
-const mockCobs_connector = require('../shared/bank.BiZtZWed.cjs');
-require('drizzle-zod');
+const mockCobs_connector = require('../shared/bank.BVW0vOQS.cjs');
 require('drizzle-orm/sqlite-core');
+require('drizzle-zod');
 require('date-fns');
 require('drizzle-orm/relations');
 
@@ -111,52 +111,14 @@ const updateAccountLastSyncCommand = (db, { lastSyncedAt, accountId }) => {
   };
 };
 
-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 getOpenBatchByAccountIdQuery = async (db, { accountId }) => {
-  const batch = 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 getPaymentsByBankRefIdsQuery = async (db, { ids }) => {
-  return await db.select().from(database_schema.tables.payment).where(drizzleOrm.inArray(database_schema.tables.payment.bankRefId, ids));
-};
-
-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 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"
-    ])
-  );
+const getAccountByIbanQuery = async (db, { iban }) => {
+  return await db.select().from(database_schema.tables.account).where(drizzleOrm.eq(database_schema.tables.account.iban, iban)).get();
 };
 
 const getAccountByIdQuery = async (db, { accountId }) => {
   return await db.select().from(database_schema.tables.account).where(drizzleOrm.eq(database_schema.tables.account.id, accountId)).get();
 };
 
-const getCredentialsByAccountId = async (db, { accountId }) => {
-  const cred = await db.select().from(database_schema.tables.accountCredentials).where(drizzleOrm.eq(database_schema.tables.accountCredentials.accountId, accountId)).get();
-  return cred;
-};
-
-const getAccountByIbanQuery = async (db, { iban }) => {
-  return await db.select().from(database_schema.tables.account).where(drizzleOrm.eq(database_schema.tables.account.iban, iban)).get();
-};
-
 const getAllAccountsQuery = async (db) => {
   const accountsWithExpiration = await db.select().from(database_schema.tables.account).leftJoin(
     database_schema.tables.accountCredentials,
@@ -170,6 +132,16 @@ 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"
+    ])
+  );
+};
+
 const buildMultiFilterConditions = (column, value) => {
   if (value === void 0) return void 0;
   if (Array.isArray(value)) {
@@ -234,6 +206,56 @@ const getPaymentsWithPaginationQuery = async (db, {
   };
 };
 
+const getBatchesQuery = async (db, {
+  limit,
+  page,
+  sort,
+  filterBatchAccountId,
+  filterBatchStatus
+}) => {
+  const whereConditions = drizzleOrm.and(
+    buildMultiFilterConditions(database_schema.tables.batch.accountId, filterBatchAccountId),
+    buildMultiFilterConditions(database_schema.tables.batch.status, filterBatchStatus)
+  );
+  const sortColumn = resolveColumn(database_schema.tables.batch, sort.column);
+  const [{ totalCount }] = await db.select({
+    totalCount: drizzleOrm.sql`count(*)`
+  }).from(database_schema.tables.batch).where(whereConditions);
+  const batches = await db.select().from(database_schema.tables.batch).where(whereConditions).limit(limit).offset((page - 1) * limit).orderBy(sort.direction === "asc" ? drizzleOrm.asc(sortColumn) : drizzleOrm.desc(sortColumn));
+  return {
+    batches,
+    totalCount
+  };
+};
+
+const getCredentialsByAccountId = async (db, { accountId }) => {
+  const cred = await db.select().from(database_schema.tables.accountCredentials).where(drizzleOrm.eq(database_schema.tables.accountCredentials.accountId, accountId)).get();
+  return cred;
+};
+
+const getOpenBatchByAccountIdQuery = async (db, { accountId }) => {
+  const batch = 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 }) => {
+  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 getPaymentsByBankRefIdsQuery = async (db, { ids }) => {
+  return await db.select().from(database_schema.tables.payment).where(drizzleOrm.inArray(database_schema.tables.payment.bankRefId, ids));
+};
+
 class CreditasConnector extends database_schema.FinbricksConnector {
   constructor(config) {
     super("CREDITAS", config);
@@ -377,9 +399,19 @@ const initiateConnectorInputSchema = zod.z.object({
   withAuth: zod.z.boolean().default(true).optional()
 });
 
+const ALLOWED_BATCH_FILTERS = {
+  ACCOUNT_ID: "filterBatchAccountId",
+  STATUS: "filterBatchStatus"
+};
 const getBatchesInputSchema = zod.z.object({
-  limit: zod.z.number().positive().optional().default(100),
-  offset: zod.z.number().min(0).optional().default(0)
+  page: zod.z.number().positive(),
+  limit: zod.z.number().positive(),
+  sort: zod.z.object({
+    column: zod.z.enum(["createdAt", "updatedAt", "batchPaymentInitiatedAt"]),
+    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()
 });
 
 const processBatchInputSchema = zod.z.object({
@@ -1112,16 +1144,8 @@ let BankServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
     return this.handleAction(
       { data: input, schema: getBatchesInputSchema },
       { successMessage: "Batches retrieved successfully" },
-      async ({ limit = 100, offset = 0 }) => {
-        const [batchesResult, countResult] = await Promise.all([
-          this.db.select().from(database_schema.tables.batch).limit(limit).offset(offset).orderBy(drizzleOrm.desc(database_schema.tables.batch.createdAt)),
-          this.db.select({ count: drizzleOrm.sql`count(*)`.as("count") }).from(database_schema.tables.batch)
-        ]);
-        const totalCount = Number(countResult[0]?.count) || 0;
-        return {
-          batches: batchesResult,
-          totalCount
-        };
+      async (params) => {
+        return await getBatchesQuery(this.db, params);
       }
     );
   }

package/dist/export/worker.d.cts

@@ -1,10 +1,10 @@
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { IRPCResponse } from '@develit-io/backend-sdk';
-import { P as PaymentSelectType, B as BatchSelectType, t as tables, a as PaymentInsertType } from '../shared/bank.e_XSg9KV.cjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
-import { z } from 'zod';
+import { P as PaymentSelectType, B as BatchSelectType, t as tables, a as PaymentInsertType } from '../shared/bank.e_XSg9KV.cjs';
 import { A as AccountSelectType, C as ConfigEnvironmentBank, I as IBankConnector, a as ConnectorKey } from '../shared/bank._5C74-4K.cjs';
+import { z } from 'zod';
 import 'drizzle-orm/sqlite-core';
 import 'drizzle-orm';
 import '@develit-io/general-codes';
@@ -221,15 +221,43 @@ interface initiateConnectorOutput {
 }
 
 declare const getBatchesInputSchema: z.ZodObject<{
-    limit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    offset: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    page: z.ZodNumber;
+    limit: z.ZodNumber;
+    sort: z.ZodObject<{
+        column: z.ZodEnum<{
+            createdAt: "createdAt";
+            updatedAt: "updatedAt";
+            batchPaymentInitiatedAt: "batchPaymentInitiatedAt";
+        }>;
+        direction: z.ZodEnum<{
+            asc: "asc";
+            desc: "desc";
+        }>;
+    }, z.core.$strip>;
+    filterBatchAccountId: z.ZodOptional<z.ZodUnion<readonly [z.ZodUUID, z.ZodArray<z.ZodUUID>]>>;
+    filterBatchStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
+        OPEN: "OPEN";
+        PROCESSING: "PROCESSING";
+        READY_TO_SIGN: "READY_TO_SIGN";
+        WAITING_FOR_PROCESSING: "WAITING_FOR_PROCESSING";
+        PREPARED: "PREPARED";
+        COMPLETED: "COMPLETED";
+        FAILED: "FAILED";
+    }>, z.ZodArray<z.ZodEnum<{
+        OPEN: "OPEN";
+        PROCESSING: "PROCESSING";
+        READY_TO_SIGN: "READY_TO_SIGN";
+        WAITING_FOR_PROCESSING: "WAITING_FOR_PROCESSING";
+        PREPARED: "PREPARED";
+        COMPLETED: "COMPLETED";
+        FAILED: "FAILED";
+    }>>]>>;
 }, z.core.$strip>;
-interface GetBatchesInput extends z.infer<typeof getBatchesInputSchema> {
-}
-interface GetBatchesOutput {
+type GetBatchesInput = z.input<typeof getBatchesInputSchema>;
+type GetBatchesOutput = {
     batches: BatchSelectType[];
     totalCount: number;
-}
+};
 
 declare const processBatchInputSchema: z.ZodObject<{
     connectorKey: z.ZodEnum<{

package/dist/export/worker.d.mts

@@ -1,10 +1,10 @@
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { IRPCResponse } from '@develit-io/backend-sdk';
-import { P as PaymentSelectType, B as BatchSelectType, t as tables, a as PaymentInsertType } from '../shared/bank.e_XSg9KV.mjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
-import { z } from 'zod';
+import { P as PaymentSelectType, B as BatchSelectType, t as tables, a as PaymentInsertType } from '../shared/bank.e_XSg9KV.mjs';
 import { A as AccountSelectType, C as ConfigEnvironmentBank, I as IBankConnector, a as ConnectorKey } from '../shared/bank.-qiBc98X.mjs';
+import { z } from 'zod';
 import 'drizzle-orm/sqlite-core';
 import 'drizzle-orm';
 import '@develit-io/general-codes';
@@ -221,15 +221,43 @@ interface initiateConnectorOutput {
 }
 
 declare const getBatchesInputSchema: z.ZodObject<{
-    limit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    offset: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    page: z.ZodNumber;
+    limit: z.ZodNumber;
+    sort: z.ZodObject<{
+        column: z.ZodEnum<{
+            createdAt: "createdAt";
+            updatedAt: "updatedAt";
+            batchPaymentInitiatedAt: "batchPaymentInitiatedAt";
+        }>;
+        direction: z.ZodEnum<{
+            asc: "asc";
+            desc: "desc";
+        }>;
+    }, z.core.$strip>;
+    filterBatchAccountId: z.ZodOptional<z.ZodUnion<readonly [z.ZodUUID, z.ZodArray<z.ZodUUID>]>>;
+    filterBatchStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
+        OPEN: "OPEN";
+        PROCESSING: "PROCESSING";
+        READY_TO_SIGN: "READY_TO_SIGN";
+        WAITING_FOR_PROCESSING: "WAITING_FOR_PROCESSING";
+        PREPARED: "PREPARED";
+        COMPLETED: "COMPLETED";
+        FAILED: "FAILED";
+    }>, z.ZodArray<z.ZodEnum<{
+        OPEN: "OPEN";
+        PROCESSING: "PROCESSING";
+        READY_TO_SIGN: "READY_TO_SIGN";
+        WAITING_FOR_PROCESSING: "WAITING_FOR_PROCESSING";
+        PREPARED: "PREPARED";
+        COMPLETED: "COMPLETED";
+        FAILED: "FAILED";
+    }>>]>>;
 }, z.core.$strip>;
-interface GetBatchesInput extends z.infer<typeof getBatchesInputSchema> {
-}
-interface GetBatchesOutput {
+type GetBatchesInput = z.input<typeof getBatchesInputSchema>;
+type GetBatchesOutput = {
     batches: BatchSelectType[];
     totalCount: number;
-}
+};
 
 declare const processBatchInputSchema: z.ZodObject<{
     connectorKey: z.ZodEnum<{

package/dist/export/worker.d.ts

@@ -1,10 +1,10 @@
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { IRPCResponse } from '@develit-io/backend-sdk';
-import { P as PaymentSelectType, B as BatchSelectType, t as tables, a as PaymentInsertType } from '../shared/bank.e_XSg9KV.js';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
-import { z } from 'zod';
+import { P as PaymentSelectType, B as BatchSelectType, t as tables, a as PaymentInsertType } from '../shared/bank.e_XSg9KV.js';
 import { A as AccountSelectType, C as ConfigEnvironmentBank, I as IBankConnector, a as ConnectorKey } from '../shared/bank.BRiDHyNf.js';
+import { z } from 'zod';
 import 'drizzle-orm/sqlite-core';
 import 'drizzle-orm';
 import '@develit-io/general-codes';
@@ -221,15 +221,43 @@ interface initiateConnectorOutput {
 }
 
 declare const getBatchesInputSchema: z.ZodObject<{
-    limit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    offset: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    page: z.ZodNumber;
+    limit: z.ZodNumber;
+    sort: z.ZodObject<{
+        column: z.ZodEnum<{
+            createdAt: "createdAt";
+            updatedAt: "updatedAt";
+            batchPaymentInitiatedAt: "batchPaymentInitiatedAt";
+        }>;
+        direction: z.ZodEnum<{
+            asc: "asc";
+            desc: "desc";
+        }>;
+    }, z.core.$strip>;
+    filterBatchAccountId: z.ZodOptional<z.ZodUnion<readonly [z.ZodUUID, z.ZodArray<z.ZodUUID>]>>;
+    filterBatchStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
+        OPEN: "OPEN";
+        PROCESSING: "PROCESSING";
+        READY_TO_SIGN: "READY_TO_SIGN";
+        WAITING_FOR_PROCESSING: "WAITING_FOR_PROCESSING";
+        PREPARED: "PREPARED";
+        COMPLETED: "COMPLETED";
+        FAILED: "FAILED";
+    }>, z.ZodArray<z.ZodEnum<{
+        OPEN: "OPEN";
+        PROCESSING: "PROCESSING";
+        READY_TO_SIGN: "READY_TO_SIGN";
+        WAITING_FOR_PROCESSING: "WAITING_FOR_PROCESSING";
+        PREPARED: "PREPARED";
+        COMPLETED: "COMPLETED";
+        FAILED: "FAILED";
+    }>>]>>;
 }, z.core.$strip>;
-interface GetBatchesInput extends z.infer<typeof getBatchesInputSchema> {
-}
-interface GetBatchesOutput {
+type GetBatchesInput = z.input<typeof getBatchesInputSchema>;
+type GetBatchesOutput = {
     batches: BatchSelectType[];
     totalCount: number;
-}
+};
 
 declare const processBatchInputSchema: z.ZodObject<{
     connectorKey: z.ZodEnum<{

package/dist/export/worker.mjs

@@ -1,14 +1,14 @@
 import { uuidv4, develitWorker, createInternalError, first, RPCResponse, action, service } from '@develit-io/backend-sdk';
-import { t as tables, F as FinbricksConnector, M as MockConnector, E as ErsteConnector, P as PAYMENT_TYPES, e as CONNECTOR_KEYS, c as PAYMENT_STATUSES, d as PAYMENT_DIRECTIONS, q as getPaymentDirection } from '../shared/bank.uJ3YtInA.mjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { drizzle } from 'drizzle-orm/d1';
-import { z } from 'zod';
-import { CURRENCY_CODES } from '@develit-io/general-codes';
+import { t as tables, F as FinbricksConnector, M as MockConnector, E as ErsteConnector, P as PAYMENT_TYPES, e as CONNECTOR_KEYS, B as BATCH_STATUSES, c as PAYMENT_STATUSES, d as PAYMENT_DIRECTIONS, q as getPaymentDirection } from '../shared/bank.ClfukJ-T.mjs';
 import 'jose';
-import { eq, and, inArray, sql, asc, desc, gte, lte } from 'drizzle-orm';
-import { M as MockCobsConnector } from '../shared/bank.A5zjotaU.mjs';
-import 'drizzle-zod';
+import { CURRENCY_CODES } from '@develit-io/general-codes';
+import { z } from 'zod';
+import { eq, inArray, and, sql, asc, desc, gte, lte } from 'drizzle-orm';
+import { M as MockCobsConnector } from '../shared/bank.De_ddIjl.mjs';
 import 'drizzle-orm/sqlite-core';
+import 'drizzle-zod';
 import 'date-fns';
 import 'drizzle-orm/relations';
 
@@ -107,52 +107,14 @@ const updateAccountLastSyncCommand = (db, { lastSyncedAt, accountId }) => {
   };
 };
 
-const getPaymentByRefIdQuery = async (db, { refId }) => {
-  const payment = await db.select().from(tables.payment).where(eq(tables.payment.refId, refId)).limit(1).get();
-  return payment;
-};
-
-const getOpenBatchByAccountIdQuery = async (db, { accountId }) => {
-  const batch = await db.select().from(tables.batch).where(
-    and(
-      eq(tables.batch.accountId, accountId),
-      eq(tables.batch.status, "OPEN")
-    )
-  ).limit(1).get();
-  return batch;
-};
-
-const getPaymentsByBankRefIdsQuery = async (db, { ids }) => {
-  return await db.select().from(tables.payment).where(inArray(tables.payment.bankRefId, ids));
-};
-
-const getOttQuery = async (db, { ott }) => {
-  return await db.select().from(tables.ott).where(eq(tables.ott.oneTimeToken, ott)).get();
-};
-
-const getAllPendingBatchesQuery = (db) => {
-  return db.select().from(tables.batch).where(
-    inArray(tables.batch.status, [
-      "PROCESSING",
-      "READY_TO_SIGN",
-      "WAITING_FOR_PROCESSING"
-    ])
-  );
+const getAccountByIbanQuery = async (db, { iban }) => {
+  return await db.select().from(tables.account).where(eq(tables.account.iban, iban)).get();
 };
 
 const getAccountByIdQuery = async (db, { accountId }) => {
   return await db.select().from(tables.account).where(eq(tables.account.id, accountId)).get();
 };
 
-const getCredentialsByAccountId = async (db, { accountId }) => {
-  const cred = await db.select().from(tables.accountCredentials).where(eq(tables.accountCredentials.accountId, accountId)).get();
-  return cred;
-};
-
-const getAccountByIbanQuery = async (db, { iban }) => {
-  return await db.select().from(tables.account).where(eq(tables.account.iban, iban)).get();
-};
-
 const getAllAccountsQuery = async (db) => {
   const accountsWithExpiration = await db.select().from(tables.account).leftJoin(
     tables.accountCredentials,
@@ -166,6 +128,16 @@ const getAllAccountsQuery = async (db) => {
   });
 };
 
+const getAllPendingBatchesQuery = (db) => {
+  return db.select().from(tables.batch).where(
+    inArray(tables.batch.status, [
+      "PROCESSING",
+      "READY_TO_SIGN",
+      "WAITING_FOR_PROCESSING"
+    ])
+  );
+};
+
 const buildMultiFilterConditions = (column, value) => {
   if (value === void 0) return void 0;
   if (Array.isArray(value)) {
@@ -230,6 +202,56 @@ const getPaymentsWithPaginationQuery = async (db, {
   };
 };
 
+const getBatchesQuery = async (db, {
+  limit,
+  page,
+  sort,
+  filterBatchAccountId,
+  filterBatchStatus
+}) => {
+  const whereConditions = and(
+    buildMultiFilterConditions(tables.batch.accountId, filterBatchAccountId),
+    buildMultiFilterConditions(tables.batch.status, filterBatchStatus)
+  );
+  const sortColumn = resolveColumn(tables.batch, sort.column);
+  const [{ totalCount }] = await db.select({
+    totalCount: sql`count(*)`
+  }).from(tables.batch).where(whereConditions);
+  const batches = await db.select().from(tables.batch).where(whereConditions).limit(limit).offset((page - 1) * limit).orderBy(sort.direction === "asc" ? asc(sortColumn) : desc(sortColumn));
+  return {
+    batches,
+    totalCount
+  };
+};
+
+const getCredentialsByAccountId = async (db, { accountId }) => {
+  const cred = await db.select().from(tables.accountCredentials).where(eq(tables.accountCredentials.accountId, accountId)).get();
+  return cred;
+};
+
+const getOpenBatchByAccountIdQuery = async (db, { accountId }) => {
+  const batch = 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 }) => {
+  return await db.select().from(tables.ott).where(eq(tables.ott.oneTimeToken, ott)).get();
+};
+
+const getPaymentByRefIdQuery = async (db, { refId }) => {
+  const payment = await db.select().from(tables.payment).where(eq(tables.payment.refId, refId)).limit(1).get();
+  return payment;
+};
+
+const getPaymentsByBankRefIdsQuery = async (db, { ids }) => {
+  return await db.select().from(tables.payment).where(inArray(tables.payment.bankRefId, ids));
+};
+
 class CreditasConnector extends FinbricksConnector {
   constructor(config) {
     super("CREDITAS", config);
@@ -373,9 +395,19 @@ const initiateConnectorInputSchema = z.object({
   withAuth: z.boolean().default(true).optional()
 });
 
+const ALLOWED_BATCH_FILTERS = {
+  ACCOUNT_ID: "filterBatchAccountId",
+  STATUS: "filterBatchStatus"
+};
 const getBatchesInputSchema = z.object({
-  limit: z.number().positive().optional().default(100),
-  offset: z.number().min(0).optional().default(0)
+  page: z.number().positive(),
+  limit: z.number().positive(),
+  sort: z.object({
+    column: z.enum(["createdAt", "updatedAt", "batchPaymentInitiatedAt"]),
+    direction: z.enum(["asc", "desc"])
+  }),
+  [ALLOWED_BATCH_FILTERS.ACCOUNT_ID]: z.union([z.uuid(), z.uuid().array()]).optional(),
+  [ALLOWED_BATCH_FILTERS.STATUS]: z.union([z.enum(BATCH_STATUSES), z.enum(BATCH_STATUSES).array()]).optional()
 });
 
 const processBatchInputSchema = z.object({
@@ -1108,16 +1140,8 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
     return this.handleAction(
       { data: input, schema: getBatchesInputSchema },
       { successMessage: "Batches retrieved successfully" },
-      async ({ limit = 100, offset = 0 }) => {
-        const [batchesResult, countResult] = await Promise.all([
-          this.db.select().from(tables.batch).limit(limit).offset(offset).orderBy(desc(tables.batch.createdAt)),
-          this.db.select({ count: sql`count(*)`.as("count") }).from(tables.batch)
-        ]);
-        const totalCount = Number(countResult[0]?.count) || 0;
-        return {
-          batches: batchesResult,
-          totalCount
-        };
+      async (params) => {
+        return await getBatchesQuery(this.db, params);
       }
     );
   }

package/dist/shared/{bank.BiZtZWed.cjs → bank.BVW0vOQS.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-const database_schema = require('./bank.Dx7kRjFL.cjs');
+const database_schema = require('./bank.D4BlThGx.cjs');
 
 class MockCobsConnector extends database_schema.FinbricksConnector {
   constructor(config) {

package/dist/shared/{bank.uJ3YtInA.mjs → bank.ClfukJ-T.mjs}

@@ -1,10 +1,10 @@
 import { uuidv4, useResult, createInternalError, bankAccount, base } from '@develit-io/backend-sdk';
+import { sqliteTable, integer, text, unique, real } from 'drizzle-orm/sqlite-core';
 import { and, eq } from 'drizzle-orm';
 import { COUNTRY_CODES_2, CURRENCY_CODES } from '@develit-io/general-codes';
 import { z } from 'zod';
 import { importPKCS8, SignJWT } from 'jose';
 import { createInsertSchema, createUpdateSchema, createSelectSchema } from 'drizzle-zod';
-import { sqliteTable, integer, text, unique, real } from 'drizzle-orm/sqlite-core';
 import { format, parseISO } from 'date-fns';
 import { relations } from 'drizzle-orm/relations';
 
@@ -1106,7 +1106,7 @@ const batch = sqliteTable("batch", {
     mode: "timestamp_ms"
   }),
   authorizationUrls: text("authorization_urls", { mode: "json" }).$type(),
-  accountId: text("account_id"),
+  accountId: text("account_id").references(() => account.id),
   status: text("status", { enum: BATCH_STATUSES }).$type(),
   payments: text("payments", { mode: "json" }).$type().notNull(),
   metadata: text("metadata", { mode: "json" }).$type()

package/dist/shared/{bank.Dx7kRjFL.cjs → bank.D4BlThGx.cjs}

@@ -1,12 +1,12 @@
 'use strict';
 
 const backendSdk = require('@develit-io/backend-sdk');
+const sqliteCore = require('drizzle-orm/sqlite-core');
 const drizzleOrm = require('drizzle-orm');
 const generalCodes = require('@develit-io/general-codes');
 const zod = require('zod');
 const jose = require('jose');
 const drizzleZod = require('drizzle-zod');
-const sqliteCore = require('drizzle-orm/sqlite-core');
 const dateFns = require('date-fns');
 const relations = require('drizzle-orm/relations');
 
@@ -1108,7 +1108,7 @@ const batch = sqliteCore.sqliteTable("batch", {
     mode: "timestamp_ms"
   }),
   authorizationUrls: sqliteCore.text("authorization_urls", { mode: "json" }).$type(),
-  accountId: sqliteCore.text("account_id"),
+  accountId: sqliteCore.text("account_id").references(() => account.id),
   status: sqliteCore.text("status", { enum: BATCH_STATUSES }).$type(),
   payments: sqliteCore.text("payments", { mode: "json" }).$type().notNull(),
   metadata: sqliteCore.text("metadata", { mode: "json" }).$type()

package/dist/shared/{bank.A5zjotaU.mjs → bank.De_ddIjl.mjs}

@@ -1,4 +1,4 @@
-import { F as FinbricksConnector } from './bank.uJ3YtInA.mjs';
+import { F as FinbricksConnector } from './bank.ClfukJ-T.mjs';
 
 class MockCobsConnector extends FinbricksConnector {
   constructor(config) {

package/dist/types.cjs

@@ -1,14 +1,14 @@
 'use strict';
 
-const database_schema = require('./shared/bank.Dx7kRjFL.cjs');
-const mockCobs_connector = require('./shared/bank.BiZtZWed.cjs');
+const database_schema = require('./shared/bank.D4BlThGx.cjs');
+const mockCobs_connector = require('./shared/bank.BVW0vOQS.cjs');
 const generalCodes = require('@develit-io/general-codes');
 require('@develit-io/backend-sdk');
+require('drizzle-orm/sqlite-core');
 require('drizzle-orm');
 require('zod');
 require('jose');
 require('drizzle-zod');
-require('drizzle-orm/sqlite-core');
 require('date-fns');
 require('drizzle-orm/relations');
 

package/dist/types.mjs

@@ -1,11 +1,11 @@
-export { A as ACCOUNT_STATUSES, B as BATCH_STATUES, B as BATCH_STATUSES, e as CONNECTOR_KEYS, C as COUNTRY_CODES, f as CREDENTIALS_TYPES, E as ErsteConnector, b as FINBRICKS_ENDPOINTS, a as FinbricksClient, F as FinbricksConnector, I as IBankConnector, M as MockConnector, d as PAYMENT_DIRECTIONS, c as PAYMENT_STATUSES, P as PAYMENT_TYPES, T as TOKEN_TYPES, j as accountCredentialsInsertSchema, l as accountCredentialsSelectSchema, k as accountCredentialsUpdateSchema, g as accountInsertSchema, i as accountSelectSchema, h as accountUpdateSchema, o as ottInsertSchema, n as ottSelectSchema, m as ottUpdateSchema, p as paymentInsertTypeZod, s as signFinbricksJws, u as useFinbricksFetch } from './shared/bank.uJ3YtInA.mjs';
-export { M as MockCobsConnector } from './shared/bank.A5zjotaU.mjs';
+export { A as ACCOUNT_STATUSES, B as BATCH_STATUES, B as BATCH_STATUSES, e as CONNECTOR_KEYS, C as COUNTRY_CODES, f as CREDENTIALS_TYPES, E as ErsteConnector, b as FINBRICKS_ENDPOINTS, a as FinbricksClient, F as FinbricksConnector, I as IBankConnector, M as MockConnector, d as PAYMENT_DIRECTIONS, c as PAYMENT_STATUSES, P as PAYMENT_TYPES, T as TOKEN_TYPES, j as accountCredentialsInsertSchema, l as accountCredentialsSelectSchema, k as accountCredentialsUpdateSchema, g as accountInsertSchema, i as accountSelectSchema, h as accountUpdateSchema, o as ottInsertSchema, n as ottSelectSchema, m as ottUpdateSchema, p as paymentInsertTypeZod, s as signFinbricksJws, u as useFinbricksFetch } from './shared/bank.ClfukJ-T.mjs';
+export { M as MockCobsConnector } from './shared/bank.De_ddIjl.mjs';
 export { BANK_CODES, CURRENCY_CODES } from '@develit-io/general-codes';
 import '@develit-io/backend-sdk';
+import 'drizzle-orm/sqlite-core';
 import 'drizzle-orm';
 import 'zod';
 import 'jose';
 import 'drizzle-zod';
-import 'drizzle-orm/sqlite-core';
 import 'date-fns';
 import 'drizzle-orm/relations';

package/package.json

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