@iservice365/module-hygiene 0.1.0 → 0.1.1

package/dist/index.mjs

@@ -1436,42 +1436,66 @@ function useToiletLocationController() {
 }
 
 // src/models/hygiene-parent-checklist.model.ts
-import { BadRequestError as BadRequestError9 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError9, logger as logger8 } from "@iservice365/node-server-utils";
 import Joi5 from "joi";
+import { ObjectId as ObjectId5 } from "mongodb";
+var allowedTypes = ["cleaner", "toilet"];
+var allowedStatus = [
+  "To Do",
+  "Pending",
+  "In Progress",
+  "Completed",
+  "Expired"
+];
 var parentChecklistSchema = Joi5.object({
   date: Joi5.date().required(),
   status: Joi5.array().items(
     Joi5.object({
-      site: Joi5.string().hex().required(),
-      status: Joi5.string().required(),
-      completedAt: Joi5.date().required(),
-      type: Joi5.string().required()
+      type: Joi5.string().required().valid(...allowedTypes),
+      site: Joi5.string().hex().required()
     })
-  ).optional(),
-  updatedAt: Joi5.date().optional().allow("", null)
+  ).optional()
 });
 function MParentChecklist(value) {
   const { error } = parentChecklistSchema.validate(value);
   if (error) {
+    logger8.info(`Hygiene Parent Checklist Model: ${error.message}`);
     throw new BadRequestError9(error.message);
   }
+  if (value.status && Array.isArray(value.status)) {
+    value.status = value.status.map((item) => {
+      try {
+        return {
+          ...item,
+          site: new ObjectId5(item.site),
+          status: item.status || "To Do",
+          completedAt: item.completedAt || ""
+        };
+      } catch (error2) {
+        throw new BadRequestError9(
+          `Invalid status site ID format: ${item.site}`
+        );
+      }
+    });
+  }
   return {
-    date: value.date,
+    date: new Date(value.date),
     status: value.status,
     createdAt: /* @__PURE__ */ new Date(),
-    updatedAt: value.updatedAt ?? "",
-    deletedAt: value.deletedAt ?? ""
+    updatedAt: value.updatedAt ?? ""
   };
 }
 
 // src/repositories/hygiene-parent-checklist.repository.ts
+import { ObjectId as ObjectId6 } from "mongodb";
 import {
   useAtlas as useAtlas5,
   InternalServerError as InternalServerError3,
   paginate as paginate3,
   useCache as useCache3,
-  logger as logger8,
-  makeCacheKey as makeCacheKey3
+  logger as logger9,
+  makeCacheKey as makeCacheKey3,
+  BadRequestError as BadRequestError10
 } from "@iservice365/node-server-utils";
 function useParentChecklistRepo() {
   const db = useAtlas5.getDb();
@@ -1480,219 +1504,420 @@ function useParentChecklistRepo() {
   }
   const namespace_collection = "hygiene-parent-checklist";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache, delCache } = useCache3(namespace_collection);
-  async function createIndexes() {
+  const { delNamespace, setCache, getCache } = useCache3(namespace_collection);
+  async function createIndex() {
     try {
       await collection.createIndexes([
-        { key: { date: "text" } }
+        { key: { date: 1 } },
+        { key: { "status.type": 1, "status.site": 1 } }
       ]);
     } catch (error) {
-      throw new InternalServerError3("Failed to create index on site.");
+      throw new InternalServerError3(
+        "Failed to create index on hygiene parent checklist."
+      );
     }
   }
-  async function create(value, session) {
+  async function createParentChecklist(value, session) {
     try {
-      const currentDate = /* @__PURE__ */ new Date();
+      const currentDate = value.date ? new Date(value.date) : /* @__PURE__ */ new Date();
       const startOfDay = new Date(currentDate);
-      startOfDay.setDate(currentDate.getDate());
       startOfDay.setUTCHours(0, 0, 0, 0);
       const endOfDay = new Date(currentDate);
-      endOfDay.setDate(currentDate.getDate());
       endOfDay.setUTCHours(23, 59, 59, 999);
-      const checklistRecord = await collection.findOne({
+      const existingChecklist = await collection.findOne({
         date: {
           $gte: startOfDay,
           $lte: endOfDay
         }
       });
+      if (existingChecklist) {
+        const dateStr2 = currentDate.toISOString().split("T")[0];
+        logger9.info(`Parent checklist already exists for today: ${dateStr2}`);
+        return existingChecklist._id;
+      }
+      const processedValue = MParentChecklist(value);
+      const result = await collection.insertOne(processedValue, { session });
       delNamespace().then(() => {
-        logger8.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger9.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger8.error(
+        logger9.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
       });
-      if (!checklistRecord) {
-        value = MParentChecklist(value);
-        const res = await collection.insertOne(value, { session });
-        return res.insertedId;
-      }
-      return checklistRecord;
+      const dateStr = currentDate.toISOString().split("T")[0];
+      logger9.info(
+        `Created new parent checklist ${result.insertedId} for today: ${dateStr}`
+      );
+      return result.insertedId;
     } catch (error) {
+      logger9.error("Failed to create daily parent checklist", error);
       throw error;
     }
   }
-  async function get({
+  async function getAllParentChecklist({
     page = 1,
     limit = 10,
     search = "",
-    sort = {},
+    site,
+    type,
     startDate = "",
     endDate = ""
   }) {
     page = page > 0 ? page - 1 : 0;
-    let dateFilter = {};
-    const query = {
-      createdAt: {
-        createdAt: {
-          $gte: new Date(startDate),
-          $lte: new Date(endDate)
-        }
-      }
-    };
+    const query = {};
     const cacheOptions = {
-      createdAt: {
-        createdAt: {
-          $gte: new Date(startDate),
-          $lte: new Date(endDate)
-        }
+      page,
+      limit
+    };
+    try {
+      site = new ObjectId6(site);
+      cacheOptions.site = site.toString();
+    } catch (error) {
+      throw new BadRequestError10("Invalid site ID format.");
+    }
+    cacheOptions.type = type;
+    query.status = {
+      $elemMatch: {
+        site: new ObjectId6(site),
+        type
       }
     };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
-    cacheOptions.sort = JSON.stringify(sort);
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
-    delNamespace().then(() => {
-      logger8.info(`Cache cleared for namespace: ${namespace_collection}`);
-    }).catch((err) => {
-      logger8.error(
-        `Failed to clear cache for namespace: ${namespace_collection}`,
-        err
-      );
-    });
+    if (startDate && endDate) {
+      query.createdAt = {
+        $gte: new Date(startDate),
+        $lte: new Date(endDate)
+      };
+      cacheOptions.startDate = new Date(startDate).toISOString().split("T")[0];
+      cacheOptions.endDate = new Date(endDate).toISOString().split("T")[0];
+    } else if (startDate) {
+      query.createdAt = { $gte: new Date(startDate) };
+      cacheOptions.startDate = new Date(startDate).toISOString().split("T")[0];
+    } else if (endDate) {
+      query.createdAt = { $lte: new Date(endDate) };
+      cacheOptions.endDate = new Date(endDate).toISOString().split("T")[0];
+    }
     const cacheKey = makeCacheKey3(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger8.info(`Cache hit for key: ${cacheKey}`);
+      logger9.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
-    if (startDate && endDate) {
-      dateFilter = {
-        createdAt: {
-          $gte: new Date(startDate),
-          $lte: new Date(endDate)
+    try {
+      const pipeline = [{ $match: query }];
+      const filterConditions = [];
+      filterConditions.push({ $eq: ["$$this.site", new ObjectId6(site)] });
+      filterConditions.push({ $eq: ["$$this.type", type] });
+      pipeline.push({
+        $addFields: {
+          filteredStatus: {
+            $filter: {
+              input: "$status",
+              cond: { $and: filterConditions }
+            }
+          }
         }
-      };
-    } else if (startDate) {
-      dateFilter = { createdAt: { $gte: new Date(startDate) } };
-    } else if (endDate) {
-      dateFilter = { createdAt: { $lte: new Date(endDate) } };
+      });
+      pipeline.push({
+        $match: {
+          filteredStatus: { $ne: [] }
+        }
+      });
+      pipeline.push({
+        $addFields: {
+          statusObj: { $arrayElemAt: ["$filteredStatus", 0] }
+        }
+      });
+      pipeline.push({
+        $project: {
+          _id: 1,
+          date: 1,
+          status: "$statusObj.status",
+          completedAt: "$statusObj.completedAt",
+          createdAt: 1
+        }
+      });
+      pipeline.push(
+        { $sort: { _id: -1 } },
+        { $skip: page * limit },
+        { $limit: limit }
+      );
+      const items = await collection.aggregate(pipeline).toArray();
+      const length = await collection.countDocuments(query);
+      const data = paginate3(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger9.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger9.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
     }
+  }
+  async function updateParentChecklistStatuses(date) {
     try {
-      const items = await collection.aggregate([
+      const currentDate = /* @__PURE__ */ new Date();
+      const dateToUpdate = date || new Date(currentDate.getTime() - 24 * 60 * 60 * 1e3);
+      const startOfDay = new Date(dateToUpdate);
+      startOfDay.setUTCHours(0, 0, 0, 0);
+      const endOfDay = new Date(dateToUpdate);
+      endOfDay.setUTCHours(23, 59, 59, 999);
+      logger9.info(
+        `Updating parent checklist statuses for date: ${dateToUpdate.toISOString().split("T")[0]}`
+      );
+      const statusUpdates = await collection.aggregate([
         {
           $match: {
-            ...dateFilter
+            createdAt: {
+              $gte: startOfDay,
+              $lte: endOfDay
+            }
+          }
+        },
+        {
+          $lookup: {
+            from: "hygiene-checklist.areas",
+            localField: "_id",
+            foreignField: "parentChecklist",
+            pipeline: [
+              {
+                $group: {
+                  _id: {
+                    site: "$site",
+                    type: "$type"
+                  },
+                  completedCount: {
+                    $sum: {
+                      $cond: [{ $eq: ["$status", "Completed"] }, 1, 0]
+                    }
+                  },
+                  inProgressCount: {
+                    $sum: {
+                      $cond: [{ $eq: ["$status", "In Progress"] }, 1, 0]
+                    }
+                  },
+                  toDoCount: {
+                    $sum: {
+                      $cond: [
+                        {
+                          $or: [
+                            { $eq: ["$status", "To Do"] },
+                            { $eq: ["$status", "Pending"] }
+                          ]
+                        },
+                        1,
+                        0
+                      ]
+                    }
+                  },
+                  totalCount: { $sum: 1 }
+                }
+              },
+              {
+                $addFields: {
+                  finalStatus: {
+                    $cond: {
+                      if: {
+                        $and: [
+                          { $gt: ["$completedCount", 0] },
+                          { $eq: ["$inProgressCount", 0] },
+                          { $eq: ["$toDoCount", 0] }
+                        ]
+                      },
+                      then: "Completed",
+                      else: {
+                        $cond: {
+                          if: {
+                            $and: [
+                              { $eq: ["$completedCount", 0] },
+                              { $eq: ["$inProgressCount", 0] }
+                            ]
+                          },
+                          then: "Expired",
+                          else: "In Progress"
+                        }
+                      }
+                    }
+                  },
+                  completedAt: {
+                    $cond: {
+                      if: {
+                        $and: [
+                          { $gt: ["$completedCount", 0] },
+                          { $eq: ["$inProgressCount", 0] },
+                          { $eq: ["$toDoCount", 0] }
+                        ]
+                      },
+                      then: /* @__PURE__ */ new Date(),
+                      else: null
+                    }
+                  }
+                }
+              }
+            ],
+            as: "areaStats"
+          }
+        },
+        {
+          $addFields: {
+            newStatus: {
+              $map: {
+                input: "$areaStats",
+                as: "stat",
+                in: {
+                  site: "$$stat._id.site",
+                  type: "$$stat._id.type",
+                  status: "$$stat.finalStatus",
+                  completedAt: "$$stat.completedAt"
+                }
+              }
+            }
           }
         },
+        { $match: { newStatus: { $ne: [] } } },
         {
-          $facet: {
-            totalCount: [{ $count: "count" }],
-            items: [
-              { $sort: { createdAt: -1 } },
-              { $skip: page * limit },
-              { $limit: limit }
-            ]
+          $project: {
+            _id: 1,
+            newStatus: 1
           }
         }
       ]).toArray();
-      const length = await collection.countDocuments(dateFilter);
-      const data = paginate3(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger8.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger8.error(`Failed to set cache for key: ${cacheKey}`, err);
+      logger9.info(
+        `Found ${statusUpdates.length} parent checklists to potentially update`
+      );
+      if (statusUpdates.length === 0) {
+        logger9.info(
+          `No parent checklists found for date range: ${startOfDay.toISOString()} to ${endOfDay.toISOString()}`
+        );
+        return null;
+      }
+      const bulkOps = statusUpdates.map((update) => {
+        const statusTypes = update.newStatus.map((s) => `${s.type}(${s.status})`).join(", ");
+        logger9.info(
+          `Updating parent checklist ${update._id} with ${update.newStatus.length} status entries: [${statusTypes}]`
+        );
+        return {
+          updateOne: {
+            filter: { _id: update._id },
+            update: {
+              $set: {
+                status: update.newStatus,
+                updatedAt: /* @__PURE__ */ new Date()
+              }
+            }
+          }
+        };
       });
-      return data;
+      let result = null;
+      if (bulkOps.length > 0) {
+        result = await collection.bulkWrite(bulkOps);
+        delNamespace().then(() => {
+          logger9.info(`Cache cleared for namespace: ${namespace_collection}`);
+        }).catch((err) => {
+          logger9.error(
+            `Failed to clear cache for namespace: ${namespace_collection}`,
+            err
+          );
+        });
+      }
+      logger9.info(`Updated statuses for ${bulkOps.length} parent checklists.`);
+      return result;
     } catch (error) {
+      logger9.error("Failed to update parent checklist statuses", error);
       throw error;
     }
   }
   return {
-    createIndexes,
-    create,
-    get
+    createIndex,
+    createParentChecklist,
+    getAllParentChecklist,
+    updateParentChecklistStatuses
   };
 }
 
 // src/controllers/hygiene-parent-checklist.controller.ts
-import { BadRequestError as BadRequestError11, logger as logger9 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError11, logger as logger10 } from "@iservice365/node-server-utils";
 import Joi6 from "joi";
-function useParentCheckilstController() {
+function useParentChecklistController() {
   const {
-    get: _getAll,
-    create: _create
+    createParentChecklist: _createParentChecklist,
+    getAllParentChecklist: _getAllParentChecklist
   } = useParentChecklistRepo();
-  async function getAll(req, res, next) {
-    const query = req.query;
-    const validation = Joi6.object({
-      page: Joi6.number().min(1).optional().allow("", null),
-      limit: Joi6.number().min(1).optional().allow("", null)
-    });
-    const { error } = validation.validate(query);
+  async function createParentChecklist(req, res, next) {
+    const payload = req.body;
+    const { error } = parentChecklistSchema.validate(payload);
     if (error) {
+      logger10.log({ level: "error", message: error.message });
       next(new BadRequestError11(error.message));
       return;
     }
-    const page = parseInt(req.query.page) ?? 1;
-    let limit = parseInt(req.query.limit) ?? 20;
-    limit = isNaN(limit) ? 20 : limit;
-    const sort = req.query.sort ? String(req.query.sort).split(",") : "";
-    const sortOrder = req.query.sortOrder ? String(req.query.sortOrder).split(",") : "";
-    const sortObj = {};
-    if (sort && Array.isArray(sort) && sort.length && sortOrder && Array.isArray(sortOrder) && sortOrder.length) {
-      sort.forEach((field, index) => {
-        sortObj[field] = sortOrder[index] === "desc" ? -1 : 1;
-      });
-    }
-    const site = req.query.site ?? "";
-    const search = req.query.search ?? "";
     try {
-      const buildings = await _getAll({
-        page,
-        limit,
-        sort: sortObj,
-        site,
-        search
-      });
-      res.json(buildings);
+      const id = await _createParentChecklist(payload);
+      res.status(201).json({ message: "Parent checklist created successfully.", id });
       return;
     } catch (error2) {
+      logger10.log({ level: "error", message: error2.message });
       next(error2);
+      return;
     }
   }
-  async function create(req, res, next) {
-    const value = req.body;
-    const schema = Joi6.object({
-      date: Joi6.string().required()
+  async function getAllParentChecklist(req, res, next) {
+    const query = { ...req.query, ...req.params };
+    const validation = Joi6.object({
+      page: Joi6.number().min(1).optional().allow("", null),
+      limit: Joi6.number().min(1).optional().allow("", null),
+      search: Joi6.string().optional().allow("", null),
+      site: Joi6.string().hex().required(),
+      type: Joi6.string().required().valid(...allowedTypes),
+      startDate: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null),
+      endDate: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null)
     });
-    const { error } = schema.validate(value);
+    const { error } = validation.validate(query);
     if (error) {
+      logger10.log({ level: "error", message: error.message });
       next(new BadRequestError11(error.message));
-      logger9.info(`Controller: ${error.message}`);
       return;
     }
+    const page = parseInt(req.query.page) ?? 1;
+    const limit = parseInt(req.query.limit) ?? 20;
+    const search = req.query.search ?? "";
+    const site = req.params.site ?? "";
+    const type = req.params.type ?? "";
+    const startDate = req.query.startDate ?? "";
+    const endDate = req.query.endDate ?? "";
     try {
-      const result = await _create(value);
-      res.status(201).json(result);
+      const data = await _getAllParentChecklist({
+        page,
+        limit,
+        search,
+        site,
+        type,
+        startDate,
+        endDate
+      });
+      res.json(data);
       return;
     } catch (error2) {
+      logger10.log({ level: "error", message: error2.message });
       next(error2);
+      return;
     }
   }
   return {
-    getAll,
-    create
+    createParentChecklist,
+    getAllParentChecklist
   };
 }
 
 // src/models/hygiene-unit.model.ts
-import { BadRequestError as BadRequestError12, logger as logger10 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError12, logger as logger11 } from "@iservice365/node-server-utils";
 import Joi7 from "joi";
-import { ObjectId as ObjectId5 } from "mongodb";
+import { ObjectId as ObjectId7 } from "mongodb";
 var unitSchema = Joi7.object({
   name: Joi7.string().required(),
   site: Joi7.string().hex().required(),
@@ -1701,19 +1926,19 @@ var unitSchema = Joi7.object({
 function MUnit(value) {
   const { error } = unitSchema.validate(value);
   if (error) {
-    logger10.info(`Hygiene Unit Model: ${error.message}`);
+    logger11.info(`Hygiene Unit Model: ${error.message}`);
     throw new BadRequestError12(error.message);
   }
   if (value.site) {
     try {
-      value.site = new ObjectId5(value.site);
+      value.site = new ObjectId7(value.site);
     } catch (error2) {
       throw new BadRequestError12("Invalid site ID format.");
     }
   }
   if (value.createdBy) {
     try {
-      value.createdBy = new ObjectId5(value.createdBy);
+      value.createdBy = new ObjectId7(value.createdBy);
     } catch (error2) {
       throw new BadRequestError12("Invalid createdBy ID format.");
     }
@@ -1732,20 +1957,20 @@ function MUnit(value) {
 // src/services/hygiene-unit.service.ts
 import {
   BadRequestError as BadRequestError14,
-  logger as logger12,
-  NotFoundError as NotFoundError6,
+  logger as logger13,
+  NotFoundError as NotFoundError5,
   useAtlas as useAtlas7
 } from "@iservice365/node-server-utils";
 
 // src/repositories/hygiene-unit.repository.ts
-import { ObjectId as ObjectId6 } from "mongodb";
+import { ObjectId as ObjectId8 } from "mongodb";
 import {
   useAtlas as useAtlas6,
   InternalServerError as InternalServerError4,
   paginate as paginate4,
   BadRequestError as BadRequestError13,
   useCache as useCache4,
-  logger as logger11,
+  logger as logger12,
   makeCacheKey as makeCacheKey4
 } from "@iservice365/node-server-utils";
 function useUnitRepository() {
@@ -1793,9 +2018,9 @@ function useUnitRepository() {
       value = MUnit(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger11.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger12.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger11.error(
+        logger12.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -1819,7 +2044,7 @@ function useUnitRepository() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId6(site);
+      site = new ObjectId8(site);
     } catch (error) {
       throw new BadRequestError13("Invalid site ID format.");
     }
@@ -1853,7 +2078,7 @@ function useUnitRepository() {
     const cacheKey = makeCacheKey4(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger11.info(`Cache hit for key: ${cacheKey}`);
+      logger12.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -1907,9 +2132,9 @@ function useUnitRepository() {
       const length = await collection.countDocuments(query);
       const data = paginate4(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger11.info(`Cache set for key: ${cacheKey}`);
+        logger12.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger11.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger12.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -1919,7 +2144,7 @@ function useUnitRepository() {
   async function getUnitByName(name, site) {
     try {
       if (site)
-        site = new ObjectId6(site);
+        site = new ObjectId8(site);
     } catch (error) {
       throw new BadRequestError13("Invalid site ID format.");
     }
@@ -1934,13 +2159,13 @@ function useUnitRepository() {
   }
   async function getUnitById(id, site) {
     try {
-      id = typeof id === "string" ? new ObjectId6(id) : id;
+      id = typeof id === "string" ? new ObjectId8(id) : id;
     } catch (error) {
       throw new BadRequestError13("Invalid unit ID format.");
     }
     try {
       if (site)
-        site = new ObjectId6(site);
+        site = new ObjectId8(site);
     } catch (error) {
       throw new BadRequestError13(
         "Unable to fetch unit by ID, Invalid site ID format."
@@ -1954,7 +2179,7 @@ function useUnitRepository() {
   }
   async function updateUnit(_id, value) {
     try {
-      _id = new ObjectId6(_id);
+      _id = new ObjectId8(_id);
     } catch (error) {
       throw new BadRequestError13("Invalid unit ID format.");
     }
@@ -1965,9 +2190,9 @@ function useUnitRepository() {
         throw new InternalServerError4("Unable to update cleaning unit.");
       }
       delNamespace().then(() => {
-        logger11.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger12.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger11.error(
+        logger12.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -1983,7 +2208,7 @@ function useUnitRepository() {
   }
   async function deleteUnit(_id, session) {
     try {
-      _id = new ObjectId6(_id);
+      _id = new ObjectId8(_id);
     } catch (error) {
       throw new BadRequestError13("Invalid unit ID format.");
     }
@@ -2002,9 +2227,9 @@ function useUnitRepository() {
         throw new InternalServerError4("Unable to delete unit.");
       }
       delNamespace().then(() => {
-        logger11.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger12.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger11.error(
+        logger12.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -2042,7 +2267,7 @@ function useUnitService() {
       throw new BadRequestError14("Invalid JSON format for data in excel");
     }
     if (!dataArray || dataArray.length === 0) {
-      throw new NotFoundError6("No data found in the uploaded file");
+      throw new NotFoundError5("No data found in the uploaded file");
     }
     const session = useAtlas7.getClient()?.startSession();
     const insertedUnitIds = [];
@@ -2050,7 +2275,7 @@ function useUnitService() {
       session?.startTransaction();
       for (const row of dataArray) {
         if (!row?.UNIT_NAME) {
-          logger12.warn("Skipping row with missing UNIT_NAME:", row);
+          logger13.warn("Skipping row with missing UNIT_NAME:", row);
           continue;
         }
         try {
@@ -2064,7 +2289,7 @@ function useUnitService() {
           );
           insertedUnitIds.push(insertedId);
         } catch (error) {
-          logger12.error(
+          logger13.error(
             `Error creating unit "${row.UNIT_NAME}":`,
             error.message
           );
@@ -2072,13 +2297,13 @@ function useUnitService() {
         }
       }
       await session?.commitTransaction();
-      logger12.info(`Successfully uploaded ${insertedUnitIds.length} units`);
+      logger13.info(`Successfully uploaded ${insertedUnitIds.length} units`);
       return {
         message: `Successfully uploaded ${insertedUnitIds.length} units`
       };
     } catch (error) {
       await session?.abortTransaction();
-      logger12.error("Error while uploading unit information", error);
+      logger13.error("Error while uploading unit information", error);
       throw error;
     } finally {
       session?.endSession();
@@ -2090,7 +2315,7 @@ function useUnitService() {
 }
 
 // src/controllers/hygiene-unit.controller.ts
-import { BadRequestError as BadRequestError15, logger as logger13 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError15, logger as logger14 } from "@iservice365/node-server-utils";
 import Joi8 from "joi";
 function useUnitController() {
   const {
@@ -2109,7 +2334,7 @@ function useUnitController() {
     const payload = { ...req.body, createdBy };
     const { error } = unitSchema.validate(payload);
     if (error) {
-      logger13.log({ level: "error", message: error.message });
+      logger14.log({ level: "error", message: error.message });
       next(new BadRequestError15(error.message));
       return;
     }
@@ -2118,7 +2343,7 @@ function useUnitController() {
       res.status(201).json({ message: "Unit created successfully.", id });
       return;
     } catch (error2) {
-      logger13.log({ level: "error", message: error2.message });
+      logger14.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -2135,7 +2360,7 @@ function useUnitController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger13.log({ level: "error", message: error.message });
+      logger14.log({ level: "error", message: error.message });
       next(new BadRequestError15(error.message));
       return;
     }
@@ -2157,7 +2382,7 @@ function useUnitController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger13.log({ level: "error", message: error2.message });
+      logger14.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -2170,7 +2395,7 @@ function useUnitController() {
     });
     const { error } = schema.validate(payload);
     if (error) {
-      logger13.log({ level: "error", message: error.message });
+      logger14.log({ level: "error", message: error.message });
       next(new BadRequestError15(error.message));
       return;
     }
@@ -2180,7 +2405,7 @@ function useUnitController() {
       res.json({ message: "Unit updated successfully." });
       return;
     } catch (error2) {
-      logger13.log({ level: "error", message: error2.message });
+      logger14.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -2192,7 +2417,7 @@ function useUnitController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      logger13.log({ level: "error", message: error.message });
+      logger14.log({ level: "error", message: error.message });
       next(new BadRequestError15(error.message));
       return;
     }
@@ -2201,7 +2426,7 @@ function useUnitController() {
       res.json({ message: "Unit deleted successfully." });
       return;
     } catch (error2) {
-      logger13.log({ level: "error", message: error2.message });
+      logger14.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -2223,7 +2448,7 @@ function useUnitController() {
     });
     const { error } = schema.validate({ site, createdBy });
     if (error) {
-      logger13.log({ level: "error", message: error.message });
+      logger14.log({ level: "error", message: error.message });
       next(new BadRequestError15(error.message));
       return;
     }
@@ -2233,7 +2458,7 @@ function useUnitController() {
       const result = await _uploadByFile({ dataJson, createdBy, site });
       return res.status(201).json(result);
     } catch (error2) {
-      logger13.log({ level: "error", message: error2.message });
+      logger14.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -2250,7 +2475,7 @@ function useUnitController() {
 // src/models/hygiene-schedule-task-area.model.ts
 import { BadRequestError as BadRequestError16 } from "@iservice365/node-server-utils";
 import Joi9 from "joi";
-import { ObjectId as ObjectId7 } from "mongodb";
+import { ObjectId as ObjectId9 } from "mongodb";
 var scheduleTaskAreaSchema = Joi9.object({
   name: Joi9.string().required(),
   site: Joi9.string().hex().required(),
@@ -2271,14 +2496,14 @@ function MScheduleTaskArea(value) {
   }
   if (value.site) {
     try {
-      value.site = new ObjectId7(value.site);
+      value.site = new ObjectId9(value.site);
     } catch (error2) {
       throw new BadRequestError16("Invalid site ID format.");
     }
   }
   if (value.createdBy) {
     try {
-      value.createdBy = new ObjectId7(value.createdBy);
+      value.createdBy = new ObjectId9(value.createdBy);
     } catch (error2) {
       throw new BadRequestError16("Invalid createdBy ID format.");
     }
@@ -2288,7 +2513,7 @@ function MScheduleTaskArea(value) {
       try {
         return {
           ...item,
-          _id: new ObjectId7(item._id)
+          _id: new ObjectId9(item._id)
         };
       } catch (error2) {
         throw new BadRequestError16(
@@ -2310,14 +2535,15 @@ function MScheduleTaskArea(value) {
 }
 
 // src/repositories/hygiene-schedule-task-area.repository.ts
-import { ObjectId as ObjectId8 } from "mongodb";
+import { ObjectId as ObjectId10 } from "mongodb";
 import {
   useAtlas as useAtlas8,
   InternalServerError as InternalServerError5,
   paginate as paginate5,
   BadRequestError as BadRequestError17,
+  NotFoundError as NotFoundError6,
   useCache as useCache5,
-  logger as logger14,
+  logger as logger15,
   makeCacheKey as makeCacheKey5
 } from "@iservice365/node-server-utils";
 function useScheduleTaskAreaRepository() {
@@ -2338,51 +2564,71 @@ function useScheduleTaskAreaRepository() {
       throw new InternalServerError5("Failed to create index on site.");
     }
   }
+  async function createUniqueIndex() {
+    try {
+      await collection.createIndex(
+        { name: 1, site: 1, deletedAt: 1 },
+        { unique: true }
+      );
+    } catch (error) {
+      throw new InternalServerError5(
+        "Failed to create unique index on hygiene area."
+      );
+    }
+  }
   async function createScheduleTaskArea(value, session) {
     try {
       value = MScheduleTaskArea(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger14.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger15.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger14.error(
+        logger15.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
       });
       return res.insertedId;
     } catch (error) {
+      const isDuplicated = error.message.includes("duplicate");
+      if (isDuplicated) {
+        throw new BadRequestError17("Area already exists.");
+      }
       throw error;
     }
   }
   async function updateScheduleTaskArea(_id, params) {
     try {
-      _id = new ObjectId8(_id);
+      _id = new ObjectId10(_id);
     } catch (error) {
       throw new BadRequestError17("Invalid area ID format.");
     }
     try {
-      const value = MScheduleTaskArea({ ...params, updatedAt: /* @__PURE__ */ new Date() });
-      const res = await collection.updateOne({ _id }, { $set: value });
+      const updateValue = { ...params, updatedAt: /* @__PURE__ */ new Date() };
+      const res = await collection.updateOne({ _id }, { $set: updateValue });
       if (res.modifiedCount === 0) {
         throw new InternalServerError5("Unable to update cleaning area.");
       }
       delNamespace().then(() => {
-        logger14.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger15.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger14.error(
+        logger15.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
       });
       return res.modifiedCount;
     } catch (error) {
+      const isDuplicated = error.message.includes("duplicate");
+      if (isDuplicated) {
+        throw new BadRequestError17("Area already exists.");
+      }
       throw error;
     }
   }
   async function deleteScheduleTaskArea(_id, session) {
     try {
-      _id = new ObjectId8(_id);
+      _id = new ObjectId10(_id);
     } catch (error) {
       throw new BadRequestError17("Invalid area ID format.");
     }
@@ -2397,13 +2643,16 @@ function useScheduleTaskAreaRepository() {
         { $set: updateValue },
         { session }
       );
-      if (res.modifiedCount === 0)
+      if (res.modifiedCount === 0) {
         throw new InternalServerError5("Unable to delete area.");
-      const cacheKey = makeCacheKey5(namespace_collection, { _id });
-      delCache(cacheKey).then(() => {
-        logger14.info(`Cache deleted for key: ${cacheKey}`);
+      }
+      delNamespace().then(() => {
+        logger15.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger14.error(`Failed to delete cache for key: ${cacheKey}`, err);
+        logger15.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
       });
       return res.modifiedCount;
     } catch (error) {
@@ -2414,63 +2663,54 @@ function useScheduleTaskAreaRepository() {
     page = 1,
     limit = 10,
     search = "",
-    sort = {},
     startDate = "",
     endDate = "",
     site = ""
   }) {
     page = page > 0 ? page - 1 : 0;
-    let dateFilter = {};
-    try {
-      site = new ObjectId8(site);
-    } catch (error) {
-      throw new BadRequestError17("Invalid site ID format.");
-    }
     const query = {
       status: { $ne: "deleted" }
     };
     const cacheOptions = {
-      site: site.toString()
+      page,
+      limit
     };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
-    cacheOptions.sort = JSON.stringify(sort);
+    if (site) {
+      try {
+        site = new ObjectId10(site);
+        cacheOptions.site = site.toString();
+      } catch (error) {
+        throw new BadRequestError17("Invalid site ID format.");
+      }
+    }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
-    delNamespace().then(() => {
-      logger14.info(`Cache cleared for namespace: ${namespace_collection}`);
-    }).catch((err) => {
-      logger14.error(
-        `Failed to clear cache for namespace: ${namespace_collection}`,
-        err
-      );
-    });
-    const cacheKey = makeCacheKey5(namespace_collection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger14.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
     if (startDate && endDate) {
-      dateFilter = {
-        createdAt: {
-          $gte: new Date(startDate),
-          $lte: new Date(endDate)
-        }
-      };
-    } else if (startDate) {
-      dateFilter = { createdAt: { $gte: new Date(startDate) } };
+      query.createdAt = {
+        $gte: new Date(startDate),
+        $lte: new Date(endDate)
+      };
+      cacheOptions.startDate = new Date(startDate).toISOString().split("T")[0];
+      cacheOptions.endDate = new Date(endDate).toISOString().split("T")[0];
+    } else if (startDate) {
+      query.createdAt = { $gte: new Date(startDate) };
+      cacheOptions.startDate = new Date(startDate).toISOString().split("T")[0];
     } else if (endDate) {
-      dateFilter = { createdAt: { $lte: new Date(endDate) } };
+      query.createdAt = { $lte: new Date(endDate) };
+      cacheOptions.endDate = new Date(endDate).toISOString().split("T")[0];
+    }
+    const cacheKey = makeCacheKey5(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger15.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
     }
     try {
       const items = await collection.aggregate([
         {
-          $match: {
-            ...dateFilter,
-            ...query
-          }
+          $match: query
         },
         {
           $lookup: {
@@ -2503,22 +2743,26 @@ function useScheduleTaskAreaRepository() {
           }
         },
         {
-          $facet: {
-            totalCount: [{ $count: "count" }],
-            items: [
-              { $sort: { createdAt: -1 } },
-              { $skip: page * limit },
-              { $limit: limit }
-            ]
+          $project: {
+            name: 1,
+            site: "$site._id",
+            siteName: "$site.name",
+            createdByName: "$createdBy.name",
+            checklist: 1,
+            status: 1,
+            createdAt: 1
           }
-        }
+        },
+        { $sort: { _id: -1 } },
+        { $skip: page * limit },
+        { $limit: limit }
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate5(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger14.info(`Cache set for key: ${cacheKey}`);
+        logger15.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger14.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger15.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -2528,7 +2772,7 @@ function useScheduleTaskAreaRepository() {
   async function getScheduleTaskAreaByName(name, site) {
     try {
       if (site)
-        site = new ObjectId8(site);
+        site = new ObjectId10(site);
     } catch (error) {
       throw new BadRequestError17("Invalid site ID format.");
     }
@@ -2543,13 +2787,13 @@ function useScheduleTaskAreaRepository() {
   }
   async function getScheduleTaskAreaById(id, site) {
     try {
-      id = typeof id === "string" ? new ObjectId8(id) : id;
+      id = typeof id === "string" ? new ObjectId10(id) : id;
     } catch (error) {
       throw new BadRequestError17("Invalid unit ID format.");
     }
     try {
       if (site)
-        site = new ObjectId8(site);
+        site = new ObjectId10(site);
     } catch (error) {
       throw new BadRequestError17(
         "Unable to fetch schedule task area by ID, Invalid site ID format."
@@ -2561,84 +2805,148 @@ function useScheduleTaskAreaRepository() {
       throw new BadRequestError17("Unable to fetch schedule task area by id.");
     }
   }
+  async function getAreaById(_id) {
+    try {
+      _id = new ObjectId10(_id);
+    } catch (error) {
+      throw new BadRequestError17("Invalid area ID format.");
+    }
+    const query = {
+      _id,
+      status: { $ne: "deleted" }
+    };
+    const cacheKey = makeCacheKey5(namespace_collection, {
+      _id: _id.toString()
+    });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger15.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const data = await collection.aggregate([
+        { $match: query },
+        {
+          $project: {
+            name: 1,
+            checklist: 1
+          }
+        }
+      ]).toArray();
+      if (!data || !data.length) {
+        throw new NotFoundError6("Area not found.");
+      }
+      setCache(cacheKey, data[0], 15 * 60).then(() => {
+        logger15.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger15.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data[0];
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
+    createUniqueIndex,
     createScheduleTaskArea,
     updateScheduleTaskArea,
     deleteScheduleTaskArea,
     getScheduleTaskAreas,
     createIndexes,
     getScheduleTaskAreaByName,
-    getScheduleTaskAreaById
+    getScheduleTaskAreaById,
+    getAreaById
   };
 }
 
 // src/services/hygiene-schedule-task-area.service.ts
 import {
-  InternalServerError as InternalServerError6
+  BadRequestError as BadRequestError18,
+  logger as logger16,
+  NotFoundError as NotFoundError7,
+  useAtlas as useAtlas9
 } from "@iservice365/node-server-utils";
 function useScheduleTaskAreaService() {
-  const {
-    getScheduleTaskAreas: _getAll,
-    createScheduleTaskArea: _create,
-    updateScheduleTaskArea: _updateById,
-    deleteScheduleTaskArea: _deleteById,
-    getScheduleTaskAreaByName: _getScheduleTaskAreaByName,
-    getScheduleTaskAreaById: _getScheduleTaskAreaById
-  } = useScheduleTaskAreaRepository();
-  async function getAll(query) {
-    return await _getAll(query);
-  }
-  async function create(scheduleTaskArea) {
-    const result = await _getScheduleTaskAreaByName(
-      scheduleTaskArea.name,
-      scheduleTaskArea.site
-    );
-    if (result)
-      throw new InternalServerError6(
-        "Schedule Task Area name already exists in this site."
-      );
-    return await _create(scheduleTaskArea);
-  }
-  async function updateById(id, scheduleTaskArea) {
-    const result = await _getScheduleTaskAreaByName(
-      scheduleTaskArea.name,
-      scheduleTaskArea.site
-    );
-    const resultId = result?._id.toString() ?? "";
-    if (result && id != resultId) {
-      throw new InternalServerError6(
-        "Schedule Task Area name already exists in this site."
-      );
+  const { createScheduleTaskArea: _create } = useScheduleTaskAreaRepository();
+  async function uploadByFile({
+    dataJson,
+    createdBy,
+    site
+  }) {
+    let dataArray;
+    try {
+      dataArray = JSON.parse(dataJson);
+    } catch (error) {
+      throw new BadRequestError18("Invalid JSON format for data in excel");
+    }
+    if (!dataArray || dataArray.length === 0) {
+      throw new NotFoundError7("No data found in the uploaded file");
+    }
+    const session = useAtlas9.getClient()?.startSession();
+    const insertedAreaIds = [];
+    try {
+      session?.startTransaction();
+      for (const row of dataArray) {
+        if (!row?.AREA_NAME) {
+          logger16.warn("Skipping row with missing AREA_NAME:", row);
+          continue;
+        }
+        try {
+          const insertedId = await _create(
+            {
+              name: String(row.AREA_NAME).trim(),
+              site,
+              createdBy
+            },
+            session
+          );
+          insertedAreaIds.push(insertedId);
+        } catch (error) {
+          logger16.error(
+            `Error creating area "${row.AREA_NAME}":`,
+            error.message
+          );
+          continue;
+        }
+      }
+      await session?.commitTransaction();
+      logger16.info(`Successfully uploaded ${insertedAreaIds.length} areas`);
+      return {
+        message: `Successfully uploaded ${insertedAreaIds.length} areas`
+      };
+    } catch (error) {
+      await session?.abortTransaction();
+      logger16.error("Error while uploading area information", error);
+      throw error;
+    } finally {
+      session?.endSession();
     }
-    return await _updateById(id, scheduleTaskArea);
-  }
-  async function deleteById(id) {
-    return await _deleteById(id);
   }
   return {
-    getAll,
-    create,
-    updateById,
-    deleteById
+    uploadByFile
   };
 }
 
 // src/controllers/hygiene-schedule-task-area.controller.ts
-import { BadRequestError as BadRequestError19, logger as logger16 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError19, logger as logger17 } from "@iservice365/node-server-utils";
 import Joi10 from "joi";
 function useScheduleTaskAreaController() {
+  const { uploadByFile: _uploadByFile } = useScheduleTaskAreaService();
   const {
-    getAll: _getAll,
-    create: _createScheduleTaskArea,
-    updateById: _updateScheduleTaskArea,
-    deleteById: _deleteById
-  } = useScheduleTaskAreaService();
+    getScheduleTaskAreas: _getAll,
+    createScheduleTaskArea: _createScheduleTaskArea,
+    updateScheduleTaskArea: _updateScheduleTaskArea,
+    deleteScheduleTaskArea: _deleteById,
+    getAreaById: _getAreaById
+  } = useScheduleTaskAreaRepository();
   async function getAll(req, res, next) {
     const query = req.query;
     const validation = Joi10.object({
       page: Joi10.number().min(1).optional().allow("", null),
       limit: Joi10.number().min(1).optional().allow("", null),
       search: Joi10.string().optional().allow("", null),
+      startDate: Joi10.alternatives().try(Joi10.date(), Joi10.string()).optional().allow("", null),
+      endDate: Joi10.alternatives().try(Joi10.date(), Joi10.string()).optional().allow("", null),
       site: Joi10.string().hex().optional().allow("", null)
     });
     const { error } = validation.validate(query);
@@ -2647,84 +2955,71 @@ function useScheduleTaskAreaController() {
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
-    let limit = parseInt(req.query.limit) ?? 20;
-    limit = isNaN(limit) ? 20 : limit;
-    const sort = req.query.sort ? String(req.query.sort).split(",") : "";
-    const sortOrder = req.query.sortOrder ? String(req.query.sortOrder).split(",") : "";
-    const sortObj = {};
-    if (sort && Array.isArray(sort) && sort.length && sortOrder && Array.isArray(sortOrder) && sortOrder.length) {
-      sort.forEach((field, index) => {
-        sortObj[field] = sortOrder[index] === "desc" ? -1 : 1;
-      });
-    }
-    const site = req.query.site ?? "";
+    const limit = parseInt(req.query.limit) ?? 20;
     const search = req.query.search ?? "";
+    const site = req.query.site ?? "";
+    const startDate = req.query.startDate ?? "";
+    const endDate = req.query.endDate ?? "";
     try {
-      const scheduleTaskAreas = await _getAll({
+      const data = await _getAll({
         page,
         limit,
-        sort: sortObj,
+        search,
         site,
-        search
+        startDate,
+        endDate
       });
-      res.json(scheduleTaskAreas);
+      res.json(data);
       return;
     } catch (error2) {
       next(error2);
+      return;
     }
   }
   async function createScheduleTaskArea(req, res, next) {
-    const value = req.body;
-    const schema = Joi10.object({
-      name: Joi10.string().required(),
-      site: Joi10.string().hex().optional().allow("", null),
-      createdBy: Joi10.string().hex().optional().allow("", null)
-    });
-    const { error } = schema.validate(value);
+    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    ) : {};
+    const createdBy = cookies["user"] || "";
+    const payload = { ...req.body, createdBy };
+    const { error } = scheduleTaskAreaSchema.validate(payload);
     if (error) {
+      logger17.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
-      logger16.info(`Controller: ${error.message}`);
       return;
     }
     try {
-      const result = await _createScheduleTaskArea(value);
-      res.status(201).json(result);
+      const id = await _createScheduleTaskArea(payload);
+      res.status(201).json({ message: "Area created successfully.", id });
       return;
     } catch (error2) {
+      logger17.log({ level: "error", message: error2.message });
       next(error2);
+      return;
     }
   }
   async function updateScheduleTaskArea(req, res, next) {
-    const { name, site, createdBy } = req.body;
-    const id = req.params.id;
+    const payload = { id: req.params.id, ...req.body };
     const schema = Joi10.object({
       id: Joi10.string().hex().required(),
-      name: Joi10.string().required(),
-      site: Joi10.string().required(),
-      checklist: Joi10.array().optional().items(
-        Joi10.object({
-          _id: Joi10.string().optional().required(),
-          name: Joi10.string().optional().required()
-        })
-      ),
-      createdBy: Joi10.string().hex().optional().allow("", null)
+      name: Joi10.string().required()
     });
-    const { error } = schema.validate({ id, name, createdBy, site });
+    const { error } = schema.validate(payload);
     if (error) {
       next(new BadRequestError19(error.message));
-      logger16.info(`Controller: ${error.message}`);
+      logger17.info(`Controller: ${error.message}`);
       return;
     }
     try {
-      const result = await _updateScheduleTaskArea(id, {
-        name,
-        createdBy,
-        site
-      });
-      res.json(result);
+      const { id, ...value } = payload;
+      await _updateScheduleTaskArea(id, value);
+      res.json({ message: "Area updated successfully." });
       return;
     } catch (error2) {
+      logger17.log({ level: "error", message: error2.message });
       next(error2);
+      return;
     }
   }
   async function deleteScheduleTaskArea(req, res, next) {
@@ -2734,39 +3029,1655 @@ function useScheduleTaskAreaController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
+      logger17.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
       return;
     }
     try {
-      const message = await _deleteById(id);
-      res.json(message);
+      await _deleteById(id);
+      res.json({ message: "Area deleted successfully." });
+      return;
+    } catch (error2) {
+      logger17.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function uploadByFile(req, res, next) {
+    if (!req.file) {
+      next(new BadRequestError19("File is required!"));
+      return;
+    }
+    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    ) : {};
+    const createdBy = cookies["user"] || "";
+    const { site } = req.body;
+    const schema = Joi10.object({
+      site: Joi10.string().hex().optional().allow("", null),
+      createdBy: Joi10.string().hex().required()
+    });
+    const { error } = schema.validate({ site, createdBy });
+    if (error) {
+      logger17.log({ level: "error", message: error.message });
+      next(new BadRequestError19(error.message));
+      return;
+    }
+    try {
+      const xlsData = await convertBufferFile(req.file.buffer);
+      const dataJson = JSON.stringify(xlsData);
+      const result = await _uploadByFile({ dataJson, createdBy, site });
+      return res.status(201).json(result);
+    } catch (error2) {
+      logger17.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getAreaById(req, res, next) {
+    const validation = Joi10.string().hex().required();
+    const _id = req.params.id;
+    const { error } = validation.validate(_id);
+    if (error) {
+      logger17.log({ level: "error", message: error.message });
+      next(new BadRequestError19(error.message));
+      return;
+    }
+    try {
+      const data = await _getAreaById(_id);
+      res.json(data);
       return;
     } catch (error2) {
+      logger17.log({ level: "error", message: error2.message });
       next(error2);
+      return;
     }
   }
   return {
     getAll,
+    getAreaById,
     createScheduleTaskArea,
     updateScheduleTaskArea,
-    deleteScheduleTaskArea
+    deleteScheduleTaskArea,
+    uploadByFile
+  };
+}
+
+// src/models/hygiene-area-checklist.model.ts
+import { BadRequestError as BadRequestError20, logger as logger18 } from "@iservice365/node-server-utils";
+import Joi11 from "joi";
+import { ObjectId as ObjectId11 } from "mongodb";
+var areaChecklistSchema = Joi11.object({
+  type: Joi11.string().required().valid(...allowedTypes),
+  site: Joi11.string().hex().required(),
+  parentChecklist: Joi11.string().hex().required(),
+  area: Joi11.string().hex().required(),
+  name: Joi11.string().optional().allow("", null),
+  createdBy: Joi11.string().hex().optional().allow("", null)
+});
+function MAreaChecklist(value) {
+  const { error } = areaChecklistSchema.validate(value);
+  if (error) {
+    logger18.info(`Hygiene Checklist Area Model: ${error.message}`);
+    throw new BadRequestError20(error.message);
+  }
+  if (value.site) {
+    try {
+      value.site = new ObjectId11(value.site);
+    } catch (error2) {
+      throw new BadRequestError20("Invalid site ID format.");
+    }
+  }
+  if (value.parentChecklist) {
+    try {
+      value.parentChecklist = new ObjectId11(value.parentChecklist);
+    } catch (error2) {
+      throw new BadRequestError20("Invalid checklist ID format.");
+    }
+  }
+  if (value.area) {
+    try {
+      value.area = new ObjectId11(value.area);
+    } catch (error2) {
+      throw new BadRequestError20("Invalid area ID format.");
+    }
+  }
+  if (value.createdBy) {
+    try {
+      value.createdBy = new ObjectId11(value.createdBy);
+    } catch (error2) {
+      throw new BadRequestError20("Invalid createdBy ID format.");
+    }
+  }
+  if (value.acceptedBy) {
+    try {
+      value.acceptedBy = new ObjectId11(value.acceptedBy);
+    } catch (error2) {
+      throw new BadRequestError20("Invalid acceptedBy ID format.");
+    }
+  }
+  return {
+    type: value.type,
+    site: value.site,
+    parentChecklist: value.parentChecklist,
+    area: value.area,
+    name: value.name ?? "",
+    status: value.status ?? "To Do",
+    createdBy: value.createdBy ?? "",
+    createdAt: /* @__PURE__ */ new Date(),
+    acceptedBy: value.acceptedBy ?? "",
+    acceptedAt: value.acceptedAt ?? "",
+    startedAt: value.startedAt ?? "",
+    endedAt: value.endedAt ?? "",
+    signature: value.signature ?? "",
+    updatedAt: value.updatedAt ?? ""
+  };
+}
+
+// src/repositories/hygiene-area-checklist.repository.ts
+import {
+  BadRequestError as BadRequestError21,
+  InternalServerError as InternalServerError7,
+  logger as logger19,
+  makeCacheKey as makeCacheKey6,
+  paginate as paginate6,
+  useAtlas as useAtlas10,
+  useCache as useCache6
+} from "@iservice365/node-server-utils";
+import { ObjectId as ObjectId12 } from "mongodb";
+function useAreaChecklistRepo() {
+  const db = useAtlas10.getDb();
+  if (!db) {
+    throw new InternalServerError7("Unable to connect to server.");
+  }
+  const namespace_collection = "hygiene-checklist.areas";
+  const unit_checklist_collection = "hygiene-checklist.units";
+  const collection = db.collection(namespace_collection);
+  const unitChecklistCollection = db.collection(unit_checklist_collection);
+  const { delNamespace, setCache, getCache } = useCache6(namespace_collection);
+  const { delNamespace: delUnitNamespace } = useCache6(
+    unit_checklist_collection
+  );
+  async function createIndex() {
+    try {
+      await collection.createIndexes([
+        { key: { type: 1 } },
+        { key: { site: 1 } },
+        { key: { parentChecklist: 1 } },
+        { key: { area: 1 } },
+        { key: { createdAt: 1 } },
+        { key: { acceptedBy: 1 } }
+      ]);
+    } catch (error) {
+      throw new InternalServerError7(
+        "Failed to create index on hygiene checklist area."
+      );
+    }
+  }
+  async function createTextIndex() {
+    try {
+      await collection.createIndex({ name: "text" });
+    } catch (error) {
+      throw new InternalServerError7(
+        "Failed to create text index on hygiene checklist area."
+      );
+    }
+  }
+  async function createAreaChecklist(value, session) {
+    try {
+      const siteId = new ObjectId12(value.site);
+      const parentChecklistId = new ObjectId12(value.parentChecklist);
+      const areaId = new ObjectId12(value.area);
+      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,
+        site: siteId,
+        parentChecklist: parentChecklistId,
+        area: areaId,
+        createdAt: {
+          $gte: startOfDay,
+          $lte: endOfDay
+        }
+      });
+      if (existingChecklist) {
+        logger19.info(
+          `Area checklist already exists for area ${areaId} on ${currentDate.toISOString().split("T")[0]}`
+        );
+        return existingChecklist._id;
+      }
+      const processedValue = MAreaChecklist(value);
+      const result = await collection.insertOne(processedValue, { session });
+      delNamespace().then(() => {
+        logger19.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger19.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return result.insertedId;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function getAllAreaChecklist({
+    page = 1,
+    limit = 10,
+    search = "",
+    site,
+    type,
+    parentChecklist
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = { type };
+    const cacheOptions = {
+      page,
+      limit
+    };
+    try {
+      query.site = new ObjectId12(site);
+      cacheOptions.site = site.toString();
+    } catch (error) {
+      throw new BadRequestError21("Invalid site ID format.");
+    }
+    try {
+      query.parentChecklist = new ObjectId12(parentChecklist);
+      cacheOptions.parentChecklist = parentChecklist.toString();
+    } catch (error) {
+      throw new BadRequestError21("Invalid parent checklist ID format.");
+    }
+    if (search) {
+      query.$text = { $search: search };
+      cacheOptions.search = search;
+    }
+    const cacheKey = makeCacheKey6(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger19.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const pipeline = [
+        { $match: query },
+        {
+          $lookup: {
+            from: "users",
+            localField: "acceptedBy",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
+            as: "acceptedBy"
+          }
+        },
+        {
+          $unwind: {
+            path: "$acceptedBy",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $project: {
+            name: 1,
+            acceptedByName: "$acceptedBy.name",
+            status: 1,
+            createdAt: 1
+          }
+        },
+        { $sort: { _id: -1 } },
+        { $skip: page * limit },
+        { $limit: limit }
+      ];
+      const items = await collection.aggregate(pipeline).toArray();
+      const length = await collection.countDocuments(query);
+      const data = paginate6(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger19.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger19.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function getAreaChecklistHistory({
+    page = 1,
+    limit = 10,
+    search = "",
+    site,
+    type,
+    parentChecklist,
+    status,
+    createdAt,
+    user
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = { type };
+    const cacheOptions = {
+      page,
+      limit
+    };
+    try {
+      query.site = new ObjectId12(site);
+      cacheOptions.site = site.toString();
+    } catch (error) {
+      throw new BadRequestError21("Invalid site ID format.");
+    }
+    try {
+      query.parentChecklist = new ObjectId12(parentChecklist);
+      cacheOptions.parentChecklist = parentChecklist.toString();
+    } catch (error) {
+      throw new BadRequestError21("Invalid parent checklist ID format.");
+    }
+    if (search) {
+      query.$text = { $search: search };
+      cacheOptions.search = search;
+    }
+    if (createdAt) {
+      query.createdAt = {
+        $gte: /* @__PURE__ */ new Date(`${createdAt}T00:00:00Z`),
+        $lte: /* @__PURE__ */ new Date(`${createdAt}T23:59:59Z`)
+      };
+      cacheOptions.createdAt = new Date(createdAt).toISOString().split("T")[0];
+    }
+    if (status) {
+      query.status = status;
+      cacheOptions.status = status;
+    } else {
+      query.status = { $in: ["In Progress", "Completed"] };
+    }
+    if (user) {
+      try {
+        query.acceptedBy = new ObjectId12(user);
+        cacheOptions.user = user.toString();
+      } catch (error) {
+        throw new BadRequestError21("Invalid user ID format.");
+      }
+    }
+    const cacheKey = makeCacheKey6(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger19.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const pipeline = [
+        { $match: query },
+        {
+          $lookup: {
+            from: "users",
+            localField: "acceptedBy",
+            foreignField: "_id",
+            pipeline: [
+              ...search ? [{ $match: { name: { $regex: search, $options: "i" } } }] : [],
+              { $project: { name: 1 } }
+            ],
+            as: "acceptedBy"
+          }
+        },
+        {
+          $unwind: {
+            path: "$acceptedBy",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $project: {
+            name: 1,
+            createdAt: 1,
+            acceptedByName: "$acceptedBy.name",
+            status: 1,
+            startedAt: 1,
+            endedAt: 1
+          }
+        },
+        { $sort: { status: 1 } },
+        { $skip: page * limit },
+        { $limit: limit }
+      ];
+      const items = await collection.aggregate(pipeline).toArray();
+      const length = await collection.countDocuments(query);
+      const data = paginate6(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger19.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger19.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function getAreaChecklistHistoryDetails(_id) {
+    try {
+      _id = new ObjectId12(_id);
+    } catch (error) {
+      throw new BadRequestError21("Invalid area checklist ID format.");
+    }
+    const cacheKey = makeCacheKey6(namespace_collection, {
+      _id: _id.toString()
+    });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger19.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const areaPipeline = [
+        { $match: { _id } },
+        {
+          $lookup: {
+            from: "users",
+            localField: "createdBy",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
+            as: "createdBy"
+          }
+        },
+        {
+          $unwind: {
+            path: "$createdBy",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $lookup: {
+            from: "users",
+            localField: "acceptedBy",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
+            as: "acceptedBy"
+          }
+        },
+        {
+          $unwind: {
+            path: "$acceptedBy",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $project: {
+            name: 1,
+            createdAt: 1,
+            createdByName: "$createdBy.name",
+            startedAt: 1,
+            endedAt: 1,
+            status: 1,
+            signature: 1,
+            acceptedByName: "$acceptedBy.name"
+          }
+        }
+      ];
+      const unitPipeline = [
+        { $match: { areaChecklist: _id } },
+        {
+          $project: {
+            name: 1,
+            remarks: "$metadata.remarks",
+            attachments: "$metadata.attachments",
+            approve: { $ifNull: ["$approve", null] },
+            reject: { $ifNull: ["$reject", null] }
+          }
+        }
+      ];
+      const [area, units] = await Promise.all([
+        collection.aggregate(areaPipeline).toArray(),
+        unitChecklistCollection.aggregate(unitPipeline).toArray()
+      ]);
+      if (!area.length) {
+        throw new BadRequestError21("Area checklist not found.");
+      }
+      const items = {
+        area: area[0],
+        units
+      };
+      setCache(cacheKey, items, 15 * 60).then(() => {
+        logger19.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger19.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return items;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function acceptAreaChecklist(_id, acceptedBy) {
+    try {
+      _id = new ObjectId12(_id);
+    } catch (error) {
+      throw new BadRequestError21("Invalid area ID format.");
+    }
+    try {
+      acceptedBy = new ObjectId12(acceptedBy);
+    } catch (error) {
+      throw new BadRequestError21("Invalid acceptedBy ID format.");
+    }
+    try {
+      const now = /* @__PURE__ */ new Date();
+      const updateValue = {
+        acceptedBy,
+        acceptedAt: now,
+        startedAt: now,
+        updatedAt: now
+      };
+      const res = await collection.updateOne({ _id }, { $set: updateValue });
+      if (res.modifiedCount === 0) {
+        throw new InternalServerError7("Unable to update cleaning area.");
+      }
+      delNamespace().then(() => {
+        logger19.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger19.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.modifiedCount;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function attachImageAreaChecklist(_id, attachments, session) {
+    try {
+      _id = new ObjectId12(_id);
+    } catch (error) {
+      throw new BadRequestError21("Invalid area checklist ID format.");
+    }
+    try {
+      const now = /* @__PURE__ */ new Date();
+      const updateValue = {
+        metadata: { attachments },
+        updatedAt: now
+      };
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
+      if (res.modifiedCount === 0) {
+        throw new InternalServerError7(
+          "Unable to update cleaning area checklist."
+        );
+      }
+      delNamespace().then(() => {
+        logger19.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger19.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      delUnitNamespace().then(() => {
+        logger19.info(
+          `Cache cleared for namespace: ${unit_checklist_collection}`
+        );
+      }).catch((err) => {
+        logger19.error(
+          `Failed to clear cache for namespace: ${unit_checklist_collection}`,
+          err
+        );
+      });
+      return res.modifiedCount;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function submitAreaChecklist(_id, signature) {
+    try {
+      _id = new ObjectId12(_id);
+    } catch (error) {
+      throw new BadRequestError21("Invalid area ID format.");
+    }
+    try {
+      const now = /* @__PURE__ */ new Date();
+      const updateValue = {
+        signature,
+        status: "In Progress",
+        endedAt: now,
+        updatedAt: now
+      };
+      const res = await collection.updateOne({ _id }, { $set: updateValue });
+      if (res.modifiedCount === 0) {
+        throw new InternalServerError7("Unable to update cleaning area.");
+      }
+      delNamespace().then(() => {
+        logger19.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger19.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.modifiedCount;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function completeAreaChecklist(_id, signature) {
+    try {
+      _id = new ObjectId12(_id);
+    } catch (error) {
+      throw new BadRequestError21("Invalid area ID format.");
+    }
+    try {
+      const now = /* @__PURE__ */ new Date();
+      const updateValue = {
+        signature,
+        status: "Completed",
+        endedAt: now,
+        updatedAt: now
+      };
+      const res = await collection.updateOne({ _id }, { $set: updateValue });
+      if (res.modifiedCount === 0) {
+        throw new InternalServerError7("Unable to update cleaning area.");
+      }
+      delNamespace().then(() => {
+        logger19.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger19.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.modifiedCount;
+    } catch (error) {
+      throw error;
+    }
+  }
+  return {
+    createIndex,
+    createTextIndex,
+    createAreaChecklist,
+    getAllAreaChecklist,
+    getAreaChecklistHistory,
+    getAreaChecklistHistoryDetails,
+    acceptAreaChecklist,
+    attachImageAreaChecklist,
+    submitAreaChecklist,
+    completeAreaChecklist
+  };
+}
+
+// src/controllers/hygiene-area-checklist.controller.ts
+import { BadRequestError as BadRequestError22, logger as logger21 } from "@iservice365/node-server-utils";
+import Joi12 from "joi";
+
+// src/services/hygiene-area-checklist.service.ts
+import { logger as logger20 } from "@iservice365/node-server-utils";
+function useAreaChecklistService() {
+  const { createAreaChecklist: _createAreaChecklist } = useAreaChecklistRepo();
+  const { getAreas } = useAreaRepository();
+  const { getToiletLocations } = useToiletLocationRepository();
+  async function createAreaChecklist(value) {
+    try {
+      const results = [];
+      if (value.type === "cleaner") {
+        const cleanerAreasResult = await getAreas({
+          site: value.site
+        });
+        const cleanerAreas = cleanerAreasResult.items || [];
+        if (cleanerAreas.length === 0) {
+          logger20.warn(`No cleaner areas found for site: ${value.site}`);
+          return results;
+        }
+        for (const area of cleanerAreas) {
+          const checklistData = {
+            type: "cleaner",
+            site: value.site,
+            parentChecklist: value.parentChecklist,
+            area: area._id.toString(),
+            name: area.name,
+            createdBy: value.createdBy
+          };
+          const insertedId = await _createAreaChecklist(checklistData);
+          results.push(insertedId);
+        }
+        logger20.info(
+          `Created ${results.length} cleaner area checklists for site: ${value.site}`
+        );
+      }
+      if (value.type === "toilet") {
+        const toiletAreasResult = await getToiletLocations({
+          site: value.site
+        });
+        const toiletAreas = toiletAreasResult.items || [];
+        if (toiletAreas.length === 0) {
+          logger20.warn(`No toilet locations found for site: ${value.site}`);
+          return results;
+        }
+        for (const toiletLocation of toiletAreas) {
+          const checklistData = {
+            type: "toilet",
+            site: value.site,
+            parentChecklist: value.parentChecklist,
+            area: toiletLocation._id,
+            name: toiletLocation.name,
+            createdBy: value.createdBy
+          };
+          const insertedId = await _createAreaChecklist(checklistData);
+          results.push(insertedId);
+        }
+        logger20.info(
+          `Created ${results.length} toilet area checklists for site: ${value.site}`
+        );
+      }
+      return results;
+    } catch (error) {
+      logger20.error(`Error generating area checklists:`, error);
+      throw error;
+    }
+  }
+  return { createAreaChecklist };
+}
+
+// src/controllers/hygiene-area-checklist.controller.ts
+function useAreaChecklistController() {
+  const {
+    getAllAreaChecklist: _getAllAreaChecklist,
+    getAreaChecklistHistory: _getAreaChecklistHistory,
+    getAreaChecklistHistoryDetails: _getAreaChecklistHistoryDetails,
+    acceptAreaChecklist: _acceptAreaChecklist,
+    attachImageAreaChecklist: _attachImageAreaChecklist,
+    submitAreaChecklist: _submitAreaChecklist,
+    completeAreaChecklist: _completeAreaChecklist
+  } = useAreaChecklistRepo();
+  const { createAreaChecklist: _createAreaChecklist } = useAreaChecklistService();
+  async function createAreaChecklist(req, res, next) {
+    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    ) : {};
+    const createdBy = cookies["user"] || "";
+    const payload = { ...req.body, ...req.params, createdBy };
+    const validation = Joi12.object({
+      type: Joi12.string().required().valid(...allowedTypes),
+      site: Joi12.string().hex().required(),
+      parentChecklist: Joi12.string().hex().required(),
+      createdBy: Joi12.string().hex().optional().allow("", null)
+    });
+    const { error } = validation.validate(payload);
+    if (error) {
+      logger21.log({ level: "error", message: error.message });
+      next(new BadRequestError22(error.message));
+      return;
+    }
+    try {
+      await _createAreaChecklist(payload);
+      res.status(201).json({ message: "Area checklists generated successfully." });
+      return;
+    } catch (error2) {
+      logger21.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getAllAreaChecklist(req, res, next) {
+    const query = { ...req.query, ...req.params };
+    const validation = Joi12.object({
+      page: Joi12.number().min(1).optional().allow("", null),
+      limit: Joi12.number().min(1).optional().allow("", null),
+      search: Joi12.string().optional().allow("", null),
+      site: Joi12.string().hex().required(),
+      type: Joi12.string().valid(...allowedTypes).required(),
+      parentChecklist: Joi12.string().hex().required()
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      logger21.log({ level: "error", message: error.message });
+      next(new BadRequestError22(error.message));
+      return;
+    }
+    const page = parseInt(req.query.page) ?? 1;
+    const limit = parseInt(req.query.limit) ?? 20;
+    const search = req.query.search ?? "";
+    const site = req.params.site ?? "";
+    const type = req.params.type ?? "";
+    const parentChecklist = req.params.parentChecklist ?? "";
+    try {
+      const data = await _getAllAreaChecklist({
+        page,
+        limit,
+        search,
+        site,
+        type,
+        parentChecklist
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger21.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getAreaChecklistHistory(req, res, next) {
+    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    ) : {};
+    const user = cookies["user"] || "";
+    const query = { ...req.query, ...req.params, user };
+    const validation = Joi12.object({
+      page: Joi12.number().min(1).optional().allow("", null),
+      limit: Joi12.number().min(1).optional().allow("", null),
+      search: Joi12.string().optional().allow("", null),
+      site: Joi12.string().hex().required(),
+      type: Joi12.string().valid(...allowedTypes).required(),
+      parentChecklist: Joi12.string().hex().required(),
+      status: Joi12.string().allow("", null, ...allowedStatus),
+      createdAt: Joi12.alternatives().try(Joi12.date(), Joi12.string()).optional().allow("", null),
+      user: Joi12.string().hex().optional().allow("", null)
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      logger21.log({ level: "error", message: error.message });
+      next(new BadRequestError22(error.message));
+      return;
+    }
+    const page = parseInt(req.query.page) ?? 1;
+    const limit = parseInt(req.query.limit) ?? 20;
+    const search = req.query.search ?? "";
+    const site = req.params.site ?? "";
+    const type = req.params.type ?? "";
+    const parentChecklist = req.params.parentChecklist ?? "";
+    const status = req.query.status ?? "";
+    const createdAt = req.query.createdAt ?? "";
+    try {
+      const data = await _getAreaChecklistHistory({
+        page,
+        limit,
+        search,
+        site,
+        type,
+        parentChecklist,
+        status,
+        createdAt,
+        user
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger21.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getAreaChecklistHistoryDetails(req, res, next) {
+    const validation = Joi12.string().hex().required();
+    const _id = req.params.id;
+    const { error } = validation.validate(_id);
+    if (error) {
+      logger21.log({ level: "error", message: error.message });
+      next(new BadRequestError22(error.message));
+      return;
+    }
+    try {
+      const data = await _getAreaChecklistHistoryDetails(_id);
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger21.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function acceptAreaChecklist(req, res, next) {
+    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    ) : {};
+    const acceptedBy = cookies["user"] || "";
+    const payload = { id: req.params.id, acceptedBy };
+    const validation = Joi12.object({
+      id: Joi12.string().hex().required(),
+      acceptedBy: Joi12.string().hex().required()
+    });
+    const { error } = validation.validate(payload);
+    if (error) {
+      logger21.log({ level: "error", message: error.message });
+      next(new BadRequestError22(error.message));
+      return;
+    }
+    try {
+      await _acceptAreaChecklist(payload.id, payload.acceptedBy);
+      res.json({ message: "Area checklist updated successfully." });
+      return;
+    } catch (error2) {
+      logger21.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function attachImageAreaChecklist(req, res, next) {
+    const payload = { id: req.params.id, attachments: req.body.attachments };
+    const validation = Joi12.object({
+      id: Joi12.string().hex().required(),
+      attachments: Joi12.array().items(Joi12.string()).optional()
+    });
+    const { error } = validation.validate(payload);
+    if (error) {
+      logger21.log({ level: "error", message: error.message });
+      next(new BadRequestError22(error.message));
+      return;
+    }
+    try {
+      await _attachImageAreaChecklist(payload.id, payload.attachments);
+      res.json({ message: "Area checklist attachments updated successfully." });
+      return;
+    } catch (error2) {
+      logger21.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function submitAreaChecklist(req, res, next) {
+    const payload = { id: req.params.id, signature: req.body.signature };
+    const validation = Joi12.object({
+      id: Joi12.string().hex().required(),
+      signature: Joi12.string().required()
+    });
+    const { error } = validation.validate(payload);
+    if (error) {
+      logger21.log({ level: "error", message: error.message });
+      next(new BadRequestError22(error.message));
+      return;
+    }
+    try {
+      await _submitAreaChecklist(payload.id, payload.signature);
+      res.json({ message: "Area checklist submitted successfully." });
+      return;
+    } catch (error2) {
+      logger21.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function completeAreaChecklist(req, res, next) {
+    const payload = { id: req.params.id, signature: req.body.signature };
+    const validation = Joi12.object({
+      id: Joi12.string().hex().required(),
+      signature: Joi12.string().required()
+    });
+    const { error } = validation.validate(payload);
+    if (error) {
+      logger21.log({ level: "error", message: error.message });
+      next(new BadRequestError22(error.message));
+      return;
+    }
+    try {
+      await _completeAreaChecklist(payload.id, payload.signature);
+      res.json({ message: "Area checklist completed successfully." });
+      return;
+    } catch (error2) {
+      logger21.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  return {
+    createAreaChecklist,
+    getAllAreaChecklist,
+    getAreaChecklistHistory,
+    getAreaChecklistHistoryDetails,
+    acceptAreaChecklist,
+    attachImageAreaChecklist,
+    submitAreaChecklist,
+    completeAreaChecklist
+  };
+}
+
+// src/models/hygiene-unit-checklist.model.ts
+import { BadRequestError as BadRequestError23, logger as logger22 } from "@iservice365/node-server-utils";
+import Joi13 from "joi";
+import { ObjectId as ObjectId13 } from "mongodb";
+var unitChecklistSchema = Joi13.object({
+  site: Joi13.string().hex().required(),
+  type: Joi13.string().valid(...allowedTypes).required(),
+  parentChecklist: Joi13.string().hex().required(),
+  areaChecklist: Joi13.string().hex().required(),
+  unit: Joi13.string().hex().required(),
+  name: Joi13.string().optional().allow("", null),
+  createdBy: Joi13.string().hex().optional().allow("", null)
+});
+function MUnitChecklist(value) {
+  const { error } = unitChecklistSchema.validate(value);
+  if (error) {
+    logger22.info(`Hygiene Checklist Unit Model: ${error.message}`);
+    throw new BadRequestError23(error.message);
+  }
+  if (value.site) {
+    try {
+      value.site = new ObjectId13(value.site);
+    } catch (error2) {
+      throw new BadRequestError23("Invalid site ID format.");
+    }
+  }
+  if (value.parentChecklist) {
+    try {
+      value.parentChecklist = new ObjectId13(value.parentChecklist);
+    } catch (error2) {
+      throw new BadRequestError23("Invalid parent checklist ID format.");
+    }
+  }
+  if (value.areaChecklist) {
+    try {
+      value.areaChecklist = new ObjectId13(value.areaChecklist);
+    } catch (error2) {
+      throw new BadRequestError23("Invalid area checklist ID format.");
+    }
+  }
+  if (value.unit) {
+    try {
+      value.unit = new ObjectId13(value.unit);
+    } catch (error2) {
+      throw new BadRequestError23("Invalid unit ID format.");
+    }
+  }
+  if (value.createdBy) {
+    try {
+      value.createdBy = new ObjectId13(value.createdBy);
+    } catch (error2) {
+      throw new BadRequestError23("Invalid createdBy ID format.");
+    }
+  }
+  return {
+    site: value.site,
+    type: value.type,
+    parentChecklist: value.parentChecklist,
+    areaChecklist: value.areaChecklist,
+    unit: value.unit,
+    name: value.name ?? "",
+    approve: false,
+    reject: false,
+    createdBy: value.createdBy ?? "",
+    createdAt: /* @__PURE__ */ new Date(),
+    updatedAt: value.updatedAt ?? ""
+  };
+}
+
+// src/repositories/hygiene-unit-checklist.repository.ts
+import {
+  BadRequestError as BadRequestError24,
+  InternalServerError as InternalServerError8,
+  logger as logger23,
+  makeCacheKey as makeCacheKey7,
+  paginate as paginate7,
+  useAtlas as useAtlas11,
+  useCache as useCache7
+} from "@iservice365/node-server-utils";
+import { ObjectId as ObjectId14 } from "mongodb";
+function useUnitChecklistRepo() {
+  const db = useAtlas11.getDb();
+  if (!db) {
+    throw new InternalServerError8("Unable to connect to server.");
+  }
+  const namespace_collection = "hygiene-checklist.units";
+  const collection = db.collection(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache7(namespace_collection);
+  async function createIndex() {
+    try {
+      await collection.createIndexes([
+        { key: { site: 1 } },
+        { key: { type: 1 } },
+        { key: { parentChecklist: 1 } },
+        { key: { areaChecklist: 1 } },
+        { key: { "metadata.workOrder.category": 1 } },
+        { key: { "metadata.workOrder.createdBy": 1 } },
+        { key: { "metadata.workOrder.serviceProvider": 1 } },
+        { key: { "metadata.workOrder.organization": 1 } },
+        { key: { "metadata.workOrder.site": 1 } }
+      ]);
+    } catch (error) {
+      throw new InternalServerError8(
+        "Failed to create index on hygiene unit checklist."
+      );
+    }
+  }
+  async function createTextIndex() {
+    try {
+      await collection.createIndex({ name: "text" });
+    } catch (error) {
+      throw new InternalServerError8(
+        "Failed to create text index on hygiene unit checklist."
+      );
+    }
+  }
+  async function createUnitChecklist(value, session) {
+    try {
+      value = MUnitChecklist(value);
+      const res = await collection.insertOne(value, { session });
+      delNamespace().then(() => {
+        logger23.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger23.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.insertedId;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function getAllUnitChecklist({
+    page = 1,
+    limit = 10,
+    search = "",
+    site,
+    type,
+    parentChecklist,
+    areaChecklist
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = { type };
+    const cacheOptions = {
+      page,
+      limit
+    };
+    try {
+      query.site = new ObjectId14(site);
+      cacheOptions.site = site.toString();
+    } catch (error) {
+      throw new BadRequestError24("Invalid site ID format.");
+    }
+    try {
+      query.parentChecklist = new ObjectId14(parentChecklist);
+      cacheOptions.parentChecklist = parentChecklist.toString();
+    } catch (error) {
+      throw new BadRequestError24("Invalid parent checklist ID format.");
+    }
+    try {
+      query.areaChecklist = new ObjectId14(areaChecklist);
+      cacheOptions.areaChecklist = areaChecklist.toString();
+    } catch (error) {
+      throw new BadRequestError24("Invalid area checklist ID format.");
+    }
+    if (search) {
+      query.$text = { $search: search };
+      cacheOptions.search = search;
+    }
+    const cacheKey = makeCacheKey7(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger23.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const areaAttachmentsResult = await collection.aggregate([
+        { $match: query },
+        {
+          $lookup: {
+            from: "hygiene-checklist.areas",
+            localField: "areaChecklist",
+            foreignField: "_id",
+            pipeline: [
+              { $project: { attachments: "$metadata.attachments" } }
+            ],
+            as: "areaChecklistData"
+          }
+        },
+        {
+          $unwind: {
+            path: "$areaChecklistData",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $group: {
+            _id: null,
+            attachments: { $first: "$areaChecklistData.attachments" }
+          }
+        }
+      ]).toArray();
+      const areaAttachments = areaAttachmentsResult.length > 0 ? areaAttachmentsResult[0].attachments || [] : [];
+      const pipeline = [
+        { $match: query },
+        {
+          $lookup: {
+            from: "organizations",
+            localField: "metadata.workOrder.category",
+            foreignField: "_id",
+            pipeline: [{ $project: { nature: 1 } }],
+            as: "categoryData"
+          }
+        },
+        {
+          $lookup: {
+            from: "users",
+            localField: "metadata.workOrder.createdBy",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
+            as: "createdByData"
+          }
+        },
+        {
+          $lookup: {
+            from: "service-providers",
+            localField: "metadata.workOrder.serviceProvider",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
+            as: "serviceProviderData"
+          }
+        },
+        {
+          $lookup: {
+            from: "organizations",
+            localField: "metadata.workOrder.organization",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
+            as: "organizationData"
+          }
+        },
+        {
+          $lookup: {
+            from: "sites",
+            localField: "metadata.workOrder.site",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
+            as: "siteData"
+          }
+        },
+        {
+          $addFields: {
+            "metadata.workOrder.categoryName": {
+              $arrayElemAt: ["$categoryData.nature", 0]
+            },
+            "metadata.workOrder.createdByName": {
+              $arrayElemAt: ["$createdByData.name", 0]
+            },
+            "metadata.workOrder.serviceProviderName": {
+              $arrayElemAt: ["$serviceProviderData.name", 0]
+            },
+            "metadata.workOrder.organizationName": {
+              $arrayElemAt: ["$organizationData.name", 0]
+            },
+            "metadata.workOrder.siteName": {
+              $arrayElemAt: ["$siteData.name", 0]
+            }
+          }
+        },
+        {
+          $project: {
+            name: 1,
+            remarks: "$metadata.remarks",
+            attachments: "$metadata.attachments",
+            workOrder: "$metadata.workOrder",
+            approve: { $ifNull: ["$approve", null] },
+            reject: { $ifNull: ["$reject", null] }
+          }
+        },
+        { $sort: { _id: -1 } },
+        { $skip: page * limit },
+        { $limit: limit }
+      ];
+      const items = await collection.aggregate(pipeline).toArray();
+      const length = await collection.countDocuments(query);
+      const paginatedData = paginate7(items, page, limit, length);
+      const data = {
+        attachments: areaAttachments,
+        ...paginatedData
+      };
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger23.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger23.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function getUnitChecklistById(_id) {
+    try {
+      _id = new ObjectId14(_id);
+    } catch (error) {
+      throw new BadRequestError24("Invalid unit checklist ID format.");
+    }
+    try {
+      return await collection.findOne({ _id });
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function updateUnitChecklist(_id, value, session) {
+    try {
+      _id = new ObjectId14(_id);
+    } catch (error) {
+      throw new BadRequestError24("Invalid unit checklist ID format.");
+    }
+    if (value.checkedBy && typeof value.checkedBy === "string") {
+      try {
+        value.checkedBy = new ObjectId14(value.checkedBy);
+      } catch (error) {
+        throw new BadRequestError24("Invalid checkedBy ID format.");
+      }
+    }
+    if ("metadata" in value && value.metadata?.workOrder) {
+      const workOrder = value.metadata.workOrder;
+      if (workOrder.category && typeof workOrder.category === "string") {
+        try {
+          workOrder.category = new ObjectId14(workOrder.category);
+        } catch (error) {
+          throw new BadRequestError24("Invalid category ID format.");
+        }
+      }
+      if (workOrder.createdBy && typeof workOrder.createdBy === "string") {
+        try {
+          workOrder.createdBy = new ObjectId14(workOrder.createdBy);
+        } catch (error) {
+          throw new BadRequestError24("Invalid createdBy ID format.");
+        }
+      }
+      if (workOrder.serviceProvider && typeof workOrder.serviceProvider === "string") {
+        try {
+          workOrder.serviceProvider = new ObjectId14(workOrder.serviceProvider);
+        } catch (error) {
+          throw new BadRequestError24("Invalid serviceProvider ID format.");
+        }
+      }
+      if (workOrder.organization && typeof workOrder.organization === "string") {
+        try {
+          workOrder.organization = new ObjectId14(workOrder.organization);
+        } catch (error) {
+          throw new BadRequestError24("Invalid organization ID format.");
+        }
+      }
+      if (workOrder.site && typeof workOrder.site === "string") {
+        try {
+          workOrder.site = new ObjectId14(workOrder.site);
+        } catch (error) {
+          throw new BadRequestError24("Invalid site ID format.");
+        }
+      }
+    }
+    try {
+      const updateValue = { ...value, updatedAt: /* @__PURE__ */ new Date() };
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
+      if (res.modifiedCount === 0) {
+        throw new InternalServerError8("Unable to update unit checklist.");
+      }
+      delNamespace().then(() => {
+        logger23.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger23.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.modifiedCount;
+    } catch (error) {
+      throw error;
+    }
+  }
+  return {
+    createIndex,
+    createTextIndex,
+    createUnitChecklist,
+    getAllUnitChecklist,
+    getUnitChecklistById,
+    updateUnitChecklist
+  };
+}
+
+// src/controllers/hygiene-unit-checklist.controller.ts
+import { BadRequestError as BadRequestError25, logger as logger25 } from "@iservice365/node-server-utils";
+import Joi14 from "joi";
+
+// src/services/hygiene-unit-checklist.service.ts
+import { logger as logger24, NotFoundError as NotFoundError8 } from "@iservice365/node-server-utils";
+import {
+  useSiteRepo,
+  useWorkOrderService
+} from "@iservice365/core";
+function useUnitChecklistService() {
+  const {
+    getUnitChecklistById: _getUnitChecklistById,
+    updateUnitChecklist: _updateUnitChecklist
+  } = useUnitChecklistRepo();
+  const { getSiteById } = useSiteRepo();
+  const { createWorkOrder } = useWorkOrderService();
+  async function approveUnitChecklist(id, value) {
+    try {
+      value.approve = true;
+      value.reject = false;
+      const result = await _updateUnitChecklist(id, value);
+      return result;
+    } catch (error) {
+      logger24.error(`Error updating unit checklist with id ${id}:`, error);
+      throw error;
+    }
+  }
+  async function rejectUnitChecklist(id, value, fullHost) {
+    try {
+      value.reject = true;
+      value.approve = false;
+      if (value.metadata?.workOrder) {
+        const existingChecklist = await _getUnitChecklistById(id);
+        if (!existingChecklist)
+          throw new NotFoundError8("Unit checklist not found.");
+        const site = await getSiteById(
+          existingChecklist.site
+        );
+        if (!site)
+          throw new NotFoundError8("Site not found.");
+        const workOrderData = {
+          ...value.metadata.workOrder,
+          attachments: value.metadata.attachments,
+          createdBy: value.checkedBy,
+          organization: site.orgId,
+          site: site._id
+        };
+        const workOrder = await createWorkOrder(
+          workOrderData,
+          fullHost
+        );
+        if (!workOrder)
+          throw new NotFoundError8("Failed to create work order.");
+      }
+      const result = await _updateUnitChecklist(id, value);
+      return result;
+    } catch (error) {
+      logger24.error(`Error updating unit checklist with id ${id}:`, error);
+      throw error;
+    }
+  }
+  return {
+    approveUnitChecklist,
+    rejectUnitChecklist
+  };
+}
+
+// src/controllers/hygiene-unit-checklist.controller.ts
+import { workOrderSchema } from "@iservice365/core";
+function useUnitChecklistController() {
+  const {
+    createUnitChecklist: _createUnitChecklist,
+    getAllUnitChecklist: _getAllUnitChecklist
+  } = useUnitChecklistRepo();
+  const {
+    approveUnitChecklist: _approveUnitChecklist,
+    rejectUnitChecklist: _rejectUnitChecklist
+  } = useUnitChecklistService();
+  async function createUnitChecklist(req, res, next) {
+    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    ) : {};
+    const createdBy = cookies["user"] || "";
+    const payload = { ...req.body, ...req.params, createdBy };
+    const { error } = unitChecklistSchema.validate(payload);
+    if (error) {
+      logger25.log({ level: "error", message: error.message });
+      next(new BadRequestError25(error.message));
+      return;
+    }
+    try {
+      const id = await _createUnitChecklist(payload);
+      res.status(201).json({ message: "Unit checklist created successfully.", id });
+      return;
+    } catch (error2) {
+      logger25.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getAllUnitChecklist(req, res, next) {
+    const query = { ...req.query, ...req.params };
+    const validation = Joi14.object({
+      page: Joi14.number().min(1).optional().allow("", null),
+      limit: Joi14.number().min(1).optional().allow("", null),
+      search: Joi14.string().optional().allow("", null),
+      site: Joi14.string().hex().required(),
+      type: Joi14.string().valid(...allowedTypes).required(),
+      parentChecklist: Joi14.string().hex().required(),
+      areaChecklist: Joi14.string().hex().required()
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      logger25.log({ level: "error", message: error.message });
+      next(new BadRequestError25(error.message));
+      return;
+    }
+    const page = parseInt(req.query.page) ?? 1;
+    const limit = parseInt(req.query.limit) ?? 20;
+    const search = req.query.search ?? "";
+    const site = req.params.site ?? "";
+    const type = req.params.type ?? "";
+    const parentChecklist = req.params.parentChecklist ?? "";
+    const areaChecklist = req.params.areaChecklist ?? "";
+    try {
+      const data = await _getAllUnitChecklist({
+        page,
+        limit,
+        search,
+        site,
+        type,
+        parentChecklist,
+        areaChecklist
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger25.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function approveUnitChecklist(req, res, next) {
+    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    ) : {};
+    const checkedBy = cookies["user"] || "";
+    const payload = { id: req.params.id, checkedBy };
+    const validation = Joi14.object({
+      id: Joi14.string().hex().required(),
+      checkedBy: Joi14.string().hex().required()
+    });
+    const { error } = validation.validate(payload);
+    if (error) {
+      logger25.log({ level: "error", message: error.message });
+      next(new BadRequestError25(error.message));
+      return;
+    }
+    try {
+      const { id, ...value } = payload;
+      await _approveUnitChecklist(id, value);
+      res.json({ message: "Unit checklist approved successfully." });
+      return;
+    } catch (error2) {
+      logger25.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function rejectUnitChecklist(req, res, next) {
+    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    ) : {};
+    const checkedBy = cookies["user"] || "";
+    if (req.body.workOrder) {
+      req.body.workOrder.createdBy = checkedBy;
+    }
+    const payload = { id: req.params.id, checkedBy, ...req.body };
+    const validation = Joi14.object({
+      id: Joi14.string().hex().required(),
+      attachments: Joi14.array().items(Joi14.string()).optional(),
+      remarks: Joi14.string().required(),
+      workOrder: workOrderSchema.optional(),
+      checkedBy: Joi14.string().hex().required()
+    });
+    const { error } = validation.validate(payload);
+    if (error) {
+      logger25.log({ level: "error", message: error.message });
+      next(new BadRequestError25(error.message));
+      return;
+    }
+    try {
+      const { id, attachments, remarks, workOrder, ...value } = payload;
+      value.metadata = {
+        attachments: attachments || [],
+        remarks: remarks || "",
+        workOrder
+      };
+      if (value.metadata.workOrder) {
+        if (value.metadata.workOrder.category) {
+          value.metadata.workOrder.category = value.metadata.workOrder.category;
+        }
+        if (value.metadata.workOrder.serviceProvider) {
+          value.metadata.workOrder.serviceProvider = value.metadata.workOrder.serviceProvider;
+        }
+        value.metadata.workOrder.createdBy = checkedBy;
+      }
+      const fullHost = req.headers.origin;
+      await _rejectUnitChecklist(id, value, fullHost);
+      res.json({ message: "Unit checklist rejected successfully." });
+      return;
+    } catch (error2) {
+      logger25.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  return {
+    createUnitChecklist,
+    getAllUnitChecklist,
+    approveUnitChecklist,
+    rejectUnitChecklist
   };
 }
 export {
   MArea,
+  MAreaChecklist,
   MParentChecklist,
   MScheduleTaskArea,
   MToiletLocation,
   MUnit,
+  MUnitChecklist,
+  allowedStatus,
+  allowedTypes,
+  areaChecklistSchema,
   areaSchema,
   parentChecklistSchema,
   scheduleTaskAreaSchema,
   toiletLocationSchema,
+  unitChecklistSchema,
   unitSchema,
+  useAreaChecklistController,
+  useAreaChecklistRepo,
   useAreaController,
   useAreaRepository,
   useAreaService,
-  useParentCheckilstController,
+  useParentChecklistController,
   useParentChecklistRepo,
   useScheduleTaskAreaController,
   useScheduleTaskAreaRepository,
@@ -2774,6 +4685,8 @@ export {
   useToiletLocationController,
   useToiletLocationRepository,
   useToiletLocationService,
+  useUnitChecklistController,
+  useUnitChecklistRepo,
   useUnitController,
   useUnitRepository,
   useUnitService