av6-core 1.2.0 → 1.2.2

package/dist/index.d.mts

@@ -1,11 +1,11 @@
-import * as PrismaNamespace from '@prisma/client';
-import { PrismaClient } from '@prisma/client';
 import winston from 'winston';
 import { AsyncLocalStorage } from 'async_hooks';
 import { Readable } from 'stream';
 import { JsonValue } from '@prisma/client/runtime/library';
 import ExcelJs from 'exceljs';
 import { AxiosResponse } from 'axios';
+import * as PrismaNamespace from '@prisma/client';
+import { PrismaClient, Prisma } from '@prisma/client';
 
 declare enum ErrorMessageType {
     INVALID_ID = "Invalid id: %1 Numeric value expected.",
@@ -29,6 +29,8 @@ declare enum ErrorMessageType {
     EXCEL = "No data found to be downloaded"
 }
 
+type TxClient = PrismaClient | Prisma.TransactionClient;
+
 interface EmployeeCache {
     id: number;
     name: string;
@@ -102,6 +104,7 @@ type DynamicShortCode = {
     permission?: string | null;
     whereClause?: JsonValue | null;
     selectClause?: JsonValue | null;
+    config?: unknown | null;
 };
 interface ExportExcel {
     shortCode: string;
@@ -192,20 +195,13 @@ interface LockUnlockParams {
 interface LockUnlockRequestRepository<T extends DynamicShortCode> extends LockUnlockParams {
     shortCodeData: T;
 }
-interface CommonCreateParams {
-    shortCode: string;
-    value: string;
-    description?: string;
+interface CommonCreateRequestRepository {
+    shortCodeData: DynamicShortCode;
+    body: Record<string, unknown>;
 }
-interface CommonCreateRequestRepository<T extends DynamicShortCode> extends CommonCreateParams {
-    shortCodeData: T;
-}
-interface CommonUpdateParams extends CommonCreateParams {
+interface CommonUpdateRequestRepository extends CommonCreateRequestRepository {
     id: number;
 }
-interface CommonUpdateRequestRepository<T extends DynamicShortCode> extends CommonUpdateParams {
-    shortCodeData: T;
-}
 interface PaginatedResponse<T> {
     totalRecords: number;
     currentPageNumber: number;
@@ -234,6 +230,7 @@ interface CacheAdapter {
     updateCache(key: string, id: number | string, value: unknown): 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>;
 }
 interface Mapper {
     dtoMapping: Record<string, DtoMappingFunction>;
@@ -276,7 +273,7 @@ interface Deps {
     logger: winston.Logger;
     cacheAdapter: CacheAdapter;
     requestStorage: AsyncLocalStorage<Store>;
-    db: PrismaClient;
+    db: TxClient;
 }
 interface CommonServiceResponse {
     search: (searchParams: SearchRequestService<DynamicShortCode>) => Promise<unknown>;
@@ -290,8 +287,8 @@ interface CommonServiceResponse {
     delete: (deleteParams: DeleteRequestRepository<DynamicShortCode>) => Promise<void>;
     updateStatus: (updateStatusParams: UpdateStatusRequestRepository<DynamicShortCode>) => Promise<unknown>;
     lockUnlock: (lockUnlockParams: LockUnlockRequestRepository<DynamicShortCode>) => Promise<unknown>;
-    create: (createParams: CommonCreateRequestRepository<DynamicShortCode>) => Promise<unknown>;
-    update: (updateParams: CommonUpdateRequestRepository<DynamicShortCode>) => Promise<unknown>;
+    create: (createParams: CommonCreateRequestRepository) => Promise<unknown>;
+    update: (updateParams: CommonUpdateRequestRepository) => Promise<unknown>;
     fetchImageStream: (imageBaseUrl: string, fileName: string) => Promise<AxiosResponse<Readable>>;
 }
 
@@ -434,14 +431,16 @@ declare class NotificationEmitter {
 interface AuditContext {
     userId: number | null;
     traceId: string | null;
-    ccId: number | null;
+    level1Id: number | null;
+    level2Id: number | null;
     module: "OPD" | "PROCEDURE" | "GENERAL_BILL" | "PHARMACY" | "LAB" | "IPD";
 }
 type AuditContextProvider = () => AuditContext;
 interface AuditLogPayload {
     message: string;
     type?: "INFO" | "CREATE" | "UPDATE" | "DELETE" | "ERROR";
-    ccId?: number | null;
+    level1Id?: number | null;
+    level2Id?: number | null;
     extra?: Record<string, any>;
 }
 
@@ -472,4 +471,4 @@ declare class AuditProxy {
     createAuditedService<T extends object>(serviceName: string, service: T): T;
 }
 
-export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateParams, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateParams, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type Mapper, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type PaginatedResponse, type Recipient, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type Store, type ToggleActive, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, fromTimestampToSqlDatetime, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };
+export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type Mapper, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type PaginatedResponse, type Recipient, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type Store, type ToggleActive, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, fromTimestampToSqlDatetime, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-import * as PrismaNamespace from '@prisma/client';
-import { PrismaClient } from '@prisma/client';
 import winston from 'winston';
 import { AsyncLocalStorage } from 'async_hooks';
 import { Readable } from 'stream';
 import { JsonValue } from '@prisma/client/runtime/library';
 import ExcelJs from 'exceljs';
 import { AxiosResponse } from 'axios';
+import * as PrismaNamespace from '@prisma/client';
+import { PrismaClient, Prisma } from '@prisma/client';
 
 declare enum ErrorMessageType {
     INVALID_ID = "Invalid id: %1 Numeric value expected.",
@@ -29,6 +29,8 @@ declare enum ErrorMessageType {
     EXCEL = "No data found to be downloaded"
 }
 
+type TxClient = PrismaClient | Prisma.TransactionClient;
+
 interface EmployeeCache {
     id: number;
     name: string;
@@ -102,6 +104,7 @@ type DynamicShortCode = {
     permission?: string | null;
     whereClause?: JsonValue | null;
     selectClause?: JsonValue | null;
+    config?: unknown | null;
 };
 interface ExportExcel {
     shortCode: string;
@@ -192,20 +195,13 @@ interface LockUnlockParams {
 interface LockUnlockRequestRepository<T extends DynamicShortCode> extends LockUnlockParams {
     shortCodeData: T;
 }
-interface CommonCreateParams {
-    shortCode: string;
-    value: string;
-    description?: string;
+interface CommonCreateRequestRepository {
+    shortCodeData: DynamicShortCode;
+    body: Record<string, unknown>;
 }
-interface CommonCreateRequestRepository<T extends DynamicShortCode> extends CommonCreateParams {
-    shortCodeData: T;
-}
-interface CommonUpdateParams extends CommonCreateParams {
+interface CommonUpdateRequestRepository extends CommonCreateRequestRepository {
     id: number;
 }
-interface CommonUpdateRequestRepository<T extends DynamicShortCode> extends CommonUpdateParams {
-    shortCodeData: T;
-}
 interface PaginatedResponse<T> {
     totalRecords: number;
     currentPageNumber: number;
@@ -234,6 +230,7 @@ interface CacheAdapter {
     updateCache(key: string, id: number | string, value: unknown): 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>;
 }
 interface Mapper {
     dtoMapping: Record<string, DtoMappingFunction>;
@@ -276,7 +273,7 @@ interface Deps {
     logger: winston.Logger;
     cacheAdapter: CacheAdapter;
     requestStorage: AsyncLocalStorage<Store>;
-    db: PrismaClient;
+    db: TxClient;
 }
 interface CommonServiceResponse {
     search: (searchParams: SearchRequestService<DynamicShortCode>) => Promise<unknown>;
@@ -290,8 +287,8 @@ interface CommonServiceResponse {
     delete: (deleteParams: DeleteRequestRepository<DynamicShortCode>) => Promise<void>;
     updateStatus: (updateStatusParams: UpdateStatusRequestRepository<DynamicShortCode>) => Promise<unknown>;
     lockUnlock: (lockUnlockParams: LockUnlockRequestRepository<DynamicShortCode>) => Promise<unknown>;
-    create: (createParams: CommonCreateRequestRepository<DynamicShortCode>) => Promise<unknown>;
-    update: (updateParams: CommonUpdateRequestRepository<DynamicShortCode>) => Promise<unknown>;
+    create: (createParams: CommonCreateRequestRepository) => Promise<unknown>;
+    update: (updateParams: CommonUpdateRequestRepository) => Promise<unknown>;
     fetchImageStream: (imageBaseUrl: string, fileName: string) => Promise<AxiosResponse<Readable>>;
 }
 
@@ -434,14 +431,16 @@ declare class NotificationEmitter {
 interface AuditContext {
     userId: number | null;
     traceId: string | null;
-    ccId: number | null;
+    level1Id: number | null;
+    level2Id: number | null;
     module: "OPD" | "PROCEDURE" | "GENERAL_BILL" | "PHARMACY" | "LAB" | "IPD";
 }
 type AuditContextProvider = () => AuditContext;
 interface AuditLogPayload {
     message: string;
     type?: "INFO" | "CREATE" | "UPDATE" | "DELETE" | "ERROR";
-    ccId?: number | null;
+    level1Id?: number | null;
+    level2Id?: number | null;
     extra?: Record<string, any>;
 }
 
@@ -472,4 +471,4 @@ declare class AuditProxy {
     createAuditedService<T extends object>(serviceName: string, service: T): T;
 }
 
-export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateParams, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateParams, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type Mapper, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type PaginatedResponse, type Recipient, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type Store, type ToggleActive, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, fromTimestampToSqlDatetime, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };
+export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type Mapper, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type PaginatedResponse, type Recipient, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type Store, type ToggleActive, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, fromTimestampToSqlDatetime, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };

package/dist/index.js

@@ -458,39 +458,6 @@ var commonRepository = (serviceDeps) => {
       logger.info("exiting::commonLock::repository");
       return updatedRecord;
     },
-    async commonCreate({ shortCodeData, value, description }) {
-      logger.info("entering::commonCreate::repository");
-      const tableName = shortCodeData.tableName;
-      const model = db[tableName];
-      if (!model) {
-        throw new ErrorHandler(400, generateErrorMessage("INVALID_TABLE"));
-      }
-      const results = model.create({
-        data: {
-          value,
-          description
-        }
-      });
-      logger.info("exiting::commonCreate::repository");
-      return results;
-    },
-    async commonUpdate({ id, shortCodeData, value, description }) {
-      logger.info("entering::commonUpdate::repository");
-      const tableName = shortCodeData.tableName;
-      const model = db[tableName];
-      if (!model) {
-        throw new ErrorHandler(400, generateErrorMessage("INVALID_TABLE"));
-      }
-      const results = model.update({
-        where: { id },
-        data: {
-          value,
-          description
-        }
-      });
-      logger.info("exiting::commonUpdate::repository");
-      return results;
-    },
     async generateRootCondition({
       fixedSearch,
       fixedNotSearch
@@ -818,6 +785,382 @@ var commonRepository = (serviceDeps) => {
   };
 };
 
+// src/utils/dynamicCreateUpdate.utils.ts
+var isRecord = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+var getByPath = (root, path) => {
+  if (!path) return void 0;
+  const parts = path.split(".");
+  let cur = root;
+  for (const p of parts) {
+    if (!isRecord(cur)) return void 0;
+    cur = cur[p];
+  }
+  return cur;
+};
+var omitUndefined = (obj) => {
+  const out = {};
+  for (const [k, v] of Object.entries(obj)) {
+    if (v !== void 0) out[k] = v;
+  }
+  return out;
+};
+
+// src/utils/dynamicPrismaBuilder.utils.ts
+var resolveSrc = (f, env) => {
+  const src = f.src ?? `body.${f.name}`;
+  if (src.startsWith("body.")) return getByPath(env.body, src.slice(5));
+  if (src.startsWith("vars.")) return getByPath(env.ctx.vars ?? {}, src.slice(5));
+  if (src.startsWith("ctx.")) return getByPath(env.ctx, src.slice(4));
+  return void 0;
+};
+var setAudit = (cfg, op, out, ctx) => {
+  const createdByField = cfg.audit?.createdByField ?? "createdBy";
+  const updatedByField = cfg.audit?.updatedByField ?? "updatedBy";
+  if (op === "create" && ctx.userId != null) out[createdByField] = ctx.userId;
+  if (ctx.userId != null) out[updatedByField] = ctx.userId;
+};
+var buildScalarData = (cfg, op, env) => {
+  const out = {};
+  for (const f of cfg.fields) {
+    const dbKey = f.db ?? f.name;
+    const presence = f.presence[op];
+    if (presence === "forbidden") continue;
+    if (dbKey === cfg.primaryKey) continue;
+    const value = resolveSrc(f, env);
+    if (value === void 0) continue;
+    if (value === null && !f.allowNull) continue;
+    out[dbKey] = value;
+  }
+  setAudit(cfg, op, out, env.ctx);
+  return out;
+};
+var buildRelationWrite = (rel, op, env) => {
+  const raw = env.body[rel.name];
+  if (raw === void 0) return void 0;
+  const writeCfg = op === "create" ? rel.write.create : rel.write.update;
+  const itemPrimaryKey = writeCfg.itemPrimaryKey ?? "id";
+  const toItemData = (item, itemOp) => {
+    const itemBody = isRecord(item) ? item : {};
+    const itemOut = {};
+    for (const f of rel.items.fields) {
+      const dbKey = f.db ?? f.name;
+      const presence = f.presence[itemOp];
+      if (presence === "forbidden") continue;
+      if (dbKey === itemPrimaryKey) continue;
+      const v = itemBody[f.name];
+      if (v === void 0) continue;
+      if (v === null && !f.allowNull) continue;
+      itemOut[dbKey] = v;
+    }
+    if (rel.items.audit?.createdBy?.startsWith("ctx.") && env.ctx.userId != null) {
+      itemOut["createdBy"] = env.ctx.userId;
+    }
+    if (rel.items.audit?.updatedBy?.startsWith("ctx.") && env.ctx.userId != null) {
+      itemOut["updatedBy"] = env.ctx.userId;
+    }
+    return itemOut;
+  };
+  if (rel.kind === "one") {
+    const itemData = toItemData(raw, op);
+    if (op === "create") return { create: itemData };
+    if (writeCfg.strategy === "replace") return { delete: true, create: itemData };
+    if (writeCfg.strategy === "upsert")
+      return { upsert: { create: itemData, update: omitUndefined(itemData), where: {} } };
+    return { create: itemData };
+  }
+  const arr = Array.isArray(raw) ? raw : [];
+  const itemsCreate = arr.map((i) => toItemData(i, op));
+  if (op === "create") return { create: itemsCreate };
+  if (writeCfg.strategy === "replace") return { deleteMany: {}, create: itemsCreate };
+  if (writeCfg.strategy === "upsert") {
+    const incomingIds = [];
+    const upsertItems = [];
+    const createOnly = [];
+    for (const item of arr) {
+      const itemRec = isRecord(item) ? item : {};
+      const pk = itemRec[itemPrimaryKey];
+      const dataCreate = toItemData(itemRec, "create");
+      const dataUpdate = toItemData(itemRec, "update");
+      if (pk === void 0 || pk === null || pk === "") {
+        createOnly.push(dataCreate);
+        continue;
+      }
+      const pkNum = typeof pk === "string" ? Number(pk) : pk;
+      if (Number.isFinite(pkNum)) incomingIds.push(pkNum);
+      upsertItems.push({
+        where: { [itemPrimaryKey]: pkNum },
+        create: dataCreate,
+        update: omitUndefined(dataUpdate)
+      });
+    }
+    const payload = {};
+    if (upsertItems.length) payload.upsert = upsertItems;
+    if (createOnly.length) payload.create = createOnly;
+    const cfgAny = writeCfg;
+    const now = /* @__PURE__ */ new Date();
+    if (cfgAny.softDeleteMissing) {
+      const whereExtra = cfgAny.softDelete?.whereExtra ?? { isActive: true };
+      const data = {
+        ...cfgAny.softDelete?.data ?? { isActive: false }
+      };
+      if (data.deletedAt === "now") data.deletedAt = now;
+      if (data.deletedBy === "ctx.userId") data.deletedBy = env.ctx.userId ?? void 0;
+      if (incomingIds.length > 0) {
+        payload.updateMany = [
+          {
+            where: {
+              ...whereExtra,
+              createdAt: { lt: now },
+              [itemPrimaryKey]: { notIn: incomingIds }
+            },
+            data
+          }
+        ];
+      }
+    }
+    return payload;
+  }
+  return { create: itemsCreate };
+};
+var buildPrismaData = (cfg, op, validatedBody, ctx) => {
+  const env = { body: validatedBody, ctx };
+  const out = buildScalarData(cfg, op, env);
+  for (const rel of cfg.relations ?? []) {
+    const write = buildRelationWrite(rel, op, env);
+    if (write) out[rel.name] = write;
+  }
+  return out;
+};
+
+// src/repository/commonCreateUpdate.repository.ts
+var commonCreateUpdateRepository = (serviceDeps) => {
+  const { mappingExport, mappingImport, dtoMapping } = serviceDeps.mapper;
+  const db = serviceDeps.db;
+  const { generateErrorMessage, ErrorHandler } = serviceDeps.helpers;
+  const logger = serviceDeps.logger;
+  const createCache = serviceDeps.cacheAdapter.createCache;
+  const requestStorage = serviceDeps.requestStorage;
+  return {
+    // async commonCreate({
+    //   pageNo = 1,
+    //   pageSize = 10,
+    //   searchText,
+    //   sortBy,
+    //   sortDir,
+    //   searchColumns,
+    //   shortCodeData,
+    //   includes,
+    // }: SearchRequestService<DynamicShortCode>) {
+    //   logger.info("entering::commonSearch::repository");
+    //   const tableName = shortCodeData.tableName;
+    //   const whereClause: { OR?: Array<Record<string, unknown>> } = {};
+    //   if (searchText && searchColumns.length > 0) {
+    //     // Build an array of sub-objects
+    //     whereClause.OR = searchColumns.map((column: string) => {
+    //       if (column.includes(".")) {
+    //         const keys = column.split(".");
+    //         return buildNestedCondition(keys, searchText);
+    //       }
+    //       return { [column]: { contains: searchText } };
+    //     });
+    //     // Then transform them
+    //     whereClause.OR = transformData(whereClause.OR);
+    //   }
+    //   const orderByClause: Record<string, "asc" | "desc"> = {};
+    //   if (sortBy && sortDir) {
+    //     orderByClause[sortBy] = sortDir.toLowerCase() as "asc" | "desc";
+    //   }
+    //   const skip = (pageNo - 1) * pageSize;
+    //   const take = pageSize;
+    //   const model = db[tableName];
+    //   if (!model) {
+    //     throw new ErrorHandler(400, "Invalid mapping table name");
+    //   }
+    //   const query: QueryType = {
+    //     where: whereClause,
+    //     orderBy: orderByClause,
+    //     skip,
+    //     take,
+    //   };
+    //   if (includes) {
+    //     query.include = includes;
+    //   }
+    //   const results = await model.findMany(query);
+    //   const totalRecords = await model.count({ where: whereClause });
+    //   const totalPages = Math.ceil(totalRecords / pageSize);
+    //   const DTOClass = dtoMapping[shortCodeData.shortCode];
+    //   if (shortCodeData.isDTO && DTOClass) {
+    //     let DTOs = [];
+    //     if (shortCodeData.isSingleDto === undefined || shortCodeData.isSingleDto === true) {
+    //       DTOs = await Promise.all(results.map((record: unknown) => DTOClass(record)));
+    //     } else {
+    //       DTOs = await DTOClass(results);
+    //     }
+    //     return {
+    //       data: DTOs,
+    //       totalRecords,
+    //       currentPageNumber: pageNo,
+    //       pageSize,
+    //       lastPageNumber: totalPages,
+    //     };
+    //   }
+    //   logger.info("exiting::commonSearch::repository");
+    //   return {
+    //     data: results,
+    //     totalRecords,
+    //     currentPageNumber: pageNo,
+    //     pageSize,
+    //     lastPageNumber: totalPages,
+    //   };
+    // },
+    getDelegate(tableName) {
+      const d = db[tableName];
+      if (!d || typeof d !== "object") throw new ErrorHandler(400, "Invalid mapping table name");
+      const del = d;
+      if (typeof del.create !== "function" || typeof del.update !== "function" || typeof del.findFirst !== "function") {
+        throw new ErrorHandler(400, "Invalid prisma delegate for tableName");
+      }
+      return del;
+    },
+    resolveUniqueWhere(u, vars, body, ctx) {
+      const out = {};
+      for (const c of u.where) {
+        if (c.src.startsWith("vars.")) out[c.field] = (vars ?? {})[c.src.slice(5)];
+        else if (c.src.startsWith("body.")) out[c.field] = (body ?? {})[c.src.slice(5)];
+        else if (c.src.startsWith("ctx.")) out[c.field] = ctx[c.src.slice(4)];
+      }
+      return omitUndefined(out);
+    },
+    async runUniqueChecks(delegate, cfg, op, pkField, pkValue, body, ctx) {
+      for (const u of cfg.uniques ?? []) {
+        if (!u.op.includes(op)) continue;
+        const where = this.resolveUniqueWhere(u, ctx.vars ?? {}, body, ctx);
+        if (op === "update" && pkValue != null) {
+          where["NOT"] = { [pkField]: pkValue };
+        }
+        if (!Object.keys(where).length) continue;
+        const query = { where, select: { [pkField]: true } };
+        console.log(query);
+        const existing = await delegate.findFirst({ where, select: { [pkField]: true } });
+        if (existing) throw new ErrorHandler(400, u.message);
+      }
+    },
+    async commonCreate({ body, ctx, shortCodeData }) {
+      if (!shortCodeData.config) throw new ErrorHandler(400, "ShortCode config missing");
+      const cfg = shortCodeData.config;
+      const delegate = this.getDelegate(shortCodeData.tableName);
+      await this.runUniqueChecks(delegate, cfg, "create", cfg.primaryKey, void 0, body, ctx);
+      const data = buildPrismaData(cfg, "create", body, ctx);
+      const include = cfg.response?.include;
+      const select = cfg.response?.select ?? void 0;
+      return delegate.create({ data, include, select });
+    },
+    async commonUpdate({ body, ctx, id, shortCodeData }) {
+      if (!shortCodeData.config) throw new ErrorHandler(400, "ShortCode config missing");
+      const cfg = shortCodeData.config;
+      const pk = cfg.primaryKey;
+      if (cfg.operations.update.requirePrimaryKey && (id === void 0 || id === null || isNaN(Number(id)))) {
+        throw new ErrorHandler(400, "Missing id for update");
+      }
+      const delegate = this.getDelegate(shortCodeData.tableName);
+      await this.runUniqueChecks(delegate, cfg, "update", pk, id, body, ctx);
+      const data = buildPrismaData(cfg, "update", body, ctx);
+      const include = cfg.response?.include;
+      const select = cfg.response?.select ?? void 0;
+      return delegate.update({
+        where: { [pk]: id },
+        data,
+        include,
+        select
+      });
+    }
+  };
+};
+
+// src/utils/dynamicJoiBuilder.utils.ts
+var import_joi = __toESM(require("joi"));
+var buildScalar = (f) => {
+  const rules = f.rules ?? {};
+  let s;
+  switch (f.type) {
+    case "string": {
+      let j = import_joi.default.string();
+      if (rules.trim) j = j.trim();
+      if (typeof rules.min === "number") j = j.min(rules.min);
+      if (typeof rules.max === "number") j = j.max(rules.max);
+      if (rules.regex) j = j.pattern(new RegExp(rules.regex));
+      s = j;
+      break;
+    }
+    case "number": {
+      let j = import_joi.default.number();
+      if (rules.integer) j = j.integer();
+      if (typeof rules.min === "number") j = j.min(rules.min);
+      if (typeof rules.max === "number") j = j.max(rules.max);
+      s = j;
+      break;
+    }
+    case "boolean":
+      s = import_joi.default.boolean();
+      break;
+    case "date": {
+      let j = import_joi.default.date();
+      if (rules.iso) j = j.iso();
+      s = j;
+      break;
+    }
+    case "enum": {
+      const values = rules.values ?? [];
+      s = import_joi.default.string().valid(...values);
+      break;
+    }
+    case "object":
+      s = import_joi.default.object(rules.schema ?? {});
+      break;
+    case "array":
+      s = import_joi.default.array();
+      break;
+    case "json":
+    default:
+      s = import_joi.default.any();
+  }
+  if (f.allowNull) s = s.allow(null);
+  if (f.default !== void 0) s = s.default(f.default);
+  if (f.messages) s = s.messages(f.messages);
+  return s;
+};
+var applyPresence = (schema, presence) => {
+  if (presence === "required") return schema.required();
+  if (presence === "forbidden") return schema.forbidden();
+  return schema.optional();
+};
+var buildRelationSchema = (rel, op) => {
+  const itemShape = {};
+  for (const f of rel.items.fields) {
+    const scalar = buildScalar(f);
+    itemShape[f.name] = applyPresence(scalar, f.presence[op]);
+  }
+  const itemSchema = import_joi.default.object(itemShape);
+  const base = rel.kind === "many" ? import_joi.default.array().items(itemSchema) : itemSchema;
+  return applyPresence(base, rel.presence[op]);
+};
+var buildJoiSchemaForOp = (cfg, op) => {
+  const shape = {};
+  for (const f of cfg.fields) {
+    const scalar = buildScalar(f);
+    shape[f.name] = applyPresence(scalar, f.presence[op]);
+  }
+  for (const rel of cfg.relations ?? []) {
+    shape[rel.name] = buildRelationSchema(rel, op);
+  }
+  return import_joi.default.object(shape).prefs({
+    abortEarly: cfg.validation.abortEarly,
+    allowUnknown: cfg.validation.allowUnknown,
+    stripUnknown: cfg.validation.stripUnknown,
+    convert: cfg.validation.convert
+  });
+};
+
 // src/utils/helper.utils.ts
 function customOmit(obj, keys) {
   const rest = { ...obj };
@@ -944,11 +1287,13 @@ var import_exceljs = __toESM(require("exceljs"));
 var commonService = (serviceDeps) => {
   const generateErrorMessage = serviceDeps.helpers.generateErrorMessage;
   const ErrorHandler = serviceDeps.helpers.ErrorHandler;
-  const { deleteCache, getCacheById, updateCache, createCache } = serviceDeps.cacheAdapter;
+  const { deleteCache, getCacheById, updateCache, createCache, addToCache } = serviceDeps.cacheAdapter;
   const logger = serviceDeps.logger;
   const dtoMapping = serviceDeps.mapper.dtoMapping;
   const { REDIS_PREFIX, CACHE_KEY_NAME } = serviceDeps.config;
   const commonRepositoryFactory = commonRepository(serviceDeps);
+  const commonCreateUpdateRepositoryFactory = commonCreateUpdateRepository(serviceDeps);
+  const requestStorage = serviceDeps.requestStorage;
   return {
     async search(searchParams) {
       logger.info("entering::search::service");
@@ -1188,18 +1533,55 @@ var commonService = (serviceDeps) => {
     },
     async create(createParams) {
       logger.info("entering::create::service");
+      const store = requestStorage.getStore();
+      const currentUser = store?.user?.id ?? null;
       const shortCodeData = createParams.shortCodeData;
-      const createResult = await commonRepositoryFactory.commonCreate({ ...createParams, shortCodeData });
+      const cfg = shortCodeData.config;
+      const ctx = { userId: currentUser ?? void 0, vars: {} };
+      const schema = buildJoiSchemaForOp(cfg, "create");
+      const validated = await schema.validateAsync(createParams.body);
+      const createResult = await commonCreateUpdateRepositoryFactory.commonCreate({
+        body: validated,
+        ctx,
+        shortCodeData
+      });
       if (shortCodeData.isCacheable) {
-        await createCache(`${REDIS_PREFIX}${CACHE_KEY_NAME}:${shortCodeData.tableName}:all`, createResult);
+        await addToCache(
+          `${REDIS_PREFIX}${CACHE_KEY_NAME}:${shortCodeData.tableName}:all`,
+          createResult[cfg.primaryKey],
+          createResult
+        );
+      }
+      if (shortCodeData.isDTO && dtoMapping[shortCodeData.shortCode]) {
+        let dtoResult;
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          dtoResult = await dtoMapping[shortCodeData.shortCode](createResult);
+        } else {
+          dtoResult = (await dtoMapping[shortCodeData.shortCode]([createResult]))?.[0];
+        }
+        if (!dtoResult) {
+          throw new ErrorHandler(404, generateErrorMessage("NOT_FOUND", `${shortCodeData.tableName}`));
+        }
+        return dtoResult;
       }
       logger.info("exiting::create::service");
       return createResult;
     },
     async update(updateParams) {
       logger.info("entering::update::service");
+      const store = requestStorage.getStore();
+      const currentUser = store?.user?.id ?? null;
       const shortCodeData = updateParams.shortCodeData;
-      const updateResult = await commonRepositoryFactory.commonUpdate({ ...updateParams, shortCodeData });
+      const cfg = shortCodeData.config;
+      const ctx = { userId: currentUser ?? void 0, vars: {} };
+      const schema = buildJoiSchemaForOp(cfg, "update");
+      const validated = await schema.validateAsync(updateParams.body);
+      const updateResult = await commonCreateUpdateRepositoryFactory.commonUpdate({
+        body: validated,
+        ctx,
+        shortCodeData,
+        id: updateParams.id
+      });
       if (shortCodeData.isCacheable) {
         await updateCache(
           `${REDIS_PREFIX}${CACHE_KEY_NAME}:${shortCodeData.tableName}:all`,
@@ -1207,6 +1589,18 @@ var commonService = (serviceDeps) => {
           updateResult
         );
       }
+      if (shortCodeData.isDTO && dtoMapping[shortCodeData.shortCode]) {
+        let dtoResult;
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          dtoResult = await dtoMapping[shortCodeData.shortCode](updateResult);
+        } else {
+          dtoResult = (await dtoMapping[shortCodeData.shortCode]([updateResult]))?.[0];
+        }
+        if (!dtoResult) {
+          throw new ErrorHandler(404, generateErrorMessage("NOT_FOUND", `${shortCodeData.tableName}`));
+        }
+        return dtoResult;
+      }
       logger.info("exiting::update::service");
       return updateResult;
     },
@@ -2126,7 +2520,7 @@ var AuditLogger = class {
   async logIfEnabled(params) {
     const { service, method, payload } = params;
     const prisma = this.core.getPrisma();
-    const { userId, traceId, ccId: ctxCcId, module: module2 } = this.core.getContext();
+    const { userId, traceId, level1Id: ctxLvl1Id, level2Id: ctxLvl2Id, module: module2 } = this.core.getContext();
     try {
       const config = await prisma.auditConfig.findFirst({
         where: {
@@ -2141,14 +2535,16 @@ var AuditLogger = class {
       }
       const message = payload.type === "ERROR" ? payload.message : config.message;
       const type = payload.type ?? "INFO";
-      const ccId = payload.ccId ?? ctxCcId ?? 0;
+      const level1Id = payload.level1Id ?? ctxLvl1Id ?? 0;
+      const level2Id = payload.level2Id ?? ctxLvl2Id ?? 0;
       await prisma.commonAudit.create({
         data: {
           service,
           module: module2,
           type,
           message,
-          ccId,
+          level1Id,
+          level2Id,
           methodName: method,
           traceId,
           createdBy: userId ?? void 0

package/dist/index.mjs

@@ -408,39 +408,6 @@ var commonRepository = (serviceDeps) => {
       logger.info("exiting::commonLock::repository");
       return updatedRecord;
     },
-    async commonCreate({ shortCodeData, value, description }) {
-      logger.info("entering::commonCreate::repository");
-      const tableName = shortCodeData.tableName;
-      const model = db[tableName];
-      if (!model) {
-        throw new ErrorHandler(400, generateErrorMessage("INVALID_TABLE"));
-      }
-      const results = model.create({
-        data: {
-          value,
-          description
-        }
-      });
-      logger.info("exiting::commonCreate::repository");
-      return results;
-    },
-    async commonUpdate({ id, shortCodeData, value, description }) {
-      logger.info("entering::commonUpdate::repository");
-      const tableName = shortCodeData.tableName;
-      const model = db[tableName];
-      if (!model) {
-        throw new ErrorHandler(400, generateErrorMessage("INVALID_TABLE"));
-      }
-      const results = model.update({
-        where: { id },
-        data: {
-          value,
-          description
-        }
-      });
-      logger.info("exiting::commonUpdate::repository");
-      return results;
-    },
     async generateRootCondition({
       fixedSearch,
       fixedNotSearch
@@ -768,6 +735,382 @@ var commonRepository = (serviceDeps) => {
   };
 };
 
+// src/utils/dynamicCreateUpdate.utils.ts
+var isRecord = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+var getByPath = (root, path) => {
+  if (!path) return void 0;
+  const parts = path.split(".");
+  let cur = root;
+  for (const p of parts) {
+    if (!isRecord(cur)) return void 0;
+    cur = cur[p];
+  }
+  return cur;
+};
+var omitUndefined = (obj) => {
+  const out = {};
+  for (const [k, v] of Object.entries(obj)) {
+    if (v !== void 0) out[k] = v;
+  }
+  return out;
+};
+
+// src/utils/dynamicPrismaBuilder.utils.ts
+var resolveSrc = (f, env) => {
+  const src = f.src ?? `body.${f.name}`;
+  if (src.startsWith("body.")) return getByPath(env.body, src.slice(5));
+  if (src.startsWith("vars.")) return getByPath(env.ctx.vars ?? {}, src.slice(5));
+  if (src.startsWith("ctx.")) return getByPath(env.ctx, src.slice(4));
+  return void 0;
+};
+var setAudit = (cfg, op, out, ctx) => {
+  const createdByField = cfg.audit?.createdByField ?? "createdBy";
+  const updatedByField = cfg.audit?.updatedByField ?? "updatedBy";
+  if (op === "create" && ctx.userId != null) out[createdByField] = ctx.userId;
+  if (ctx.userId != null) out[updatedByField] = ctx.userId;
+};
+var buildScalarData = (cfg, op, env) => {
+  const out = {};
+  for (const f of cfg.fields) {
+    const dbKey = f.db ?? f.name;
+    const presence = f.presence[op];
+    if (presence === "forbidden") continue;
+    if (dbKey === cfg.primaryKey) continue;
+    const value = resolveSrc(f, env);
+    if (value === void 0) continue;
+    if (value === null && !f.allowNull) continue;
+    out[dbKey] = value;
+  }
+  setAudit(cfg, op, out, env.ctx);
+  return out;
+};
+var buildRelationWrite = (rel, op, env) => {
+  const raw = env.body[rel.name];
+  if (raw === void 0) return void 0;
+  const writeCfg = op === "create" ? rel.write.create : rel.write.update;
+  const itemPrimaryKey = writeCfg.itemPrimaryKey ?? "id";
+  const toItemData = (item, itemOp) => {
+    const itemBody = isRecord(item) ? item : {};
+    const itemOut = {};
+    for (const f of rel.items.fields) {
+      const dbKey = f.db ?? f.name;
+      const presence = f.presence[itemOp];
+      if (presence === "forbidden") continue;
+      if (dbKey === itemPrimaryKey) continue;
+      const v = itemBody[f.name];
+      if (v === void 0) continue;
+      if (v === null && !f.allowNull) continue;
+      itemOut[dbKey] = v;
+    }
+    if (rel.items.audit?.createdBy?.startsWith("ctx.") && env.ctx.userId != null) {
+      itemOut["createdBy"] = env.ctx.userId;
+    }
+    if (rel.items.audit?.updatedBy?.startsWith("ctx.") && env.ctx.userId != null) {
+      itemOut["updatedBy"] = env.ctx.userId;
+    }
+    return itemOut;
+  };
+  if (rel.kind === "one") {
+    const itemData = toItemData(raw, op);
+    if (op === "create") return { create: itemData };
+    if (writeCfg.strategy === "replace") return { delete: true, create: itemData };
+    if (writeCfg.strategy === "upsert")
+      return { upsert: { create: itemData, update: omitUndefined(itemData), where: {} } };
+    return { create: itemData };
+  }
+  const arr = Array.isArray(raw) ? raw : [];
+  const itemsCreate = arr.map((i) => toItemData(i, op));
+  if (op === "create") return { create: itemsCreate };
+  if (writeCfg.strategy === "replace") return { deleteMany: {}, create: itemsCreate };
+  if (writeCfg.strategy === "upsert") {
+    const incomingIds = [];
+    const upsertItems = [];
+    const createOnly = [];
+    for (const item of arr) {
+      const itemRec = isRecord(item) ? item : {};
+      const pk = itemRec[itemPrimaryKey];
+      const dataCreate = toItemData(itemRec, "create");
+      const dataUpdate = toItemData(itemRec, "update");
+      if (pk === void 0 || pk === null || pk === "") {
+        createOnly.push(dataCreate);
+        continue;
+      }
+      const pkNum = typeof pk === "string" ? Number(pk) : pk;
+      if (Number.isFinite(pkNum)) incomingIds.push(pkNum);
+      upsertItems.push({
+        where: { [itemPrimaryKey]: pkNum },
+        create: dataCreate,
+        update: omitUndefined(dataUpdate)
+      });
+    }
+    const payload = {};
+    if (upsertItems.length) payload.upsert = upsertItems;
+    if (createOnly.length) payload.create = createOnly;
+    const cfgAny = writeCfg;
+    const now = /* @__PURE__ */ new Date();
+    if (cfgAny.softDeleteMissing) {
+      const whereExtra = cfgAny.softDelete?.whereExtra ?? { isActive: true };
+      const data = {
+        ...cfgAny.softDelete?.data ?? { isActive: false }
+      };
+      if (data.deletedAt === "now") data.deletedAt = now;
+      if (data.deletedBy === "ctx.userId") data.deletedBy = env.ctx.userId ?? void 0;
+      if (incomingIds.length > 0) {
+        payload.updateMany = [
+          {
+            where: {
+              ...whereExtra,
+              createdAt: { lt: now },
+              [itemPrimaryKey]: { notIn: incomingIds }
+            },
+            data
+          }
+        ];
+      }
+    }
+    return payload;
+  }
+  return { create: itemsCreate };
+};
+var buildPrismaData = (cfg, op, validatedBody, ctx) => {
+  const env = { body: validatedBody, ctx };
+  const out = buildScalarData(cfg, op, env);
+  for (const rel of cfg.relations ?? []) {
+    const write = buildRelationWrite(rel, op, env);
+    if (write) out[rel.name] = write;
+  }
+  return out;
+};
+
+// src/repository/commonCreateUpdate.repository.ts
+var commonCreateUpdateRepository = (serviceDeps) => {
+  const { mappingExport, mappingImport, dtoMapping } = serviceDeps.mapper;
+  const db = serviceDeps.db;
+  const { generateErrorMessage, ErrorHandler } = serviceDeps.helpers;
+  const logger = serviceDeps.logger;
+  const createCache = serviceDeps.cacheAdapter.createCache;
+  const requestStorage = serviceDeps.requestStorage;
+  return {
+    // async commonCreate({
+    //   pageNo = 1,
+    //   pageSize = 10,
+    //   searchText,
+    //   sortBy,
+    //   sortDir,
+    //   searchColumns,
+    //   shortCodeData,
+    //   includes,
+    // }: SearchRequestService<DynamicShortCode>) {
+    //   logger.info("entering::commonSearch::repository");
+    //   const tableName = shortCodeData.tableName;
+    //   const whereClause: { OR?: Array<Record<string, unknown>> } = {};
+    //   if (searchText && searchColumns.length > 0) {
+    //     // Build an array of sub-objects
+    //     whereClause.OR = searchColumns.map((column: string) => {
+    //       if (column.includes(".")) {
+    //         const keys = column.split(".");
+    //         return buildNestedCondition(keys, searchText);
+    //       }
+    //       return { [column]: { contains: searchText } };
+    //     });
+    //     // Then transform them
+    //     whereClause.OR = transformData(whereClause.OR);
+    //   }
+    //   const orderByClause: Record<string, "asc" | "desc"> = {};
+    //   if (sortBy && sortDir) {
+    //     orderByClause[sortBy] = sortDir.toLowerCase() as "asc" | "desc";
+    //   }
+    //   const skip = (pageNo - 1) * pageSize;
+    //   const take = pageSize;
+    //   const model = db[tableName];
+    //   if (!model) {
+    //     throw new ErrorHandler(400, "Invalid mapping table name");
+    //   }
+    //   const query: QueryType = {
+    //     where: whereClause,
+    //     orderBy: orderByClause,
+    //     skip,
+    //     take,
+    //   };
+    //   if (includes) {
+    //     query.include = includes;
+    //   }
+    //   const results = await model.findMany(query);
+    //   const totalRecords = await model.count({ where: whereClause });
+    //   const totalPages = Math.ceil(totalRecords / pageSize);
+    //   const DTOClass = dtoMapping[shortCodeData.shortCode];
+    //   if (shortCodeData.isDTO && DTOClass) {
+    //     let DTOs = [];
+    //     if (shortCodeData.isSingleDto === undefined || shortCodeData.isSingleDto === true) {
+    //       DTOs = await Promise.all(results.map((record: unknown) => DTOClass(record)));
+    //     } else {
+    //       DTOs = await DTOClass(results);
+    //     }
+    //     return {
+    //       data: DTOs,
+    //       totalRecords,
+    //       currentPageNumber: pageNo,
+    //       pageSize,
+    //       lastPageNumber: totalPages,
+    //     };
+    //   }
+    //   logger.info("exiting::commonSearch::repository");
+    //   return {
+    //     data: results,
+    //     totalRecords,
+    //     currentPageNumber: pageNo,
+    //     pageSize,
+    //     lastPageNumber: totalPages,
+    //   };
+    // },
+    getDelegate(tableName) {
+      const d = db[tableName];
+      if (!d || typeof d !== "object") throw new ErrorHandler(400, "Invalid mapping table name");
+      const del = d;
+      if (typeof del.create !== "function" || typeof del.update !== "function" || typeof del.findFirst !== "function") {
+        throw new ErrorHandler(400, "Invalid prisma delegate for tableName");
+      }
+      return del;
+    },
+    resolveUniqueWhere(u, vars, body, ctx) {
+      const out = {};
+      for (const c of u.where) {
+        if (c.src.startsWith("vars.")) out[c.field] = (vars ?? {})[c.src.slice(5)];
+        else if (c.src.startsWith("body.")) out[c.field] = (body ?? {})[c.src.slice(5)];
+        else if (c.src.startsWith("ctx.")) out[c.field] = ctx[c.src.slice(4)];
+      }
+      return omitUndefined(out);
+    },
+    async runUniqueChecks(delegate, cfg, op, pkField, pkValue, body, ctx) {
+      for (const u of cfg.uniques ?? []) {
+        if (!u.op.includes(op)) continue;
+        const where = this.resolveUniqueWhere(u, ctx.vars ?? {}, body, ctx);
+        if (op === "update" && pkValue != null) {
+          where["NOT"] = { [pkField]: pkValue };
+        }
+        if (!Object.keys(where).length) continue;
+        const query = { where, select: { [pkField]: true } };
+        console.log(query);
+        const existing = await delegate.findFirst({ where, select: { [pkField]: true } });
+        if (existing) throw new ErrorHandler(400, u.message);
+      }
+    },
+    async commonCreate({ body, ctx, shortCodeData }) {
+      if (!shortCodeData.config) throw new ErrorHandler(400, "ShortCode config missing");
+      const cfg = shortCodeData.config;
+      const delegate = this.getDelegate(shortCodeData.tableName);
+      await this.runUniqueChecks(delegate, cfg, "create", cfg.primaryKey, void 0, body, ctx);
+      const data = buildPrismaData(cfg, "create", body, ctx);
+      const include = cfg.response?.include;
+      const select = cfg.response?.select ?? void 0;
+      return delegate.create({ data, include, select });
+    },
+    async commonUpdate({ body, ctx, id, shortCodeData }) {
+      if (!shortCodeData.config) throw new ErrorHandler(400, "ShortCode config missing");
+      const cfg = shortCodeData.config;
+      const pk = cfg.primaryKey;
+      if (cfg.operations.update.requirePrimaryKey && (id === void 0 || id === null || isNaN(Number(id)))) {
+        throw new ErrorHandler(400, "Missing id for update");
+      }
+      const delegate = this.getDelegate(shortCodeData.tableName);
+      await this.runUniqueChecks(delegate, cfg, "update", pk, id, body, ctx);
+      const data = buildPrismaData(cfg, "update", body, ctx);
+      const include = cfg.response?.include;
+      const select = cfg.response?.select ?? void 0;
+      return delegate.update({
+        where: { [pk]: id },
+        data,
+        include,
+        select
+      });
+    }
+  };
+};
+
+// src/utils/dynamicJoiBuilder.utils.ts
+import Joi from "joi";
+var buildScalar = (f) => {
+  const rules = f.rules ?? {};
+  let s;
+  switch (f.type) {
+    case "string": {
+      let j = Joi.string();
+      if (rules.trim) j = j.trim();
+      if (typeof rules.min === "number") j = j.min(rules.min);
+      if (typeof rules.max === "number") j = j.max(rules.max);
+      if (rules.regex) j = j.pattern(new RegExp(rules.regex));
+      s = j;
+      break;
+    }
+    case "number": {
+      let j = Joi.number();
+      if (rules.integer) j = j.integer();
+      if (typeof rules.min === "number") j = j.min(rules.min);
+      if (typeof rules.max === "number") j = j.max(rules.max);
+      s = j;
+      break;
+    }
+    case "boolean":
+      s = Joi.boolean();
+      break;
+    case "date": {
+      let j = Joi.date();
+      if (rules.iso) j = j.iso();
+      s = j;
+      break;
+    }
+    case "enum": {
+      const values = rules.values ?? [];
+      s = Joi.string().valid(...values);
+      break;
+    }
+    case "object":
+      s = Joi.object(rules.schema ?? {});
+      break;
+    case "array":
+      s = Joi.array();
+      break;
+    case "json":
+    default:
+      s = Joi.any();
+  }
+  if (f.allowNull) s = s.allow(null);
+  if (f.default !== void 0) s = s.default(f.default);
+  if (f.messages) s = s.messages(f.messages);
+  return s;
+};
+var applyPresence = (schema, presence) => {
+  if (presence === "required") return schema.required();
+  if (presence === "forbidden") return schema.forbidden();
+  return schema.optional();
+};
+var buildRelationSchema = (rel, op) => {
+  const itemShape = {};
+  for (const f of rel.items.fields) {
+    const scalar = buildScalar(f);
+    itemShape[f.name] = applyPresence(scalar, f.presence[op]);
+  }
+  const itemSchema = Joi.object(itemShape);
+  const base = rel.kind === "many" ? Joi.array().items(itemSchema) : itemSchema;
+  return applyPresence(base, rel.presence[op]);
+};
+var buildJoiSchemaForOp = (cfg, op) => {
+  const shape = {};
+  for (const f of cfg.fields) {
+    const scalar = buildScalar(f);
+    shape[f.name] = applyPresence(scalar, f.presence[op]);
+  }
+  for (const rel of cfg.relations ?? []) {
+    shape[rel.name] = buildRelationSchema(rel, op);
+  }
+  return Joi.object(shape).prefs({
+    abortEarly: cfg.validation.abortEarly,
+    allowUnknown: cfg.validation.allowUnknown,
+    stripUnknown: cfg.validation.stripUnknown,
+    convert: cfg.validation.convert
+  });
+};
+
 // src/utils/helper.utils.ts
 function customOmit(obj, keys) {
   const rest = { ...obj };
@@ -894,11 +1237,13 @@ import ExcelJs from "exceljs";
 var commonService = (serviceDeps) => {
   const generateErrorMessage = serviceDeps.helpers.generateErrorMessage;
   const ErrorHandler = serviceDeps.helpers.ErrorHandler;
-  const { deleteCache, getCacheById, updateCache, createCache } = serviceDeps.cacheAdapter;
+  const { deleteCache, getCacheById, updateCache, createCache, addToCache } = serviceDeps.cacheAdapter;
   const logger = serviceDeps.logger;
   const dtoMapping = serviceDeps.mapper.dtoMapping;
   const { REDIS_PREFIX, CACHE_KEY_NAME } = serviceDeps.config;
   const commonRepositoryFactory = commonRepository(serviceDeps);
+  const commonCreateUpdateRepositoryFactory = commonCreateUpdateRepository(serviceDeps);
+  const requestStorage = serviceDeps.requestStorage;
   return {
     async search(searchParams) {
       logger.info("entering::search::service");
@@ -1138,18 +1483,55 @@ var commonService = (serviceDeps) => {
     },
     async create(createParams) {
       logger.info("entering::create::service");
+      const store = requestStorage.getStore();
+      const currentUser = store?.user?.id ?? null;
       const shortCodeData = createParams.shortCodeData;
-      const createResult = await commonRepositoryFactory.commonCreate({ ...createParams, shortCodeData });
+      const cfg = shortCodeData.config;
+      const ctx = { userId: currentUser ?? void 0, vars: {} };
+      const schema = buildJoiSchemaForOp(cfg, "create");
+      const validated = await schema.validateAsync(createParams.body);
+      const createResult = await commonCreateUpdateRepositoryFactory.commonCreate({
+        body: validated,
+        ctx,
+        shortCodeData
+      });
       if (shortCodeData.isCacheable) {
-        await createCache(`${REDIS_PREFIX}${CACHE_KEY_NAME}:${shortCodeData.tableName}:all`, createResult);
+        await addToCache(
+          `${REDIS_PREFIX}${CACHE_KEY_NAME}:${shortCodeData.tableName}:all`,
+          createResult[cfg.primaryKey],
+          createResult
+        );
+      }
+      if (shortCodeData.isDTO && dtoMapping[shortCodeData.shortCode]) {
+        let dtoResult;
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          dtoResult = await dtoMapping[shortCodeData.shortCode](createResult);
+        } else {
+          dtoResult = (await dtoMapping[shortCodeData.shortCode]([createResult]))?.[0];
+        }
+        if (!dtoResult) {
+          throw new ErrorHandler(404, generateErrorMessage("NOT_FOUND", `${shortCodeData.tableName}`));
+        }
+        return dtoResult;
       }
       logger.info("exiting::create::service");
       return createResult;
     },
     async update(updateParams) {
       logger.info("entering::update::service");
+      const store = requestStorage.getStore();
+      const currentUser = store?.user?.id ?? null;
       const shortCodeData = updateParams.shortCodeData;
-      const updateResult = await commonRepositoryFactory.commonUpdate({ ...updateParams, shortCodeData });
+      const cfg = shortCodeData.config;
+      const ctx = { userId: currentUser ?? void 0, vars: {} };
+      const schema = buildJoiSchemaForOp(cfg, "update");
+      const validated = await schema.validateAsync(updateParams.body);
+      const updateResult = await commonCreateUpdateRepositoryFactory.commonUpdate({
+        body: validated,
+        ctx,
+        shortCodeData,
+        id: updateParams.id
+      });
       if (shortCodeData.isCacheable) {
         await updateCache(
           `${REDIS_PREFIX}${CACHE_KEY_NAME}:${shortCodeData.tableName}:all`,
@@ -1157,6 +1539,18 @@ var commonService = (serviceDeps) => {
           updateResult
         );
       }
+      if (shortCodeData.isDTO && dtoMapping[shortCodeData.shortCode]) {
+        let dtoResult;
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          dtoResult = await dtoMapping[shortCodeData.shortCode](updateResult);
+        } else {
+          dtoResult = (await dtoMapping[shortCodeData.shortCode]([updateResult]))?.[0];
+        }
+        if (!dtoResult) {
+          throw new ErrorHandler(404, generateErrorMessage("NOT_FOUND", `${shortCodeData.tableName}`));
+        }
+        return dtoResult;
+      }
       logger.info("exiting::update::service");
       return updateResult;
     },
@@ -2076,7 +2470,7 @@ var AuditLogger = class {
   async logIfEnabled(params) {
     const { service, method, payload } = params;
     const prisma = this.core.getPrisma();
-    const { userId, traceId, ccId: ctxCcId, module } = this.core.getContext();
+    const { userId, traceId, level1Id: ctxLvl1Id, level2Id: ctxLvl2Id, module } = this.core.getContext();
     try {
       const config = await prisma.auditConfig.findFirst({
         where: {
@@ -2091,14 +2485,16 @@ var AuditLogger = class {
       }
       const message = payload.type === "ERROR" ? payload.message : config.message;
       const type = payload.type ?? "INFO";
-      const ccId = payload.ccId ?? ctxCcId ?? 0;
+      const level1Id = payload.level1Id ?? ctxLvl1Id ?? 0;
+      const level2Id = payload.level2Id ?? ctxLvl2Id ?? 0;
       await prisma.commonAudit.create({
         data: {
           service,
           module,
           type,
           message,
-          ccId,
+          level1Id,
+          level2Id,
           methodName: method,
           traceId,
           createdBy: userId ?? void 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -21,12 +21,13 @@
   },
   "dependencies": {
     "@prisma/client": "^6.19.0",
-    "prisma": "^6.19.0",
     "axios": "^1.11.0",
     "exceljs": "^4.4.0",
     "handlebars": "^4.7.8",
+    "joi": "^17.13.3",
     "node-cron": "^4.2.1",
     "nodemailer": "^7.0.10",
-    "prettier": "^3.6.2"
+    "prettier": "^3.6.2",
+    "prisma": "^6.19.0"
   }
 }