av6-core 1.9.3 → 2.0.1

package/dist/index.d.mts

@@ -1,4 +1,3 @@
-import { JsonValue, Decimal, DecimalJsLike, InputJsonValue } from '@prisma/client/runtime/library';
 import { AsyncLocalStorage } from 'async_hooks';
 import { AxiosResponse } from 'axios';
 import ExcelJs from 'exceljs';
@@ -306,9 +305,9 @@ type DynamicShortCode = {
     isSingleDto?: boolean;
     isDropDown?: boolean;
     permission?: string | null;
-    whereClause?: JsonValue | null;
-    selectClause?: JsonValue | null;
-    config?: JsonValue | null;
+    whereClause?: Prisma.JsonValue | null;
+    selectClause?: Prisma.JsonValue | null;
+    config?: Prisma.JsonValue | null;
 };
 interface UpdateConfigByCodeInput extends Pick<DynamicShortCode, "config"> {
     shortCode: string;
@@ -441,7 +440,7 @@ type DataType = {
 interface CacheAdapter {
     getCacheById(key: string, id: number | string): Promise<any | undefined>;
     updateCache(key: string, id: number | string, value: unknown): Promise<void>;
-    createCache(table: string, data: DataType[]): Promise<void>;
+    createCache?(table: string, data: DataType[]): Promise<void>;
     deleteCache(key: string, id: number | string): Promise<void>;
     addToCache(key: string, id: number | string, data: unknown): Promise<void>;
 }
@@ -499,6 +498,7 @@ interface Deps {
     cacheAdapter: CacheAdapter;
     requestStorage: AsyncLocalStorage<Store>;
     db: TxClient;
+    getDb?: () => PrismaClient;
 }
 interface CommonServiceResponse {
     search: (searchParams: SearchRequestService<DynamicShortCode>) => Promise<unknown>;
@@ -545,11 +545,11 @@ type ApprovalStep = {
     id?: number;
     flowId: number;
     level: number;
-    minAmount?: Decimal | DecimalJsLike | number | string | null;
-    maxAmount?: Decimal | DecimalJsLike | number | string | null;
+    minAmount?: Prisma.Decimal | Prisma.DecimalJsLike | number | string | null;
+    maxAmount?: Prisma.Decimal | Prisma.DecimalJsLike | number | string | null;
     stepType?: StepType;
-    config?: InputJsonValue;
-    childConfig?: InputJsonValue;
+    config?: Prisma.JsonValue;
+    childConfig?: Prisma.JsonValue;
     isActive?: boolean;
     createdBy?: number | null;
     updatedBy?: number | null;
@@ -576,9 +576,9 @@ type ApprovalInstance = {
     subjectId: number;
     refNo?: string | null;
     currentStep: number;
-    netTotal?: Decimal | DecimalJsLike | number | string | null;
+    netTotal?: Prisma.Decimal | Prisma.DecimalJsLike | number | string | null;
     status?: ApprovalStatus;
-    extra?: JsonValue | InputJsonValue;
+    extra?: Prisma.JsonValue | null;
     isActive?: boolean;
     createdBy?: number | null;
     updatedBy?: number | null;
@@ -804,12 +804,14 @@ interface ApprovalDeps {
     requestStorage: AsyncLocalStorage<Store>;
     prisma: PrismaClient;
     eventBus: EventEmitter;
+    getDb?: () => PrismaClient;
 }
 type PrismaTransactionClient = Omit<PrismaClient, "$connect" | "$disconnect" | "$on" | "$transaction" | "$use" | "$extends">;
 
 declare class ApprovalService {
     private deps;
     private approvalRepo;
+    private prisma;
     constructor(deps: ApprovalDeps);
     startFlow(tx: PrismaClient | PrismaTransactionClient, { service, subjectType, subjectId, netTotal, ccId, refNo, level, extra }: StartFlowReq): Promise<void>;
     lastLevel(steps: ApprovalStep[]): Promise<number>;
@@ -897,6 +899,7 @@ interface UinDeps {
     db: PrismaClient;
     prisma: typeof PrismaNamespace;
     modelName?: string;
+    getDb?: () => PrismaClient;
 }
 type UINSegmentType = "text" | "separator" | "dateFormat" | "sequenceNo";
 type UIN_RESET_POLICY = "daily" | "weekly" | "monthly" | "yearly" | "no";
@@ -968,6 +971,7 @@ type NotificationEmitterDeps = {
     logger?: ILogger;
     envMode?: "Production" | "Development";
     helpers: Helpers;
+    getDb?: () => PrismaClient;
 };
 
 /**

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { JsonValue, Decimal, DecimalJsLike, InputJsonValue } from '@prisma/client/runtime/library';
 import { AsyncLocalStorage } from 'async_hooks';
 import { AxiosResponse } from 'axios';
 import ExcelJs from 'exceljs';
@@ -306,9 +305,9 @@ type DynamicShortCode = {
     isSingleDto?: boolean;
     isDropDown?: boolean;
     permission?: string | null;
-    whereClause?: JsonValue | null;
-    selectClause?: JsonValue | null;
-    config?: JsonValue | null;
+    whereClause?: Prisma.JsonValue | null;
+    selectClause?: Prisma.JsonValue | null;
+    config?: Prisma.JsonValue | null;
 };
 interface UpdateConfigByCodeInput extends Pick<DynamicShortCode, "config"> {
     shortCode: string;
@@ -441,7 +440,7 @@ type DataType = {
 interface CacheAdapter {
     getCacheById(key: string, id: number | string): Promise<any | undefined>;
     updateCache(key: string, id: number | string, value: unknown): Promise<void>;
-    createCache(table: string, data: DataType[]): Promise<void>;
+    createCache?(table: string, data: DataType[]): Promise<void>;
     deleteCache(key: string, id: number | string): Promise<void>;
     addToCache(key: string, id: number | string, data: unknown): Promise<void>;
 }
@@ -499,6 +498,7 @@ interface Deps {
     cacheAdapter: CacheAdapter;
     requestStorage: AsyncLocalStorage<Store>;
     db: TxClient;
+    getDb?: () => PrismaClient;
 }
 interface CommonServiceResponse {
     search: (searchParams: SearchRequestService<DynamicShortCode>) => Promise<unknown>;
@@ -545,11 +545,11 @@ type ApprovalStep = {
     id?: number;
     flowId: number;
     level: number;
-    minAmount?: Decimal | DecimalJsLike | number | string | null;
-    maxAmount?: Decimal | DecimalJsLike | number | string | null;
+    minAmount?: Prisma.Decimal | Prisma.DecimalJsLike | number | string | null;
+    maxAmount?: Prisma.Decimal | Prisma.DecimalJsLike | number | string | null;
     stepType?: StepType;
-    config?: InputJsonValue;
-    childConfig?: InputJsonValue;
+    config?: Prisma.JsonValue;
+    childConfig?: Prisma.JsonValue;
     isActive?: boolean;
     createdBy?: number | null;
     updatedBy?: number | null;
@@ -576,9 +576,9 @@ type ApprovalInstance = {
     subjectId: number;
     refNo?: string | null;
     currentStep: number;
-    netTotal?: Decimal | DecimalJsLike | number | string | null;
+    netTotal?: Prisma.Decimal | Prisma.DecimalJsLike | number | string | null;
     status?: ApprovalStatus;
-    extra?: JsonValue | InputJsonValue;
+    extra?: Prisma.JsonValue | null;
     isActive?: boolean;
     createdBy?: number | null;
     updatedBy?: number | null;
@@ -804,12 +804,14 @@ interface ApprovalDeps {
     requestStorage: AsyncLocalStorage<Store>;
     prisma: PrismaClient;
     eventBus: EventEmitter;
+    getDb?: () => PrismaClient;
 }
 type PrismaTransactionClient = Omit<PrismaClient, "$connect" | "$disconnect" | "$on" | "$transaction" | "$use" | "$extends">;
 
 declare class ApprovalService {
     private deps;
     private approvalRepo;
+    private prisma;
     constructor(deps: ApprovalDeps);
     startFlow(tx: PrismaClient | PrismaTransactionClient, { service, subjectType, subjectId, netTotal, ccId, refNo, level, extra }: StartFlowReq): Promise<void>;
     lastLevel(steps: ApprovalStep[]): Promise<number>;
@@ -897,6 +899,7 @@ interface UinDeps {
     db: PrismaClient;
     prisma: typeof PrismaNamespace;
     modelName?: string;
+    getDb?: () => PrismaClient;
 }
 type UINSegmentType = "text" | "separator" | "dateFormat" | "sequenceNo";
 type UIN_RESET_POLICY = "daily" | "weekly" | "monthly" | "yearly" | "no";
@@ -968,6 +971,7 @@ type NotificationEmitterDeps = {
     logger?: ILogger;
     envMode?: "Production" | "Development";
     helpers: Helpers;
+    getDb?: () => PrismaClient;
 };
 
 /**

package/dist/index.js

@@ -462,10 +462,9 @@ function normalizeWhere(where) {
 var import_util2 = require("util");
 var commonRepository = (serviceDeps) => {
   const { mappingExport, mappingImport, dtoMapping } = serviceDeps.mapper;
-  const db = serviceDeps.db;
+  const db = serviceDeps?.getDb?.() ?? serviceDeps.db;
   const { generateErrorMessage, ErrorHandler } = serviceDeps.helpers;
   const logger = serviceDeps.logger;
-  const createCache = serviceDeps.cacheAdapter.createCache;
   const requestStorage = serviceDeps.requestStorage;
   return {
     async commonSearch({
@@ -1161,7 +1160,7 @@ var buildPrismaData = (cfg, op, validatedBody, ctx) => {
 
 // src/repository/commonCreateUpdate.repository.ts
 var commonCreateUpdateRepository = (serviceDeps) => {
-  const db = serviceDeps.db;
+  const db = serviceDeps?.getDb?.() ?? serviceDeps.db;
   const { ErrorHandler } = serviceDeps.helpers;
   return {
     getDelegate(tableName) {
@@ -1896,7 +1895,7 @@ var import_joi2 = __toESM(require("joi"));
 var commonService = (serviceDeps) => {
   const generateErrorMessage = serviceDeps.helpers.generateErrorMessage;
   const ErrorHandler = serviceDeps.helpers.ErrorHandler;
-  const { deleteCache, getCacheById, updateCache, createCache, addToCache } = serviceDeps.cacheAdapter;
+  const { deleteCache, getCacheById, updateCache, addToCache } = serviceDeps.cacheAdapter;
   const logger = serviceDeps.logger;
   const dtoMapping = serviceDeps.mapper.dtoMapping;
   const validationMapping = serviceDeps.mapper.validationMapping;
@@ -2345,6 +2344,7 @@ var ActionMode = /* @__PURE__ */ ((ActionMode2) => {
 // src/repository/approval.repository.ts
 var import_client = require("@prisma/client");
 var approvalRepository = (deps) => {
+  const prisma = deps.getDb?.() ?? deps.prisma;
   return {
     async findMatchingFlow(tx, type, service, ccId, netTotal, level = 1) {
       const result = await tx.$queryRaw`
@@ -2478,6 +2478,9 @@ var approvalRepository = (deps) => {
             service
           },
           isActive: true
+        },
+        include: {
+          approvalInstance: true
         }
       });
     },
@@ -2493,14 +2496,14 @@ var approvalRepository = (deps) => {
          SET ${import_client.Prisma.join(setFragments, ", ")}
          WHERE id = ${data.id};
        `;
-      await deps.prisma.$queryRaw(query);
+      await prisma.$queryRaw(query);
     },
     async commonParentChildUpdate(config, childConfig, inst) {
       deps.logger.info("entering::commonRefundUpdate::repository");
       const { tableName: parentTableName, ...parentTableConfig } = config;
       const { tableName: childTableName, ...childTableConfig } = childConfig ?? {};
       const parentId = inst.subjectId;
-      await deps.prisma.$transaction(async (tx) => {
+      await prisma.$transaction(async (tx) => {
         const commonDetails = await this.getChildCommonDetailsByParentId(tx, parentId, inst.subjectType, inst.service);
         const parentDetails = await this.getParentCommonDetailsByParentId(tx, parentId, inst.subjectType, inst.service);
         if (!parentDetails) {
@@ -2596,10 +2599,12 @@ var externalInterceptor = () => {
 var ApprovalService = class {
   constructor(deps) {
     this.deps = deps;
+    this.prisma = deps.getDb?.() ?? deps.prisma;
     this.approvalRepo = approvalRepository(deps);
   }
   deps;
   approvalRepo;
+  prisma;
   async startFlow(tx, { service, subjectType, subjectId, netTotal, ccId, refNo, level = 1, extra }) {
     const store = this.deps.requestStorage.getStore();
     const currentUser = store?.user?.id;
@@ -2648,7 +2653,7 @@ var ApprovalService = class {
   }
   /** Approver clicks “Approve” or “Reject”. */
   async act({ instanceId, approverId, action, ccId, comment }) {
-    return this.deps.prisma.$transaction(async (tx) => {
+    return this.prisma.$transaction(async (tx) => {
       const inst = await tx.approvalInstance.findUnique({
         where: { id: instanceId },
         include: { flow: { where: { isActive: true }, include: { steps: { where: { isActive: true } } } } }
@@ -2929,7 +2934,7 @@ var ApprovalService = class {
   }
   async getAllApprovalFlow(input) {
     this.deps.logger.info("entering:getAllApprovalFlow --" + JSON.stringify({ input }));
-    const instance = await this.approvalRepo.getAllApprovalFlow(this.deps.prisma, input);
+    const instance = await this.approvalRepo.getAllApprovalFlow(this.prisma, input);
     this.deps.logger.info("exiting:getAllApprovalFlow --" + JSON.stringify({ instance }));
     return instance;
   }
@@ -2937,7 +2942,7 @@ var ApprovalService = class {
     this.deps.logger.info(
       "entering:getApprovalActDetailsBySubjectId --" + JSON.stringify({ subjectId, subjectType, service })
     );
-    return this.approvalRepo.getApprovalActDetailsBySubjectId(this.deps.prisma, { subjectId, subjectType, service });
+    return this.approvalRepo.getApprovalActDetailsBySubjectId(this.prisma, { subjectId, subjectType, service });
   }
   async commonStatusUpdate(config, data) {
     return this.approvalRepo.commonStatusUpdate(config, data);
@@ -3047,7 +3052,7 @@ var toUINConfigDTO = (model) => {
 
 // src/repository/uinConfig.repository.ts
 var uinConfigRepository = (uinDeps) => {
-  const db = uinDeps.db;
+  const db = uinDeps?.getDb?.() ?? uinDeps.db;
   const logger = uinDeps.logger;
   const requestStorage = uinDeps.requestStorage;
   const modelName = uinDeps.modelName || "uINConfig";
@@ -4789,7 +4794,8 @@ var NotificationEmitter = class {
   service;
   constructor(deps) {
     this.emitter = new import_events.EventEmitter();
-    this.service = new NotificationService(deps.prisma, deps.logger ?? console, deps.helpers);
+    const prisma = deps.getDb?.() ?? deps.prisma;
+    this.service = new NotificationService(prisma, deps.logger ?? console, deps.helpers);
     this.emitter.on("notify", async (payload) => {
       try {
         await this.service.handleEvent(payload);

package/dist/index.mjs

@@ -399,10 +399,9 @@ function normalizeWhere(where) {
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "util";
 var commonRepository = (serviceDeps) => {
   const { mappingExport, mappingImport, dtoMapping } = serviceDeps.mapper;
-  const db = serviceDeps.db;
+  const db = serviceDeps?.getDb?.() ?? serviceDeps.db;
   const { generateErrorMessage, ErrorHandler } = serviceDeps.helpers;
   const logger = serviceDeps.logger;
-  const createCache = serviceDeps.cacheAdapter.createCache;
   const requestStorage = serviceDeps.requestStorage;
   return {
     async commonSearch({
@@ -1098,7 +1097,7 @@ var buildPrismaData = (cfg, op, validatedBody, ctx) => {
 
 // src/repository/commonCreateUpdate.repository.ts
 var commonCreateUpdateRepository = (serviceDeps) => {
-  const db = serviceDeps.db;
+  const db = serviceDeps?.getDb?.() ?? serviceDeps.db;
   const { ErrorHandler } = serviceDeps.helpers;
   return {
     getDelegate(tableName) {
@@ -1833,7 +1832,7 @@ import Joi2 from "joi";
 var commonService = (serviceDeps) => {
   const generateErrorMessage = serviceDeps.helpers.generateErrorMessage;
   const ErrorHandler = serviceDeps.helpers.ErrorHandler;
-  const { deleteCache, getCacheById, updateCache, createCache, addToCache } = serviceDeps.cacheAdapter;
+  const { deleteCache, getCacheById, updateCache, addToCache } = serviceDeps.cacheAdapter;
   const logger = serviceDeps.logger;
   const dtoMapping = serviceDeps.mapper.dtoMapping;
   const validationMapping = serviceDeps.mapper.validationMapping;
@@ -2282,6 +2281,7 @@ var ActionMode = /* @__PURE__ */ ((ActionMode2) => {
 // src/repository/approval.repository.ts
 import { Prisma } from "@prisma/client";
 var approvalRepository = (deps) => {
+  const prisma = deps.getDb?.() ?? deps.prisma;
   return {
     async findMatchingFlow(tx, type, service, ccId, netTotal, level = 1) {
       const result = await tx.$queryRaw`
@@ -2415,6 +2415,9 @@ var approvalRepository = (deps) => {
             service
           },
           isActive: true
+        },
+        include: {
+          approvalInstance: true
         }
       });
     },
@@ -2430,14 +2433,14 @@ var approvalRepository = (deps) => {
          SET ${Prisma.join(setFragments, ", ")}
          WHERE id = ${data.id};
        `;
-      await deps.prisma.$queryRaw(query);
+      await prisma.$queryRaw(query);
     },
     async commonParentChildUpdate(config, childConfig, inst) {
       deps.logger.info("entering::commonRefundUpdate::repository");
       const { tableName: parentTableName, ...parentTableConfig } = config;
       const { tableName: childTableName, ...childTableConfig } = childConfig ?? {};
       const parentId = inst.subjectId;
-      await deps.prisma.$transaction(async (tx) => {
+      await prisma.$transaction(async (tx) => {
         const commonDetails = await this.getChildCommonDetailsByParentId(tx, parentId, inst.subjectType, inst.service);
         const parentDetails = await this.getParentCommonDetailsByParentId(tx, parentId, inst.subjectType, inst.service);
         if (!parentDetails) {
@@ -2533,10 +2536,12 @@ var externalInterceptor = () => {
 var ApprovalService = class {
   constructor(deps) {
     this.deps = deps;
+    this.prisma = deps.getDb?.() ?? deps.prisma;
     this.approvalRepo = approvalRepository(deps);
   }
   deps;
   approvalRepo;
+  prisma;
   async startFlow(tx, { service, subjectType, subjectId, netTotal, ccId, refNo, level = 1, extra }) {
     const store = this.deps.requestStorage.getStore();
     const currentUser = store?.user?.id;
@@ -2585,7 +2590,7 @@ var ApprovalService = class {
   }
   /** Approver clicks “Approve” or “Reject”. */
   async act({ instanceId, approverId, action, ccId, comment }) {
-    return this.deps.prisma.$transaction(async (tx) => {
+    return this.prisma.$transaction(async (tx) => {
       const inst = await tx.approvalInstance.findUnique({
         where: { id: instanceId },
         include: { flow: { where: { isActive: true }, include: { steps: { where: { isActive: true } } } } }
@@ -2866,7 +2871,7 @@ var ApprovalService = class {
   }
   async getAllApprovalFlow(input) {
     this.deps.logger.info("entering:getAllApprovalFlow --" + JSON.stringify({ input }));
-    const instance = await this.approvalRepo.getAllApprovalFlow(this.deps.prisma, input);
+    const instance = await this.approvalRepo.getAllApprovalFlow(this.prisma, input);
     this.deps.logger.info("exiting:getAllApprovalFlow --" + JSON.stringify({ instance }));
     return instance;
   }
@@ -2874,7 +2879,7 @@ var ApprovalService = class {
     this.deps.logger.info(
       "entering:getApprovalActDetailsBySubjectId --" + JSON.stringify({ subjectId, subjectType, service })
     );
-    return this.approvalRepo.getApprovalActDetailsBySubjectId(this.deps.prisma, { subjectId, subjectType, service });
+    return this.approvalRepo.getApprovalActDetailsBySubjectId(this.prisma, { subjectId, subjectType, service });
   }
   async commonStatusUpdate(config, data) {
     return this.approvalRepo.commonStatusUpdate(config, data);
@@ -2984,7 +2989,7 @@ var toUINConfigDTO = (model) => {
 
 // src/repository/uinConfig.repository.ts
 var uinConfigRepository = (uinDeps) => {
-  const db = uinDeps.db;
+  const db = uinDeps?.getDb?.() ?? uinDeps.db;
   const logger = uinDeps.logger;
   const requestStorage = uinDeps.requestStorage;
   const modelName = uinDeps.modelName || "uINConfig";
@@ -4726,7 +4731,8 @@ var NotificationEmitter = class {
   service;
   constructor(deps) {
     this.emitter = new EventEmitter();
-    this.service = new NotificationService(deps.prisma, deps.logger ?? console, deps.helpers);
+    const prisma = deps.getDb?.() ?? deps.prisma;
+    this.service = new NotificationService(prisma, deps.logger ?? console, deps.helpers);
     this.emitter.on("notify", async (payload) => {
       try {
         await this.service.handleEvent(payload);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.9.3",
+  "version": "2.0.1",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",