npm - av6-core - Versions diffs - 1.8.4 → 1.8.6 - Mend

av6-core 1.8.4 → 1.8.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.d.mts CHANGED Viewed

@@ -522,19 +522,19 @@ interface CommonServiceResponse {
 declare const commonService: (serviceDeps: Deps) => CommonServiceResponse;
 declare enum ApprovalStatus {
-    PENDING = 0,
-    PARTIALLY_APPROVED = 1,
-    APPROVED = 2,
-    REJECTED = 3,
-    CANCELLED = 4
+    PENDING = "PENDING",
+    PARTIALLY_APPROVED = "PARTIALLY_APPROVED",
+    APPROVED = "APPROVED",
+    REJECTED = "REJECTED",
+    CANCELLED = "CANCELLED"
 }
 declare enum FlowType {
-    STATUS = 0,
-    CO_PAY = 1,
-    INDIVIDUAL_DISCOUNT = 2,
-    OVERALL_DISCOUNT = 3,
-    SPECIAL_DISCOUNT = 4,
-    REFUND = 5
+    STATUS = "STATUS",
+    CO_PAY = "CO_PAY",
+    INDIVIDUAL_DISCOUNT = "INDIVIDUAL_DISCOUNT",
+    OVERALL_DISCOUNT = "OVERALL_DISCOUNT",
+    SPECIAL_DISCOUNT = "SPECIAL_DISCOUNT",
+    REFUND = "REFUND"
 }
 type StepType = "MIN_MAX" | "NORMAL";
 declare enum ActionMode {

package/dist/index.d.ts CHANGED Viewed

@@ -522,19 +522,19 @@ interface CommonServiceResponse {
 declare const commonService: (serviceDeps: Deps) => CommonServiceResponse;
 declare enum ApprovalStatus {
-    PENDING = 0,
-    PARTIALLY_APPROVED = 1,
-    APPROVED = 2,
-    REJECTED = 3,
-    CANCELLED = 4
+    PENDING = "PENDING",
+    PARTIALLY_APPROVED = "PARTIALLY_APPROVED",
+    APPROVED = "APPROVED",
+    REJECTED = "REJECTED",
+    CANCELLED = "CANCELLED"
 }
 declare enum FlowType {
-    STATUS = 0,
-    CO_PAY = 1,
-    INDIVIDUAL_DISCOUNT = 2,
-    OVERALL_DISCOUNT = 3,
-    SPECIAL_DISCOUNT = 4,
-    REFUND = 5
+    STATUS = "STATUS",
+    CO_PAY = "CO_PAY",
+    INDIVIDUAL_DISCOUNT = "INDIVIDUAL_DISCOUNT",
+    OVERALL_DISCOUNT = "OVERALL_DISCOUNT",
+    SPECIAL_DISCOUNT = "SPECIAL_DISCOUNT",
+    REFUND = "REFUND"
 }
 type StepType = "MIN_MAX" | "NORMAL";
 declare enum ActionMode {

package/dist/index.js CHANGED Viewed

@@ -2307,20 +2307,20 @@ var commonService = (serviceDeps) => {
 // src/types/approval.type.ts
 var ApprovalStatus = /* @__PURE__ */ ((ApprovalStatus2) => {
-  ApprovalStatus2[ApprovalStatus2["PENDING"] = 0] = "PENDING";
-  ApprovalStatus2[ApprovalStatus2["PARTIALLY_APPROVED"] = 1] = "PARTIALLY_APPROVED";
-  ApprovalStatus2[ApprovalStatus2["APPROVED"] = 2] = "APPROVED";
-  ApprovalStatus2[ApprovalStatus2["REJECTED"] = 3] = "REJECTED";
-  ApprovalStatus2[ApprovalStatus2["CANCELLED"] = 4] = "CANCELLED";
+  ApprovalStatus2["PENDING"] = "PENDING";
+  ApprovalStatus2["PARTIALLY_APPROVED"] = "PARTIALLY_APPROVED";
+  ApprovalStatus2["APPROVED"] = "APPROVED";
+  ApprovalStatus2["REJECTED"] = "REJECTED";
+  ApprovalStatus2["CANCELLED"] = "CANCELLED";
   return ApprovalStatus2;
 })(ApprovalStatus || {});
 var FlowType = /* @__PURE__ */ ((FlowType3) => {
-  FlowType3[FlowType3["STATUS"] = 0] = "STATUS";
-  FlowType3[FlowType3["CO_PAY"] = 1] = "CO_PAY";
-  FlowType3[FlowType3["INDIVIDUAL_DISCOUNT"] = 2] = "INDIVIDUAL_DISCOUNT";
-  FlowType3[FlowType3["OVERALL_DISCOUNT"] = 3] = "OVERALL_DISCOUNT";
-  FlowType3[FlowType3["SPECIAL_DISCOUNT"] = 4] = "SPECIAL_DISCOUNT";
-  FlowType3[FlowType3["REFUND"] = 5] = "REFUND";
+  FlowType3["STATUS"] = "STATUS";
+  FlowType3["CO_PAY"] = "CO_PAY";
+  FlowType3["INDIVIDUAL_DISCOUNT"] = "INDIVIDUAL_DISCOUNT";
+  FlowType3["OVERALL_DISCOUNT"] = "OVERALL_DISCOUNT";
+  FlowType3["SPECIAL_DISCOUNT"] = "SPECIAL_DISCOUNT";
+  FlowType3["REFUND"] = "REFUND";
   return FlowType3;
 })(FlowType || {});
 var ActionMode = /* @__PURE__ */ ((ActionMode2) => {
@@ -2372,7 +2372,7 @@ var approvalRepository = (helpers) => {
       startDate,
       endDate,
       searchText = "",
-      status = [0 /* PENDING */, 1 /* PARTIALLY_APPROVED */],
+      status = ["PENDING" /* PENDING */, "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */],
       flowType
     }) {
       const offset = (pageNo - 1) * pageSize;
@@ -2541,7 +2541,7 @@ var ApprovalService = class {
         return s.stepType === "NORMAL" || s.stepType === "MIN_MAX" && Number(inst.netTotal) >= Number(s.minAmount) && Number(inst.netTotal) <= Number(s.maxAmount);
       });
       const lastLevel = await this.lastLevel(inst.flow.steps);
-      const newStatus = action === "REJECT" ? 3 /* REJECTED */ : step.level === lastLevel ? 2 /* APPROVED */ : 1 /* PARTIALLY_APPROVED */;
+      const newStatus = action === "REJECT" ? "REJECTED" /* REJECTED */ : step.level === lastLevel ? "APPROVED" /* APPROVED */ : "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */;
       await tx.approvalAction.create({
         data: {
           instanceId,
@@ -2552,7 +2552,7 @@ var ApprovalService = class {
         }
       });
       let newFlow = null;
-      if (newStatus === 1 /* PARTIALLY_APPROVED */) {
+      if (newStatus === "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */) {
         newFlow = await this.approvalRepo.findMatchingFlow(
           tx,
           inst.flow.subjectType,
@@ -2568,7 +2568,7 @@ var ApprovalService = class {
       const updated = await tx.approvalInstance.update({
         where: { id: instanceId },
         data: {
-          currentStep: newStatus === 1 /* PARTIALLY_APPROVED */ ? newFlow?.stepId : step.id,
+          currentStep: newStatus === "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */ ? newFlow?.stepId : step.id,
           status: newStatus
         }
       });
@@ -2589,7 +2589,7 @@ var ApprovalService = class {
         action,
         comment
       });
-      if (newStatus === 1 /* PARTIALLY_APPROVED */) {
+      if (newStatus === "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */) {
         const nextLevel = step.level + 1;
         const approvers = await tx.approverMapping.findMany({
           where: { stepId: updated.currentStep, ccId, isActive: true }
@@ -2685,7 +2685,7 @@ var ApprovalService = class {
       });
     } else {
       switch (instance.status) {
-        case 2 /* APPROVED */:
+        case "APPROVED" /* APPROVED */:
           if (approvalFlow.approveActionUrl) {
             const res = await fetch(approvalFlow.approveActionUrl, {
               method: "POST",
@@ -2703,7 +2703,7 @@ var ApprovalService = class {
             }
           }
           break;
-        case 3 /* REJECTED */:
+        case "REJECTED" /* REJECTED */:
           if (approvalFlow.rejectActionUrl) {
             const res = await fetch(approvalFlow.rejectActionUrl, {
               method: "POST",
@@ -2716,7 +2716,7 @@ var ApprovalService = class {
             }
           }
           break;
-        case 1 /* PARTIALLY_APPROVED */:
+        case "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */:
           if (approvalFlow.partiallyApproveActionUrl) {
             const res = await fetch(approvalFlow.partiallyApproveActionUrl, {
               method: "POST",
@@ -2739,59 +2739,57 @@ var ApprovalService = class {
     }
   }
   async assertPermission(step, approverId, instanceId, ccId, tx) {
-    const result = await tx.$queryRaw(`
-    SELECT COUNT(*) AS count
-    FROM (
-        SELECT am.staff_id AS staff_id
-        FROM core_approver_mapping am
-        WHERE am.step_id = ${step.id}
-          AND am.is_active = TRUE
-          AND am.cc_id = ${ccId}
-          AND am.staff_id = ${approverId}
+    const result = await tx.$queryRaw`
+  SELECT COUNT(*) AS count
+  FROM (
+      SELECT am.staff_id AS staff_id
+      FROM core_approver_mapping am
+      WHERE am.step_id = ${step.id}
+        AND am.is_active = TRUE
+        AND am.cc_id = ${ccId}
+        AND am.staff_id = ${approverId}
-        UNION
+      UNION
-        SELECT scc.staff_id AS staff_id
-        FROM core_approver_mapping am
-        LEFT JOIN staff_roles sr
-          ON sr.role_id = am.role_id
-        LEFT JOIN staff_collection_center scc
-          ON scc.collection_center_id = am.cc_id
-        AND scc.staff_id = sr.staff_id
-        WHERE am.step_id = ${step.id}
-          AND am.is_active = TRUE
-          AND am.cc_id = ${ccId}
-          AND scc.staff_id = ${approverId}
-    ) AS staff_union;
-      `);
+      SELECT scc.staff_id AS staff_id
+      FROM core_approver_mapping am
+      LEFT JOIN staff_roles sr
+        ON sr.role_id = am.role_id
+      LEFT JOIN staff_collection_center scc
+        ON scc.collection_center_id = am.cc_id
+       AND scc.staff_id = sr.staff_id
+      WHERE am.step_id = ${step.id}
+        AND am.is_active = TRUE
+        AND am.cc_id = ${ccId}
+        AND scc.staff_id = ${approverId}
+  ) AS staff_union;
+`;
     if (Number(result[0].count) === 0) {
       throw new this.deps.helpers.ErrorHandler(403, "You are not allowed to act on this approval step");
     }
-    const existingActsQuery = `
-      SELECT COUNT(*) AS count
-      FROM core_approval_action a
-      JOIN core_approval_instance ai ON ai.id = a.instance_id
-      WHERE ai.id = ?
-      AND a.level = ?
-      AND a.acted_by = ?
-      AND a.is_active = true
-      AND ai.is_active = true
-    `;
-    const actionsResult = await tx.$queryRawUnsafe(existingActsQuery, instanceId, step.level, approverId);
+    const actionsResult = await tx.$queryRaw`
+  SELECT COUNT(*) AS count
+  FROM core_approval_action a
+  JOIN core_approval_instance ai ON ai.id = a.instance_id
+  WHERE ai.id = ${instanceId}
+    AND a.level = ${step.level}
+    AND a.acted_by = ${approverId}
+    AND a.is_active = true
+    AND ai.is_active = true
+`;
     if (Number(actionsResult[0].count) > 0) {
       throw new this.deps.helpers.ErrorHandler(409, "You have already submitted a decision for this level");
     }
-    const prevApproversQuery = `
-      SELECT COUNT(*) AS count
-      FROM core_approval_action a
-      JOIN core_approval_instance ai ON ai.id = a.instance_id
-      WHERE ai.id = ?
-      AND a.level < ?
-      AND a.is_active = true
-      AND ai.is_active = true
-      AND a.acted_by IS NOT NULL
-    `;
-    const prevActionsResult = await tx.$queryRawUnsafe(prevApproversQuery, instanceId, step.level);
+    const prevActionsResult = await tx.$queryRaw`
+  SELECT COUNT(*) AS count
+  FROM core_approval_action a
+  JOIN core_approval_instance ai ON ai.id = a.instance_id
+  WHERE ai.id = ${instanceId}
+    AND a.level < ${step.level}
+    AND a.is_active = true
+    AND ai.is_active = true
+    AND a.acted_by IS NOT NULL
+`;
     if (Number(prevActionsResult[0].count) !== step.level - 1) {
       throw new this.deps.helpers.ErrorHandler(403, "You must wait for previous approvers to act first");
     }

package/dist/index.mjs CHANGED Viewed

@@ -2246,20 +2246,20 @@ var commonService = (serviceDeps) => {
 // src/types/approval.type.ts
 var ApprovalStatus = /* @__PURE__ */ ((ApprovalStatus2) => {
-  ApprovalStatus2[ApprovalStatus2["PENDING"] = 0] = "PENDING";
-  ApprovalStatus2[ApprovalStatus2["PARTIALLY_APPROVED"] = 1] = "PARTIALLY_APPROVED";
-  ApprovalStatus2[ApprovalStatus2["APPROVED"] = 2] = "APPROVED";
-  ApprovalStatus2[ApprovalStatus2["REJECTED"] = 3] = "REJECTED";
-  ApprovalStatus2[ApprovalStatus2["CANCELLED"] = 4] = "CANCELLED";
+  ApprovalStatus2["PENDING"] = "PENDING";
+  ApprovalStatus2["PARTIALLY_APPROVED"] = "PARTIALLY_APPROVED";
+  ApprovalStatus2["APPROVED"] = "APPROVED";
+  ApprovalStatus2["REJECTED"] = "REJECTED";
+  ApprovalStatus2["CANCELLED"] = "CANCELLED";
   return ApprovalStatus2;
 })(ApprovalStatus || {});
 var FlowType = /* @__PURE__ */ ((FlowType3) => {
-  FlowType3[FlowType3["STATUS"] = 0] = "STATUS";
-  FlowType3[FlowType3["CO_PAY"] = 1] = "CO_PAY";
-  FlowType3[FlowType3["INDIVIDUAL_DISCOUNT"] = 2] = "INDIVIDUAL_DISCOUNT";
-  FlowType3[FlowType3["OVERALL_DISCOUNT"] = 3] = "OVERALL_DISCOUNT";
-  FlowType3[FlowType3["SPECIAL_DISCOUNT"] = 4] = "SPECIAL_DISCOUNT";
-  FlowType3[FlowType3["REFUND"] = 5] = "REFUND";
+  FlowType3["STATUS"] = "STATUS";
+  FlowType3["CO_PAY"] = "CO_PAY";
+  FlowType3["INDIVIDUAL_DISCOUNT"] = "INDIVIDUAL_DISCOUNT";
+  FlowType3["OVERALL_DISCOUNT"] = "OVERALL_DISCOUNT";
+  FlowType3["SPECIAL_DISCOUNT"] = "SPECIAL_DISCOUNT";
+  FlowType3["REFUND"] = "REFUND";
   return FlowType3;
 })(FlowType || {});
 var ActionMode = /* @__PURE__ */ ((ActionMode2) => {
@@ -2311,7 +2311,7 @@ var approvalRepository = (helpers) => {
       startDate,
       endDate,
       searchText = "",
-      status = [0 /* PENDING */, 1 /* PARTIALLY_APPROVED */],
+      status = ["PENDING" /* PENDING */, "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */],
       flowType
     }) {
       const offset = (pageNo - 1) * pageSize;
@@ -2480,7 +2480,7 @@ var ApprovalService = class {
         return s.stepType === "NORMAL" || s.stepType === "MIN_MAX" && Number(inst.netTotal) >= Number(s.minAmount) && Number(inst.netTotal) <= Number(s.maxAmount);
       });
       const lastLevel = await this.lastLevel(inst.flow.steps);
-      const newStatus = action === "REJECT" ? 3 /* REJECTED */ : step.level === lastLevel ? 2 /* APPROVED */ : 1 /* PARTIALLY_APPROVED */;
+      const newStatus = action === "REJECT" ? "REJECTED" /* REJECTED */ : step.level === lastLevel ? "APPROVED" /* APPROVED */ : "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */;
       await tx.approvalAction.create({
         data: {
           instanceId,
@@ -2491,7 +2491,7 @@ var ApprovalService = class {
         }
       });
       let newFlow = null;
-      if (newStatus === 1 /* PARTIALLY_APPROVED */) {
+      if (newStatus === "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */) {
         newFlow = await this.approvalRepo.findMatchingFlow(
           tx,
           inst.flow.subjectType,
@@ -2507,7 +2507,7 @@ var ApprovalService = class {
       const updated = await tx.approvalInstance.update({
         where: { id: instanceId },
         data: {
-          currentStep: newStatus === 1 /* PARTIALLY_APPROVED */ ? newFlow?.stepId : step.id,
+          currentStep: newStatus === "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */ ? newFlow?.stepId : step.id,
           status: newStatus
         }
       });
@@ -2528,7 +2528,7 @@ var ApprovalService = class {
         action,
         comment
       });
-      if (newStatus === 1 /* PARTIALLY_APPROVED */) {
+      if (newStatus === "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */) {
         const nextLevel = step.level + 1;
         const approvers = await tx.approverMapping.findMany({
           where: { stepId: updated.currentStep, ccId, isActive: true }
@@ -2624,7 +2624,7 @@ var ApprovalService = class {
       });
     } else {
       switch (instance.status) {
-        case 2 /* APPROVED */:
+        case "APPROVED" /* APPROVED */:
           if (approvalFlow.approveActionUrl) {
             const res = await fetch(approvalFlow.approveActionUrl, {
               method: "POST",
@@ -2642,7 +2642,7 @@ var ApprovalService = class {
             }
           }
           break;
-        case 3 /* REJECTED */:
+        case "REJECTED" /* REJECTED */:
           if (approvalFlow.rejectActionUrl) {
             const res = await fetch(approvalFlow.rejectActionUrl, {
               method: "POST",
@@ -2655,7 +2655,7 @@ var ApprovalService = class {
             }
           }
           break;
-        case 1 /* PARTIALLY_APPROVED */:
+        case "PARTIALLY_APPROVED" /* PARTIALLY_APPROVED */:
           if (approvalFlow.partiallyApproveActionUrl) {
             const res = await fetch(approvalFlow.partiallyApproveActionUrl, {
               method: "POST",
@@ -2678,59 +2678,57 @@ var ApprovalService = class {
     }
   }
   async assertPermission(step, approverId, instanceId, ccId, tx) {
-    const result = await tx.$queryRaw(`
-    SELECT COUNT(*) AS count
-    FROM (
-        SELECT am.staff_id AS staff_id
-        FROM core_approver_mapping am
-        WHERE am.step_id = ${step.id}
-          AND am.is_active = TRUE
-          AND am.cc_id = ${ccId}
-          AND am.staff_id = ${approverId}
+    const result = await tx.$queryRaw`
+  SELECT COUNT(*) AS count
+  FROM (
+      SELECT am.staff_id AS staff_id
+      FROM core_approver_mapping am
+      WHERE am.step_id = ${step.id}
+        AND am.is_active = TRUE
+        AND am.cc_id = ${ccId}
+        AND am.staff_id = ${approverId}
-        UNION
+      UNION
-        SELECT scc.staff_id AS staff_id
-        FROM core_approver_mapping am
-        LEFT JOIN staff_roles sr
-          ON sr.role_id = am.role_id
-        LEFT JOIN staff_collection_center scc
-          ON scc.collection_center_id = am.cc_id
-        AND scc.staff_id = sr.staff_id
-        WHERE am.step_id = ${step.id}
-          AND am.is_active = TRUE
-          AND am.cc_id = ${ccId}
-          AND scc.staff_id = ${approverId}
-    ) AS staff_union;
-      `);
+      SELECT scc.staff_id AS staff_id
+      FROM core_approver_mapping am
+      LEFT JOIN staff_roles sr
+        ON sr.role_id = am.role_id
+      LEFT JOIN staff_collection_center scc
+        ON scc.collection_center_id = am.cc_id
+       AND scc.staff_id = sr.staff_id
+      WHERE am.step_id = ${step.id}
+        AND am.is_active = TRUE
+        AND am.cc_id = ${ccId}
+        AND scc.staff_id = ${approverId}
+  ) AS staff_union;
+`;
     if (Number(result[0].count) === 0) {
       throw new this.deps.helpers.ErrorHandler(403, "You are not allowed to act on this approval step");
     }
-    const existingActsQuery = `
-      SELECT COUNT(*) AS count
-      FROM core_approval_action a
-      JOIN core_approval_instance ai ON ai.id = a.instance_id
-      WHERE ai.id = ?
-      AND a.level = ?
-      AND a.acted_by = ?
-      AND a.is_active = true
-      AND ai.is_active = true
-    `;
-    const actionsResult = await tx.$queryRawUnsafe(existingActsQuery, instanceId, step.level, approverId);
+    const actionsResult = await tx.$queryRaw`
+  SELECT COUNT(*) AS count
+  FROM core_approval_action a
+  JOIN core_approval_instance ai ON ai.id = a.instance_id
+  WHERE ai.id = ${instanceId}
+    AND a.level = ${step.level}
+    AND a.acted_by = ${approverId}
+    AND a.is_active = true
+    AND ai.is_active = true
+`;
     if (Number(actionsResult[0].count) > 0) {
       throw new this.deps.helpers.ErrorHandler(409, "You have already submitted a decision for this level");
     }
-    const prevApproversQuery = `
-      SELECT COUNT(*) AS count
-      FROM core_approval_action a
-      JOIN core_approval_instance ai ON ai.id = a.instance_id
-      WHERE ai.id = ?
-      AND a.level < ?
-      AND a.is_active = true
-      AND ai.is_active = true
-      AND a.acted_by IS NOT NULL
-    `;
-    const prevActionsResult = await tx.$queryRawUnsafe(prevApproversQuery, instanceId, step.level);
+    const prevActionsResult = await tx.$queryRaw`
+  SELECT COUNT(*) AS count
+  FROM core_approval_action a
+  JOIN core_approval_instance ai ON ai.id = a.instance_id
+  WHERE ai.id = ${instanceId}
+    AND a.level < ${step.level}
+    AND a.is_active = true
+    AND ai.is_active = true
+    AND a.acted_by IS NOT NULL
+`;
     if (Number(prevActionsResult[0].count) !== step.level - 1) {
       throw new this.deps.helpers.ErrorHandler(403, "You must wait for previous approvers to act first");
     }

package/package.json CHANGED Viewed

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