@7365admin1/module-hygiene 4.11.0 → 4.13.0

package/dist/index.mjs

@@ -1,4 +1,15 @@
 // src/models/hygiene-base.model.ts
+var ServiceType = /* @__PURE__ */ ((ServiceType2) => {
+  ServiceType2["REAL_ESTATE_DEVELOPER"] = "real_estate_developer";
+  ServiceType2["PROPERTY_MANAGEMENT_AGENCY"] = "property_management_agency";
+  ServiceType2["SECURITY_AGENCY"] = "security_agency";
+  ServiceType2["CLEANING_SERVICES"] = "cleaning_services";
+  ServiceType2["MECHANICAL_ELECTRICAL_SERVICES"] = "mechanical_electrical_services";
+  ServiceType2["LANDSCAPING_SERVICES"] = "landscaping_services";
+  ServiceType2["PEST_CONTROL_SERVICES"] = "pest_control_services";
+  ServiceType2["POOL_MAINTENANCE_SERVICES"] = "pool_maintenance_services";
+  return ServiceType2;
+})(ServiceType || {});
 var allowedTypes = ["common", "toilet"];
 var allowedStatus = [
   "open",
@@ -547,6 +558,7 @@ import { ObjectId as ObjectId2 } from "mongodb";
 import { BadRequestError as BadRequestError3, logger as logger3 } from "@7365admin1/node-server-utils";
 var areaSchema = Joi2.object({
   site: Joi2.string().hex().required(),
+  serviceType: Joi2.string().valid(...Object.values(ServiceType)).required(),
   name: Joi2.string().required(),
   type: Joi2.string().valid(...allowedTypes).required(),
   set: Joi2.number().min(0).optional(),
@@ -586,6 +598,7 @@ function MArea(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     name: value.name,
     type: value.type,
     set: value.set ?? 0,
@@ -630,6 +643,7 @@ function useAreaRepo() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { type: 1 } },
         { key: { status: 1 } },
         { key: { "units.unit": 1 } }
@@ -650,7 +664,7 @@ function useAreaRepo() {
   async function createUniqueIndex() {
     try {
       await collection.createIndex(
-        { site: 1, name: 1, type: 1, deletedAt: 1 },
+        { site: 1, serviceType: 1, name: 1, type: 1, deletedAt: 1 },
         { unique: true }
       );
     } catch (error) {
@@ -687,15 +701,18 @@ function useAreaRepo() {
     limit = 10,
     search = "",
     type = "all",
-    site
+    site,
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      serviceType
     };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new ObjectId3(site);
@@ -744,9 +761,15 @@ function useAreaRepo() {
       throw error;
     }
   }
-  async function getAreasForChecklist(site) {
-    const query = { status: { $ne: "deleted" } };
+  async function getAreasForChecklist(site, serviceType) {
+    const query = {
+      status: { $ne: "deleted" }
+    };
     const cacheOptions = {};
+    if (serviceType) {
+      query.serviceType = serviceType;
+      cacheOptions.serviceType = serviceType;
+    }
     try {
       site = new ObjectId3(site);
       query.site = site;
@@ -826,28 +849,6 @@ function useAreaRepo() {
       throw error;
     }
   }
-  async function getAreaByMultipleId(_id) {
-    for (let i = 0; i < _id.length; i++) {
-      try {
-        _id[i] = new ObjectId3(_id[i]);
-      } catch (error) {
-        throw new BadRequestError4("Invalid area ID format.");
-      }
-    }
-    const query = {
-      _id: { $in: _id },
-      status: { $ne: "deleted" }
-    };
-    try {
-      const data = await collection.aggregate([{ $match: query }]).toArray();
-      if (!data || data.length === 0) {
-        throw new NotFoundError("Area not found.");
-      }
-      return data;
-    } catch (error) {
-      throw error;
-    }
-  }
   async function verifyAreaByUnitId(unitId) {
     try {
       unitId = new ObjectId3(unitId);
@@ -1009,7 +1010,6 @@ function useAreaRepo() {
     getAreas,
     getAreasForChecklist,
     getAreaById,
-    getAreaByMultipleId,
     verifyAreaByUnitId,
     updateArea,
     updateAreaChecklist,
@@ -1088,6 +1088,7 @@ import { ObjectId as ObjectId4 } from "mongodb";
 import { BadRequestError as BadRequestError5, logger as logger6 } from "@7365admin1/node-server-utils";
 var unitSchema = Joi3.object({
   site: Joi3.string().hex().required(),
+  serviceType: Joi3.string().valid(...Object.values(ServiceType)).required(),
   name: Joi3.string().required()
 });
 function MUnit(value) {
@@ -1105,6 +1106,7 @@ function MUnit(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     name: value.name,
     status: "active",
     createdAt: /* @__PURE__ */ new Date(),
@@ -1126,6 +1128,7 @@ function useUnitRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { status: 1 } }
       ]);
     } catch (error) {
@@ -1144,7 +1147,7 @@ function useUnitRepository() {
   async function createUniqueIndex() {
     try {
       await collection.createIndex(
-        { site: 1, name: 1, deletedAt: 1 },
+        { site: 1, serviceType: 1, name: 1, deletedAt: 1 },
         { unique: true }
       );
     } catch (error) {
@@ -1178,7 +1181,8 @@ function useUnitRepository() {
     page = 1,
     limit = 10,
     search = "",
-    site
+    site,
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
@@ -1195,6 +1199,10 @@ function useUnitRepository() {
     } catch (error) {
       throw new BadRequestError6("Invalid site ID format.");
     }
+    if (serviceType) {
+      query.serviceType = serviceType;
+      cacheOptions.serviceType = serviceType;
+    }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
@@ -1253,7 +1261,7 @@ function useUnitRepository() {
     } catch (error) {
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
-        throw new BadRequestError6("Area already exists.");
+        throw new BadRequestError6("Unit already exists.");
       }
       throw error;
     }
@@ -1309,7 +1317,8 @@ function useAreaService() {
   const { getUnits: _getUnits } = useUnitRepository();
   async function importArea({
     dataJson,
-    site
+    site,
+    serviceType
   }) {
     let dataArray;
     try {
@@ -1330,7 +1339,8 @@ function useAreaService() {
         page: 1,
         limit: 999999,
         search: "",
-        site
+        site,
+        serviceType
       });
       if (unitsData && unitsData.items) {
         availableUnits = unitsData.items;
@@ -1377,7 +1387,8 @@ function useAreaService() {
           const areaData = {
             type: areaType,
             name: areaName,
-            site
+            site,
+            serviceType
           };
           if (row.SET !== void 0 && row.SET !== null && row.SET !== "") {
             const setNumber = parseInt(String(row.SET).trim());
@@ -1471,9 +1482,12 @@ function useAreaService() {
       }
     }
   }
-  async function exportAreas(site) {
+  async function exportAreas({
+    site,
+    serviceType
+  }) {
     try {
-      const areas = await getAreasForChecklist(site);
+      const areas = await getAreasForChecklist(site, serviceType);
       if (!areas || !Array.isArray(areas) || areas.length === 0) {
         throw new BadRequestError7(
           "There are no areas to export yet. Please add some areas first, then try again."
@@ -1560,7 +1574,8 @@ function useAreaController() {
       limit: Joi4.number().min(1).optional().allow("", null),
       search: Joi4.string().optional().allow("", null),
       type: Joi4.string().valid("all", ...allowedTypes).optional().allow("", null),
-      site: Joi4.string().hex().required()
+      site: Joi4.string().hex().required(),
+      serviceType: Joi4.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -1573,13 +1588,15 @@ function useAreaController() {
     const search = req.query.search ?? "";
     const type = req.query.type ?? "all";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getAreas({
         page,
         limit,
         search,
         type,
-        site
+        site,
+        serviceType
       });
       res.json(data);
       return;
@@ -1664,9 +1681,12 @@ function useAreaController() {
       next(new BadRequestError8("File is required!"));
       return;
     }
-    const { site } = req.params;
-    const schema = Joi4.string().hex().required();
-    const { error, value } = schema.validate(site);
+    const query = { ...req.query, ...req.params };
+    const validation = Joi4.object({
+      site: Joi4.string().hex().required(),
+      serviceType: Joi4.string().valid(...Object.values(ServiceType)).required()
+    });
+    const { error, value } = validation.validate(query);
     if (error) {
       logger9.log({ level: "error", message: error.message });
       next(new BadRequestError8(error.message));
@@ -1675,7 +1695,7 @@ function useAreaController() {
     try {
       const xlsData = await convertBufferFile(req.file.buffer);
       const dataJson = JSON.stringify(xlsData);
-      const result = await _importArea({ dataJson, site: value });
+      const result = await _importArea({ dataJson, ...value });
       return res.status(201).json(result);
     } catch (error2) {
       logger9.log({ level: "error", message: error2.message });
@@ -1684,9 +1704,12 @@ function useAreaController() {
     }
   }
   async function exportAreas(req, res, next) {
-    const { site } = req.params;
-    const validation = Joi4.string().hex().required();
-    const { error, value } = validation.validate(site);
+    const query = { ...req.query, ...req.params };
+    const validation = Joi4.object({
+      site: Joi4.string().hex().required(),
+      serviceType: Joi4.string().valid(...Object.values(ServiceType)).required()
+    });
+    const { error, value } = validation.validate(query);
     if (error) {
       logger9.log({ level: "error", message: error.message });
       next(new BadRequestError8(error.message));
@@ -1782,7 +1805,8 @@ function useUnitService() {
   } = useUnitRepository();
   async function importUnit({
     dataJson,
-    site
+    site,
+    serviceType
   }) {
     let dataArray;
     try {
@@ -1823,7 +1847,8 @@ function useUnitService() {
         try {
           const insertedId = await _createUnit({
             name: unitName,
-            site
+            site,
+            serviceType
           });
           insertedUnitIds.push(insertedId);
           logger11.info(`Successfully created unit: ${unitName}`);
@@ -1928,7 +1953,10 @@ function useUnitService() {
       session?.endSession();
     }
   }
-  async function exportUnits(site) {
+  async function exportUnits({
+    site,
+    serviceType
+  }) {
     const { generateUnitExcel: _generateUnitExcel } = useUnitExportService();
     const { getUnits: _getUnits } = useUnitRepository();
     try {
@@ -1936,7 +1964,8 @@ function useUnitService() {
         page: 1,
         limit: 999999,
         search: "",
-        site
+        site,
+        serviceType
       });
       if (!data || !data.items || data.items.length === 0) {
         throw new BadRequestError9(
@@ -1993,7 +2022,8 @@ function useUnitController() {
       page: Joi5.number().min(1).optional().allow("", null),
       limit: Joi5.number().min(1).optional().allow("", null),
       search: Joi5.string().optional().allow("", null),
-      site: Joi5.string().hex().required()
+      site: Joi5.string().hex().required(),
+      serviceType: Joi5.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -2005,12 +2035,14 @@ function useUnitController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getUnits({
         page,
         limit,
         search,
-        site
+        site,
+        serviceType
       });
       res.json(data);
       return;
@@ -2069,9 +2101,12 @@ function useUnitController() {
       next(new BadRequestError10("File is required!"));
       return;
     }
-    const { site } = req.params;
-    const validation = Joi5.string().hex().required();
-    const { error, value } = validation.validate(site);
+    const query = { ...req.query, ...req.params };
+    const validation = Joi5.object({
+      site: Joi5.string().hex().required(),
+      serviceType: Joi5.string().valid(...Object.values(ServiceType)).required()
+    });
+    const { error, value } = validation.validate(query);
     if (error) {
       logger12.log({ level: "error", message: error.message });
       next(new BadRequestError10(error.message));
@@ -2080,7 +2115,7 @@ function useUnitController() {
     try {
       const xlsData = await convertBufferFile(req.file.buffer);
       const dataJson = JSON.stringify(xlsData);
-      const result = await _importUnit({ dataJson, site: value });
+      const result = await _importUnit({ dataJson, ...value });
       return res.status(201).json(result);
     } catch (error2) {
       logger12.log({ level: "error", message: error2.message });
@@ -2089,9 +2124,12 @@ function useUnitController() {
     }
   }
   async function exportUnits(req, res, next) {
-    const { site } = req.params;
-    const validation = Joi5.string().hex().required();
-    const { error, value } = validation.validate(site);
+    const query = { ...req.query, ...req.params };
+    const validation = Joi5.object({
+      site: Joi5.string().hex().required(),
+      serviceType: Joi5.string().valid(...Object.values(ServiceType)).required()
+    });
+    const { error, value } = validation.validate(query);
     if (error) {
       logger12.log({ level: "error", message: error.message });
       next(new BadRequestError10(error.message));
@@ -2137,7 +2175,8 @@ import { ObjectId as ObjectId6 } from "mongodb";
 import { BadRequestError as BadRequestError11, logger as logger13 } from "@7365admin1/node-server-utils";
 var parentChecklistSchema = Joi6.object({
   createdAt: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null),
-  site: Joi6.string().hex().required()
+  site: Joi6.string().hex().required(),
+  serviceType: Joi6.string().valid(...Object.values(ServiceType)).required()
 });
 function MParentChecklist(value) {
   const { error } = parentChecklistSchema.validate(value);
@@ -2154,6 +2193,7 @@ function MParentChecklist(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     status: "open",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt ?? ""
@@ -2236,12 +2276,16 @@ function useParentChecklistRepo() {
         );
         return existingChecklist._id;
       }
+      const allServiceTypes = Object.values(ServiceType);
       if (value.site) {
-        const checklistDoc = MParentChecklist({
-          site: value.site,
-          createdAt: currentDate
-        });
-        const result2 = await collection.insertOne(checklistDoc, { session });
+        const checklistDocs2 = allServiceTypes.map(
+          (serviceType) => MParentChecklist({
+            site: value.site,
+            createdAt: currentDate,
+            serviceType
+          })
+        );
+        const result2 = await collection.insertMany(checklistDocs2, { session });
         delNamespace().then(() => {
           logger14.info(`Cache cleared for namespace: ${namespace_collection}`);
         }).catch((err) => {
@@ -2252,9 +2296,9 @@ function useParentChecklistRepo() {
         });
         const dateStr2 = currentDate.toISOString().split("T")[0];
         logger14.info(
-          `Created parent checklist for site ${value.site} for today: ${dateStr2}`
+          `Created ${checklistDocs2.length} parent checklists for site ${value.site} for today: ${dateStr2}`
         );
-        return result2.insertedId;
+        return Object.values(result2.insertedIds);
       }
       const siteIds = await getHygieneSiteIds();
       if (!Array.isArray(siteIds)) {
@@ -2267,12 +2311,15 @@ function useParentChecklistRepo() {
       }
       const checklistDocs = [];
       for (const site of siteIds) {
-        checklistDocs.push(
-          MParentChecklist({
-            site,
-            createdAt: currentDate
-          })
-        );
+        for (const serviceType of allServiceTypes) {
+          checklistDocs.push(
+            MParentChecklist({
+              site,
+              createdAt: currentDate,
+              serviceType
+            })
+          );
+        }
       }
       const result = await collection.insertMany(checklistDocs, { session });
       delNamespace().then(() => {
@@ -2300,13 +2347,15 @@ function useParentChecklistRepo() {
     site,
     startDate = "",
     endDate = "",
-    status = "all"
+    status = "all",
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
-    const query = {};
+    const query = { serviceType };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new ObjectId7(site);
@@ -2486,12 +2535,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) {
+      logger14.error("Failed to get today's parent checklists", error);
+      throw error;
+    }
+  }
   return {
     createIndex,
     createParentChecklist,
     getAllParentChecklist,
     updateParentChecklistStatuses,
-    closeExpiredParentChecklists
+    closeExpiredParentChecklists,
+    getTodayParentChecklists
   };
 }
 
@@ -2528,6 +2595,7 @@ function useParentChecklistController() {
       limit: Joi7.number().min(1).optional().allow("", null),
       search: Joi7.string().optional().allow("", null),
       site: Joi7.string().hex().required(),
+      serviceType: Joi7.string().valid(...Object.values(ServiceType)).required(),
       startDate: Joi7.alternatives().try(Joi7.date(), Joi7.string()).optional().allow("", null),
       endDate: Joi7.alternatives().try(Joi7.date(), Joi7.string()).optional().allow("", null),
       status: Joi7.string().valid(...allowedStatus, "all").optional().allow("", null)
@@ -2542,6 +2610,7 @@ function useParentChecklistController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     const startDate = req.query.startDate ?? "";
     const endDate = req.query.endDate ?? "";
     const status = req.query.status ?? "all";
@@ -2551,6 +2620,7 @@ function useParentChecklistController() {
         limit,
         search,
         site,
+        serviceType,
         startDate,
         endDate,
         status
@@ -2587,7 +2657,9 @@ var areaChecklistSchema = Joi8.object({
           unit: Joi8.string().hex().required(),
           name: Joi8.string().required()
         }).required()
-      ).min(1).required()
+      ).min(1).required(),
+      isScheduleTask: Joi8.boolean().optional().default(false),
+      scheduleTaskId: Joi8.string().hex().optional().allow(null)
     }).required()
   ).optional().default([]),
   createdBy: Joi8.string().hex().required()
@@ -2616,6 +2688,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 ObjectId8(unit.unit),
           name: unit.name,
@@ -2651,6 +2725,7 @@ function MAreaChecklist(value) {
 }
 
 // src/services/hygiene-area-checklist.service.ts
+import { ObjectId as ObjectId10 } from "mongodb";
 import {
   logger as logger18,
   UnauthorizedError,
@@ -2706,26 +2781,26 @@ function useAreaChecklistRepo() {
       );
     }
   }
+  async function createUniqueIndex() {
+    try {
+      await collection.createIndex({ schedule: 1, area: 1 }, { unique: true });
+    } catch (error) {
+      throw new InternalServerError5(
+        "Failed to create unique index on hygiene checklist area."
+      );
+    }
+  }
   async function createAreaChecklist(value, session) {
     try {
       const parentChecklistId = new ObjectId9(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 ObjectId9(value.area);
+      const existingChecklist = await collection.findOne(
+        { schedule: parentChecklistId, area: areaId },
+        { session }
+      );
       if (existingChecklist) {
         logger17.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;
       }
@@ -2741,6 +2816,14 @@ function useAreaChecklistRepo() {
       });
       return result.insertedId;
     } catch (error) {
+      if (error?.code === 11e3) {
+        logger17.info(`Duplicate area checklist skipped for area ${value.name}`);
+        const existing = await collection.findOne({
+          schedule: new ObjectId9(value.schedule),
+          area: new ObjectId9(value.area)
+        });
+        return existing._id;
+      }
       throw error;
     }
   }
@@ -3078,6 +3161,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",
@@ -3108,6 +3194,7 @@ function useAreaChecklistRepo() {
         {
           $group: {
             _id: "$set",
+            isScheduleTask: { $first: "$isScheduleTask" },
             units: {
               $push: {
                 unit: "$unit",
@@ -3124,6 +3211,7 @@ function useAreaChecklistRepo() {
           $project: {
             _id: 0,
             set: "$_id",
+            isScheduleTask: 1,
             units: 1
           }
         },
@@ -3240,7 +3328,7 @@ function useAreaChecklistRepo() {
         },
         {
           $sort: {
-            set: 1,
+            "checklist.set": 1,
             isActioned: 1,
             "checklist.units.timestamp": 1,
             isCompleted: -1
@@ -3250,6 +3338,12 @@ function useAreaChecklistRepo() {
           $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",
@@ -3282,6 +3376,8 @@ function useAreaChecklistRepo() {
         {
           $group: {
             _id: "$set",
+            isScheduleTask: { $first: "$isScheduleTask" },
+            scheduleTaskId: { $first: "$scheduleTaskId" },
             remarks: { $first: "$remarks" },
             attachment: { $first: "$attachment" },
             completedByName: { $first: "$completedByName" },
@@ -3303,6 +3399,8 @@ function useAreaChecklistRepo() {
           $project: {
             _id: 0,
             set: "$_id",
+            isScheduleTask: 1,
+            scheduleTaskId: 1,
             remarks: "$remarks",
             attachment: "$attachment",
             completedByName: 1,
@@ -3327,7 +3425,7 @@ function useAreaChecklistRepo() {
             }
           }
         },
-        { $sort: { isFullyActioned: 1 } },
+        { $sort: { isFullyActioned: 1, set: 1 } },
         { $skip: page * limit },
         { $limit: limit }
       ];
@@ -3550,7 +3648,7 @@ function useAreaChecklistRepo() {
       const _id = new ObjectId9(areaId);
       const result = await collection.aggregate(
         [
-          { $match: { area: _id.toString() } },
+          { $match: { area: _id } },
           { $unwind: "$checklist" },
           { $group: { _id: null, maxSet: { $max: "$checklist.set" } } }
         ],
@@ -3598,9 +3696,155 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
+  async function pushScheduleTaskSets(scheduleId, areaId, scheduleTaskId, newSets) {
+    try {
+      const schedule = new ObjectId9(scheduleId);
+      const area = new ObjectId9(areaId);
+      const taskId = new ObjectId9(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) => {
+          logger17.error(
+            `Failed to clear cache for namespace: ${namespace_collection}`,
+            err
+          );
+        });
+      }
+      return result.modifiedCount;
+    } catch (error) {
+      logger17.error("Error in pushScheduleTaskSets:", error);
+      throw error;
+    }
+  }
+  async function insertAutoGenSets(scheduleId, areaId, newSets) {
+    try {
+      const schedule = new ObjectId9(scheduleId);
+      const area = new ObjectId9(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) => {
+          logger17.error(
+            `Failed to clear cache for namespace: ${namespace_collection}`,
+            err
+          );
+        });
+      }
+      return result.modifiedCount;
+    } catch (error) {
+      logger17.error("Error in insertAutoGenSets:", error);
+      throw error;
+    }
+  }
+  async function trimOverflowSets() {
+    try {
+      const db2 = useAtlas6.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) {
+        logger17.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++;
+          logger17.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(() => {
+      });
+      logger17.info(`trimOverflowSets: trimmed ${trimmed} document(s)`);
+      return trimmed;
+    } catch (error) {
+      logger17.error("Error in trimOverflowSets:", error);
+      return 0;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
+    createUniqueIndex,
     createAreaChecklist,
     getAllAreaChecklist,
     getAreaChecklistHistory,
@@ -3613,7 +3857,10 @@ function useAreaChecklistRepo() {
     updateAreaChecklistStatus,
     updateAreaChecklistUnits,
     getMaxSetNumberForArea,
-    closeExpiredAreaChecklists
+    closeExpiredAreaChecklists,
+    pushScheduleTaskSets,
+    insertAutoGenSets,
+    trimOverflowSets
   };
 }
 
@@ -3625,19 +3872,18 @@ function useAreaChecklistService() {
     getAllAreaChecklist,
     getAreaChecklistUnits,
     getAreaChecklistById,
+    getAreaChecklistByAreaAndSchedule,
     getAreaChecklistSetOwner,
     updateAreaChecklistUnits: _updateAreaChecklistUnits,
     updateAreaChecklistStatus,
-    getMaxSetNumberForArea
+    insertAutoGenSets
   } = useAreaChecklistRepo();
   const { updateParentChecklistStatuses } = useParentChecklistRepo();
   const { getUserById } = useUserRepo();
   async function createAreaChecklist(value) {
-    const session = useAtlas7.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 || [];
@@ -3651,15 +3897,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) {
+                logger18.info(
+                  `Area checklist already exists with auto-gen sets for area ${area.name}, skipping`
+                );
+                return existing._id;
+              }
+              logger18.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) {
+                logger18.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 ObjectId10(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
@@ -3667,10 +3970,7 @@ function useAreaChecklistService() {
               })),
               createdBy: value.createdBy
             };
-            const insertedId = await _createAreaChecklist(
-              checklistData,
-              session
-            );
+            const insertedId = await _createAreaChecklist(checklistData);
             totalChecklistsCreated++;
             return insertedId;
           });
@@ -3683,19 +3983,13 @@ function useAreaChecklistService() {
       } else {
         logger18.warn(`No common areas found for site: ${value.site}`);
       }
-      await session?.commitTransaction();
       logger18.info(
         `Successfully created ${totalChecklistsCreated} area checklists for site: ${value.site}`
       );
       return results;
     } catch (error) {
       logger18.error(`Error generating area checklists:`, error);
-      if (session?.inTransaction()) {
-        await session?.abortTransaction();
-      }
       throw error;
-    } finally {
-      session?.endSession();
     }
   }
   async function updateAreaChecklistUnits(_id, set, unitId, value) {
@@ -3799,7 +4093,7 @@ import { BadRequestError as BadRequestError16, InternalServerError as InternalSe
 // src/services/hygiene-checklist-pdf.service.ts
 import { launch } from "puppeteer";
 import { InternalServerError as InternalServerError6, useAtlas as useAtlas8 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId10 } from "mongodb";
+import { ObjectId as ObjectId11 } from "mongodb";
 function escapeHtml(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
 }
@@ -3973,7 +4267,7 @@ function useChecklistPdfService() {
     const collection = db.collection("site.cleaning.schedule.areas");
     let scheduleObjectId;
     try {
-      scheduleObjectId = new ObjectId10(scheduleId);
+      scheduleObjectId = new ObjectId11(scheduleId);
     } catch {
       throw new InternalServerError6("Invalid schedule ID format.");
     }
@@ -4282,7 +4576,7 @@ function useAreaChecklistController() {
 
 // src/models/hygiene-supply.model.ts
 import Joi10 from "joi";
-import { ObjectId as ObjectId11 } from "mongodb";
+import { ObjectId as ObjectId12 } from "mongodb";
 import { BadRequestError as BadRequestError17, logger as logger21 } from "@7365admin1/node-server-utils";
 var supplySchema = Joi10.object({
   site: Joi10.string().hex().required(),
@@ -4297,7 +4591,7 @@ function MSupply(value) {
   }
   if (value.site) {
     try {
-      value.site = new ObjectId11(value.site);
+      value.site = new ObjectId12(value.site);
     } catch (error2) {
       throw new BadRequestError17("Invalid site ID format.");
     }
@@ -4315,7 +4609,7 @@ function MSupply(value) {
 }
 
 // src/repositories/hygiene-supply.repository.ts
-import { ObjectId as ObjectId12 } from "mongodb";
+import { ObjectId as ObjectId13 } from "mongodb";
 import {
   useAtlas as useAtlas9,
   InternalServerError as InternalServerError8,
@@ -4400,7 +4694,7 @@ function useSupplyRepository() {
       limit
     };
     try {
-      site = new ObjectId12(site);
+      site = new ObjectId13(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -4444,7 +4738,7 @@ function useSupplyRepository() {
   }
   async function getSupplyById(_id, session) {
     try {
-      _id = new ObjectId12(_id);
+      _id = new ObjectId13(_id);
     } catch (error) {
       throw new BadRequestError18("Invalid supply ID format.");
     }
@@ -4490,7 +4784,7 @@ function useSupplyRepository() {
   }
   async function updateSupply(_id, value, session) {
     try {
-      _id = new ObjectId12(_id);
+      _id = new ObjectId13(_id);
     } catch (error) {
       throw new BadRequestError18("Invalid supply ID format.");
     }
@@ -4523,7 +4817,7 @@ function useSupplyRepository() {
   }
   async function deleteSupply(_id, session) {
     try {
-      _id = new ObjectId12(_id);
+      _id = new ObjectId13(_id);
     } catch (error) {
       throw new BadRequestError18("Invalid supply ID format.");
     }
@@ -4704,7 +4998,7 @@ function useSupplyController() {
 
 // src/models/hygiene-stock.model.ts
 import Joi12 from "joi";
-import { ObjectId as ObjectId13 } from "mongodb";
+import { ObjectId as ObjectId14 } from "mongodb";
 import { BadRequestError as BadRequestError20, logger as logger24 } from "@7365admin1/node-server-utils";
 var stockSchema = Joi12.object({
   site: Joi12.string().hex().required(),
@@ -4722,14 +5016,14 @@ function MStock(value) {
   }
   if (value.site) {
     try {
-      value.site = new ObjectId13(value.site);
+      value.site = new ObjectId14(value.site);
     } catch (error2) {
       throw new BadRequestError20("Invalid site ID format.");
     }
   }
   if (value.supply) {
     try {
-      value.supply = new ObjectId13(value.supply);
+      value.supply = new ObjectId14(value.supply);
     } catch (error2) {
       throw new BadRequestError20("Invalid supply ID format.");
     }
@@ -4749,7 +5043,7 @@ function MStock(value) {
 }
 
 // src/repositories/hygiene-stock.repository.ts
-import { ObjectId as ObjectId14 } from "mongodb";
+import { ObjectId as ObjectId15 } from "mongodb";
 import {
   useAtlas as useAtlas10,
   InternalServerError as InternalServerError9,
@@ -4822,14 +5116,14 @@ function useStockRepository() {
       limit
     };
     try {
-      site = new ObjectId14(site);
+      site = new ObjectId15(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
       throw new BadRequestError21("Invalid site ID format.");
     }
     try {
-      supply = new ObjectId14(supply);
+      supply = new ObjectId15(supply);
       query.supply = supply;
       cacheOptions.supply = supply.toString();
     } catch (error) {
@@ -5007,7 +5301,7 @@ function useStockController() {
 
 // src/models/hygiene-checkout-item.model.ts
 import Joi14 from "joi";
-import { ObjectId as ObjectId15 } from "mongodb";
+import { ObjectId as ObjectId16 } from "mongodb";
 import { BadRequestError as BadRequestError24, logger as logger27 } from "@7365admin1/node-server-utils";
 var allowedCheckOutItemStatus = ["pending", "completed"];
 var checkOutItemSchema = Joi14.object({
@@ -5027,14 +5321,14 @@ function MCheckOutItem(value) {
   }
   if (value.site) {
     try {
-      value.site = new ObjectId15(value.site);
+      value.site = new ObjectId16(value.site);
     } catch (error2) {
       throw new BadRequestError24("Invalid site ID format.");
     }
   }
   if (value.supply) {
     try {
-      value.supply = new ObjectId15(value.supply);
+      value.supply = new ObjectId16(value.supply);
     } catch (error2) {
       throw new BadRequestError24("Invalid supply ID format.");
     }
@@ -5055,7 +5349,7 @@ function MCheckOutItem(value) {
 }
 
 // src/repositories/hygiene-checkout-item.repository.ts
-import { ObjectId as ObjectId16 } from "mongodb";
+import { ObjectId as ObjectId17 } from "mongodb";
 import {
   useAtlas as useAtlas12,
   InternalServerError as InternalServerError10,
@@ -5128,7 +5422,7 @@ function useCheckOutItemRepository() {
       limit
     };
     try {
-      site = new ObjectId16(site);
+      site = new ObjectId17(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -5201,7 +5495,7 @@ function useCheckOutItemRepository() {
   }
   async function getCheckOutItemById(_id, session) {
     try {
-      _id = new ObjectId16(_id);
+      _id = new ObjectId17(_id);
     } catch (error) {
       throw new BadRequestError25("Invalid check out item ID format.");
     }
@@ -5265,7 +5559,7 @@ function useCheckOutItemRepository() {
   }
   async function completeCheckOutItem(_id, session) {
     try {
-      _id = new ObjectId16(_id);
+      _id = new ObjectId17(_id);
     } catch (error) {
       throw new BadRequestError25("Invalid check out item ID format.");
     }
@@ -5551,7 +5845,7 @@ function useCheckOutItemController() {
 // src/models/hygiene-schedule-task.model.ts
 import { BadRequestError as BadRequestError28, logger as logger30 } from "@7365admin1/node-server-utils";
 import Joi16 from "joi";
-import { ObjectId as ObjectId17 } from "mongodb";
+import { ObjectId as ObjectId18 } from "mongodb";
 var scheduleTaskSchema = Joi16.object({
   site: Joi16.string().hex().required(),
   title: Joi16.string().required(),
@@ -5576,7 +5870,7 @@ function MScheduleTask(value) {
   }
   if (value.site) {
     try {
-      value.site = new ObjectId17(value.site);
+      value.site = new ObjectId18(value.site);
     } catch (error2) {
       throw new BadRequestError28("Invalid site ID format.");
     }
@@ -5586,7 +5880,7 @@ function MScheduleTask(value) {
       try {
         return {
           name: area.name,
-          value: new ObjectId17(area.value.toString())
+          value: new ObjectId18(area.value.toString())
         };
       } catch (error2) {
         throw new BadRequestError28(`Invalid area value format: ${area.name}`);
@@ -5595,7 +5889,7 @@ function MScheduleTask(value) {
   }
   if (value.createdBy) {
     try {
-      value.createdBy = new ObjectId17(value.createdBy);
+      value.createdBy = new ObjectId18(value.createdBy);
     } catch (error2) {
       throw new BadRequestError28("Invalid createdBy ID format.");
     }
@@ -5616,7 +5910,7 @@ function MScheduleTask(value) {
 }
 
 // src/repositories/hygiene-schedule-task.repository.ts
-import { ObjectId as ObjectId18 } from "mongodb";
+import { ObjectId as ObjectId19 } from "mongodb";
 import {
   useAtlas as useAtlas14,
   InternalServerError as InternalServerError11,
@@ -5688,7 +5982,7 @@ function useScheduleTaskRepository() {
       limit
     };
     try {
-      site = new ObjectId18(site);
+      site = new ObjectId19(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -5756,7 +6050,7 @@ function useScheduleTaskRepository() {
       limit
     };
     try {
-      site = new ObjectId18(site);
+      site = new ObjectId19(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -5799,7 +6093,7 @@ function useScheduleTaskRepository() {
   }
   async function getScheduleTaskById(_id, session) {
     try {
-      _id = new ObjectId18(_id);
+      _id = new ObjectId19(_id);
     } catch (error) {
       throw new BadRequestError29("Invalid schedule task ID format.");
     }
@@ -5849,7 +6143,7 @@ function useScheduleTaskRepository() {
   }
   async function updateScheduleTask(_id, value, session) {
     try {
-      _id = new ObjectId18(_id);
+      _id = new ObjectId19(_id);
     } catch (error) {
       throw new BadRequestError29("Invalid schedule task ID format.");
     }
@@ -5858,7 +6152,7 @@ function useScheduleTaskRepository() {
         try {
           return {
             name: area.name,
-            value: new ObjectId18(area.value.toString())
+            value: new ObjectId19(area.value.toString())
           };
         } catch (error) {
           throw new BadRequestError29(`Invalid area value format: ${area.name}`);
@@ -5903,6 +6197,7 @@ function useScheduleTaskRepository() {
 }
 
 // src/services/hygiene-schedule-task.service.ts
+import { ObjectId as ObjectId20 } from "mongodb";
 import { logger as logger32 } from "@7365admin1/node-server-utils";
 function useScheduleTaskService() {
   const { createParentChecklist } = useParentChecklistRepo();
@@ -5910,7 +6205,7 @@ function useScheduleTaskService() {
   const {
     createAreaChecklist,
     getAreaChecklistByAreaAndSchedule,
-    updateAreaChecklist
+    pushScheduleTaskSets
   } = useAreaChecklistRepo();
   const { getAreaById } = useAreaRepo();
   function checkScheduleConditions(schedule, currentDate = /* @__PURE__ */ new Date()) {
@@ -5949,6 +6244,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) {
+          logger32.info(
+            `Schedule ${schedule._id}: Skipping \u2014 task was saved this minute (${savedHour}:${String(
+              savedMinNum
+            ).padStart(2, "0")}). Will fire on next occurrence.`
+          );
+          return false;
+        }
+      }
       logger32.info(
         `Schedule ${schedule._id}: All conditions matched - Date is within range and time matches`
       );
@@ -6016,8 +6340,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 ObjectId20(unit.unit),
+                  name: unit.name,
+                  approve: false,
+                  reject: false,
+                  status: "open",
+                  remarks: "",
+                  completedBy: "",
+                  timestamp: ""
                 }));
                 logger32.info(
                   `Area ${area.name} (${areaId}): Using units from area details: ${JSON.stringify(
@@ -6054,79 +6384,62 @@ function useScheduleTaskService() {
                 );
               }
               if (existingAreaChecklist) {
-                const currentSetNumber = existingAreaChecklist.checklist?.length || 0;
-                const newSet = {
-                  set: currentSetNumber + 1,
-                  units
-                };
-                const updatedChecklist = [
-                  ...existingAreaChecklist.checklist || [],
-                  newSet
-                ];
-                logger32.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
-                });
-                logger32.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) {
                   logger32.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) {
-                  logger32.warn(
-                    `Area ${area.name} (${areaId}): Error verifying checklist after update:`,
-                    verifyError
+                } else {
+                  logger32.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
                 };
                 logger32.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);
                 logger32.info(`Created new area checklist for area ${area.name}`);
-                try {
-                  const verifyChecklist = await getAreaChecklistByAreaAndSchedule(
-                    parentChecklistId.toString(),
-                    areaId
-                  );
-                  logger32.info(
-                    `Area ${area.name} (${areaId}): Checklist after creation: ${JSON.stringify(
-                      verifyChecklist.checklist
-                    )}`
-                  );
-                } catch (verifyError) {
-                  logger32.warn(
-                    `Area ${area.name} (${areaId}): Error verifying checklist after creation:`,
-                    verifyError
-                  );
-                }
               }
             } catch (error) {
               logger32.error(`Error processing area ${area.name}:`, error);
@@ -6611,6 +6924,7 @@ export {
   MStock,
   MSupply,
   MUnit,
+  ServiceType,
   allowedCheckOutItemStatus,
   allowedChecklistStatus,
   allowedPeriods,