@iservice365/module-hygiene 0.2.0 → 1.0.0

package/dist/index.mjs

@@ -1,13 +1,11 @@
-// src/models/hygiene-area.model.ts
-import { BadRequestError, logger } from "@iservice365/node-server-utils";
-import Joi from "joi";
-import { ObjectId } from "mongodb";
-
 // src/models/hygiene-base.model.ts
 var allowedTypes = ["common", "toilet"];
 var allowedStatus = ["ready", "ongoing", "completed"];
 
 // src/models/hygiene-area.model.ts
+import { BadRequestError, logger } from "@iservice365/node-server-utils";
+import Joi from "joi";
+import { ObjectId } from "mongodb";
 var areaSchema = Joi.object({
   site: Joi.string().hex().required(),
   name: Joi.string().required(),
@@ -266,6 +264,7 @@ function useAreaRepo() {
         { $match: query },
         {
           $project: {
+            type: 1,
             name: 1,
             set: 1,
             units: 1
@@ -285,7 +284,38 @@ function useAreaRepo() {
       throw error;
     }
   }
-  async function updateArea(_id, value) {
+  async function verifyAreaByUnitId(unitId) {
+    try {
+      unitId = new ObjectId2(unitId);
+    } catch (error) {
+      throw new BadRequestError2("Invalid unit ID format.");
+    }
+    const query = {
+      "units.unit": unitId,
+      status: { $ne: "deleted" }
+    };
+    const cacheKey = makeCacheKey(namespace_collection, {
+      verify_unitId: unitId.toString()
+    });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger2.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const count = await collection.countDocuments(query);
+      const result = count > 0;
+      setCache(cacheKey, result, 15 * 60).then(() => {
+        logger2.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger2.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return result;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function updateArea(_id, value, session) {
     try {
       _id = new ObjectId2(_id);
     } catch (error) {
@@ -316,7 +346,11 @@ function useAreaRepo() {
           }
         });
       }
-      const res = await collection.updateOne({ _id }, { $set: updateValue });
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
       if (res.modifiedCount === 0) {
         throw new InternalServerError("Unable to update cleaning area.");
       }
@@ -337,29 +371,25 @@ function useAreaRepo() {
       throw error;
     }
   }
-  async function updateAreaChecklist(_id, value) {
+  async function updateAreaChecklist(unitId, name, session) {
     try {
-      _id = new ObjectId2(_id);
+      unitId = new ObjectId2(unitId);
     } catch (error) {
-      throw new BadRequestError2("Invalid area ID format.");
-    }
-    if (value.units && Array.isArray(value.units)) {
-      value.units = value.units.map((item) => {
-        try {
-          return {
-            ...item,
-            unit: new ObjectId2(item.unit)
-          };
-        } catch (error) {
-          throw new BadRequestError2(`Invalid unit ID format: ${item.unit}`);
-        }
-      });
+      throw new BadRequestError2("Invalid unit ID format.");
     }
     try {
-      const updateValue = { ...value, updatedAt: /* @__PURE__ */ new Date() };
-      const res = await collection.updateOne({ _id }, { $set: updateValue });
+      const res = await collection.updateMany(
+        { "units.unit": unitId },
+        {
+          $set: {
+            "units.$.name": name,
+            updatedAt: /* @__PURE__ */ new Date()
+          }
+        },
+        { session }
+      );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError("Unable to update cleaning area.");
+        throw new InternalServerError("Unable to update unit name in areas.");
       }
       delNamespace().then(() => {
         logger2.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -415,6 +445,7 @@ function useAreaRepo() {
     getAreas,
     getAreasForChecklist,
     getAreaById,
+    verifyAreaByUnitId,
     updateArea,
     updateAreaChecklist,
     deleteArea
@@ -454,7 +485,7 @@ function useAreaService() {
           skippedRows.push(i + 1);
           continue;
         }
-        const areaType = String(row.TYPE).trim();
+        const areaType = String(row.TYPE).trim().toLowerCase();
         if (!areaType) {
           logger3.warn(`Skipping row ${i + 1} with empty area type`);
           skippedRows.push(i + 1);
@@ -502,18 +533,22 @@ function useAreaService() {
       }
       logger3.info(message);
       if (insertedAreaIds.length === 0) {
-        if (duplicateAreas.length > 0 && failedAreas.length === 0) {
-          throw new BadRequestError3(
-            `No new areas were created. All ${duplicateAreas.length} areas already exist in the system: ${duplicateAreas.join(", ")}`
-          );
+        if (duplicateAreas.length > 0 && failedAreas.length === 0 && skippedRows.length === 0) {
+          return {
+            message: `No new areas were created. All ${duplicateAreas.length} areas already exist in the system: ${duplicateAreas.join(", ")}`
+          };
         } else if (failedAreas.length > 0) {
           throw new BadRequestError3(
-            `No areas were created. Please check your data format and ensure area names are valid.`
+            `No areas were created. ${failedAreas.length} areas failed due to errors. Please check your data format and ensure area names are valid.`
           );
-        } else if (skippedRows.length > 0) {
+        } else if (skippedRows.length > 0 && duplicateAreas.length === 0) {
           throw new BadRequestError3(
-            `No areas were created. All rows contained invalid or missing area names.`
+            `No areas were created. All ${skippedRows.length} rows contained invalid or missing data.`
           );
+        } else {
+          return {
+            message: `No new areas were created. ${duplicateAreas.length} areas already exist, ${skippedRows.length} rows had invalid data.`
+          };
         }
       }
       return { message };
@@ -521,10 +556,6 @@ function useAreaService() {
       logger3.error("Error while uploading area information", error);
       if (error instanceof BadRequestError3) {
         throw error;
-      } else if (error.message.includes("duplicate")) {
-        throw new BadRequestError3(
-          `Upload failed due to duplicate area names. Please ensure all area names are unique.`
-        );
       } else if (error.message.includes("validation")) {
         throw new BadRequestError3(
           "Upload failed due to invalid data format. Please check that all required fields are properly filled."
@@ -577,7 +608,6 @@ function useAreaController() {
     getAreas: _getAreas,
     getAreaById: _getAreaById,
     updateArea: _updateArea,
-    updateAreaChecklist: _updateAreaChecklist,
     deleteArea: _deleteById
   } = useAreaRepo();
   const { importArea: _importArea } = useAreaService();
@@ -683,36 +713,6 @@ function useAreaController() {
       return;
     }
   }
-  async function updateAreaChecklist(req, res, next) {
-    const payload = { id: req.params.id, ...req.body };
-    const schema = Joi2.object({
-      id: Joi2.string().hex().required(),
-      units: Joi2.array().items(
-        Joi2.object({
-          unit: Joi2.string().hex().required(),
-          name: Joi2.string().required()
-        }).required()
-      ).min(1).unique("unit", { ignoreUndefined: true }).messages({
-        "array.unique": "Duplicate area units are not allowed"
-      })
-    });
-    const { error } = schema.validate(payload);
-    if (error) {
-      logger4.log({ level: "error", message: error.message });
-      next(new BadRequestError4(error.message));
-      return;
-    }
-    try {
-      const { id, ...value } = payload;
-      await _updateAreaChecklist(id, value);
-      res.json({ message: "Area updated successfully." });
-      return;
-    } catch (error2) {
-      logger4.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
   async function deleteArea(req, res, next) {
     const id = req.params.id;
     const validation = Joi2.string().hex().required();
@@ -761,7 +761,6 @@ function useAreaController() {
     getAreas,
     getAreaById,
     updateArea,
-    updateAreaChecklist,
     deleteArea,
     importArea
   };
@@ -802,7 +801,8 @@ function MUnit(value) {
 import {
   BadRequestError as BadRequestError7,
   logger as logger7,
-  NotFoundError as NotFoundError3
+  NotFoundError as NotFoundError3,
+  useAtlas as useAtlas3
 } from "@iservice365/node-server-utils";
 
 // src/repositories/hygiene-unit.repository.ts
@@ -927,7 +927,7 @@ function useUnitRepository() {
       throw error;
     }
   }
-  async function updateUnit(_id, value) {
+  async function updateUnit(_id, value, session) {
     try {
       _id = new ObjectId4(_id);
     } catch (error) {
@@ -935,7 +935,11 @@ function useUnitRepository() {
     }
     try {
       const updateValue = { ...value, updatedAt: /* @__PURE__ */ new Date() };
-      const res = await collection.updateOne({ _id }, { $set: updateValue });
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
       if (res.modifiedCount === 0) {
         throw new InternalServerError2("Unable to update cleaning unit.");
       }
@@ -1002,7 +1006,12 @@ function useUnitRepository() {
 
 // src/services/hygiene-unit.service.ts
 function useUnitService() {
-  const { createUnit: _createUnit } = useUnitRepository();
+  const {
+    createUnit: _createUnit,
+    updateUnit: _updateUnit,
+    deleteUnit: _deleteUnit
+  } = useUnitRepository();
+  const { verifyAreaByUnitId, updateAreaChecklist } = useAreaRepo();
   async function importUnit({
     dataJson,
     site
@@ -1096,20 +1105,61 @@ function useUnitService() {
       }
     }
   }
-  return { importUnit };
+  async function updateUnit(_id, value) {
+    const session = useAtlas3.getClient()?.startSession();
+    try {
+      session?.startTransaction();
+      const result = await _updateUnit(_id, value, session);
+      const isExistingArea = await verifyAreaByUnitId(_id);
+      if (isExistingArea) {
+        await updateAreaChecklist(_id, value.name, session);
+      }
+      await session?.commitTransaction();
+      return result;
+    } catch (error) {
+      logger7.error(`Error updating unit and associated areas:`, error);
+      if (session?.inTransaction()) {
+        await session?.abortTransaction();
+      }
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
+  async function deleteUnit(_id) {
+    const session = useAtlas3.getClient()?.startSession();
+    try {
+      session?.startTransaction();
+      const isExistingArea = await verifyAreaByUnitId(_id);
+      if (isExistingArea) {
+        throw new BadRequestError7("Failed to delete unit, unit is in use.");
+      }
+      const result = await _deleteUnit(_id, session);
+      await session?.commitTransaction();
+      return result;
+    } catch (error) {
+      logger7.error(`Error deleting unit:`, error);
+      if (session?.inTransaction()) {
+        await session?.abortTransaction();
+      }
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
+  return { importUnit, updateUnit, deleteUnit };
 }
 
 // src/controllers/hygiene-unit.controller.ts
 import { BadRequestError as BadRequestError8, logger as logger8 } from "@iservice365/node-server-utils";
 import Joi4 from "joi";
 function useUnitController() {
+  const { createUnit: _createUnit, getUnits: _getUnits } = useUnitRepository();
   const {
-    createUnit: _createUnit,
-    getUnits: _getUnits,
     updateUnit: _updateUnit,
-    deleteUnit: _deleteUnit
-  } = useUnitRepository();
-  const { importUnit: _importUnit } = useUnitService();
+    deleteUnit: _deleteUnit,
+    importUnit: _importUnit
+  } = useUnitService();
   async function createUnit(req, res, next) {
     const payload = { ...req.body, ...req.params };
     const { error } = unitSchema.validate(payload);
@@ -1270,7 +1320,7 @@ function MParentChecklist(value) {
 // src/repositories/hygiene-parent-checklist.repository.ts
 import { ObjectId as ObjectId6 } from "mongodb";
 import {
-  useAtlas as useAtlas3,
+  useAtlas as useAtlas4,
   InternalServerError as InternalServerError3,
   paginate as paginate3,
   useCache as useCache3,
@@ -1279,7 +1329,7 @@ import {
   BadRequestError as BadRequestError10
 } from "@iservice365/node-server-utils";
 function useParentChecklistRepo() {
-  const db = useAtlas3.getDb();
+  const db = useAtlas4.getDb();
   if (!db) {
     throw new InternalServerError3("Unable to connect to server.");
   }
@@ -1442,164 +1492,37 @@ function useParentChecklistRepo() {
       throw error;
     }
   }
-  async function updateParentChecklistStatuses(createdAt) {
+  async function updateParentChecklistStatuses(_id, status, session) {
     try {
-      const currentDate = /* @__PURE__ */ new Date();
-      const dateToUpdate = createdAt || 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);
-      logger10.info(
-        `Updating parent checklist statuses for date: ${dateToUpdate.toISOString().split("T")[0]}`
-      );
-      const statusUpdates = await collection.aggregate([
-        {
-          $match: {
-            createdAt: {
-              $gte: startOfDay,
-              $lte: endOfDay
-            }
-          }
-        },
-        {
-          $lookup: {
-            from: "site.cleaning.schedule.areas",
-            let: { parentId: "$_id" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ["$parentChecklist", "$$parentId"] }
-                }
-              },
-              {
-                $group: {
-                  _id: {
-                    parentChecklist: "$parentChecklist"
-                  },
-                  completedCount: {
-                    $sum: {
-                      $cond: [{ $eq: ["$status", "completed"] }, 1, 0]
-                    }
-                  },
-                  ongoingCount: {
-                    $sum: {
-                      $cond: [{ $eq: ["$status", "ongoing"] }, 1, 0]
-                    }
-                  },
-                  readyCount: {
-                    $sum: {
-                      $cond: [{ $eq: ["$status", "ready"] }, 1, 0]
-                    }
-                  },
-                  totalCount: { $sum: 1 }
-                }
-              },
-              {
-                $addFields: {
-                  finalStatus: {
-                    $cond: {
-                      if: {
-                        $and: [
-                          { $gt: ["$completedCount", 0] },
-                          { $eq: ["$ongoingCount", 0] },
-                          { $eq: ["$readyCount", 0] }
-                        ]
-                      },
-                      then: "completed",
-                      else: {
-                        $cond: {
-                          if: {
-                            $and: [
-                              { $eq: ["$completedCount", 0] },
-                              { $eq: ["$ongoingCount", 0] }
-                            ]
-                          },
-                          then: "expired",
-                          else: "ongoing"
-                        }
-                      }
-                    }
-                  },
-                  completedAt: {
-                    $cond: {
-                      if: {
-                        $and: [
-                          { $gt: ["$completedCount", 0] },
-                          { $eq: ["$ongoingCount", 0] },
-                          { $eq: ["$readyCount", 0] }
-                        ]
-                      },
-                      then: /* @__PURE__ */ new Date(),
-                      else: null
-                    }
-                  }
-                }
-              }
-            ],
-            as: "areaStats"
-          }
-        },
-        {
-          $match: {
-            "areaStats.0": { $exists: true }
-          }
-        },
-        {
-          $addFields: {
-            areaData: { $arrayElemAt: ["$areaStats", 0] }
-          }
-        },
-        {
-          $project: {
-            _id: 1,
-            newStatus: "$areaData.finalStatus",
-            completedAt: "$areaData.completedAt"
-          }
-        }
-      ]).toArray();
-      logger10.info(
-        `Found ${statusUpdates.length} parent checklists to potentially update`
+      _id = new ObjectId6(_id);
+    } catch (error) {
+      throw new BadRequestError10("Invalid parent checklist ID format.");
+    }
+    try {
+      const updateValue = {
+        status,
+        updatedAt: /* @__PURE__ */ new Date()
+      };
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
       );
-      if (statusUpdates.length === 0) {
-        logger10.info(
-          `No parent checklists found for date range: ${startOfDay.toISOString()} to ${endOfDay.toISOString()}`
+      if (res.modifiedCount === 0) {
+        throw new InternalServerError3(
+          "Unable to update parent checklist status."
         );
-        return null;
       }
-      const bulkOps = statusUpdates.map((update) => {
-        logger10.info(
-          `Updating parent checklist ${update._id} with status: ${update.newStatus}`
+      delNamespace().then(() => {
+        logger10.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger10.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
         );
-        return {
-          updateOne: {
-            filter: { _id: update._id },
-            update: {
-              $set: {
-                status: update.newStatus,
-                completedAt: update.completedAt,
-                updatedAt: /* @__PURE__ */ new Date()
-              }
-            }
-          }
-        };
       });
-      let result = null;
-      if (bulkOps.length > 0) {
-        result = await collection.bulkWrite(bulkOps);
-        delNamespace().then(() => {
-          logger10.info(`Cache cleared for namespace: ${namespace_collection}`);
-        }).catch((err) => {
-          logger10.error(
-            `Failed to clear cache for namespace: ${namespace_collection}`,
-            err
-          );
-        });
-      }
-      logger10.info(`Updated statuses for ${bulkOps.length} parent checklists.`);
-      return result;
+      return res.modifiedCount;
     } catch (error) {
-      logger10.error("Failed to update parent checklist statuses", error);
       throw error;
     }
   }
@@ -1726,6 +1649,7 @@ var areaChecklistSchema = Joi7.object({
       set: Joi7.number().min(0).required(),
       units: Joi7.array().items(
         Joi7.object({
+          unit: Joi7.string().hex().required(),
           name: Joi7.string().required()
         }).required()
       ).min(1).required()
@@ -1750,9 +1674,11 @@ function MAreaChecklist(value) {
       return {
         set: checklistItem.set,
         units: checklistItem.units.map((unit) => ({
+          unit: new ObjectId7(unit.unit),
           name: unit.name,
           status: "ready",
           remarks: "",
+          completedBy: "",
           timestamp: ""
         }))
       };
@@ -1765,10 +1691,14 @@ function MAreaChecklist(value) {
     checklist: value.checklist || [],
     status: "ready",
     createdAt: /* @__PURE__ */ new Date(),
+    completedAt: "",
     updatedAt: ""
   };
 }
 
+// src/services/hygiene-area-checklist.service.ts
+import { logger as logger14, useAtlas as useAtlas6 } from "@iservice365/node-server-utils";
+
 // src/repositories/hygiene-area-checklist.repository.ts
 import {
   BadRequestError as BadRequestError13,
@@ -1776,23 +1706,18 @@ import {
   logger as logger13,
   makeCacheKey as makeCacheKey4,
   paginate as paginate4,
-  useAtlas as useAtlas4,
+  useAtlas as useAtlas5,
   useCache as useCache4
 } from "@iservice365/node-server-utils";
 import { ObjectId as ObjectId8 } from "mongodb";
 function useAreaChecklistRepo() {
-  const db = useAtlas4.getDb();
+  const db = useAtlas5.getDb();
   if (!db) {
     throw new InternalServerError4("Unable to connect to server.");
   }
   const namespace_collection = "site.cleaning.schedule.areas";
-  const unit_checklist_collection = "site.cleaning.schedule.units";
   const collection = db.collection(namespace_collection);
-  const unitChecklistCollection = db.collection(unit_checklist_collection);
   const { delNamespace, setCache, getCache } = useCache4(namespace_collection);
-  const { delNamespace: delUnitNamespace } = useCache4(
-    unit_checklist_collection
-  );
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -1800,7 +1725,8 @@ function useAreaChecklistRepo() {
         { key: { type: 1 } },
         { key: { status: 1 } },
         { key: { createdAt: 1 } },
-        { key: { acceptedBy: 1 } }
+        { key: { "checklist.units.unit": 1 } },
+        { key: { "checklist.units.status": 1 } }
       ]);
     } catch (error) {
       throw new InternalServerError4(
@@ -1810,7 +1736,11 @@ function useAreaChecklistRepo() {
   }
   async function createTextIndex() {
     try {
-      await collection.createIndex({ name: "text" });
+      await collection.createIndex({
+        name: "text",
+        "checklist.units.name": "text",
+        "checklist.units.remarks": "text"
+      });
     } catch (error) {
       throw new InternalServerError4(
         "Failed to create text index on hygiene checklist area."
@@ -1861,7 +1791,7 @@ function useAreaChecklistRepo() {
     search = "",
     type,
     schedule
-  }) {
+  }, session) {
     page = page > 0 ? page - 1 : 0;
     const query = {};
     const cacheOptions = {
@@ -1883,10 +1813,12 @@ function useAreaChecklistRepo() {
       cacheOptions.search = search;
     }
     const cacheKey = makeCacheKey4(namespace_collection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger13.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
+    if (!session) {
+      const cachedData = await getCache(cacheKey);
+      if (cachedData) {
+        logger13.info(`Cache hit for key: ${cacheKey}`);
+        return cachedData;
+      }
     }
     try {
       const pipeline = [
@@ -1911,7 +1843,15 @@ function useAreaChecklistRepo() {
             set: {
               $cond: {
                 if: { $gt: [{ $size: { $ifNull: ["$checklist", []] } }, 0] },
-                then: { $max: "$checklist.set" },
+                then: {
+                  $max: {
+                    $map: {
+                      input: "$checklist",
+                      as: "item",
+                      in: { $toInt: "$$item.set" }
+                    }
+                  }
+                },
                 else: 0
               }
             }
@@ -1921,8 +1861,8 @@ function useAreaChecklistRepo() {
         { $skip: page * limit },
         { $limit: limit }
       ];
-      const items = await collection.aggregate(pipeline).toArray();
-      const length = await collection.countDocuments(query);
+      const items = await collection.aggregate(pipeline, { session }).toArray();
+      const length = await collection.countDocuments(query, { session });
       const data = paginate4(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
         logger13.info(`Cache set for key: ${cacheKey}`);
@@ -1938,31 +1878,27 @@ function useAreaChecklistRepo() {
     page = 1,
     limit = 10,
     search = "",
-    site,
     type,
     schedule,
     status,
-    createdAt,
-    user
+    createdAt
   }) {
     page = page > 0 ? page - 1 : 0;
-    const query = { type };
+    const query = {};
     const cacheOptions = {
       page,
       limit
     };
-    try {
-      query.site = new ObjectId8(site);
-      cacheOptions.site = site.toString();
-    } catch (error) {
-      throw new BadRequestError13("Invalid site ID format.");
-    }
     try {
       query.schedule = new ObjectId8(schedule);
       cacheOptions.schedule = schedule.toString();
     } catch (error) {
       throw new BadRequestError13("Invalid parent checklist ID format.");
     }
+    if (type) {
+      query.type = type;
+      cacheOptions.type = type;
+    }
     if (search) {
       query.$text = { $search: search };
       cacheOptions.search = search;
@@ -1980,14 +1916,6 @@ function useAreaChecklistRepo() {
     } else {
       query.status = { $in: ["ongoing", "completed"] };
     }
-    if (user) {
-      try {
-        query.acceptedBy = new ObjectId8(user);
-        cacheOptions.user = user.toString();
-      } catch (error) {
-        throw new BadRequestError13("Invalid user ID format.");
-      }
-    }
     const cacheKey = makeCacheKey4(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -1997,29 +1925,12 @@ function useAreaChecklistRepo() {
     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,
+            type: 1,
             createdAt: 1,
-            acceptedByName: "$acceptedBy.name",
+            completedAt: 1,
             status: {
               $switch: {
                 branches: [
@@ -2033,8 +1944,21 @@ function useAreaChecklistRepo() {
                 default: "$status"
               }
             },
-            startedAt: "$acceptedAt",
-            endedAt: "$completedAt"
+            set: {
+              $cond: {
+                if: { $gt: [{ $size: { $ifNull: ["$checklist", []] } }, 0] },
+                then: {
+                  $max: {
+                    $map: {
+                      input: "$checklist",
+                      as: "item",
+                      in: { $toInt: "$$item.set" }
+                    }
+                  }
+                },
+                else: 0
+              }
+            }
           }
         },
         { $sort: { status: 1 } },
@@ -2072,75 +1996,120 @@ function useAreaChecklistRepo() {
       const areaPipeline = [
         { $match: { _id } },
         {
-          $lookup: {
-            from: "users",
-            localField: "createdBy",
-            foreignField: "_id",
-            pipeline: [{ $project: { name: 1 } }],
-            as: "createdBy"
+          $project: {
+            name: 1,
+            createdAt: 1,
+            completedAt: 1,
+            status: {
+              $switch: {
+                branches: [
+                  { case: { $eq: ["$status", "ready"] }, then: "Ready" },
+                  { case: { $eq: ["$status", "ongoing"] }, then: "Ongoing" },
+                  {
+                    case: { $eq: ["$status", "completed"] },
+                    then: "Completed"
+                  }
+                ],
+                default: "$status"
+              }
+            }
+          }
+        }
+      ];
+      const unitPipeline = [
+        { $match: { _id } },
+        {
+          $unwind: {
+            path: "$checklist",
+            preserveNullAndEmptyArrays: false
           }
         },
         {
           $unwind: {
-            path: "$createdBy",
-            preserveNullAndEmptyArrays: true
+            path: "$checklist.units",
+            preserveNullAndEmptyArrays: false
           }
         },
         {
           $lookup: {
             from: "users",
-            localField: "acceptedBy",
-            foreignField: "_id",
-            pipeline: [{ $project: { name: 1 } }],
-            as: "acceptedBy"
+            let: { completedById: "$checklist.units.completedBy" },
+            pipeline: [
+              {
+                $match: {
+                  $expr: {
+                    $and: [
+                      { $ne: ["$$completedById", ""] },
+                      { $eq: ["$_id", "$$completedById"] }
+                    ]
+                  }
+                }
+              },
+              { $project: { name: 1 } }
+            ],
+            as: "completedBy"
           }
         },
         {
           $unwind: {
-            path: "$acceptedBy",
+            path: "$completedBy",
             preserveNullAndEmptyArrays: true
           }
         },
         {
           $project: {
-            name: 1,
-            createdAt: 1,
-            createdByName: "$createdBy.name",
-            startedAt: "$acceptedAt",
-            endedAt: "$completedAt",
+            _id: 0,
+            set: "$checklist.set",
+            unit: "$checklist.units.unit",
+            name: "$checklist.units.name",
+            remarks: "$checklist.units.remarks",
             status: {
               $switch: {
                 branches: [
-                  { case: { $eq: ["$status", "ready"] }, then: "Ready" },
-                  { case: { $eq: ["$status", "ongoing"] }, then: "Ongoing" },
                   {
-                    case: { $eq: ["$status", "completed"] },
+                    case: { $eq: ["$checklist.units.status", "ready"] },
+                    then: "Ready"
+                  },
+                  {
+                    case: { $eq: ["$checklist.units.status", "completed"] },
                     then: "Completed"
                   }
                 ],
-                default: "$status"
+                default: "$checklist.units.status"
               }
             },
-            signature: 1,
-            acceptedByName: "$acceptedBy.name"
+            completedByName: "$completedBy.name",
+            timestamp: "$checklist.units.timestamp"
           }
-        }
-      ];
-      const unitPipeline = [
-        { $match: { areaChecklist: _id } },
+        },
+        { $sort: { set: 1, name: 1 } },
+        {
+          $group: {
+            _id: "$set",
+            units: {
+              $push: {
+                unit: "$unit",
+                name: "$name",
+                status: "$status",
+                remarks: "$remarks",
+                completedByName: "$completedByName",
+                timestamp: "$timestamp"
+              }
+            }
+          }
+        },
         {
           $project: {
-            name: 1,
-            remarks: "$metadata.remarks",
-            attachments: "$metadata.attachments",
-            approve: { $ifNull: ["$approve", null] },
-            reject: { $ifNull: ["$reject", null] }
+            _id: 0,
+            set: "$_id",
+            units: 1
           }
-        }
+        },
+        { $sort: { set: 1 } }
       ];
       const [area, units] = await Promise.all([
         collection.aggregate(areaPipeline).toArray(),
-        unitChecklistCollection.aggregate(unitPipeline).toArray()
+        collection.aggregate(unitPipeline).toArray()
       ]);
       if (!area.length) {
         throw new BadRequestError13("Area checklist not found.");
@@ -2159,64 +2128,166 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
-  async function acceptAreaChecklist(_id, acceptedBy) {
+  async function getAreaChecklistUnits({
+    page = 1,
+    limit = 10,
+    search = "",
+    _id
+  }, session) {
+    page = page > 0 ? page - 1 : 0;
+    const query = {};
+    const cacheOptions = {
+      page,
+      limit
+    };
     try {
-      _id = new ObjectId8(_id);
+      query._id = new ObjectId8(_id);
+      cacheOptions._id = _id.toString();
     } catch (error) {
-      throw new BadRequestError13("Invalid area ID format.");
+      throw new BadRequestError13("Invalid area checklist ID format.");
     }
-    try {
-      acceptedBy = new ObjectId8(acceptedBy);
-    } catch (error) {
-      throw new BadRequestError13("Invalid acceptedBy ID format.");
+    if (search) {
+      query.$text = { $search: search };
+      cacheOptions.search = search;
+    }
+    const cacheKey = makeCacheKey4(namespace_collection, cacheOptions);
+    if (!session) {
+      const cachedData = await getCache(cacheKey);
+      if (cachedData) {
+        logger13.info(`Cache hit for key: ${cacheKey}`);
+        return cachedData;
+      }
     }
     try {
-      const now = /* @__PURE__ */ new Date();
-      const updateValue = {
-        metadata: {
-          acceptedBy,
-          acceptedAt: now
+      const pipeline = [
+        { $match: query },
+        {
+          $unwind: {
+            path: "$checklist",
+            preserveNullAndEmptyArrays: false
+          }
         },
-        updatedAt: now
-      };
-      const res = await collection.updateOne({ _id }, { $set: updateValue });
-      if (res.modifiedCount === 0) {
-        throw new InternalServerError4("Unable to update cleaning area.");
-      }
-      delNamespace().then(() => {
-        logger13.info(`Cache cleared for namespace: ${namespace_collection}`);
+        {
+          $unwind: {
+            path: "$checklist.units",
+            preserveNullAndEmptyArrays: false
+          }
+        },
+        {
+          $project: {
+            _id: 0,
+            set: "$checklist.set",
+            unit: "$checklist.units.unit",
+            name: "$checklist.units.name",
+            status: {
+              $switch: {
+                branches: [
+                  {
+                    case: { $eq: ["$checklist.units.status", "ready"] },
+                    then: "Ready"
+                  },
+                  {
+                    case: { $eq: ["$checklist.units.status", "completed"] },
+                    then: "Completed"
+                  }
+                ],
+                default: "$checklist.units.status"
+              }
+            },
+            remarks: "$checklist.units.remarks"
+          }
+        },
+        { $sort: { set: 1, name: 1 } },
+        {
+          $group: {
+            _id: "$set",
+            units: {
+              $push: {
+                unit: "$unit",
+                name: "$name",
+                status: "$status",
+                remarks: "$remarks"
+              }
+            }
+          }
+        },
+        {
+          $project: {
+            _id: 0,
+            set: "$_id",
+            units: 1
+          }
+        },
+        { $sort: { set: 1 } },
+        { $skip: page * limit },
+        { $limit: limit }
+      ];
+      const countPipeline = [
+        { $match: query },
+        {
+          $unwind: {
+            path: "$checklist",
+            preserveNullAndEmptyArrays: false
+          }
+        },
+        {
+          $group: {
+            _id: "$checklist.set"
+          }
+        },
+        { $count: "total" }
+      ];
+      const [items, countResult] = await Promise.all([
+        collection.aggregate(pipeline, { session }).toArray(),
+        collection.aggregate(countPipeline, { session }).toArray()
+      ]);
+      const length = countResult.length > 0 ? countResult[0].total : 0;
+      const data = paginate4(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger13.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger13.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
+        logger13.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
-      return res.modifiedCount;
+      return data;
     } catch (error) {
       throw error;
     }
   }
-  async function attachImageAreaChecklist(_id, attachments, session) {
+  async function completeAreaChecklistUnits(_id, set, unitId, value, session) {
     try {
       _id = new ObjectId8(_id);
     } catch (error) {
       throw new BadRequestError13("Invalid area checklist ID format.");
     }
+    try {
+      unitId = new ObjectId8(unitId);
+    } catch (error) {
+      throw new BadRequestError13("Invalid unit checklist ID format.");
+    }
     try {
       const now = /* @__PURE__ */ new Date();
       const updateValue = {
-        metadata: { attachments },
+        "checklist.$[checklist].units.$[unit].timestamp": now,
+        "checklist.$[checklist].units.$[unit].status": "completed",
         updatedAt: now
       };
+      if (value.remarks) {
+        updateValue["checklist.$[checklist].units.$[unit].remarks"] = value.remarks;
+      }
+      if (value.completedBy) {
+        updateValue["checklist.$[checklist].units.$[unit].completedBy"] = new ObjectId8(value.completedBy);
+      }
+      const arrayFilters = [
+        { "checklist.set": set, "checklist.units.unit": unitId },
+        { "unit.unit": unitId }
+      ];
       const res = await collection.updateOne(
-        { _id },
+        { _id, "checklist.set": set, "checklist.units.unit": unitId },
         { $set: updateValue },
-        { session }
+        { arrayFilters, session }
       );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError4(
-          "Unable to update cleaning area checklist."
-        );
+        throw new InternalServerError4("Unable to update area checklist unit.");
       }
       delNamespace().then(() => {
         logger13.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -2226,40 +2297,35 @@ function useAreaChecklistRepo() {
           err
         );
       });
-      delUnitNamespace().then(() => {
-        logger13.info(
-          `Cache cleared for namespace: ${unit_checklist_collection}`
-        );
-      }).catch((err) => {
-        logger13.error(
-          `Failed to clear cache for namespace: ${unit_checklist_collection}`,
-          err
-        );
-      });
       return res.modifiedCount;
     } catch (error) {
+      logger13.error("Error updating area checklist unit:", error.message);
       throw error;
     }
   }
-  async function submitAreaChecklist(_id, signature) {
+  async function updateAreaChecklistStatus(_id, status, session) {
     try {
       _id = new ObjectId8(_id);
     } catch (error) {
-      throw new BadRequestError13("Invalid area ID format.");
+      throw new BadRequestError13("Invalid area checklist ID format.");
     }
     try {
-      const now = /* @__PURE__ */ new Date();
       const updateValue = {
-        metadata: {
-          signature,
-          completedAt: now
-        },
-        status: "ongoing",
-        updatedAt: now
+        status,
+        updatedAt: /* @__PURE__ */ new Date()
       };
-      const res = await collection.updateOne({ _id }, { $set: updateValue });
+      if (status === "completed") {
+        updateValue.completedAt = /* @__PURE__ */ new Date();
+      }
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError4("Unable to update cleaning area.");
+        throw new InternalServerError4(
+          "Unable to update area checklist status."
+        );
       }
       delNamespace().then(() => {
         logger13.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -2274,35 +2340,21 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
-  async function completeAreaChecklist(_id, signature) {
+  async function getAreaChecklistById(_id, session) {
     try {
       _id = new ObjectId8(_id);
     } catch (error) {
-      throw new BadRequestError13("Invalid area ID format.");
+      throw new BadRequestError13("Invalid area checklist ID format.");
     }
     try {
-      const now = /* @__PURE__ */ new Date();
-      const updateValue = {
-        metadata: {
-          signature,
-          completedAt: now
-        },
-        status: "completed",
-        updatedAt: now
-      };
-      const res = await collection.updateOne({ _id }, { $set: updateValue });
-      if (res.modifiedCount === 0) {
-        throw new InternalServerError4("Unable to update cleaning area.");
+      const area = await collection.findOne(
+        { _id },
+        { projection: { schedule: 1, name: 1, type: 1, status: 1 }, session }
+      );
+      if (!area) {
+        throw new BadRequestError13("Area checklist not found.");
       }
-      delNamespace().then(() => {
-        logger13.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        logger13.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
-      });
-      return res.modifiedCount;
+      return area;
     } catch (error) {
       throw error;
     }
@@ -2314,24 +2366,27 @@ function useAreaChecklistRepo() {
     getAllAreaChecklist,
     getAreaChecklistHistory,
     getAreaChecklistHistoryDetails,
-    acceptAreaChecklist,
-    attachImageAreaChecklist,
-    submitAreaChecklist,
-    completeAreaChecklist
+    getAreaChecklistUnits,
+    getAreaChecklistById,
+    updateAreaChecklistStatus,
+    completeAreaChecklistUnits
   };
 }
 
-// src/controllers/hygiene-area-checklist.controller.ts
-import { BadRequestError as BadRequestError14, logger as logger15 } from "@iservice365/node-server-utils";
-import Joi8 from "joi";
-
 // src/services/hygiene-area-checklist.service.ts
-import { logger as logger14, useAtlas as useAtlas5 } from "@iservice365/node-server-utils";
 function useAreaChecklistService() {
-  const { createAreaChecklist: _createAreaChecklist } = useAreaChecklistRepo();
+  const {
+    createAreaChecklist: _createAreaChecklist,
+    getAllAreaChecklist,
+    getAreaChecklistUnits,
+    getAreaChecklistById,
+    completeAreaChecklistUnits: _completeAreaChecklistUnits,
+    updateAreaChecklistStatus
+  } = useAreaChecklistRepo();
   const { getAreasForChecklist } = useAreaRepo();
+  const { updateParentChecklistStatuses } = useParentChecklistRepo();
   async function createAreaChecklist(value) {
-    const session = useAtlas5.getClient()?.startSession();
+    const session = useAtlas6.getClient()?.startSession();
     try {
       session?.startTransaction();
       const results = [];
@@ -2350,14 +2405,13 @@ function useAreaChecklistService() {
               schedule: value.schedule,
               name: area.name,
               type: "common",
-              checklist: area.units && area.units.length > 0 ? [
-                {
-                  set: area.set || 0,
-                  units: area.units.map((unit) => ({
-                    name: unit.name
-                  }))
-                }
-              ] : []
+              checklist: area.units && area.units.length > 0 ? Array.from({ length: area.set || 1 }, (_, index) => ({
+                set: index + 1,
+                units: area.units.map((unit) => ({
+                  unit: unit.unit.toString(),
+                  name: unit.name
+                }))
+              })) : []
             };
             const insertedId = await _createAreaChecklist(
               checklistData,
@@ -2388,14 +2442,16 @@ function useAreaChecklistService() {
               schedule: value.schedule,
               name: toiletLocation.name,
               type: "toilet",
-              checklist: toiletLocation.units && toiletLocation.units.length > 0 ? [
-                {
-                  set: toiletLocation.set || 0,
+              checklist: toiletLocation.units && toiletLocation.units.length > 0 ? Array.from(
+                { length: toiletLocation.set || 1 },
+                (_, index) => ({
+                  set: index + 1,
                   units: toiletLocation.units.map((unit) => ({
+                    unit: unit.unit.toString(),
                     name: unit.name
                   }))
-                }
-              ] : []
+                })
+              ) : []
             };
             const insertedId = await _createAreaChecklist(
               checklistData,
@@ -2428,21 +2484,107 @@ function useAreaChecklistService() {
       session?.endSession();
     }
   }
-  return { createAreaChecklist };
+  async function completeAreaChecklistUnits(_id, set, unitId, value) {
+    const session = useAtlas6.getClient()?.startSession();
+    try {
+      session?.startTransaction();
+      await _completeAreaChecklistUnits(_id, set, unitId, value, session);
+      const allUnitsResult = await getAreaChecklistUnits(
+        {
+          page: 1,
+          limit: 1e3,
+          _id: _id.toString()
+        },
+        session
+      );
+      let areaStatus = "ready";
+      if (allUnitsResult && allUnitsResult.items && allUnitsResult.items.length > 0) {
+        const sets = allUnitsResult.items;
+        const allUnits = sets.flatMap((set2) => set2.units || []);
+        const readyCount = allUnits.filter(
+          (unit) => unit.status === "Ready"
+        ).length;
+        const completedCount = allUnits.filter(
+          (unit) => unit.status === "Completed"
+        ).length;
+        const totalCount = allUnits.length;
+        if (completedCount === totalCount) {
+          areaStatus = "completed";
+        } else if (readyCount === totalCount) {
+          areaStatus = "ready";
+        } else {
+          areaStatus = "ongoing";
+        }
+      }
+      await updateAreaChecklistStatus(_id, areaStatus, session);
+      const currentArea = await getAreaChecklistById(_id, session);
+      const scheduleId = currentArea.schedule;
+      if (scheduleId) {
+        const allAreasResult = await getAllAreaChecklist(
+          {
+            page: 1,
+            limit: 1e3,
+            schedule: scheduleId.toString()
+          },
+          session
+        );
+        if (allAreasResult && allAreasResult.items && allAreasResult.items.length > 0) {
+          const areas = allAreasResult.items;
+          const readyAreasCount = areas.filter(
+            (area) => area.status === "Ready"
+          ).length;
+          const completedAreasCount = areas.filter(
+            (area) => area.status === "Completed"
+          ).length;
+          const totalAreasCount = areas.length;
+          let parentStatus = "ready";
+          if (completedAreasCount === totalAreasCount) {
+            parentStatus = "completed";
+          } else if (readyAreasCount === totalAreasCount) {
+            parentStatus = "ready";
+          } else {
+            parentStatus = "ongoing";
+          }
+          await updateParentChecklistStatuses(
+            scheduleId,
+            parentStatus,
+            session
+          );
+        } else {
+          logger14.info(
+            "No area checklists found, keeping parent status as ready"
+          );
+        }
+      }
+      await session?.commitTransaction();
+      return;
+    } catch (error) {
+      logger14.error(`Error updating area checklist unit and statuses:`, error);
+      if (session?.inTransaction()) {
+        await session?.abortTransaction();
+      }
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
+  return { createAreaChecklist, completeAreaChecklistUnits };
 }
 
 // src/controllers/hygiene-area-checklist.controller.ts
+import { BadRequestError as BadRequestError14, logger as logger15 } from "@iservice365/node-server-utils";
+import Joi8 from "joi";
 function useAreaChecklistController() {
   const {
     getAllAreaChecklist: _getAllAreaChecklist,
     getAreaChecklistHistory: _getAreaChecklistHistory,
     getAreaChecklistHistoryDetails: _getAreaChecklistHistoryDetails,
-    acceptAreaChecklist: _acceptAreaChecklist,
-    attachImageAreaChecklist: _attachImageAreaChecklist,
-    submitAreaChecklist: _submitAreaChecklist,
-    completeAreaChecklist: _completeAreaChecklist
+    getAreaChecklistUnits: _getAreaChecklistUnits
   } = useAreaChecklistRepo();
-  const { createAreaChecklist: _createAreaChecklist } = useAreaChecklistService();
+  const {
+    createAreaChecklist: _createAreaChecklist,
+    completeAreaChecklistUnits: _completeAreaChecklistUnits
+  } = useAreaChecklistService();
   async function createAreaChecklist(req, res, next) {
     const payload = {
       site: req.params.site,
@@ -2505,22 +2647,15 @@ function useAreaChecklistController() {
     }
   }
   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 query = { ...req.query, ...req.params };
     const validation = Joi8.object({
       page: Joi8.number().min(1).optional().allow("", null),
       limit: Joi8.number().min(1).optional().allow("", null),
       search: Joi8.string().optional().allow("", null),
-      site: Joi8.string().hex().required(),
-      type: Joi8.string().valid(...allowedTypes).required(),
+      type: Joi8.string().optional().allow("", ...allowedTypes),
       schedule: Joi8.string().hex().required(),
       status: Joi8.string().allow("", null, ...allowedStatus),
-      createdAt: Joi8.alternatives().try(Joi8.date(), Joi8.string()).optional().allow("", null),
-      user: Joi8.string().hex().optional().allow("", null)
+      createdAt: Joi8.alternatives().try(Joi8.date(), Joi8.string()).optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -2531,7 +2666,6 @@ function useAreaChecklistController() {
     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.query.type ?? "";
     const schedule = req.params.schedule ?? "";
     const status = req.query.status ?? "";
@@ -2541,12 +2675,10 @@ function useAreaChecklistController() {
         page,
         limit,
         search,
-        site,
         type,
         schedule,
         status,
-        createdAt,
-        user
+        createdAt
       });
       res.json(data);
       return;
@@ -2575,70 +2707,32 @@ function useAreaChecklistController() {
       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 = Joi8.object({
-      id: Joi8.string().hex().required(),
-      acceptedBy: Joi8.string().hex().required()
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      logger15.log({ level: "error", message: error.message });
-      next(new BadRequestError14(error.message));
-      return;
-    }
-    try {
-      await _acceptAreaChecklist(payload.id, payload.acceptedBy);
-      res.json({ message: "Area checklist updated successfully." });
-      return;
-    } catch (error2) {
-      logger15.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 = Joi8.object({
-      id: Joi8.string().hex().required(),
-      attachments: Joi8.array().items(Joi8.string()).optional()
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      logger15.log({ level: "error", message: error.message });
-      next(new BadRequestError14(error.message));
-      return;
-    }
-    try {
-      await _attachImageAreaChecklist(payload.id, payload.attachments);
-      res.json({ message: "Area checklist attachments updated successfully." });
-      return;
-    } catch (error2) {
-      logger15.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 };
+  async function getAreaChecklistUnits(req, res, next) {
+    const query = { ...req.query, ...req.params };
     const validation = Joi8.object({
-      id: Joi8.string().hex().required(),
-      signature: Joi8.string().required()
+      page: Joi8.number().min(1).optional().allow("", null),
+      limit: Joi8.number().min(1).optional().allow("", null),
+      search: Joi8.string().optional().allow("", null),
+      id: Joi8.string().hex().required()
     });
-    const { error } = validation.validate(payload);
+    const { error } = validation.validate(query);
     if (error) {
       logger15.log({ level: "error", message: error.message });
       next(new BadRequestError14(error.message));
       return;
     }
+    const page = parseInt(req.query.page) ?? 1;
+    const limit = parseInt(req.query.limit) ?? 20;
+    const search = req.query.search ?? "";
+    const _id = req.params.id ?? "";
     try {
-      await _submitAreaChecklist(payload.id, payload.signature);
-      res.json({ message: "Area checklist submitted successfully." });
+      const data = await _getAreaChecklistUnits({
+        page,
+        limit,
+        search,
+        _id
+      });
+      res.json(data);
       return;
     } catch (error2) {
       logger15.log({ level: "error", message: error2.message });
@@ -2646,11 +2740,23 @@ function useAreaChecklistController() {
       return;
     }
   }
-  async function completeAreaChecklist(req, res, next) {
-    const payload = { id: req.params.id, signature: req.body.signature };
+  async function completeAreaChecklistUnits(req, res, next) {
+    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    ) : {};
+    const completedBy = cookies["user"] || "";
+    const payload = {
+      ...req.params,
+      ...req.body,
+      completedBy
+    };
     const validation = Joi8.object({
       id: Joi8.string().hex().required(),
-      signature: Joi8.string().required()
+      set: Joi8.number().integer().min(1).required(),
+      unit: Joi8.string().hex().required(),
+      remarks: Joi8.string().optional().allow("", null),
+      completedBy: Joi8.string().hex().required()
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -2659,8 +2765,14 @@ function useAreaChecklistController() {
       return;
     }
     try {
-      await _completeAreaChecklist(payload.id, payload.signature);
-      res.json({ message: "Area checklist completed successfully." });
+      const { id, set, unit, ...value } = payload;
+      await _completeAreaChecklistUnits(
+        id,
+        parseInt(set),
+        unit,
+        value
+      );
+      res.json({ message: "Area checklist updated successfully." });
       return;
     } catch (error2) {
       logger15.log({ level: "error", message: error2.message });
@@ -2673,30 +2785,25 @@ function useAreaChecklistController() {
     getAllAreaChecklist,
     getAreaChecklistHistory,
     getAreaChecklistHistoryDetails,
-    acceptAreaChecklist,
-    attachImageAreaChecklist,
-    submitAreaChecklist,
-    completeAreaChecklist
+    getAreaChecklistUnits,
+    completeAreaChecklistUnits
   };
 }
 
-// src/models/hygiene-unit-checklist.model.ts
+// src/models/hygiene-supply.model.ts
 import { BadRequestError as BadRequestError15, logger as logger16 } from "@iservice365/node-server-utils";
 import Joi9 from "joi";
 import { ObjectId as ObjectId9 } from "mongodb";
-var unitChecklistSchema = Joi9.object({
+var supplySchema = Joi9.object({
   site: Joi9.string().hex().required(),
-  type: Joi9.string().valid(...allowedTypes).required(),
-  parentChecklist: Joi9.string().hex().required(),
-  areaChecklist: Joi9.string().hex().required(),
-  unit: Joi9.string().hex().required(),
-  name: Joi9.string().optional().allow("", null),
-  createdBy: Joi9.string().hex().optional().allow("", null)
+  name: Joi9.string().required(),
+  unitOfMeasurement: Joi9.string().required(),
+  qty: Joi9.number().min(0).required()
 });
-function MUnitChecklist(value) {
-  const { error } = unitChecklistSchema.validate(value);
+function MSupply(value) {
+  const { error } = supplySchema.validate(value);
   if (error) {
-    logger16.info(`Hygiene Checklist Unit Model: ${error.message}`);
+    logger16.info(`Hygiene Supply Model: ${error.message}`);
     throw new BadRequestError15(error.message);
   }
   if (value.site) {
@@ -2706,84 +2813,43 @@ function MUnitChecklist(value) {
       throw new BadRequestError15("Invalid site ID format.");
     }
   }
-  if (value.parentChecklist) {
-    try {
-      value.parentChecklist = new ObjectId9(value.parentChecklist);
-    } catch (error2) {
-      throw new BadRequestError15("Invalid parent checklist ID format.");
-    }
-  }
-  if (value.areaChecklist) {
-    try {
-      value.areaChecklist = new ObjectId9(value.areaChecklist);
-    } catch (error2) {
-      throw new BadRequestError15("Invalid area checklist ID format.");
-    }
-  }
-  if (value.unit) {
-    try {
-      value.unit = new ObjectId9(value.unit);
-    } catch (error2) {
-      throw new BadRequestError15("Invalid unit ID format.");
-    }
-  }
-  if (value.createdBy) {
-    try {
-      value.createdBy = new ObjectId9(value.createdBy);
-    } catch (error2) {
-      throw new BadRequestError15("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 ?? "",
+    name: value.name,
+    unitOfMeasurement: value.unitOfMeasurement,
+    qty: value.qty,
     createdAt: /* @__PURE__ */ new Date(),
-    updatedAt: value.updatedAt ?? ""
+    status: "active",
+    updatedAt: "",
+    deletedAt: ""
   };
 }
 
-// src/repositories/hygiene-unit-checklist.repository.ts
+// src/repositories/hygiene-supply.repository.ts
+import { ObjectId as ObjectId10 } from "mongodb";
 import {
-  BadRequestError as BadRequestError16,
+  useAtlas as useAtlas7,
   InternalServerError as InternalServerError5,
-  logger as logger17,
-  makeCacheKey as makeCacheKey5,
   paginate as paginate5,
-  useAtlas as useAtlas6,
-  useCache as useCache5
+  BadRequestError as BadRequestError16,
+  useCache as useCache5,
+  logger as logger17,
+  makeCacheKey as makeCacheKey5
 } from "@iservice365/node-server-utils";
-import { ObjectId as ObjectId10 } from "mongodb";
-function useUnitChecklistRepo() {
-  const db = useAtlas6.getDb();
+function useSupplyRepository() {
+  const db = useAtlas7.getDb();
   if (!db) {
     throw new InternalServerError5("Unable to connect to server.");
   }
-  const namespace_collection = "hygiene-checklist.units";
+  const namespace_collection = "site.supplies";
   const collection = db.collection(namespace_collection);
   const { delNamespace, setCache, getCache } = useCache5(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 } }
-      ]);
+      await collection.createIndexes([{ key: { site: 1 } }]);
     } catch (error) {
       throw new InternalServerError5(
-        "Failed to create index on hygiene unit checklist."
+        "Failed to create index on hygiene supply."
       );
     }
   }
@@ -2792,13 +2858,25 @@ function useUnitChecklistRepo() {
       await collection.createIndex({ name: "text" });
     } catch (error) {
       throw new InternalServerError5(
-        "Failed to create text index on hygiene unit checklist."
+        "Failed to create text index on hygiene supply."
+      );
+    }
+  }
+  async function createUniqueIndex() {
+    try {
+      await collection.createIndex(
+        { site: 1, name: 1, deletedAt: 1 },
+        { unique: true }
+      );
+    } catch (error) {
+      throw new InternalServerError5(
+        "Failed to create unique index on hygiene supply."
       );
     }
   }
-  async function createUnitChecklist(value, session) {
+  async function createSupply(value, session) {
     try {
-      value = MUnitChecklist(value);
+      value = MSupply(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
         logger17.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -2810,42 +2888,34 @@ function useUnitChecklistRepo() {
       });
       return res.insertedId;
     } catch (error) {
+      const isDuplicated = error.message.includes("duplicate");
+      if (isDuplicated) {
+        throw new BadRequestError16("Supply already exists.");
+      }
       throw error;
     }
   }
-  async function getAllUnitChecklist({
+  async function getSupplies({
     page = 1,
     limit = 10,
     search = "",
-    site,
-    type,
-    parentChecklist,
-    areaChecklist
+    site
   }) {
     page = page > 0 ? page - 1 : 0;
-    const query = { type };
+    const query = {
+      status: { $ne: "deleted" }
+    };
     const cacheOptions = {
       page,
       limit
     };
     try {
-      query.site = new ObjectId10(site);
+      site = new ObjectId10(site);
+      query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
       throw new BadRequestError16("Invalid site ID format.");
     }
-    try {
-      query.parentChecklist = new ObjectId10(parentChecklist);
-      cacheOptions.parentChecklist = parentChecklist.toString();
-    } catch (error) {
-      throw new BadRequestError16("Invalid parent checklist ID format.");
-    }
-    try {
-      query.areaChecklist = new ObjectId10(areaChecklist);
-      cacheOptions.areaChecklist = areaChecklist.toString();
-    } catch (error) {
-      throw new BadRequestError16("Invalid area checklist ID format.");
-    }
     if (search) {
       query.$text = { $search: search };
       cacheOptions.search = search;
@@ -2857,120 +2927,20 @@ function useUnitChecklistRepo() {
       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 = [
+      const items = await collection.aggregate([
         { $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] }
+            qty: 1
           }
         },
         { $sort: { _id: -1 } },
         { $skip: page * limit },
         { $limit: limit }
-      ];
-      const items = await collection.aggregate(pipeline).toArray();
+      ]).toArray();
       const length = await collection.countDocuments(query);
-      const paginatedData = paginate5(items, page, limit, length);
-      const data = {
-        attachments: areaAttachments,
-        ...paginatedData
-      };
+      const data = paginate5(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
         logger17.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -2981,78 +2951,58 @@ function useUnitChecklistRepo() {
       throw error;
     }
   }
-  async function getUnitChecklistById(_id) {
+  async function updateSupply(_id, value, session) {
     try {
       _id = new ObjectId10(_id);
     } catch (error) {
-      throw new BadRequestError16("Invalid unit checklist ID format.");
+      throw new BadRequestError16("Invalid supply ID format.");
     }
     try {
-      return await collection.findOne({ _id });
+      const updateValue = { ...value, updatedAt: /* @__PURE__ */ new Date() };
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
+      if (res.modifiedCount === 0) {
+        throw new InternalServerError5("Unable to update cleaning supply.");
+      }
+      delNamespace().then(() => {
+        logger17.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger17.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 BadRequestError16("Area already exists.");
+      }
       throw error;
     }
   }
-  async function updateUnitChecklist(_id, value, session) {
+  async function deleteSupply(_id, session) {
     try {
       _id = new ObjectId10(_id);
     } catch (error) {
-      throw new BadRequestError16("Invalid unit checklist ID format.");
-    }
-    if (value.checkedBy && typeof value.checkedBy === "string") {
-      try {
-        value.checkedBy = new ObjectId10(value.checkedBy);
-      } catch (error) {
-        throw new BadRequestError16("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 ObjectId10(workOrder.category);
-        } catch (error) {
-          throw new BadRequestError16("Invalid category ID format.");
-        }
-      }
-      if (workOrder.createdBy && typeof workOrder.createdBy === "string") {
-        try {
-          workOrder.createdBy = new ObjectId10(workOrder.createdBy);
-        } catch (error) {
-          throw new BadRequestError16("Invalid createdBy ID format.");
-        }
-      }
-      if (workOrder.serviceProvider && typeof workOrder.serviceProvider === "string") {
-        try {
-          workOrder.serviceProvider = new ObjectId10(workOrder.serviceProvider);
-        } catch (error) {
-          throw new BadRequestError16("Invalid serviceProvider ID format.");
-        }
-      }
-      if (workOrder.organization && typeof workOrder.organization === "string") {
-        try {
-          workOrder.organization = new ObjectId10(workOrder.organization);
-        } catch (error) {
-          throw new BadRequestError16("Invalid organization ID format.");
-        }
-      }
-      if (workOrder.site && typeof workOrder.site === "string") {
-        try {
-          workOrder.site = new ObjectId10(workOrder.site);
-        } catch (error) {
-          throw new BadRequestError16("Invalid site ID format.");
-        }
-      }
+      throw new BadRequestError16("Invalid supply ID format.");
     }
     try {
-      const updateValue = { ...value, updatedAt: /* @__PURE__ */ new Date() };
+      const updateValue = {
+        status: "deleted",
+        updatedAt: /* @__PURE__ */ new Date(),
+        deletedAt: /* @__PURE__ */ new Date()
+      };
       const res = await collection.updateOne(
         { _id },
         { $set: updateValue },
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError5("Unable to update unit checklist.");
+        throw new InternalServerError5("Unable to delete supply.");
       }
       delNamespace().then(() => {
         logger17.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -3070,129 +3020,53 @@ function useUnitChecklistRepo() {
   return {
     createIndex,
     createTextIndex,
-    createUnitChecklist,
-    getAllUnitChecklist,
-    getUnitChecklistById,
-    updateUnitChecklist
+    createUniqueIndex,
+    createSupply,
+    getSupplies,
+    updateSupply,
+    deleteSupply
   };
 }
 
-// src/controllers/hygiene-unit-checklist.controller.ts
-import { BadRequestError as BadRequestError17, logger as logger19 } from "@iservice365/node-server-utils";
+// src/controllers/hygiene-supply.controller.ts
+import { BadRequestError as BadRequestError17, logger as logger18 } from "@iservice365/node-server-utils";
 import Joi10 from "joi";
-
-// src/services/hygiene-unit-checklist.service.ts
-import { logger as logger18, NotFoundError as NotFoundError4 } 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) {
-      logger18.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 NotFoundError4("Unit checklist not found.");
-        const site = await getSiteById(
-          existingChecklist.site
-        );
-        if (!site)
-          throw new NotFoundError4("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 NotFoundError4("Failed to create work order.");
-      }
-      const result = await _updateUnitChecklist(id, value);
-      return result;
-    } catch (error) {
-      logger18.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() {
+function useSupplyController() {
   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);
+    createSupply: _createSupply,
+    getSupplies: _getSupplies,
+    updateSupply: _updateSupply,
+    deleteSupply: _deleteSupply
+  } = useSupplyRepository();
+  async function createSupply(req, res, next) {
+    const payload = { ...req.body, ...req.params };
+    const { error } = supplySchema.validate(payload);
     if (error) {
-      logger19.log({ level: "error", message: error.message });
+      logger18.log({ level: "error", message: error.message });
       next(new BadRequestError17(error.message));
       return;
     }
     try {
-      const id = await _createUnitChecklist(payload);
-      res.status(201).json({ message: "Unit checklist created successfully.", id });
+      const id = await _createSupply(payload);
+      res.status(201).json({ message: "Supply created successfully.", id });
       return;
     } catch (error2) {
-      logger19.log({ level: "error", message: error2.message });
+      logger18.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
-  async function getAllUnitChecklist(req, res, next) {
+  async function getSupplies(req, res, next) {
     const query = { ...req.query, ...req.params };
     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),
-      site: Joi10.string().hex().required(),
-      type: Joi10.string().valid(...allowedTypes).required(),
-      parentChecklist: Joi10.string().hex().required(),
-      areaChecklist: Joi10.string().hex().required()
+      site: Joi10.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger19.log({ level: "error", message: error.message });
+      logger18.log({ level: "error", message: error.message });
       next(new BadRequestError17(error.message));
       return;
     }
@@ -3200,132 +3074,98 @@ function useUnitChecklistController() {
     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({
+      const data = await _getSupplies({
         page,
         limit,
         search,
-        site,
-        type,
-        parentChecklist,
-        areaChecklist
+        site
       });
       res.json(data);
       return;
     } catch (error2) {
-      logger19.log({ level: "error", message: error2.message });
+      logger18.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 };
+  async function updateSupply(req, res, next) {
+    const payload = { id: req.params.id, ...req.body };
     const validation = Joi10.object({
       id: Joi10.string().hex().required(),
-      checkedBy: Joi10.string().hex().required()
+      name: Joi10.string().optional().allow("", null),
+      unitOfMeasurement: Joi10.string().optional().allow("", null),
+      qty: Joi10.number().min(0).optional().allow("", null)
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger19.log({ level: "error", message: error.message });
+      logger18.log({ level: "error", message: error.message });
       next(new BadRequestError17(error.message));
       return;
     }
     try {
       const { id, ...value } = payload;
-      await _approveUnitChecklist(id, value);
-      res.json({ message: "Unit checklist approved successfully." });
+      await _updateSupply(id, value);
+      res.json({ message: "Supply updated successfully." });
       return;
     } catch (error2) {
-      logger19.log({ level: "error", message: error2.message });
+      logger18.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 };
+  async function deleteSupply(req, res, next) {
+    const id = req.params.id;
     const validation = Joi10.object({
-      id: Joi10.string().hex().required(),
-      attachments: Joi10.array().items(Joi10.string()).optional(),
-      remarks: Joi10.string().required(),
-      workOrder: workOrderSchema.optional(),
-      checkedBy: Joi10.string().hex().required()
+      id: Joi10.string().hex().required()
     });
-    const { error } = validation.validate(payload);
+    const { error } = validation.validate({ id });
     if (error) {
-      logger19.log({ level: "error", message: error.message });
+      logger18.log({ level: "error", message: error.message });
       next(new BadRequestError17(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." });
+      await _deleteSupply(id);
+      res.json({ message: "Supply deleted successfully." });
       return;
     } catch (error2) {
-      logger19.log({ level: "error", message: error2.message });
+      logger18.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   return {
-    createUnitChecklist,
-    getAllUnitChecklist,
-    approveUnitChecklist,
-    rejectUnitChecklist
+    createSupply,
+    getSupplies,
+    updateSupply,
+    deleteSupply
   };
 }
 export {
   MArea,
   MAreaChecklist,
   MParentChecklist,
+  MSupply,
   MUnit,
-  MUnitChecklist,
   allowedChecklistStatus,
+  allowedStatus,
+  allowedTypes,
   areaChecklistSchema,
   areaSchema,
   parentChecklistSchema,
-  unitChecklistSchema,
+  supplySchema,
   unitSchema,
   useAreaChecklistController,
   useAreaChecklistRepo,
+  useAreaChecklistService,
   useAreaController,
   useAreaRepo,
   useAreaService,
   useParentChecklistController,
   useParentChecklistRepo,
-  useUnitChecklistController,
-  useUnitChecklistRepo,
+  useSupplyController,
+  useSupplyRepository,
   useUnitController,
   useUnitRepository,
   useUnitService