av6-core 2.0.3 → 2.0.5

package/dist/index.d.mts

@@ -692,6 +692,7 @@ interface StartFlowReq {
     ccId: number;
     refNo: string;
     level?: number;
+    createdBy: number;
     extra?: Record<string, string | number | boolean | null>;
 }
 interface NotificationEvent {
@@ -829,7 +830,7 @@ declare class ApprovalService {
     private approvalRepo;
     private prisma;
     constructor(deps: ApprovalDeps);
-    startFlow(tx: PrismaClient | PrismaTransactionClient, { service, subjectType, subjectId, netTotal, ccId, refNo, level, extra }: StartFlowReq): Promise<void>;
+    startFlow(tx: PrismaClient | PrismaTransactionClient, { service, subjectType, subjectId, netTotal, ccId, refNo, level, extra, createdBy }: StartFlowReq): Promise<void>;
     lastLevel(steps: ApprovalStep[]): Promise<number>;
     /** Approver clicks “Approve” or “Reject”. */
     act({ instanceId, approverId, action, ccId, comment }: ActInput): Promise<any>;

package/dist/index.d.ts

@@ -692,6 +692,7 @@ interface StartFlowReq {
     ccId: number;
     refNo: string;
     level?: number;
+    createdBy: number;
     extra?: Record<string, string | number | boolean | null>;
 }
 interface NotificationEvent {
@@ -829,7 +830,7 @@ declare class ApprovalService {
     private approvalRepo;
     private prisma;
     constructor(deps: ApprovalDeps);
-    startFlow(tx: PrismaClient | PrismaTransactionClient, { service, subjectType, subjectId, netTotal, ccId, refNo, level, extra }: StartFlowReq): Promise<void>;
+    startFlow(tx: PrismaClient | PrismaTransactionClient, { service, subjectType, subjectId, netTotal, ccId, refNo, level, extra, createdBy }: StartFlowReq): Promise<void>;
     lastLevel(steps: ApprovalStep[]): Promise<number>;
     /** Approver clicks “Approve” or “Reject”. */
     act({ instanceId, approverId, action, ccId, comment }: ActInput): Promise<any>;

package/dist/index.js

@@ -2486,7 +2486,7 @@ var approvalRepository = (deps) => {
         ( cam.staff_id = ${staffId} or scc.staff_id = ${staffId} )
         and cai.status in (${import_client.Prisma.join(status)})
         and LOWER(cai.service) like LOWER(${serviceLike})
-        and LOWER(cai.ref_no) like LOWER(${pattern})
+        and (LOWER(cai.ref_no) like LOWER(${pattern}) or LOWER(cai.extra) like LOWER(${pattern}) )
         and cam.cc_id = ${ccId}
         and cai.is_active = 1
         and cas.is_active = 1
@@ -2680,9 +2680,9 @@ var ApprovalService = class {
   deps;
   approvalRepo;
   prisma;
-  async startFlow(tx, { service, subjectType, subjectId, netTotal, ccId, refNo, level = 1, extra }) {
+  async startFlow(tx, { service, subjectType, subjectId, netTotal, ccId, refNo, level = 1, extra, createdBy }) {
     const store = this.deps.requestStorage.getStore();
-    const currentUser = store?.user?.id;
+    const currentUser = createdBy ?? store?.user?.id;
     const flow = await this.approvalRepo.findMatchingFlow(tx, subjectType, service, ccId, netTotal, level);
     if (!flow) throw new Error("No approval flow configured");
     await tx.approvalInstance.updateMany({

package/dist/index.mjs

@@ -2423,7 +2423,7 @@ var approvalRepository = (deps) => {
         ( cam.staff_id = ${staffId} or scc.staff_id = ${staffId} )
         and cai.status in (${Prisma.join(status)})
         and LOWER(cai.service) like LOWER(${serviceLike})
-        and LOWER(cai.ref_no) like LOWER(${pattern})
+        and (LOWER(cai.ref_no) like LOWER(${pattern}) or LOWER(cai.extra) like LOWER(${pattern}) )
         and cam.cc_id = ${ccId}
         and cai.is_active = 1
         and cas.is_active = 1
@@ -2617,9 +2617,9 @@ var ApprovalService = class {
   deps;
   approvalRepo;
   prisma;
-  async startFlow(tx, { service, subjectType, subjectId, netTotal, ccId, refNo, level = 1, extra }) {
+  async startFlow(tx, { service, subjectType, subjectId, netTotal, ccId, refNo, level = 1, extra, createdBy }) {
     const store = this.deps.requestStorage.getStore();
-    const currentUser = store?.user?.id;
+    const currentUser = createdBy ?? store?.user?.id;
     const flow = await this.approvalRepo.findMatchingFlow(tx, subjectType, service, ccId, netTotal, level);
     if (!flow) throw new Error("No approval flow configured");
     await tx.approvalInstance.updateMany({

package/package.json

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