@7365admin1/module-hygiene 4.5.0 → 4.7.0

package/dist/index.mjs

@@ -2556,6 +2556,8 @@ function MAreaChecklist(value) {
         units: checklistItem.units.map((unit) => ({
           unit: new ObjectId8(unit.unit),
           name: unit.name,
+          approve: false,
+          reject: false,
           status: "ready",
           remarks: "",
           completedBy: "",
@@ -3098,8 +3100,12 @@ function useAreaChecklistRepo() {
           $project: {
             _id: 0,
             set: "$checklist.set",
+            remarks: "$checklist.remarks",
+            attachment: "$checklist.attachment",
             unit: "$checklist.units.unit",
             name: "$checklist.units.name",
+            approve: "$checklist.units.approve",
+            reject: "$checklist.units.reject",
             status: {
               $switch: {
                 branches: [
@@ -3114,18 +3120,21 @@ function useAreaChecklistRepo() {
                 ],
                 default: "$checklist.units.status"
               }
-            },
-            remarks: "$checklist.units.remarks"
+            }
           }
         },
         { $sort: { set: 1, name: 1 } },
         {
           $group: {
             _id: "$set",
+            remarks: { $first: "$remarks" },
+            attachment: { $first: "$attachment" },
             units: {
               $push: {
                 unit: "$unit",
                 name: "$name",
+                approve: "$approve",
+                reject: "$reject",
                 status: "$status",
                 remarks: "$remarks"
               }
@@ -3136,6 +3145,8 @@ function useAreaChecklistRepo() {
           $project: {
             _id: 0,
             set: "$_id",
+            remarks: "$remarks",
+            attachment: "$attachment",
             units: 1
           }
         },
@@ -3210,7 +3221,7 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
-  async function completeAreaChecklistUnits(_id, set, unitId, value, session) {
+  async function updateAreaChecklistUnits(_id, set, unitId, value, session) {
     try {
       _id = new ObjectId9(_id);
     } catch (error) {
@@ -3225,12 +3236,26 @@ function useAreaChecklistRepo() {
       const now = /* @__PURE__ */ new Date();
       const updateValue = {
         "checklist.$[checklist].units.$[unit].timestamp": now,
-        "checklist.$[checklist].units.$[unit].status": "completed",
         updatedAt: now
       };
+      if (value.approve === true) {
+        updateValue["checklist.$[checklist].units.$[unit].approve"] = true;
+        updateValue["checklist.$[checklist].units.$[unit].reject"] = false;
+        updateValue["checklist.$[checklist].units.$[unit].status"] = "completed";
+      } else if (value.reject === true) {
+        updateValue["checklist.$[checklist].units.$[unit].approve"] = false;
+        updateValue["checklist.$[checklist].units.$[unit].reject"] = true;
+        updateValue["checklist.$[checklist].units.$[unit].status"] = "ready";
+      }
       if (value.remarks) {
         updateValue["checklist.$[checklist].units.$[unit].remarks"] = value.remarks;
       }
+      if (value.attachment) {
+        updateValue["checklist.$[checklist].attachment"] = value.attachment;
+        if (value.remarks) {
+          updateValue["checklist.$[checklist].remarks"] = value.remarks;
+        }
+      }
       if (value.completedBy) {
         updateValue["checklist.$[checklist].units.$[unit].completedBy"] = new ObjectId9(value.completedBy);
       }
@@ -3358,7 +3383,7 @@ function useAreaChecklistRepo() {
     getAreaChecklistByAreaAndSchedule,
     updateAreaChecklist,
     updateAreaChecklistStatus,
-    completeAreaChecklistUnits,
+    updateAreaChecklistUnits,
     getMaxSetNumberForArea
   };
 }
@@ -3371,7 +3396,7 @@ function useAreaChecklistService() {
     getAllAreaChecklist,
     getAreaChecklistUnits,
     getAreaChecklistById,
-    completeAreaChecklistUnits: _completeAreaChecklistUnits,
+    updateAreaChecklistUnits: _updateAreaChecklistUnits,
     updateAreaChecklistStatus,
     getMaxSetNumberForArea
   } = useAreaChecklistRepo();
@@ -3442,11 +3467,11 @@ function useAreaChecklistService() {
       session?.endSession();
     }
   }
-  async function completeAreaChecklistUnits(_id, set, unitId, value) {
+  async function updateAreaChecklistUnits(_id, set, unitId, value) {
     const session = useAtlas7.getClient()?.startSession();
     try {
       session?.startTransaction();
-      await _completeAreaChecklistUnits(_id, set, unitId, value, session);
+      await _updateAreaChecklistUnits(_id, set, unitId, value, session);
       const allUnitsResult = await getAreaChecklistUnits(
         {
           page: 1,
@@ -3526,7 +3551,7 @@ function useAreaChecklistService() {
       session?.endSession();
     }
   }
-  return { createAreaChecklist, completeAreaChecklistUnits };
+  return { createAreaChecklist, updateAreaChecklistUnits };
 }
 
 // src/controllers/hygiene-area-checklist.controller.ts
@@ -3541,7 +3566,7 @@ function useAreaChecklistController() {
   } = useAreaChecklistRepo();
   const {
     createAreaChecklist: _createAreaChecklist,
-    completeAreaChecklistUnits: _completeAreaChecklistUnits
+    updateAreaChecklistUnits: _updateAreaChecklistUnits
   } = useAreaChecklistService();
   async function createAreaChecklist(req, res, next) {
     const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
@@ -3708,22 +3733,36 @@ function useAreaChecklistController() {
       return;
     }
   }
-  async function completeAreaChecklistUnits(req, res, next) {
+  async function updateAreaChecklistUnits(req, res, next) {
     const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
       (acc, [key, value]) => ({ ...acc, [key]: value }),
       {}
     ) : {};
     const completedBy = cookies["user"] || "";
+    const decisionMap = {
+      approve: { approve: true, reject: false },
+      reject: { approve: false, reject: true }
+    };
+    const decision = req.params.decision;
+    const decisionValues = decisionMap[decision] || {
+      approve: void 0,
+      reject: void 0
+    };
     const payload = {
       ...req.params,
       ...req.body,
+      ...decisionValues,
       completedBy
     };
     const validation = Joi9.object({
       id: Joi9.string().hex().required(),
       set: Joi9.number().integer().min(1).required(),
       unit: Joi9.string().hex().required(),
+      decision: Joi9.string().valid("approve", "reject").required(),
+      approve: Joi9.boolean().optional(),
+      reject: Joi9.boolean().optional(),
       remarks: Joi9.string().optional().allow("", null),
+      attachment: Joi9.array().items(Joi9.string()).optional(),
       completedBy: Joi9.string().hex().required()
     });
     const { error } = validation.validate(payload);
@@ -3733,13 +3772,8 @@ function useAreaChecklistController() {
       return;
     }
     try {
-      const { id, set, unit, ...value } = payload;
-      await _completeAreaChecklistUnits(
-        id,
-        parseInt(set),
-        unit,
-        value
-      );
+      const { id, set, unit, decision: decision2, ...value } = payload;
+      await _updateAreaChecklistUnits(id, parseInt(set), unit, value);
       res.json({ message: "Area checklist updated successfully." });
       return;
     } catch (error2) {
@@ -3754,7 +3788,7 @@ function useAreaChecklistController() {
     getAreaChecklistHistory,
     getAreaChecklistHistoryDetails,
     getAreaChecklistUnits,
-    completeAreaChecklistUnits
+    updateAreaChecklistUnits
   };
 }