@7365admin1/module-hygiene 4.5.0 → 4.7.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @7365admin1/module-hygiene
 
+## 4.7.0
+
+### Minor Changes
+
+- Update Cleaning Schedule Area fields
+
+## 4.6.0
+
+### Minor Changes
+
+- Hygiene Cleaning Schedule Area Approve and Reject
+
 ## 4.5.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -217,10 +217,14 @@ type TCleaningScheduleArea = {
 type TAreaChecklist = {
     set: number;
     units: TAreaChecklistUnits[];
+    remarks?: string;
+    attachment?: string[];
 };
 type TAreaChecklistUnits = {
     unit: string | ObjectId;
     name: string;
+    approve?: boolean;
+    reject?: boolean;
     status?: (typeof allowedChecklistStatus)[number];
     remarks?: string;
     completedBy?: string | ObjectId;
@@ -240,7 +244,7 @@ type TCleaningScheduleAreaGetQuery = {
     status?: (typeof allowedStatus)[number] | "all";
 } & Pick<TCleaningScheduleArea, "schedule">;
 type TAreaChecklistUpdate = Pick<TCleaningScheduleArea, "checklist">;
-type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "remarks" | "completedBy">;
+type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "approve" | "reject" | "remarks" | "completedBy"> & Pick<TAreaChecklist, "attachment">;
 declare const areaChecklistSchema: Joi.ObjectSchema<any>;
 declare function MAreaChecklist(value: TCleaningScheduleArea): {
     schedule: string | ObjectId;
@@ -257,7 +261,7 @@ declare function MAreaChecklist(value: TCleaningScheduleArea): {
 
 declare function useAreaChecklistService(): {
     createAreaChecklist: (value: TAreaChecklistBatchCreate) => Promise<ObjectId[]>;
-    completeAreaChecklistUnits: (_id: string | ObjectId, set: number, unitId: string | ObjectId, value: TAreaChecklistUnitsUpdate) => Promise<void>;
+    updateAreaChecklistUnits: (_id: string | ObjectId, set: number, unitId: string | ObjectId, value: TAreaChecklistUnitsUpdate) => Promise<void>;
 };
 
 interface AreaUnit {
@@ -314,7 +318,7 @@ declare function useAreaChecklistRepo(): {
     getAreaChecklistByAreaAndSchedule: (schedule: string | ObjectId, area: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document>>;
     updateAreaChecklist: (_id: string | ObjectId, value: TAreaChecklistUpdate, session?: ClientSession) => Promise<number>;
     updateAreaChecklistStatus: (_id: string | ObjectId, status: (typeof allowedStatus)[number], session?: ClientSession) => Promise<number>;
-    completeAreaChecklistUnits: (_id: string | ObjectId, set: number, unitId: string | ObjectId, value: TAreaChecklistUnitsUpdate, session?: ClientSession) => Promise<number>;
+    updateAreaChecklistUnits: (_id: string | ObjectId, set: number, unitId: string | ObjectId, value: TAreaChecklistUnitsUpdate, session?: ClientSession) => Promise<number>;
     getMaxSetNumberForArea: (areaId: string | ObjectId, session?: ClientSession) => Promise<any>;
 };
 
@@ -324,7 +328,7 @@ declare function useAreaChecklistController(): {
     getAreaChecklistHistory: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAreaChecklistHistoryDetails: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAreaChecklistUnits: (req: Request, res: Response, next: NextFunction) => Promise<void>;
-    completeAreaChecklistUnits: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    updateAreaChecklistUnits: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TSupply = {

package/dist/index.js

@@ -2599,6 +2599,8 @@ function MAreaChecklist(value) {
         units: checklistItem.units.map((unit) => ({
           unit: new import_mongodb8.ObjectId(unit.unit),
           name: unit.name,
+          approve: false,
+          reject: false,
           status: "ready",
           remarks: "",
           completedBy: "",
@@ -3133,8 +3135,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: [
@@ -3149,18 +3155,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"
               }
@@ -3171,6 +3180,8 @@ function useAreaChecklistRepo() {
           $project: {
             _id: 0,
             set: "$_id",
+            remarks: "$remarks",
+            attachment: "$attachment",
             units: 1
           }
         },
@@ -3245,7 +3256,7 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
-  async function completeAreaChecklistUnits(_id, set, unitId, value, session) {
+  async function updateAreaChecklistUnits(_id, set, unitId, value, session) {
     try {
       _id = new import_mongodb9.ObjectId(_id);
     } catch (error) {
@@ -3260,12 +3271,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 import_mongodb9.ObjectId(value.completedBy);
       }
@@ -3393,7 +3418,7 @@ function useAreaChecklistRepo() {
     getAreaChecklistByAreaAndSchedule,
     updateAreaChecklist,
     updateAreaChecklistStatus,
-    completeAreaChecklistUnits,
+    updateAreaChecklistUnits,
     getMaxSetNumberForArea
   };
 }
@@ -3406,7 +3431,7 @@ function useAreaChecklistService() {
     getAllAreaChecklist,
     getAreaChecklistUnits,
     getAreaChecklistById,
-    completeAreaChecklistUnits: _completeAreaChecklistUnits,
+    updateAreaChecklistUnits: _updateAreaChecklistUnits,
     updateAreaChecklistStatus,
     getMaxSetNumberForArea
   } = useAreaChecklistRepo();
@@ -3477,11 +3502,11 @@ function useAreaChecklistService() {
       session?.endSession();
     }
   }
-  async function completeAreaChecklistUnits(_id, set, unitId, value) {
+  async function updateAreaChecklistUnits(_id, set, unitId, value) {
     const session = import_node_server_utils18.useAtlas.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,
@@ -3561,7 +3586,7 @@ function useAreaChecklistService() {
       session?.endSession();
     }
   }
-  return { createAreaChecklist, completeAreaChecklistUnits };
+  return { createAreaChecklist, updateAreaChecklistUnits };
 }
 
 // src/controllers/hygiene-area-checklist.controller.ts
@@ -3576,7 +3601,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(
@@ -3743,22 +3768,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 = import_joi9.default.object({
       id: import_joi9.default.string().hex().required(),
       set: import_joi9.default.number().integer().min(1).required(),
       unit: import_joi9.default.string().hex().required(),
+      decision: import_joi9.default.string().valid("approve", "reject").required(),
+      approve: import_joi9.default.boolean().optional(),
+      reject: import_joi9.default.boolean().optional(),
       remarks: import_joi9.default.string().optional().allow("", null),
+      attachment: import_joi9.default.array().items(import_joi9.default.string()).optional(),
       completedBy: import_joi9.default.string().hex().required()
     });
     const { error } = validation.validate(payload);
@@ -3768,13 +3807,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) {
@@ -3789,7 +3823,7 @@ function useAreaChecklistController() {
     getAreaChecklistHistory,
     getAreaChecklistHistoryDetails,
     getAreaChecklistUnits,
-    completeAreaChecklistUnits
+    updateAreaChecklistUnits
   };
 }