@7365admin1/module-hygiene 4.10.0 → 4.12.0

package/dist/index.js

@@ -2529,12 +2529,30 @@ function useParentChecklistRepo() {
       throw error;
     }
   }
+  async function getTodayParentChecklists() {
+    const now = /* @__PURE__ */ new Date();
+    const start = new Date(now);
+    start.setUTCHours(0, 0, 0, 0);
+    const end = new Date(now);
+    end.setUTCHours(23, 59, 59, 999);
+    try {
+      const items = await collection.find(
+        { createdAt: { $gte: start, $lte: end } },
+        { projection: { _id: 1, site: 1 } }
+      ).toArray();
+      return items;
+    } catch (error) {
+      import_node_server_utils14.logger.error("Failed to get today's parent checklists", error);
+      throw error;
+    }
+  }
   return {
     createIndex,
     createParentChecklist,
     getAllParentChecklist,
     updateParentChecklistStatuses,
-    closeExpiredParentChecklists
+    closeExpiredParentChecklists,
+    getTodayParentChecklists
   };
 }
 
@@ -2630,7 +2648,9 @@ var areaChecklistSchema = import_joi8.default.object({
           unit: import_joi8.default.string().hex().required(),
           name: import_joi8.default.string().required()
         }).required()
-      ).min(1).required()
+      ).min(1).required(),
+      isScheduleTask: import_joi8.default.boolean().optional().default(false),
+      scheduleTaskId: import_joi8.default.string().hex().optional().allow(null)
     }).required()
   ).optional().default([]),
   createdBy: import_joi8.default.string().hex().required()
@@ -2659,6 +2679,8 @@ function MAreaChecklist(value) {
     value.checklist = value.checklist.map((checklistItem) => {
       return {
         set: checklistItem.set,
+        isScheduleTask: checklistItem.isScheduleTask ?? false,
+        scheduleTaskId: checklistItem.scheduleTaskId ?? void 0,
         units: checklistItem.units.map((unit) => ({
           unit: new import_mongodb8.ObjectId(unit.unit),
           name: unit.name,
@@ -2694,7 +2716,9 @@ function MAreaChecklist(value) {
 }
 
 // src/services/hygiene-area-checklist.service.ts
+var import_mongodb10 = require("mongodb");
 var import_node_server_utils18 = require("@7365admin1/node-server-utils");
+var import_core = require("@7365admin1/core");
 
 // src/repositories/hygiene-area-checklist.repository.ts
 var import_mongodb9 = require("mongodb");
@@ -2736,26 +2760,26 @@ function useAreaChecklistRepo() {
       );
     }
   }
+  async function createUniqueIndex() {
+    try {
+      await collection.createIndex({ schedule: 1, area: 1 }, { unique: true });
+    } catch (error) {
+      throw new import_node_server_utils17.InternalServerError(
+        "Failed to create unique index on hygiene checklist area."
+      );
+    }
+  }
   async function createAreaChecklist(value, session) {
     try {
       const parentChecklistId = new import_mongodb9.ObjectId(value.schedule);
-      const currentDate = /* @__PURE__ */ new Date();
-      const startOfDay = new Date(currentDate);
-      startOfDay.setUTCHours(0, 0, 0, 0);
-      const endOfDay = new Date(currentDate);
-      endOfDay.setUTCHours(23, 59, 59, 999);
-      const existingChecklist = await collection.findOne({
-        type: value.type,
-        schedule: parentChecklistId,
-        name: value.name,
-        createdAt: {
-          $gte: startOfDay,
-          $lte: endOfDay
-        }
-      });
+      const areaId = new import_mongodb9.ObjectId(value.area);
+      const existingChecklist = await collection.findOne(
+        { schedule: parentChecklistId, area: areaId },
+        { session }
+      );
       if (existingChecklist) {
         import_node_server_utils17.logger.info(
-          `Area checklist already exists for area ${value.name} on ${currentDate.toISOString().split("T")[0]}`
+          `Area checklist already exists for area ${value.name} (schedule: ${parentChecklistId}, area: ${areaId})`
         );
         return existingChecklist._id;
       }
@@ -2771,6 +2795,14 @@ function useAreaChecklistRepo() {
       });
       return result.insertedId;
     } catch (error) {
+      if (error?.code === 11e3) {
+        import_node_server_utils17.logger.info(`Duplicate area checklist skipped for area ${value.name}`);
+        const existing = await collection.findOne({
+          schedule: new import_mongodb9.ObjectId(value.schedule),
+          area: new import_mongodb9.ObjectId(value.area)
+        });
+        return existing._id;
+      }
       throw error;
     }
   }
@@ -3108,6 +3140,9 @@ function useAreaChecklistRepo() {
           $project: {
             _id: 0,
             set: "$checklist.set",
+            isScheduleTask: {
+              $ifNull: ["$checklist.isScheduleTask", false]
+            },
             unit: "$checklist.units.unit",
             name: "$checklist.units.name",
             remarks: "$checklist.units.remarks",
@@ -3138,6 +3173,7 @@ function useAreaChecklistRepo() {
         {
           $group: {
             _id: "$set",
+            isScheduleTask: { $first: "$isScheduleTask" },
             units: {
               $push: {
                 unit: "$unit",
@@ -3154,6 +3190,7 @@ function useAreaChecklistRepo() {
           $project: {
             _id: 0,
             set: "$_id",
+            isScheduleTask: 1,
             units: 1
           }
         },
@@ -3227,7 +3264,19 @@ function useAreaChecklistRepo() {
         },
         {
           $addFields: {
-            isCompleted: { $ne: ["$checklist.units.completedBy", ""] }
+            isCompleted: { $ne: ["$checklist.units.completedBy", ""] },
+            isActioned: {
+              $cond: {
+                if: {
+                  $or: [
+                    { $eq: ["$checklist.units.approve", true] },
+                    { $eq: ["$checklist.units.reject", true] }
+                  ]
+                },
+                then: 1,
+                else: 0
+              }
+            }
           }
         },
         {
@@ -3256,11 +3305,24 @@ function useAreaChecklistRepo() {
             preserveNullAndEmptyArrays: true
           }
         },
-        { $sort: { set: 1, isCompleted: -1, "checklist.units.timestamp": 1 } },
+        {
+          $sort: {
+            "checklist.set": 1,
+            isActioned: 1,
+            "checklist.units.timestamp": 1,
+            isCompleted: -1
+          }
+        },
         {
           $project: {
             _id: 0,
             set: "$checklist.set",
+            isScheduleTask: {
+              $ifNull: ["$checklist.isScheduleTask", false]
+            },
+            scheduleTaskId: {
+              $ifNull: ["$checklist.scheduleTaskId", null]
+            },
             remarks: "$checklist.remarks",
             attachment: "$checklist.attachment",
             unit: "$checklist.units.unit",
@@ -3293,6 +3355,8 @@ function useAreaChecklistRepo() {
         {
           $group: {
             _id: "$set",
+            isScheduleTask: { $first: "$isScheduleTask" },
+            scheduleTaskId: { $first: "$scheduleTaskId" },
             remarks: { $first: "$remarks" },
             attachment: { $first: "$attachment" },
             completedByName: { $first: "$completedByName" },
@@ -3314,13 +3378,33 @@ function useAreaChecklistRepo() {
           $project: {
             _id: 0,
             set: "$_id",
+            isScheduleTask: 1,
+            scheduleTaskId: 1,
             remarks: "$remarks",
             attachment: "$attachment",
             completedByName: 1,
             units: 1
           }
         },
-        { $sort: { set: 1 } },
+        {
+          $addFields: {
+            isFullyActioned: {
+              $allElementsTrue: {
+                $map: {
+                  input: "$units",
+                  as: "u",
+                  in: {
+                    $or: [
+                      { $eq: ["$$u.approve", true] },
+                      { $eq: ["$$u.reject", true] }
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        },
+        { $sort: { isFullyActioned: 1, set: 1 } },
         { $skip: page * limit },
         { $limit: limit }
       ];
@@ -3524,12 +3608,26 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
+  async function getAreaChecklistSetOwner(_id, set, session) {
+    try {
+      _id = new import_mongodb9.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils17.BadRequestError("Invalid area checklist ID format.");
+    }
+    const existing = await collection.findOne(
+      { _id, "checklist.set": set },
+      { projection: { "checklist.$": 1 }, session }
+    );
+    if (!existing?.checklist?.length)
+      return null;
+    return existing.checklist[0].units.map((u) => u.completedBy).find((cb) => cb && cb.toString() !== "") ?? null;
+  }
   async function getMaxSetNumberForArea(areaId, session) {
     try {
       const _id = new import_mongodb9.ObjectId(areaId);
       const result = await collection.aggregate(
         [
-          { $match: { area: _id.toString() } },
+          { $match: { area: _id } },
           { $unwind: "$checklist" },
           { $group: { _id: null, maxSet: { $max: "$checklist.set" } } }
         ],
@@ -3577,9 +3675,155 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
+  async function pushScheduleTaskSets(scheduleId, areaId, scheduleTaskId, newSets) {
+    try {
+      const schedule = new import_mongodb9.ObjectId(scheduleId);
+      const area = new import_mongodb9.ObjectId(areaId);
+      const taskId = new import_mongodb9.ObjectId(scheduleTaskId);
+      const result = await collection.updateOne(
+        {
+          schedule,
+          area,
+          checklist: { $not: { $elemMatch: { scheduleTaskId: taskId } } }
+        },
+        {
+          $push: { checklist: { $each: newSets } },
+          $set: { updatedAt: /* @__PURE__ */ new Date() }
+        }
+      );
+      if (result.modifiedCount > 0) {
+        delNamespace().catch((err) => {
+          import_node_server_utils17.logger.error(
+            `Failed to clear cache for namespace: ${namespace_collection}`,
+            err
+          );
+        });
+      }
+      return result.modifiedCount;
+    } catch (error) {
+      import_node_server_utils17.logger.error("Error in pushScheduleTaskSets:", error);
+      throw error;
+    }
+  }
+  async function insertAutoGenSets(scheduleId, areaId, newSets) {
+    try {
+      const schedule = new import_mongodb9.ObjectId(scheduleId);
+      const area = new import_mongodb9.ObjectId(areaId);
+      const result = await collection.updateOne(
+        {
+          schedule,
+          area,
+          checklist: {
+            $not: { $elemMatch: { isScheduleTask: { $ne: true } } }
+          }
+        },
+        {
+          $push: { checklist: { $each: newSets } },
+          $set: { updatedAt: /* @__PURE__ */ new Date() }
+        }
+      );
+      if (result.modifiedCount > 0) {
+        delNamespace().catch((err) => {
+          import_node_server_utils17.logger.error(
+            `Failed to clear cache for namespace: ${namespace_collection}`,
+            err
+          );
+        });
+      }
+      return result.modifiedCount;
+    } catch (error) {
+      import_node_server_utils17.logger.error("Error in insertAutoGenSets:", error);
+      throw error;
+    }
+  }
+  async function trimOverflowSets() {
+    try {
+      const db2 = import_node_server_utils17.useAtlas.getDb();
+      if (!db2)
+        return 0;
+      const bloated = await collection.aggregate([
+        {
+          $lookup: {
+            from: "site.cleaning.areas",
+            localField: "area",
+            foreignField: "_id",
+            as: "areaDoc"
+          }
+        },
+        {
+          $unwind: { path: "$areaDoc", preserveNullAndEmptyArrays: false }
+        },
+        {
+          $addFields: {
+            configuredSet: { $max: [1, { $ifNull: ["$areaDoc.set", 1] }] },
+            autoGenSets: {
+              $filter: {
+                input: { $ifNull: ["$checklist", []] },
+                as: "item",
+                cond: { $ne: ["$$item.isScheduleTask", true] }
+              }
+            },
+            scheduledSets: {
+              $filter: {
+                input: { $ifNull: ["$checklist", []] },
+                as: "item",
+                cond: { $eq: ["$$item.isScheduleTask", true] }
+              }
+            }
+          }
+        },
+        {
+          $match: {
+            $expr: {
+              $gt: [{ $size: "$autoGenSets" }, "$configuredSet"]
+            }
+          }
+        },
+        {
+          $project: {
+            _id: 1,
+            checklist: 1,
+            configuredSet: 1,
+            autoGenSets: 1,
+            scheduledSets: 1
+          }
+        }
+      ]).toArray();
+      if (bloated.length === 0) {
+        import_node_server_utils17.logger.info(
+          "trimOverflowSets: no bloated area-checklist documents found"
+        );
+        return 0;
+      }
+      let trimmed = 0;
+      for (const doc of bloated) {
+        const limit = Number(doc.configuredSet) || 1;
+        const trimmedAutoGen = [...doc.autoGenSets ?? []].sort((a, b) => (a.set ?? 0) - (b.set ?? 0)).slice(0, limit);
+        const keep = [...trimmedAutoGen, ...doc.scheduledSets ?? []];
+        const res = await collection.updateOne(
+          { _id: doc._id },
+          { $set: { checklist: keep, updatedAt: /* @__PURE__ */ new Date() } }
+        );
+        if (res.modifiedCount > 0) {
+          trimmed++;
+          import_node_server_utils17.logger.info(
+            `trimOverflowSets: trimmed doc ${doc._id} \u2014 kept ${keep.length} sets (${trimmedAutoGen.length} auto-gen, ${(doc.scheduledSets ?? []).length} scheduled), removed ${doc.checklist.length - keep.length} excess auto-gen`
+          );
+        }
+      }
+      delNamespace().catch(() => {
+      });
+      import_node_server_utils17.logger.info(`trimOverflowSets: trimmed ${trimmed} document(s)`);
+      return trimmed;
+    } catch (error) {
+      import_node_server_utils17.logger.error("Error in trimOverflowSets:", error);
+      return 0;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
+    createUniqueIndex,
     createAreaChecklist,
     getAllAreaChecklist,
     getAreaChecklistHistory,
@@ -3587,11 +3831,15 @@ function useAreaChecklistRepo() {
     getAreaChecklistUnits,
     getAreaChecklistById,
     getAreaChecklistByAreaAndSchedule,
+    getAreaChecklistSetOwner,
     updateAreaChecklist,
     updateAreaChecklistStatus,
     updateAreaChecklistUnits,
     getMaxSetNumberForArea,
-    closeExpiredAreaChecklists
+    closeExpiredAreaChecklists,
+    pushScheduleTaskSets,
+    insertAutoGenSets,
+    trimOverflowSets
   };
 }
 
@@ -3603,17 +3851,18 @@ function useAreaChecklistService() {
     getAllAreaChecklist,
     getAreaChecklistUnits,
     getAreaChecklistById,
+    getAreaChecklistByAreaAndSchedule,
+    getAreaChecklistSetOwner,
     updateAreaChecklistUnits: _updateAreaChecklistUnits,
     updateAreaChecklistStatus,
-    getMaxSetNumberForArea
+    insertAutoGenSets
   } = useAreaChecklistRepo();
   const { updateParentChecklistStatuses } = useParentChecklistRepo();
+  const { getUserById } = (0, import_core.useUserRepo)();
   async function createAreaChecklist(value) {
-    const session = import_node_server_utils18.useAtlas.getClient()?.startSession();
+    const results = [];
+    let totalChecklistsCreated = 0;
     try {
-      session?.startTransaction();
-      const results = [];
-      let totalChecklistsCreated = 0;
       const BATCH_SIZE = 10;
       const areasResult = await getAreasForChecklist(value.site);
       const areas = areasResult || [];
@@ -3627,15 +3876,72 @@ function useAreaChecklistService() {
               );
               return null;
             }
-            const maxSet = await getMaxSetNumberForArea(area._id, session);
-            const setCount = area.set || 1;
+            let existing = null;
+            try {
+              existing = await getAreaChecklistByAreaAndSchedule(
+                value.schedule.toString(),
+                area._id.toString()
+              );
+            } catch (_) {
+            }
+            if (existing) {
+              const hasAutoGenSets = existing.checklist?.some(
+                (c) => c.isScheduleTask !== true
+              );
+              if (hasAutoGenSets) {
+                import_node_server_utils18.logger.info(
+                  `Area checklist already exists with auto-gen sets for area ${area.name}, skipping`
+                );
+                return existing._id;
+              }
+              import_node_server_utils18.logger.info(
+                `Area checklist for area ${area.name} exists but has no auto-gen sets. Inserting auto-gen sets.`
+              );
+              const setCount2 = Number(area.set) || 1;
+              const totalExistingSets = existing.checklist?.length ?? 0;
+              if (totalExistingSets >= setCount2) {
+                import_node_server_utils18.logger.info(
+                  `Area checklist for area ${area.name} already has ${totalExistingSets} set(s) (configured: ${setCount2}). Skipping auto-gen sets.`
+                );
+                return existing._id;
+              }
+              const maxExistingSet = existing.checklist?.reduce(
+                (max, c) => Math.max(max, c.set ?? 0),
+                0
+              ) ?? 0;
+              const setsToAdd = setCount2 - totalExistingSets;
+              const autoGenSets = Array.from(
+                { length: setsToAdd },
+                (_, index) => ({
+                  set: maxExistingSet + index + 1,
+                  isScheduleTask: false,
+                  units: area.units.map((unit) => ({
+                    unit: new import_mongodb10.ObjectId(unit.unit),
+                    name: unit.name,
+                    approve: false,
+                    reject: false,
+                    status: "open",
+                    remarks: "",
+                    completedBy: "",
+                    timestamp: ""
+                  }))
+                })
+              );
+              await insertAutoGenSets(
+                value.schedule.toString(),
+                area._id.toString(),
+                autoGenSets
+              );
+              return existing._id;
+            }
+            const setCount = Number(area.set) || 1;
             const checklistData = {
               schedule: value.schedule,
               area: area._id.toString(),
               name: area.name,
               type: area.type,
               checklist: Array.from({ length: setCount }, (_, index) => ({
-                set: maxSet + index + 1,
+                set: index + 1,
                 units: area.units.map((unit) => ({
                   unit: unit.unit.toString(),
                   name: unit.name
@@ -3643,10 +3949,7 @@ function useAreaChecklistService() {
               })),
               createdBy: value.createdBy
             };
-            const insertedId = await _createAreaChecklist(
-              checklistData,
-              session
-            );
+            const insertedId = await _createAreaChecklist(checklistData);
             totalChecklistsCreated++;
             return insertedId;
           });
@@ -3659,25 +3962,26 @@ function useAreaChecklistService() {
       } else {
         import_node_server_utils18.logger.warn(`No common areas found for site: ${value.site}`);
       }
-      await session?.commitTransaction();
       import_node_server_utils18.logger.info(
         `Successfully created ${totalChecklistsCreated} area checklists for site: ${value.site}`
       );
       return results;
     } catch (error) {
       import_node_server_utils18.logger.error(`Error generating area checklists:`, error);
-      if (session?.inTransaction()) {
-        await session?.abortTransaction();
-      }
       throw error;
-    } finally {
-      session?.endSession();
     }
   }
   async function updateAreaChecklistUnits(_id, set, unitId, value) {
     const session = import_node_server_utils18.useAtlas.getClient()?.startSession();
     try {
       session?.startTransaction();
+      const setOwner = await getAreaChecklistSetOwner(_id, set, session);
+      if (setOwner && value.completedBy && setOwner.toString() !== value.completedBy.toString()) {
+        const acceptedBy = await getUserById(setOwner.toString());
+        throw new import_node_server_utils18.UnauthorizedError(
+          `${acceptedBy.name} has already taken this set.`
+        );
+      }
       await _updateAreaChecklistUnits(_id, set, unitId, value, session);
       const allUnitsResult = await getAreaChecklistUnits(
         {
@@ -3768,7 +4072,7 @@ var import_node_server_utils20 = require("@7365admin1/node-server-utils");
 // src/services/hygiene-checklist-pdf.service.ts
 var import_puppeteer = require("puppeteer");
 var import_node_server_utils19 = require("@7365admin1/node-server-utils");
-var import_mongodb10 = require("mongodb");
+var import_mongodb11 = require("mongodb");
 function escapeHtml(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
 }
@@ -3942,7 +4246,7 @@ function useChecklistPdfService() {
     const collection = db.collection("site.cleaning.schedule.areas");
     let scheduleObjectId;
     try {
-      scheduleObjectId = new import_mongodb10.ObjectId(scheduleId);
+      scheduleObjectId = new import_mongodb11.ObjectId(scheduleId);
     } catch {
       throw new import_node_server_utils19.InternalServerError("Invalid schedule ID format.");
     }
@@ -4251,7 +4555,7 @@ function useAreaChecklistController() {
 
 // src/models/hygiene-supply.model.ts
 var import_joi10 = __toESM(require("joi"));
-var import_mongodb11 = require("mongodb");
+var import_mongodb12 = require("mongodb");
 var import_node_server_utils21 = require("@7365admin1/node-server-utils");
 var supplySchema = import_joi10.default.object({
   site: import_joi10.default.string().hex().required(),
@@ -4266,7 +4570,7 @@ function MSupply(value) {
   }
   if (value.site) {
     try {
-      value.site = new import_mongodb11.ObjectId(value.site);
+      value.site = new import_mongodb12.ObjectId(value.site);
     } catch (error2) {
       throw new import_node_server_utils21.BadRequestError("Invalid site ID format.");
     }
@@ -4284,7 +4588,7 @@ function MSupply(value) {
 }
 
 // src/repositories/hygiene-supply.repository.ts
-var import_mongodb12 = require("mongodb");
+var import_mongodb13 = require("mongodb");
 var import_node_server_utils22 = require("@7365admin1/node-server-utils");
 function useSupplyRepository() {
   const db = import_node_server_utils22.useAtlas.getDb();
@@ -4360,7 +4664,7 @@ function useSupplyRepository() {
       limit
     };
     try {
-      site = new import_mongodb12.ObjectId(site);
+      site = new import_mongodb13.ObjectId(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -4404,7 +4708,7 @@ function useSupplyRepository() {
   }
   async function getSupplyById(_id, session) {
     try {
-      _id = new import_mongodb12.ObjectId(_id);
+      _id = new import_mongodb13.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils22.BadRequestError("Invalid supply ID format.");
     }
@@ -4450,7 +4754,7 @@ function useSupplyRepository() {
   }
   async function updateSupply(_id, value, session) {
     try {
-      _id = new import_mongodb12.ObjectId(_id);
+      _id = new import_mongodb13.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils22.BadRequestError("Invalid supply ID format.");
     }
@@ -4483,7 +4787,7 @@ function useSupplyRepository() {
   }
   async function deleteSupply(_id, session) {
     try {
-      _id = new import_mongodb12.ObjectId(_id);
+      _id = new import_mongodb13.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils22.BadRequestError("Invalid supply ID format.");
     }
@@ -4664,7 +4968,7 @@ function useSupplyController() {
 
 // src/models/hygiene-stock.model.ts
 var import_joi12 = __toESM(require("joi"));
-var import_mongodb13 = require("mongodb");
+var import_mongodb14 = require("mongodb");
 var import_node_server_utils24 = require("@7365admin1/node-server-utils");
 var stockSchema = import_joi12.default.object({
   site: import_joi12.default.string().hex().required(),
@@ -4682,14 +4986,14 @@ function MStock(value) {
   }
   if (value.site) {
     try {
-      value.site = new import_mongodb13.ObjectId(value.site);
+      value.site = new import_mongodb14.ObjectId(value.site);
     } catch (error2) {
       throw new import_node_server_utils24.BadRequestError("Invalid site ID format.");
     }
   }
   if (value.supply) {
     try {
-      value.supply = new import_mongodb13.ObjectId(value.supply);
+      value.supply = new import_mongodb14.ObjectId(value.supply);
     } catch (error2) {
       throw new import_node_server_utils24.BadRequestError("Invalid supply ID format.");
     }
@@ -4709,7 +5013,7 @@ function MStock(value) {
 }
 
 // src/repositories/hygiene-stock.repository.ts
-var import_mongodb14 = require("mongodb");
+var import_mongodb15 = require("mongodb");
 var import_node_server_utils25 = require("@7365admin1/node-server-utils");
 function useStockRepository() {
   const db = import_node_server_utils25.useAtlas.getDb();
@@ -4774,14 +5078,14 @@ function useStockRepository() {
       limit
     };
     try {
-      site = new import_mongodb14.ObjectId(site);
+      site = new import_mongodb15.ObjectId(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
       throw new import_node_server_utils25.BadRequestError("Invalid site ID format.");
     }
     try {
-      supply = new import_mongodb14.ObjectId(supply);
+      supply = new import_mongodb15.ObjectId(supply);
       query.supply = supply;
       cacheOptions.supply = supply.toString();
     } catch (error) {
@@ -4955,7 +5259,7 @@ function useStockController() {
 
 // src/models/hygiene-checkout-item.model.ts
 var import_joi14 = __toESM(require("joi"));
-var import_mongodb15 = require("mongodb");
+var import_mongodb16 = require("mongodb");
 var import_node_server_utils28 = require("@7365admin1/node-server-utils");
 var allowedCheckOutItemStatus = ["pending", "completed"];
 var checkOutItemSchema = import_joi14.default.object({
@@ -4975,14 +5279,14 @@ function MCheckOutItem(value) {
   }
   if (value.site) {
     try {
-      value.site = new import_mongodb15.ObjectId(value.site);
+      value.site = new import_mongodb16.ObjectId(value.site);
     } catch (error2) {
       throw new import_node_server_utils28.BadRequestError("Invalid site ID format.");
     }
   }
   if (value.supply) {
     try {
-      value.supply = new import_mongodb15.ObjectId(value.supply);
+      value.supply = new import_mongodb16.ObjectId(value.supply);
     } catch (error2) {
       throw new import_node_server_utils28.BadRequestError("Invalid supply ID format.");
     }
@@ -5003,7 +5307,7 @@ function MCheckOutItem(value) {
 }
 
 // src/repositories/hygiene-checkout-item.repository.ts
-var import_mongodb16 = require("mongodb");
+var import_mongodb17 = require("mongodb");
 var import_node_server_utils29 = require("@7365admin1/node-server-utils");
 function useCheckOutItemRepository() {
   const db = import_node_server_utils29.useAtlas.getDb();
@@ -5067,7 +5371,7 @@ function useCheckOutItemRepository() {
       limit
     };
     try {
-      site = new import_mongodb16.ObjectId(site);
+      site = new import_mongodb17.ObjectId(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -5140,7 +5444,7 @@ function useCheckOutItemRepository() {
   }
   async function getCheckOutItemById(_id, session) {
     try {
-      _id = new import_mongodb16.ObjectId(_id);
+      _id = new import_mongodb17.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils29.BadRequestError("Invalid check out item ID format.");
     }
@@ -5204,7 +5508,7 @@ function useCheckOutItemRepository() {
   }
   async function completeCheckOutItem(_id, session) {
     try {
-      _id = new import_mongodb16.ObjectId(_id);
+      _id = new import_mongodb17.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils29.BadRequestError("Invalid check out item ID format.");
     }
@@ -5245,7 +5549,7 @@ function useCheckOutItemRepository() {
 }
 
 // src/services/hygiene-checkout-item.service.ts
-var import_core = require("@7365admin1/core");
+var import_core2 = require("@7365admin1/core");
 var import_node_server_utils30 = require("@7365admin1/node-server-utils");
 function useCheckOutItemService() {
   const {
@@ -5254,7 +5558,7 @@ function useCheckOutItemService() {
     completeCheckOutItem
   } = useCheckOutItemRepository();
   const { getSupplyById } = useSupplyRepository();
-  const { getUserById } = (0, import_core.useUserRepo)();
+  const { getUserById } = (0, import_core2.useUserRepo)();
   const { createStock } = useStockService();
   async function createCheckOutItem(value) {
     const session = import_node_server_utils30.useAtlas.getClient()?.startSession();
@@ -5490,7 +5794,7 @@ function useCheckOutItemController() {
 // src/models/hygiene-schedule-task.model.ts
 var import_node_server_utils32 = require("@7365admin1/node-server-utils");
 var import_joi16 = __toESM(require("joi"));
-var import_mongodb17 = require("mongodb");
+var import_mongodb18 = require("mongodb");
 var scheduleTaskSchema = import_joi16.default.object({
   site: import_joi16.default.string().hex().required(),
   title: import_joi16.default.string().required(),
@@ -5515,7 +5819,7 @@ function MScheduleTask(value) {
   }
   if (value.site) {
     try {
-      value.site = new import_mongodb17.ObjectId(value.site);
+      value.site = new import_mongodb18.ObjectId(value.site);
     } catch (error2) {
       throw new import_node_server_utils32.BadRequestError("Invalid site ID format.");
     }
@@ -5525,7 +5829,7 @@ function MScheduleTask(value) {
       try {
         return {
           name: area.name,
-          value: new import_mongodb17.ObjectId(area.value.toString())
+          value: new import_mongodb18.ObjectId(area.value.toString())
         };
       } catch (error2) {
         throw new import_node_server_utils32.BadRequestError(`Invalid area value format: ${area.name}`);
@@ -5534,7 +5838,7 @@ function MScheduleTask(value) {
   }
   if (value.createdBy) {
     try {
-      value.createdBy = new import_mongodb17.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb18.ObjectId(value.createdBy);
     } catch (error2) {
       throw new import_node_server_utils32.BadRequestError("Invalid createdBy ID format.");
     }
@@ -5555,7 +5859,7 @@ function MScheduleTask(value) {
 }
 
 // src/repositories/hygiene-schedule-task.repository.ts
-var import_mongodb18 = require("mongodb");
+var import_mongodb19 = require("mongodb");
 var import_node_server_utils33 = require("@7365admin1/node-server-utils");
 function useScheduleTaskRepository() {
   const db = import_node_server_utils33.useAtlas.getDb();
@@ -5618,7 +5922,7 @@ function useScheduleTaskRepository() {
       limit
     };
     try {
-      site = new import_mongodb18.ObjectId(site);
+      site = new import_mongodb19.ObjectId(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -5686,7 +5990,7 @@ function useScheduleTaskRepository() {
       limit
     };
     try {
-      site = new import_mongodb18.ObjectId(site);
+      site = new import_mongodb19.ObjectId(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -5729,7 +6033,7 @@ function useScheduleTaskRepository() {
   }
   async function getScheduleTaskById(_id, session) {
     try {
-      _id = new import_mongodb18.ObjectId(_id);
+      _id = new import_mongodb19.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils33.BadRequestError("Invalid schedule task ID format.");
     }
@@ -5779,7 +6083,7 @@ function useScheduleTaskRepository() {
   }
   async function updateScheduleTask(_id, value, session) {
     try {
-      _id = new import_mongodb18.ObjectId(_id);
+      _id = new import_mongodb19.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils33.BadRequestError("Invalid schedule task ID format.");
     }
@@ -5788,7 +6092,7 @@ function useScheduleTaskRepository() {
         try {
           return {
             name: area.name,
-            value: new import_mongodb18.ObjectId(area.value.toString())
+            value: new import_mongodb19.ObjectId(area.value.toString())
           };
         } catch (error) {
           throw new import_node_server_utils33.BadRequestError(`Invalid area value format: ${area.name}`);
@@ -5833,6 +6137,7 @@ function useScheduleTaskRepository() {
 }
 
 // src/services/hygiene-schedule-task.service.ts
+var import_mongodb20 = require("mongodb");
 var import_node_server_utils34 = require("@7365admin1/node-server-utils");
 function useScheduleTaskService() {
   const { createParentChecklist } = useParentChecklistRepo();
@@ -5840,7 +6145,7 @@ function useScheduleTaskService() {
   const {
     createAreaChecklist,
     getAreaChecklistByAreaAndSchedule,
-    updateAreaChecklist
+    pushScheduleTaskSets
   } = useAreaChecklistRepo();
   const { getAreaById } = useAreaRepo();
   function checkScheduleConditions(schedule, currentDate = /* @__PURE__ */ new Date()) {
@@ -5879,6 +6184,35 @@ function useScheduleTaskService() {
         );
         return false;
       }
+      const relevantTimestamp = schedule.updatedAt || schedule.createdAt;
+      if (relevantTimestamp) {
+        const savedAt = new Date(relevantTimestamp);
+        const savedHour = parseInt(
+          savedAt.toLocaleTimeString("en-US", {
+            hour: "2-digit",
+            hour12: false,
+            timeZone: "Asia/Singapore"
+          }),
+          10
+        );
+        const savedMinute = savedAt.toLocaleString("en-US", {
+          minute: "2-digit",
+          timeZone: "Asia/Singapore"
+        });
+        const savedDateFormatted = savedAt.toLocaleDateString("en-CA", {
+          timeZone: "Asia/Singapore"
+        });
+        const savedMinNum = parseInt(savedMinute, 10);
+        const wasSavedThisMinute = savedDateFormatted === currentDateFormatted && savedHour === currentHour && savedMinNum === currentMinute;
+        if (wasSavedThisMinute) {
+          import_node_server_utils34.logger.info(
+            `Schedule ${schedule._id}: Skipping \u2014 task was saved this minute (${savedHour}:${String(
+              savedMinNum
+            ).padStart(2, "0")}). Will fire on next occurrence.`
+          );
+          return false;
+        }
+      }
       import_node_server_utils34.logger.info(
         `Schedule ${schedule._id}: All conditions matched - Date is within range and time matches`
       );
@@ -5946,8 +6280,14 @@ function useScheduleTaskService() {
               let units = [];
               if (areaDetails.units && areaDetails.units.length > 0) {
                 units = areaDetails.units.map((unit) => ({
-                  unit: unit.unit.toString(),
-                  name: unit.name
+                  unit: new import_mongodb20.ObjectId(unit.unit),
+                  name: unit.name,
+                  approve: false,
+                  reject: false,
+                  status: "open",
+                  remarks: "",
+                  completedBy: "",
+                  timestamp: ""
                 }));
                 import_node_server_utils34.logger.info(
                   `Area ${area.name} (${areaId}): Using units from area details: ${JSON.stringify(
@@ -5984,79 +6324,62 @@ function useScheduleTaskService() {
                 );
               }
               if (existingAreaChecklist) {
-                const currentSetNumber = existingAreaChecklist.checklist?.length || 0;
-                const newSet = {
-                  set: currentSetNumber + 1,
-                  units
-                };
-                const updatedChecklist = [
-                  ...existingAreaChecklist.checklist || [],
-                  newSet
-                ];
-                import_node_server_utils34.logger.info(
-                  `Area ${area.name} (${areaId}): Appending new set ${newSet.set} to checklist. Updated checklist: ${JSON.stringify(
-                    updatedChecklist
-                  )}`
+                const areaSetConfig = Number(areaDetails.set) || 1;
+                const maxSetInChecklist = existingAreaChecklist.checklist?.length ? Math.max(
+                  ...existingAreaChecklist.checklist.map(
+                    (c) => c.set
+                  )
+                ) : 0;
+                const startSetNumber = maxSetInChecklist + 1;
+                const newSets = Array.from(
+                  { length: areaSetConfig },
+                  (_, index) => ({
+                    set: startSetNumber + index,
+                    units,
+                    isScheduleTask: true,
+                    scheduleTaskId: scheduleTask._id
+                  })
                 );
-                await updateAreaChecklist(existingAreaChecklist._id, {
-                  checklist: updatedChecklist
-                });
-                import_node_server_utils34.logger.info(
-                  `Appended set ${newSet.set} to area checklist for area ${area.name}`
+                const modified = await pushScheduleTaskSets(
+                  parentChecklistId.toString(),
+                  areaId,
+                  scheduleTask._id.toString(),
+                  newSets
                 );
-                try {
-                  const verifyChecklist = await getAreaChecklistByAreaAndSchedule(
-                    parentChecklistId.toString(),
-                    areaId
-                  );
+                if (modified > 0) {
                   import_node_server_utils34.logger.info(
-                    `Area ${area.name} (${areaId}): Checklist after update: ${JSON.stringify(
-                      verifyChecklist.checklist
-                    )}`
+                    `Appended ${areaSetConfig} set(s) starting from ${startSetNumber} to area checklist for area ${area.name}`
                   );
-                } catch (verifyError) {
-                  import_node_server_utils34.logger.warn(
-                    `Area ${area.name} (${areaId}): Error verifying checklist after update:`,
-                    verifyError
+                } else {
+                  import_node_server_utils34.logger.info(
+                    `Area ${area.name} (${areaId}): Schedule task ${scheduleTask._id} already processed (atomic check), skipping.`
                   );
                 }
               } else {
+                const areaSetConfig = Number(areaDetails.set) || 1;
+                const schedTaskId = scheduleTask._id;
+                const schedTaskSets = Array.from(
+                  { length: areaSetConfig },
+                  (_, index) => ({
+                    set: index + 1,
+                    units,
+                    isScheduleTask: true,
+                    scheduleTaskId: schedTaskId
+                  })
+                );
                 const checklistData = {
                   schedule: parentChecklistId.toString(),
                   area: areaId,
                   name: area.name,
                   type: areaDetails.type || "common",
-                  checklist: [
-                    {
-                      set: 1,
-                      units
-                    }
-                  ],
+                  checklist: schedTaskSets,
                   createdBy: scheduleTask.createdBy
                 };
                 import_node_server_utils34.logger.info(
-                  `Area ${area.name} (${areaId}): Creating new area checklist with data: ${JSON.stringify(
-                    checklistData
-                  )}`
+                  `Area ${area.name} (${areaId}): Creating new area checklist with schedule-task sets only`
                 );
                 await createAreaChecklist(checklistData);
                 import_node_server_utils34.logger.info(`Created new area checklist for area ${area.name}`);
-                try {
-                  const verifyChecklist = await getAreaChecklistByAreaAndSchedule(
-                    parentChecklistId.toString(),
-                    areaId
-                  );
-                  import_node_server_utils34.logger.info(
-                    `Area ${area.name} (${areaId}): Checklist after creation: ${JSON.stringify(
-                      verifyChecklist.checklist
-                    )}`
-                  );
-                } catch (verifyError) {
-                  import_node_server_utils34.logger.warn(
-                    `Area ${area.name} (${areaId}): Error verifying checklist after creation:`,
-                    verifyError
-                  );
-                }
               }
             } catch (error) {
               import_node_server_utils34.logger.error(`Error processing area ${area.name}:`, error);