@7365admin1/module-hygiene 4.2.0 → 4.4.0

package/dist/index.js

@@ -34,7 +34,6 @@ __export(src_exports, {
   MAreaChecklist: () => MAreaChecklist,
   MCheckOutItem: () => MCheckOutItem,
   MParentChecklist: () => MParentChecklist,
-  MRequestItem: () => MRequestItem,
   MScheduleTask: () => MScheduleTask,
   MStock: () => MStock,
   MSupply: () => MSupply,
@@ -42,14 +41,12 @@ __export(src_exports, {
   allowedCheckOutItemStatus: () => allowedCheckOutItemStatus,
   allowedChecklistStatus: () => allowedChecklistStatus,
   allowedPeriods: () => allowedPeriods,
-  allowedRequestItemStatus: () => allowedRequestItemStatus,
   allowedStatus: () => allowedStatus,
   allowedTypes: () => allowedTypes,
   areaChecklistSchema: () => areaChecklistSchema,
   areaSchema: () => areaSchema,
   checkOutItemSchema: () => checkOutItemSchema,
   parentChecklistSchema: () => parentChecklistSchema,
-  requestItemSchema: () => requestItemSchema,
   scheduleTaskSchema: () => scheduleTaskSchema,
   stockSchema: () => stockSchema,
   supplySchema: () => supplySchema,
@@ -67,9 +64,6 @@ __export(src_exports, {
   useHygieneDashboardRepository: () => useHygieneDashboardRepository,
   useParentChecklistController: () => useParentChecklistController,
   useParentChecklistRepo: () => useParentChecklistRepo,
-  useRequestItemController: () => useRequestItemController,
-  useRequestItemRepository: () => useRequestItemRepository,
-  useRequestItemService: () => useRequestItemService,
   useScheduleTaskController: () => useScheduleTaskController,
   useScheduleTaskRepository: () => useScheduleTaskRepository,
   useScheduleTaskService: () => useScheduleTaskService,
@@ -1128,6 +1122,11 @@ function useAreaService() {
           skippedRows.push(i + 1);
           continue;
         }
+        if (areaName.startsWith("Sample:")) {
+          import_node_server_utils5.logger.warn(`Skipping row ${i + 1} with sample area: ${areaName}`);
+          skippedRows.push(i + 1);
+          continue;
+        }
         try {
           const insertedId = await _createArea({
             type: areaType,
@@ -1659,6 +1658,11 @@ function useUnitService() {
           skippedRows.push(i + 1);
           continue;
         }
+        if (unitName.startsWith("Sample:")) {
+          import_node_server_utils9.logger.warn(`Skipping row ${i + 1} with sample unit: ${unitName}`);
+          skippedRows.push(i + 1);
+          continue;
+        }
         try {
           const insertedId = await _createUnit({
             name: unitName,
@@ -4246,27 +4250,24 @@ function useStockController() {
   };
 }
 
-// src/models/hygiene-request-item.model.ts
+// src/models/hygiene-checkout-item.model.ts
 var import_joi14 = __toESM(require("joi"));
 var import_mongodb14 = require("mongodb");
 var import_node_server_utils25 = require("@7365admin1/node-server-utils");
-var allowedRequestItemStatus = [
-  "pending",
-  "approved",
-  "disapproved"
-];
-var requestItemSchema = import_joi14.default.object({
+var allowedCheckOutItemStatus = ["pending", "completed"];
+var checkOutItemSchema = import_joi14.default.object({
   site: import_joi14.default.string().hex().required(),
   supply: import_joi14.default.string().hex().required(),
   supplyName: import_joi14.default.string().required(),
   qty: import_joi14.default.number().min(0).required(),
+  attachment: import_joi14.default.array().items(import_joi14.default.string()).optional().allow(null),
   createdBy: import_joi14.default.string().hex().required(),
   createdByName: import_joi14.default.string().required()
 });
-function MRequestItem(value) {
-  const { error } = requestItemSchema.validate(value);
+function MCheckOutItem(value) {
+  const { error } = checkOutItemSchema.validate(value);
   if (error) {
-    import_node_server_utils25.logger.info(`Hygiene Request Item Model: ${error.message}`);
+    import_node_server_utils25.logger.info(`Hygiene Check Out Item Model: ${error.message}`);
     throw new import_node_server_utils25.BadRequestError(error.message);
   }
   if (value.site) {
@@ -4288,7 +4289,7 @@ function MRequestItem(value) {
     supply: value.supply,
     supplyName: value.supplyName,
     qty: value.qty,
-    remarks: "",
+    attachment: value.attachment || [],
     createdBy: value.createdBy,
     createdByName: value.createdByName,
     status: "pending",
@@ -4298,15 +4299,15 @@ function MRequestItem(value) {
   };
 }
 
-// src/repositories/hygiene-request-item.repository.ts
+// src/repositories/hygiene-checkout-item.repository.ts
 var import_mongodb15 = require("mongodb");
 var import_node_server_utils26 = require("@7365admin1/node-server-utils");
-function useRequestItemRepository() {
+function useCheckOutItemRepository() {
   const db = import_node_server_utils26.useAtlas.getDb();
   if (!db) {
     throw new import_node_server_utils26.InternalServerError("Unable to connect to server.");
   }
-  const namespace_collection = "site.supply.requests";
+  const namespace_collection = "site.supply.checkouts";
   const collection = db.collection(namespace_collection);
   const { delNamespace, setCache, getCache } = (0, import_node_server_utils26.useCache)(namespace_collection);
   async function createIndex() {
@@ -4318,7 +4319,7 @@ function useRequestItemRepository() {
       ]);
     } catch (error) {
       throw new import_node_server_utils26.InternalServerError(
-        "Failed to create index on hygiene request item."
+        "Failed to create index on hygiene check out item."
       );
     }
   }
@@ -4331,9 +4332,9 @@ function useRequestItemRepository() {
       );
     }
   }
-  async function createRequestItem(value, session) {
+  async function createCheckOutItem(value, session) {
     try {
-      value = MRequestItem(value);
+      value = MCheckOutItem(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
         import_node_server_utils26.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -4348,7 +4349,7 @@ function useRequestItemRepository() {
       throw error;
     }
   }
-  async function getRequestItems({
+  async function getCheckOutItems({
     page = 1,
     limit = 10,
     search = "",
@@ -4382,9 +4383,38 @@ function useRequestItemRepository() {
     try {
       const items = await collection.aggregate([
         { $match: query },
+        {
+          $lookup: {
+            from: "site.supplies",
+            let: { supplyId: "$supply" },
+            pipeline: [
+              {
+                $match: {
+                  $expr: {
+                    $and: [
+                      { $ne: ["$$supplyId", ""] },
+                      { $eq: ["$_id", "$$supplyId"] }
+                    ]
+                  }
+                }
+              },
+              { $project: { qty: 1 } }
+            ],
+            as: "supplyDoc"
+          }
+        },
+        {
+          $unwind: {
+            path: "$supplyDoc",
+            preserveNullAndEmptyArrays: true
+          }
+        },
         {
           $project: {
             supplyName: 1,
+            supplyQty: "$supplyDoc.qty",
+            checkOutByName: "$createdByName",
+            checkOutQty: "$qty",
             createdAt: 1,
             status: 1
           }
@@ -4405,11 +4435,11 @@ function useRequestItemRepository() {
       throw error;
     }
   }
-  async function getRequestItemById(_id, session) {
+  async function getCheckOutItemById(_id, session) {
     try {
       _id = new import_mongodb15.ObjectId(_id);
     } catch (error) {
-      throw new import_node_server_utils26.BadRequestError("Invalid request item ID format.");
+      throw new import_node_server_utils26.BadRequestError("Invalid check out item ID format.");
     }
     const query = { _id };
     const cacheKey = (0, import_node_server_utils26.makeCacheKey)(namespace_collection, {
@@ -4425,35 +4455,39 @@ function useRequestItemRepository() {
       import_node_server_utils26.logger.info(`Skipping cache during transaction for key: ${cacheKey}`);
     }
     try {
-      const data = await collection.aggregate([
-        { $match: query },
-        {
-          $lookup: {
-            from: "site.supply.items",
-            localField: "supply",
-            foreignField: "_id",
-            as: "supplyDetails"
-          }
-        },
-        {
-          $unwind: {
-            path: "$supplyDetails",
-            preserveNullAndEmptyArrays: true
-          }
-        },
-        {
-          $project: {
-            site: 1,
-            supply: 1,
-            supplyName: 1,
-            qty: 1,
-            status: 1,
-            unitOfMeasurement: "$supplyDetails.unitOfMeasurement"
+      const data = await collection.aggregate(
+        [
+          { $match: query },
+          {
+            $lookup: {
+              from: "site.supply.items",
+              localField: "supply",
+              foreignField: "_id",
+              as: "supplyDetails"
+            }
+          },
+          {
+            $unwind: {
+              path: "$supplyDetails",
+              preserveNullAndEmptyArrays: true
+            }
+          },
+          {
+            $project: {
+              site: 1,
+              supply: 1,
+              supplyName: 1,
+              qty: 1,
+              status: 1,
+              unitOfMeasurement: "$supplyDetails.unitOfMeasurement",
+              attachment: 1
+            }
           }
-        }
-      ]).toArray();
+        ],
+        session ? { session } : void 0
+      ).toArray();
       if (!data || data.length === 0) {
-        throw new import_node_server_utils26.NotFoundError("Request item not found.");
+        throw new import_node_server_utils26.NotFoundError("Check out item not found.");
       }
       setCache(cacheKey, data[0], 15 * 60).then(() => {
         import_node_server_utils26.logger.info(`Cache set for key: ${cacheKey}`);
@@ -4465,49 +4499,15 @@ function useRequestItemRepository() {
       throw error;
     }
   }
-  async function approveRequestItem(_id, remarks, session) {
-    try {
-      _id = new import_mongodb15.ObjectId(_id);
-    } catch (error) {
-      throw new import_node_server_utils26.BadRequestError("Invalid request item ID format.");
-    }
-    try {
-      const updateValue = {
-        status: "approved",
-        remarks: remarks || "",
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-      };
-      const res = await collection.updateOne(
-        { _id },
-        { $set: updateValue },
-        { session }
-      );
-      if (res.modifiedCount === 0) {
-        throw new import_node_server_utils26.InternalServerError("Unable to approve request item.");
-      }
-      delNamespace().then(() => {
-        import_node_server_utils26.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        import_node_server_utils26.logger.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
-      });
-      return res.modifiedCount;
-    } catch (error) {
-      throw error;
-    }
-  }
-  async function disapproveRequestItem(_id, remarks, session) {
+  async function completeCheckOutItem(_id, session) {
     try {
       _id = new import_mongodb15.ObjectId(_id);
     } catch (error) {
-      throw new import_node_server_utils26.BadRequestError("Invalid request item ID format.");
+      throw new import_node_server_utils26.BadRequestError("Invalid check out item ID format.");
     }
     try {
       const updateValue = {
-        status: "disapproved",
-        remarks: remarks || "",
+        status: "completed",
         updatedAt: (/* @__PURE__ */ new Date()).toISOString()
       };
       const res = await collection.updateOne(
@@ -4516,7 +4516,7 @@ function useRequestItemRepository() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new import_node_server_utils26.InternalServerError("Unable to disapprove request item.");
+        throw new import_node_server_utils26.InternalServerError("Unable to complete check out item.");
       }
       delNamespace().then(() => {
         import_node_server_utils26.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -4534,93 +4534,56 @@ function useRequestItemRepository() {
   return {
     createIndex,
     createTextIndex,
-    createRequestItem,
-    getRequestItems,
-    getRequestItemById,
-    approveRequestItem,
-    disapproveRequestItem
+    createCheckOutItem,
+    getCheckOutItems,
+    getCheckOutItemById,
+    completeCheckOutItem
   };
 }
 
-// src/services/hygiene-request-item.service.ts
+// src/services/hygiene-checkout-item.service.ts
 var import_core = require("@7365admin1/core");
 var import_node_server_utils27 = require("@7365admin1/node-server-utils");
-function useRequestItemService() {
+function useCheckOutItemService() {
   const {
-    createRequestItem: _createRequestItem,
-    getRequestItemById: _getRequestItemById,
-    approveRequestItem: _approveRequestItem,
-    disapproveRequestItem: _disapproveRequestItem
-  } = useRequestItemRepository();
+    createCheckOutItem: _createCheckOutItem,
+    getCheckOutItemById: _getCheckOutItemById,
+    completeCheckOutItem
+  } = useCheckOutItemRepository();
   const { getSupplyById } = useSupplyRepository();
   const { getUserById } = (0, import_core.useUserRepo)();
   const { createStock } = useStockService();
-  async function createRequestItem(value) {
-    try {
-      const { supply, createdBy } = value;
-      const supplyData = await getSupplyById(supply);
-      const createdByData = await getUserById(createdBy);
-      const createdRequestItem = await _createRequestItem({
-        ...value,
-        supplyName: supplyData?.name || "",
-        createdByName: createdByData?.name || ""
-      });
-      return createdRequestItem;
-    } catch (error) {
-      throw error;
-    }
-  }
-  async function createRequestItemByBatch(value) {
-    const session = import_node_server_utils27.useAtlas.getClient()?.startSession();
-    try {
-      session?.startTransaction();
-      const { site, createdBy, items } = value;
-      const createdByData = await getUserById(createdBy);
-      const createdRequestItemIds = [];
-      for (const item of items) {
-        const supplyData = await getSupplyById(item.supply, session);
-        const createdId = await _createRequestItem(
-          {
-            site,
-            supply: item.supply,
-            qty: item.qty,
-            supplyName: supplyData?.name || "",
-            createdBy,
-            createdByName: createdByData?.name || ""
-          },
-          session
-        );
-        createdRequestItemIds.push(createdId);
-      }
-      await session?.commitTransaction();
-      return createdRequestItemIds;
-    } catch (error) {
-      await session?.abortTransaction();
-      throw error;
-    } finally {
-      await session?.endSession();
-    }
-  }
-  async function approveRequestItem(id, remarks) {
+  async function createCheckOutItem(value) {
     const session = import_node_server_utils27.useAtlas.getClient()?.startSession();
     try {
       session?.startTransaction();
-      await _approveRequestItem(id, remarks, session);
-      const requestItem = await _getRequestItemById(id, session);
-      if (requestItem.status !== "pending") {
-        throw new import_node_server_utils27.BadRequestError(
-          "Only 'pending' request items can be approved."
-        );
+      const supplyData = await getSupplyById(value.supply);
+      const createdByData = await getUserById(value.createdBy);
+      const checkOutItemId = await _createCheckOutItem(
+        {
+          ...value,
+          supplyName: supplyData?.name || "",
+          createdByName: createdByData?.name || ""
+        },
+        session
+      );
+      const checkOutItem = await _getCheckOutItemById(
+        checkOutItemId.toString(),
+        session
+      );
+      if (!checkOutItem) {
+        throw new import_node_server_utils27.BadRequestError("Failed to create check out item.");
       }
       const createdStocks = await createStock(
         {
-          site: requestItem.site.toString(),
-          supply: requestItem.supply.toString(),
-          qty: requestItem.qty,
-          remarks
+          site: checkOutItem.site.toString(),
+          supply: checkOutItem.supply.toString(),
+          qty: checkOutItem.qty
         },
-        true
+        true,
+        session
       );
+      await completeCheckOutItem(checkOutItemId.toString(), session);
       await session?.commitTransaction();
       return createdStocks;
     } catch (error) {
@@ -4630,19 +4593,40 @@ function useRequestItemService() {
       await session?.endSession();
     }
   }
-  async function disapproveRequestItem(id, remarks) {
+  async function createCheckOutItemByBatch(value) {
     const session = import_node_server_utils27.useAtlas.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const result = await _disapproveRequestItem(id, remarks, session);
-      const requestItem = await _getRequestItemById(id, session);
-      if (requestItem.status !== "pending") {
-        throw new import_node_server_utils27.BadRequestError(
-          "Only 'pending' request items can be disapproved."
+      const { site, attachment, createdBy, items } = value;
+      const createdByData = await getUserById(createdBy);
+      const createdCheckOutItemIds = [];
+      for (const item of items) {
+        const supplyData = await getSupplyById(item.supply, session);
+        const createdId = await _createCheckOutItem(
+          {
+            site,
+            supply: item.supply,
+            supplyName: supplyData?.name || "",
+            qty: item.qty,
+            attachment,
+            createdBy,
+            createdByName: createdByData?.name || ""
+          },
+          session
+        );
+        await createStock(
+          {
+            site,
+            supply: item.supply,
+            qty: item.qty
+          },
+          true,
+          session
         );
+        createdCheckOutItemIds.push(createdId);
       }
       await session?.commitTransaction();
-      return result;
+      return createdCheckOutItemIds;
     } catch (error) {
       await session?.abortTransaction();
       throw error;
@@ -4651,28 +4635,24 @@ function useRequestItemService() {
     }
   }
   return {
-    createRequestItem,
-    createRequestItemByBatch,
-    approveRequestItem,
-    disapproveRequestItem
+    createCheckOutItem,
+    createCheckOutItemByBatch
   };
 }
 
-// src/controllers/hygiene-request-item.controller.ts
+// src/controllers/hygiene-checkout-item.controller.ts
 var import_joi15 = __toESM(require("joi"));
 var import_node_server_utils28 = require("@7365admin1/node-server-utils");
-function useRequestItemController() {
+function useCheckOutItemController() {
   const {
-    getRequestItems: _getRequestItems,
-    getRequestItemById: _getRequestItemById
-  } = useRequestItemRepository();
+    getCheckOutItems: _getCheckOutItems,
+    getCheckOutItemById: _getCheckOutItemById
+  } = useCheckOutItemRepository();
   const {
-    createRequestItem: _createRequestItem,
-    createRequestItemByBatch: _createRequestItemByBatch,
-    approveRequestItem: _approveRequestItem,
-    disapproveRequestItem: _disapproveRequestItem
-  } = useRequestItemService();
-  async function createRequestItem(req, res, next) {
+    createCheckOutItem: _createCheckOutItem,
+    createCheckOutItemByBatch: _createCheckOutItemByBatch
+  } = useCheckOutItemService();
+  async function createCheckOutItem(req, res, next) {
     const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
       (acc, [key, value]) => ({ ...acc, [key]: value }),
       {}
@@ -4687,6 +4667,7 @@ function useRequestItemController() {
       site: import_joi15.default.string().hex().required(),
       supply: import_joi15.default.string().hex().required(),
       qty: import_joi15.default.number().min(0).required(),
+      attachment: import_joi15.default.array().items(import_joi15.default.string()).optional().allow(null),
       createdBy: import_joi15.default.string().hex().required()
     });
     const { error } = validation.validate(payload);
@@ -4696,8 +4677,8 @@ function useRequestItemController() {
       return;
     }
     try {
-      const id = await _createRequestItem(payload);
-      res.status(201).json({ message: "Request item created successfully.", id });
+      const id = await _createCheckOutItem(payload);
+      res.status(201).json({ message: "Check out item created successfully.", id });
       return;
     } catch (error2) {
       import_node_server_utils28.logger.log({ level: "error", message: error2.message });
@@ -4705,7 +4686,7 @@ function useRequestItemController() {
       return;
     }
   }
-  async function createRequestItemByBatch(req, res, next) {
+  async function createCheckOutItemByBatch(req, res, next) {
     const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
       (acc, [key, value]) => ({ ...acc, [key]: value }),
       {}
@@ -4718,6 +4699,7 @@ function useRequestItemController() {
     };
     const validation = import_joi15.default.object({
       site: import_joi15.default.string().hex().required(),
+      attachment: import_joi15.default.array().items(import_joi15.default.string()).optional().allow(null),
       createdBy: import_joi15.default.string().hex().required(),
       items: import_joi15.default.array().items(
         import_joi15.default.object({
@@ -4733,8 +4715,8 @@ function useRequestItemController() {
       return;
     }
     try {
-      await _createRequestItemByBatch(payload);
-      res.status(201).json({ message: "Request items created successfully." });
+      await _createCheckOutItemByBatch(payload);
+      res.status(201).json({ message: "Check out items created successfully." });
       return;
     } catch (error2) {
       import_node_server_utils28.logger.log({ level: "error", message: error2.message });
@@ -4742,7 +4724,7 @@ function useRequestItemController() {
       return;
     }
   }
-  async function getRequestItems(req, res, next) {
+  async function getCheckOutItems(req, res, next) {
     const query = { ...req.query, ...req.params };
     const validation = import_joi15.default.object({
       page: import_joi15.default.number().min(1).optional().allow("", null),
@@ -4761,7 +4743,7 @@ function useRequestItemController() {
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
     try {
-      const data = await _getRequestItems({
+      const data = await _getCheckOutItems({
         page,
         limit,
         search,
@@ -4775,7 +4757,7 @@ function useRequestItemController() {
       return;
     }
   }
-  async function getRequestItemById(req, res, next) {
+  async function getCheckOutItemById(req, res, next) {
     const validation = import_joi15.default.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
@@ -4785,7 +4767,7 @@ function useRequestItemController() {
       return;
     }
     try {
-      const data = await _getRequestItemById(value);
+      const data = await _getCheckOutItemById(value);
       res.json(data);
       return;
     } catch (error2) {
@@ -4794,608 +4776,44 @@ function useRequestItemController() {
       return;
     }
   }
-  async function approveRequestItem(req, res, next) {
-    const payload = { ...req.params, ...req.body };
-    const validation = import_joi15.default.object({
-      id: import_joi15.default.string().hex().required(),
-      remarks: import_joi15.default.string().optional().allow("", null)
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      import_node_server_utils28.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils28.BadRequestError(error.message));
-      return;
-    }
-    try {
-      await _approveRequestItem(payload.id, payload.remarks);
-      res.json({ message: "Request item approved successfully." });
-      return;
-    } catch (error2) {
-      import_node_server_utils28.logger.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function disapproveRequestItem(req, res, next) {
-    const payload = { ...req.params, ...req.body };
-    const validation = import_joi15.default.object({
-      id: import_joi15.default.string().hex().required(),
-      remarks: import_joi15.default.string().optional().allow("", null)
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      import_node_server_utils28.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils28.BadRequestError(error.message));
-      return;
-    }
-    try {
-      await _disapproveRequestItem(payload.id, payload.remarks);
-      res.json({ message: "Request item disapproved successfully." });
-      return;
-    } catch (error2) {
-      import_node_server_utils28.logger.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
   return {
-    createRequestItem,
-    createRequestItemByBatch,
-    getRequestItems,
-    getRequestItemById,
-    approveRequestItem,
-    disapproveRequestItem
+    createCheckOutItem,
+    createCheckOutItemByBatch,
+    getCheckOutItems,
+    getCheckOutItemById
   };
 }
 
-// src/models/hygiene-checkout-item.model.ts
+// src/models/hygiene-schedule-task.model.ts
+var import_node_server_utils29 = require("@7365admin1/node-server-utils");
 var import_joi16 = __toESM(require("joi"));
 var import_mongodb16 = require("mongodb");
-var import_node_server_utils29 = require("@7365admin1/node-server-utils");
-var allowedCheckOutItemStatus = ["pending", "completed"];
-var checkOutItemSchema = import_joi16.default.object({
+var scheduleTaskSchema = import_joi16.default.object({
   site: import_joi16.default.string().hex().required(),
-  supply: import_joi16.default.string().hex().required(),
-  supplyName: import_joi16.default.string().required(),
-  qty: import_joi16.default.number().min(0).required(),
-  attachment: import_joi16.default.string().optional().allow("", null),
-  createdBy: import_joi16.default.string().hex().required(),
-  createdByName: import_joi16.default.string().required()
-});
-function MCheckOutItem(value) {
-  const { error } = checkOutItemSchema.validate(value);
-  if (error) {
-    import_node_server_utils29.logger.info(`Hygiene Check Out Item Model: ${error.message}`);
-    throw new import_node_server_utils29.BadRequestError(error.message);
-  }
-  if (value.site) {
-    try {
-      value.site = new import_mongodb16.ObjectId(value.site);
-    } catch (error2) {
-      throw new import_node_server_utils29.BadRequestError("Invalid site ID format.");
-    }
-  }
-  if (value.supply) {
-    try {
-      value.supply = new import_mongodb16.ObjectId(value.supply);
-    } catch (error2) {
-      throw new import_node_server_utils29.BadRequestError("Invalid supply ID format.");
-    }
-  }
-  return {
-    site: value.site,
-    supply: value.supply,
-    supplyName: value.supplyName,
-    qty: value.qty,
-    attachment: "",
-    createdBy: value.createdBy,
-    createdByName: value.createdByName,
-    status: "pending",
-    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-    updatedAt: "",
-    deletedAt: ""
-  };
-}
-
-// src/repositories/hygiene-checkout-item.repository.ts
-var import_mongodb17 = require("mongodb");
-var import_node_server_utils30 = require("@7365admin1/node-server-utils");
-function useCheckOutItemRepository() {
-  const db = import_node_server_utils30.useAtlas.getDb();
-  if (!db) {
-    throw new import_node_server_utils30.InternalServerError("Unable to connect to server.");
-  }
-  const namespace_collection = "site.supply.checkouts";
-  const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache } = (0, import_node_server_utils30.useCache)(namespace_collection);
-  async function createIndex() {
-    try {
-      await collection.createIndexes([
-        { key: { site: 1 } },
-        { key: { supply: 1 } },
-        { key: { status: 1 } }
-      ]);
-    } catch (error) {
-      throw new import_node_server_utils30.InternalServerError(
-        "Failed to create index on hygiene check out item."
-      );
-    }
-  }
-  async function createTextIndex() {
-    try {
-      await collection.createIndex({ supplyName: "text" });
-    } catch (error) {
-      throw new import_node_server_utils30.InternalServerError(
-        "Failed to create text index on hygiene supply."
-      );
-    }
-  }
-  async function createCheckOutItem(value, session) {
-    try {
-      value = MCheckOutItem(value);
-      const res = await collection.insertOne(value, { session });
-      delNamespace().then(() => {
-        import_node_server_utils30.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        import_node_server_utils30.logger.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
-      });
-      return res.insertedId;
-    } catch (error) {
-      throw error;
-    }
-  }
-  async function getCheckOutItems({
-    page = 1,
-    limit = 10,
-    search = "",
-    site
-  }) {
-    page = page > 0 ? page - 1 : 0;
-    const query = {
-      status: { $ne: "deleted" }
-    };
-    const cacheOptions = {
-      page,
-      limit
-    };
-    try {
-      site = new import_mongodb17.ObjectId(site);
-      query.site = site;
-      cacheOptions.site = site.toString();
-    } catch (error) {
-      throw new import_node_server_utils30.BadRequestError("Invalid site ID format.");
-    }
-    if (search) {
-      query.$text = { $search: search };
-      cacheOptions.search = search;
-    }
-    const cacheKey = (0, import_node_server_utils30.makeCacheKey)(namespace_collection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils30.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
-    try {
-      const items = await collection.aggregate([
-        { $match: query },
-        {
-          $lookup: {
-            from: "site.supplies",
-            let: { supplyId: "$supply" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: {
-                    $and: [
-                      { $ne: ["$$supplyId", ""] },
-                      { $eq: ["$_id", "$$supplyId"] }
-                    ]
-                  }
-                }
-              },
-              { $project: { qty: 1 } }
-            ],
-            as: "supplyDoc"
-          }
-        },
-        {
-          $unwind: {
-            path: "$supplyDoc",
-            preserveNullAndEmptyArrays: true
-          }
-        },
-        {
-          $lookup: {
-            from: "users",
-            let: { createdById: "$createdBy" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: {
-                    $and: [
-                      { $ne: ["$$createdById", ""] },
-                      { $eq: ["$_id", "$$createdById"] }
-                    ]
-                  }
-                }
-              },
-              { $project: { name: 1 } }
-            ],
-            as: "createdByDoc"
-          }
-        },
-        {
-          $unwind: {
-            path: "$createdByDoc",
-            preserveNullAndEmptyArrays: true
-          }
-        },
-        {
-          $project: {
-            supplyName: 1,
-            supplyQty: "$supplyDoc.qty",
-            checkOutByName: "$createdByDoc.name",
-            checkOutQty: "$qty",
-            createdAt: 1,
-            status: 1
-          }
-        },
-        { $sort: { _id: -1 } },
-        { $skip: page * limit },
-        { $limit: limit }
-      ]).toArray();
-      const length = await collection.countDocuments(query);
-      const data = (0, import_node_server_utils30.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils30.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        import_node_server_utils30.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
-      return data;
-    } catch (error) {
-      throw error;
-    }
-  }
-  async function getCheckOutItemById(_id, session) {
-    try {
-      _id = new import_mongodb17.ObjectId(_id);
-    } catch (error) {
-      throw new import_node_server_utils30.BadRequestError("Invalid check out item ID format.");
-    }
-    const query = { _id };
-    const cacheKey = (0, import_node_server_utils30.makeCacheKey)(namespace_collection, {
-      _id: _id.toString()
-    });
-    if (!session) {
-      const cachedData = await getCache(cacheKey);
-      if (cachedData) {
-        import_node_server_utils30.logger.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
-      }
-    } else {
-      import_node_server_utils30.logger.info(`Skipping cache during transaction for key: ${cacheKey}`);
-    }
-    try {
-      const data = await collection.aggregate([
-        { $match: query },
-        {
-          $lookup: {
-            from: "site.supply.items",
-            localField: "supply",
-            foreignField: "_id",
-            as: "supplyDetails"
-          }
-        },
-        {
-          $unwind: {
-            path: "$supplyDetails",
-            preserveNullAndEmptyArrays: true
-          }
-        },
-        {
-          $project: {
-            site: 1,
-            supply: 1,
-            supplyName: 1,
-            qty: 1,
-            status: 1,
-            unitOfMeasurement: "$supplyDetails.unitOfMeasurement"
-          }
-        }
-      ]).toArray();
-      if (!data || data.length === 0) {
-        throw new import_node_server_utils30.NotFoundError("Check out item not found.");
-      }
-      setCache(cacheKey, data[0], 15 * 60).then(() => {
-        import_node_server_utils30.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        import_node_server_utils30.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
-      return data[0];
-    } catch (error) {
-      throw error;
-    }
-  }
-  return {
-    createIndex,
-    createTextIndex,
-    createCheckOutItem,
-    getCheckOutItems,
-    getCheckOutItemById
-  };
-}
-
-// src/services/hygiene-checkout-item.service.ts
-var import_core2 = require("@7365admin1/core");
-var import_node_server_utils31 = require("@7365admin1/node-server-utils");
-function useCheckOutItemService() {
-  const {
-    createCheckOutItem: _createCheckOutItem,
-    getCheckOutItemById: _getCheckOutItemById
-  } = useCheckOutItemRepository();
-  const { getSupplyById } = useSupplyRepository();
-  const { getUserById } = (0, import_core2.useUserRepo)();
-  const { createStock } = useStockService();
-  async function createCheckOutItem(value) {
-    const session = import_node_server_utils31.useAtlas.getClient()?.startSession();
-    try {
-      session?.startTransaction();
-      const supplyData = await getSupplyById(value.supply);
-      const createdByData = await getUserById(value.createdBy);
-      const checkOutItemId = await _createCheckOutItem(
-        {
-          ...value,
-          supplyName: supplyData?.name || "",
-          createdByName: createdByData?.name || ""
-        },
-        session
-      );
-      const checkOutItem = await _getCheckOutItemById(checkOutItemId, session);
-      if (!checkOutItem) {
-        throw new import_node_server_utils31.BadRequestError("Failed to create check out item.");
-      }
-      const createdStocks = await createStock(
-        {
-          site: checkOutItem.site.toString(),
-          supply: checkOutItem.supply.toString(),
-          qty: checkOutItem.qty
-        },
-        true,
-        session
-      );
-      await session?.commitTransaction();
-      return createdStocks;
-    } catch (error) {
-      await session?.abortTransaction();
-      throw error;
-    } finally {
-      await session?.endSession();
-    }
-  }
-  async function createCheckOutItemByBatch(value) {
-    const session = import_node_server_utils31.useAtlas.getClient()?.startSession();
-    try {
-      session?.startTransaction();
-      const { site, createdBy, items } = value;
-      const createdByData = await getUserById(createdBy);
-      const createdCheckOutItemIds = [];
-      for (const item of items) {
-        const supplyData = await getSupplyById(item.supply, session);
-        const createdId = await _createCheckOutItem(
-          {
-            site,
-            supply: item.supply,
-            supplyName: supplyData?.name || "",
-            qty: item.qty,
-            attachment: item.attachment || "",
-            createdBy,
-            createdByName: createdByData?.name || ""
-          },
-          session
-        );
-        await createStock(
-          {
-            site,
-            supply: item.supply,
-            qty: item.qty
-          },
-          true,
-          session
-        );
-        createdCheckOutItemIds.push(createdId);
-      }
-      await session?.commitTransaction();
-      return createdCheckOutItemIds;
-    } catch (error) {
-      await session?.abortTransaction();
-      throw error;
-    } finally {
-      await session?.endSession();
-    }
-  }
-  return {
-    createCheckOutItem,
-    createCheckOutItemByBatch
-  };
-}
-
-// src/controllers/hygiene-checkout-item.controller.ts
-var import_joi17 = __toESM(require("joi"));
-var import_node_server_utils32 = require("@7365admin1/node-server-utils");
-function useCheckOutItemController() {
-  const {
-    getCheckOutItems: _getCheckOutItems,
-    getCheckOutItemById: _getCheckOutItemById
-  } = useCheckOutItemRepository();
-  const {
-    createCheckOutItem: _createCheckOutItem,
-    createCheckOutItemByBatch: _createCheckOutItemByBatch
-  } = useCheckOutItemService();
-  async function createCheckOutItem(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 = import_joi17.default.object({
-      site: import_joi17.default.string().hex().required(),
-      supply: import_joi17.default.string().hex().required(),
-      qty: import_joi17.default.number().min(0).required(),
-      attachment: import_joi17.default.string().optional().allow("", null),
-      createdBy: import_joi17.default.string().hex().required()
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      import_node_server_utils32.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils32.BadRequestError(error.message));
-      return;
-    }
-    try {
-      const id = await _createCheckOutItem(payload);
-      res.status(201).json({ message: "Check out item created successfully.", id });
-      return;
-    } catch (error2) {
-      import_node_server_utils32.logger.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function createCheckOutItemByBatch(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 = import_joi17.default.object({
-      site: import_joi17.default.string().hex().required(),
-      createdBy: import_joi17.default.string().hex().required(),
-      items: import_joi17.default.array().items(
-        import_joi17.default.object({
-          supply: import_joi17.default.string().hex().required(),
-          qty: import_joi17.default.number().min(0).required(),
-          attachment: import_joi17.default.string().optional().allow("", null)
-        })
-      ).min(1).required()
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      import_node_server_utils32.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils32.BadRequestError(error.message));
-      return;
-    }
-    try {
-      await _createCheckOutItemByBatch(payload);
-      res.status(201).json({ message: "Check out items created successfully." });
-      return;
-    } catch (error2) {
-      import_node_server_utils32.logger.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function getCheckOutItems(req, res, next) {
-    const query = { ...req.query, ...req.params };
-    const validation = import_joi17.default.object({
-      page: import_joi17.default.number().min(1).optional().allow("", null),
-      limit: import_joi17.default.number().min(1).optional().allow("", null),
-      search: import_joi17.default.string().optional().allow("", null),
-      site: import_joi17.default.string().hex().required()
-    });
-    const { error } = validation.validate(query);
-    if (error) {
-      import_node_server_utils32.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils32.BadRequestError(error.message));
-      return;
-    }
-    const page = parseInt(req.query.page) ?? 1;
-    const limit = parseInt(req.query.limit) ?? 10;
-    const search = req.query.search ?? "";
-    const site = req.params.site ?? "";
-    try {
-      const data = await _getCheckOutItems({
-        page,
-        limit,
-        search,
-        site
-      });
-      res.json(data);
-      return;
-    } catch (error2) {
-      import_node_server_utils32.logger.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function getCheckOutItemById(req, res, next) {
-    const validation = import_joi17.default.string().hex().required();
-    const _id = req.params.id;
-    const { error, value } = validation.validate(_id);
-    if (error) {
-      import_node_server_utils32.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils32.BadRequestError(error.message));
-      return;
-    }
-    try {
-      const data = await _getCheckOutItemById(value);
-      res.json(data);
-      return;
-    } catch (error2) {
-      import_node_server_utils32.logger.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  return {
-    createCheckOutItem,
-    createCheckOutItemByBatch,
-    getCheckOutItems,
-    getCheckOutItemById
-  };
-}
-
-// src/models/hygiene-schedule-task.model.ts
-var import_node_server_utils33 = require("@7365admin1/node-server-utils");
-var import_joi18 = __toESM(require("joi"));
-var import_mongodb18 = require("mongodb");
-var scheduleTaskSchema = import_joi18.default.object({
-  site: import_joi18.default.string().hex().required(),
-  title: import_joi18.default.string().required(),
-  time: import_joi18.default.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
-  startDate: import_joi18.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required(),
-  endDate: import_joi18.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
-  description: import_joi18.default.string().optional().allow("", null),
-  areas: import_joi18.default.array().min(1).items(
-    import_joi18.default.object({
-      name: import_joi18.default.string().required(),
-      value: import_joi18.default.any().required()
-    })
-  ).required(),
-  createdBy: import_joi18.default.string().hex().required()
+  title: import_joi16.default.string().required(),
+  time: import_joi16.default.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
+  startDate: import_joi16.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required(),
+  endDate: import_joi16.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
+  description: import_joi16.default.string().optional().allow("", null),
+  areas: import_joi16.default.array().min(1).items(
+    import_joi16.default.object({
+      name: import_joi16.default.string().required(),
+      value: import_joi16.default.any().required()
+    })
+  ).required(),
+  createdBy: import_joi16.default.string().hex().required()
 });
 function MScheduleTask(value) {
   const { error } = scheduleTaskSchema.validate(value);
   if (error) {
-    import_node_server_utils33.logger.info(`Hygiene Schedule Task Model: ${error.message}`);
-    throw new import_node_server_utils33.BadRequestError(error.message);
+    import_node_server_utils29.logger.info(`Hygiene Schedule Task Model: ${error.message}`);
+    throw new import_node_server_utils29.BadRequestError(error.message);
   }
   if (value.site) {
     try {
-      value.site = new import_mongodb18.ObjectId(value.site);
+      value.site = new import_mongodb16.ObjectId(value.site);
     } catch (error2) {
-      throw new import_node_server_utils33.BadRequestError("Invalid site ID format.");
+      throw new import_node_server_utils29.BadRequestError("Invalid site ID format.");
     }
   }
   if (value.areas && Array.isArray(value.areas)) {
@@ -5403,18 +4821,18 @@ function MScheduleTask(value) {
       try {
         return {
           name: area.name,
-          value: new import_mongodb18.ObjectId(area.value.toString())
+          value: new import_mongodb16.ObjectId(area.value.toString())
         };
       } catch (error2) {
-        throw new import_node_server_utils33.BadRequestError(`Invalid area value format: ${area.name}`);
+        throw new import_node_server_utils29.BadRequestError(`Invalid area value format: ${area.name}`);
       }
     });
   }
   if (value.createdBy) {
     try {
-      value.createdBy = new import_mongodb18.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb16.ObjectId(value.createdBy);
     } catch (error2) {
-      throw new import_node_server_utils33.BadRequestError("Invalid createdBy ID format.");
+      throw new import_node_server_utils29.BadRequestError("Invalid createdBy ID format.");
     }
   }
   return {
@@ -5434,16 +4852,16 @@ function MScheduleTask(value) {
 }
 
 // src/repositories/hygiene-schedule-task.repository.ts
-var import_mongodb19 = require("mongodb");
-var import_node_server_utils34 = require("@7365admin1/node-server-utils");
+var import_mongodb17 = require("mongodb");
+var import_node_server_utils30 = require("@7365admin1/node-server-utils");
 function useScheduleTaskRepository() {
-  const db = import_node_server_utils34.useAtlas.getDb();
+  const db = import_node_server_utils30.useAtlas.getDb();
   if (!db) {
-    throw new import_node_server_utils34.InternalServerError("Unable to connect to server.");
+    throw new import_node_server_utils30.InternalServerError("Unable to connect to server.");
   }
   const namespace_collection = "site.schedule-tasks";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache } = (0, import_node_server_utils34.useCache)(namespace_collection);
+  const { delNamespace, setCache, getCache } = (0, import_node_server_utils30.useCache)(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -5451,7 +4869,7 @@ function useScheduleTaskRepository() {
         { key: { status: 1 } }
       ]);
     } catch (error) {
-      throw new import_node_server_utils34.InternalServerError(
+      throw new import_node_server_utils30.InternalServerError(
         "Failed to create index on hygiene schedule task."
       );
     }
@@ -5460,7 +4878,7 @@ function useScheduleTaskRepository() {
     try {
       await collection.createIndex({ title: "text", description: "text" });
     } catch (error) {
-      throw new import_node_server_utils34.InternalServerError(
+      throw new import_node_server_utils30.InternalServerError(
         "Failed to create text index on hygiene schedule task."
       );
     }
@@ -5470,9 +4888,9 @@ function useScheduleTaskRepository() {
       value = MScheduleTask(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        import_node_server_utils34.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
+        import_node_server_utils30.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        import_node_server_utils34.logger.error(
+        import_node_server_utils30.logger.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -5497,20 +4915,20 @@ function useScheduleTaskRepository() {
       limit
     };
     try {
-      site = new import_mongodb19.ObjectId(site);
+      site = new import_mongodb17.ObjectId(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
-      throw new import_node_server_utils34.BadRequestError("Invalid site ID format.");
+      throw new import_node_server_utils30.BadRequestError("Invalid site ID format.");
     }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
-    const cacheKey = (0, import_node_server_utils34.makeCacheKey)(namespace_collection, cacheOptions);
+    const cacheKey = (0, import_node_server_utils30.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      import_node_server_utils34.logger.info(`Cache hit for key: ${cacheKey}`);
+      import_node_server_utils30.logger.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -5528,11 +4946,11 @@ function useScheduleTaskRepository() {
         { $limit: limit }
       ]).toArray();
       const length = await collection.countDocuments(query);
-      const data = (0, import_node_server_utils34.paginate)(items, page, limit, length);
+      const data = (0, import_node_server_utils30.paginate)(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils34.logger.info(`Cache set for key: ${cacheKey}`);
+        import_node_server_utils30.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        import_node_server_utils34.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+        import_node_server_utils30.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -5565,20 +4983,20 @@ function useScheduleTaskRepository() {
       limit
     };
     try {
-      site = new import_mongodb19.ObjectId(site);
+      site = new import_mongodb17.ObjectId(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
-      throw new import_node_server_utils34.BadRequestError("Invalid site ID format.");
+      throw new import_node_server_utils30.BadRequestError("Invalid site ID format.");
     }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
-    const cacheKey = (0, import_node_server_utils34.makeCacheKey)(namespace_collection, cacheOptions);
+    const cacheKey = (0, import_node_server_utils30.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      import_node_server_utils34.logger.info(`Cache hit for key: ${cacheKey}`);
+      import_node_server_utils30.logger.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -5595,11 +5013,11 @@ function useScheduleTaskRepository() {
         { $limit: limit }
       ]).toArray();
       const length = await collection.countDocuments(query);
-      const data = (0, import_node_server_utils34.paginate)(items, page, limit, length);
+      const data = (0, import_node_server_utils30.paginate)(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils34.logger.info(`Cache set for key: ${cacheKey}`);
+        import_node_server_utils30.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        import_node_server_utils34.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+        import_node_server_utils30.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -5608,25 +5026,25 @@ function useScheduleTaskRepository() {
   }
   async function getScheduleTaskById(_id, session) {
     try {
-      _id = new import_mongodb19.ObjectId(_id);
+      _id = new import_mongodb17.ObjectId(_id);
     } catch (error) {
-      throw new import_node_server_utils34.BadRequestError("Invalid schedule task ID format.");
+      throw new import_node_server_utils30.BadRequestError("Invalid schedule task ID format.");
     }
     const query = {
       _id,
       status: { $ne: "deleted" }
     };
-    const cacheKey = (0, import_node_server_utils34.makeCacheKey)(namespace_collection, {
+    const cacheKey = (0, import_node_server_utils30.makeCacheKey)(namespace_collection, {
       _id: _id.toString()
     });
     if (!session) {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        import_node_server_utils34.logger.info(`Cache hit for key: ${cacheKey}`);
+        import_node_server_utils30.logger.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
     } else {
-      import_node_server_utils34.logger.info(`Skipping cache during transaction for key: ${cacheKey}`);
+      import_node_server_utils30.logger.info(`Skipping cache during transaction for key: ${cacheKey}`);
     }
     try {
       const data = await collection.aggregate([
@@ -5645,12 +5063,12 @@ function useScheduleTaskRepository() {
         }
       ]).toArray();
       if (!data || data.length === 0) {
-        throw new import_node_server_utils34.NotFoundError("Schedule task not found.");
+        throw new import_node_server_utils30.NotFoundError("Schedule task not found.");
       }
       setCache(cacheKey, data[0], 15 * 60).then(() => {
-        import_node_server_utils34.logger.info(`Cache set for key: ${cacheKey}`);
+        import_node_server_utils30.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        import_node_server_utils34.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+        import_node_server_utils30.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data[0];
     } catch (error) {
@@ -5659,19 +5077,19 @@ function useScheduleTaskRepository() {
   }
   async function updateScheduleTask(_id, value, session) {
     try {
-      _id = new import_mongodb19.ObjectId(_id);
+      _id = new import_mongodb17.ObjectId(_id);
     } catch (error) {
-      throw new import_node_server_utils34.BadRequestError("Invalid schedule task ID format.");
+      throw new import_node_server_utils30.BadRequestError("Invalid schedule task ID format.");
     }
     if (value.areas && Array.isArray(value.areas)) {
       value.areas = value.areas.map((area) => {
         try {
           return {
             name: area.name,
-            value: new import_mongodb19.ObjectId(area.value.toString())
+            value: new import_mongodb17.ObjectId(area.value.toString())
           };
         } catch (error) {
-          throw new import_node_server_utils34.BadRequestError(`Invalid area value format: ${area.name}`);
+          throw new import_node_server_utils30.BadRequestError(`Invalid area value format: ${area.name}`);
         }
       });
     }
@@ -5683,14 +5101,14 @@ function useScheduleTaskRepository() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new import_node_server_utils34.InternalServerError(
+        throw new import_node_server_utils30.InternalServerError(
           "Unable to update hygiene schedule task."
         );
       }
       delNamespace().then(() => {
-        import_node_server_utils34.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
+        import_node_server_utils30.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        import_node_server_utils34.logger.error(
+        import_node_server_utils30.logger.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -5713,7 +5131,7 @@ function useScheduleTaskRepository() {
 }
 
 // src/services/hygiene-schedule-task.service.ts
-var import_node_server_utils35 = require("@7365admin1/node-server-utils");
+var import_node_server_utils31 = require("@7365admin1/node-server-utils");
 function useScheduleTaskService() {
   const { createParentChecklist } = useParentChecklistRepo();
   const { getAllScheduleTask } = useScheduleTaskRepository();
@@ -5736,13 +5154,13 @@ function useScheduleTaskService() {
       const currentDateString = now.toLocaleDateString("en-US", {
         timeZone: "Asia/Singapore"
       });
-      import_node_server_utils35.logger.info(
+      import_node_server_utils31.logger.info(
         `Checking schedule ${schedule._id}: Current time ${currentHour}:${currentMinute}, Current date ${currentDateString}, Schedule time ${schedule.time}, Start date ${schedule.startDate}, End date ${schedule.endDate}`
       );
       const startDate = /* @__PURE__ */ new Date(schedule.startDate + "T00:00:00");
       const currentDateOnly = /* @__PURE__ */ new Date(currentDateString + "T00:00:00");
       if (currentDateOnly < startDate) {
-        import_node_server_utils35.logger.info(
+        import_node_server_utils31.logger.info(
           `Schedule ${schedule._id}: Current date ${currentDateString} is before start date ${schedule.startDate}`
         );
         return false;
@@ -5750,7 +5168,7 @@ function useScheduleTaskService() {
       if (schedule.endDate) {
         const endDate = /* @__PURE__ */ new Date(schedule.endDate + "T00:00:00");
         if (currentDateOnly > endDate) {
-          import_node_server_utils35.logger.info(
+          import_node_server_utils31.logger.info(
             `Schedule ${schedule._id}: Current date ${currentDateString} is after end date ${schedule.endDate}`
           );
           return false;
@@ -5759,17 +5177,17 @@ function useScheduleTaskService() {
       const [scheduleHour, scheduleMinute] = schedule.time.split(":").map(Number);
       const timeMatches = currentHour === scheduleHour && currentMinute === scheduleMinute;
       if (!timeMatches) {
-        import_node_server_utils35.logger.info(
+        import_node_server_utils31.logger.info(
           `Schedule ${schedule._id}: Time does not match. Current: ${currentHour}:${currentMinute}, Expected: ${scheduleHour}:${scheduleMinute}`
         );
         return false;
       }
-      import_node_server_utils35.logger.info(
+      import_node_server_utils31.logger.info(
         `Schedule ${schedule._id}: All conditions matched - Date is within range and time matches`
       );
       return true;
     } catch (error) {
-      import_node_server_utils35.logger.error(
+      import_node_server_utils31.logger.error(
         `Error checking schedule conditions for ${schedule._id}:`,
         error
       );
@@ -5778,40 +5196,40 @@ function useScheduleTaskService() {
   }
   async function processScheduledTasks(currentDate) {
     try {
-      import_node_server_utils35.logger.info("Starting scheduled task processing...");
+      import_node_server_utils31.logger.info("Starting scheduled task processing...");
       const scheduleTasks = await getAllScheduleTask();
       if (!scheduleTasks || scheduleTasks.length === 0) {
-        import_node_server_utils35.logger.info("No schedule tasks found to process");
+        import_node_server_utils31.logger.info("No schedule tasks found to process");
         return { processed: 0, validated: 0 };
       }
-      import_node_server_utils35.logger.info(`Found ${scheduleTasks.length} schedule tasks to check`);
+      import_node_server_utils31.logger.info(`Found ${scheduleTasks.length} schedule tasks to check`);
       let processedCount = 0;
       let validatedCount = 0;
       const validatedTasks = [];
       for (const scheduleTask of scheduleTasks) {
         try {
-          import_node_server_utils35.logger.info(
+          import_node_server_utils31.logger.info(
             `Checking schedule ${scheduleTask._id} - ${scheduleTask.title}: time=${scheduleTask.time}, startDate=${scheduleTask.startDate}, endDate=${scheduleTask.endDate}`
           );
           const shouldRun = checkScheduleConditions(scheduleTask, currentDate);
           if (!shouldRun) {
-            import_node_server_utils35.logger.info(
+            import_node_server_utils31.logger.info(
               `Schedule ${scheduleTask._id} conditions not met, skipping`
             );
             continue;
           }
-          import_node_server_utils35.logger.info(
+          import_node_server_utils31.logger.info(
             `Schedule ${scheduleTask._id} conditions validated, creating area checklists`
           );
           if (!scheduleTask._id) {
-            import_node_server_utils35.logger.warn(`Schedule ${scheduleTask.title} has no _id, skipping`);
+            import_node_server_utils31.logger.warn(`Schedule ${scheduleTask.title} has no _id, skipping`);
             continue;
           }
           if (!scheduleTask.site) {
-            import_node_server_utils35.logger.warn(`Schedule ${scheduleTask._id} has no site, skipping`);
+            import_node_server_utils31.logger.warn(`Schedule ${scheduleTask._id} has no site, skipping`);
             continue;
           }
-          import_node_server_utils35.logger.info(
+          import_node_server_utils31.logger.info(
             `Getting or creating parent checklist for schedule ${scheduleTask._id} in site ${scheduleTask.site}`
           );
           const parentChecklistIds = await createParentChecklist({
@@ -5819,7 +5237,7 @@ function useScheduleTaskService() {
             createdAt: /* @__PURE__ */ new Date()
           });
           const parentChecklistId = Array.isArray(parentChecklistIds) ? parentChecklistIds[0] : parentChecklistIds;
-          import_node_server_utils35.logger.info(
+          import_node_server_utils31.logger.info(
             `Using parent checklist ${parentChecklistId}, now creating/updating area checklists`
           );
           for (const area of scheduleTask.areas) {
@@ -5832,14 +5250,14 @@ function useScheduleTaskService() {
                   unit: unit.unit.toString(),
                   name: unit.name
                 }));
-                import_node_server_utils35.logger.info(
+                import_node_server_utils31.logger.info(
                   `Area ${area.name} (${areaId}): Using units from area details: ${JSON.stringify(
                     units
                   )}`
                 );
               }
               if (units.length === 0) {
-                import_node_server_utils35.logger.warn(
+                import_node_server_utils31.logger.warn(
                   `Area ${area.name} (${areaId}): No units found, skipping area.`
                 );
                 continue;
@@ -5850,11 +5268,11 @@ function useScheduleTaskService() {
                   parentChecklistId.toString(),
                   areaId
                 );
-                import_node_server_utils35.logger.info(
+                import_node_server_utils31.logger.info(
                   `Area ${area.name} (${areaId}): Existing area checklist found: ${existingAreaChecklist ? "Yes" : "No"}`
                 );
                 if (existingAreaChecklist) {
-                  import_node_server_utils35.logger.info(
+                  import_node_server_utils31.logger.info(
                     `Area ${area.name} (${areaId}): Existing checklist content: ${JSON.stringify(
                       existingAreaChecklist.checklist
                     )}`
@@ -5862,7 +5280,7 @@ function useScheduleTaskService() {
                 }
               } catch (error) {
                 existingAreaChecklist = null;
-                import_node_server_utils35.logger.info(
+                import_node_server_utils31.logger.info(
                   `Area ${area.name} (${areaId}): No existing area checklist found (exception).`
                 );
               }
@@ -5876,7 +5294,7 @@ function useScheduleTaskService() {
                   ...existingAreaChecklist.checklist || [],
                   newSet
                 ];
-                import_node_server_utils35.logger.info(
+                import_node_server_utils31.logger.info(
                   `Area ${area.name} (${areaId}): Appending new set ${newSet.set} to checklist. Updated checklist: ${JSON.stringify(
                     updatedChecklist
                   )}`
@@ -5884,7 +5302,7 @@ function useScheduleTaskService() {
                 await updateAreaChecklist(existingAreaChecklist._id, {
                   checklist: updatedChecklist
                 });
-                import_node_server_utils35.logger.info(
+                import_node_server_utils31.logger.info(
                   `Appended set ${newSet.set} to area checklist for area ${area.name}`
                 );
                 try {
@@ -5892,13 +5310,13 @@ function useScheduleTaskService() {
                     parentChecklistId.toString(),
                     areaId
                   );
-                  import_node_server_utils35.logger.info(
+                  import_node_server_utils31.logger.info(
                     `Area ${area.name} (${areaId}): Checklist after update: ${JSON.stringify(
                       verifyChecklist.checklist
                     )}`
                   );
                 } catch (verifyError) {
-                  import_node_server_utils35.logger.warn(
+                  import_node_server_utils31.logger.warn(
                     `Area ${area.name} (${areaId}): Error verifying checklist after update:`,
                     verifyError
                   );
@@ -5917,50 +5335,50 @@ function useScheduleTaskService() {
                   ],
                   createdBy: scheduleTask.createdBy
                 };
-                import_node_server_utils35.logger.info(
+                import_node_server_utils31.logger.info(
                   `Area ${area.name} (${areaId}): Creating new area checklist with data: ${JSON.stringify(
                     checklistData
                   )}`
                 );
                 await createAreaChecklist(checklistData);
-                import_node_server_utils35.logger.info(`Created new area checklist for area ${area.name}`);
+                import_node_server_utils31.logger.info(`Created new area checklist for area ${area.name}`);
                 try {
                   const verifyChecklist = await getAreaChecklistByAreaAndSchedule(
                     parentChecklistId.toString(),
                     areaId
                   );
-                  import_node_server_utils35.logger.info(
+                  import_node_server_utils31.logger.info(
                     `Area ${area.name} (${areaId}): Checklist after creation: ${JSON.stringify(
                       verifyChecklist.checklist
                     )}`
                   );
                 } catch (verifyError) {
-                  import_node_server_utils35.logger.warn(
+                  import_node_server_utils31.logger.warn(
                     `Area ${area.name} (${areaId}): Error verifying checklist after creation:`,
                     verifyError
                   );
                 }
               }
             } catch (error) {
-              import_node_server_utils35.logger.error(`Error processing area ${area.name}:`, error);
+              import_node_server_utils31.logger.error(`Error processing area ${area.name}:`, error);
               continue;
             }
           }
           processedCount++;
           validatedCount++;
           validatedTasks.push(scheduleTask);
-          import_node_server_utils35.logger.info(
+          import_node_server_utils31.logger.info(
             `Successfully processed schedule ${scheduleTask._id}, created/updated area checklists for all areas.`
           );
         } catch (error) {
-          import_node_server_utils35.logger.error(
+          import_node_server_utils31.logger.error(
             `Error processing schedule task ${scheduleTask._id}:`,
             error
           );
           continue;
         }
       }
-      import_node_server_utils35.logger.info(
+      import_node_server_utils31.logger.info(
         `Scheduled task processing completed. Processed: ${processedCount}, Validated: ${validatedCount} tasks`
       );
       return {
@@ -5969,7 +5387,7 @@ function useScheduleTaskService() {
         tasks: validatedTasks
       };
     } catch (error) {
-      import_node_server_utils35.logger.error("Error processing scheduled tasks:", error);
+      import_node_server_utils31.logger.error("Error processing scheduled tasks:", error);
       throw error;
     }
   }
@@ -5977,8 +5395,8 @@ function useScheduleTaskService() {
 }
 
 // src/controllers/hygiene-schedule-task.controller.ts
-var import_joi19 = __toESM(require("joi"));
-var import_node_server_utils36 = require("@7365admin1/node-server-utils");
+var import_joi17 = __toESM(require("joi"));
+var import_node_server_utils32 = require("@7365admin1/node-server-utils");
 function useScheduleTaskController() {
   const {
     createScheduleTask: _createScheduleTask,
@@ -5996,8 +5414,8 @@ function useScheduleTaskController() {
     const payload = { ...req.body, ...req.params, createdBy };
     const { error } = scheduleTaskSchema.validate(payload);
     if (error) {
-      import_node_server_utils36.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils36.BadRequestError(error.message));
+      import_node_server_utils32.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils32.BadRequestError(error.message));
       return;
     }
     try {
@@ -6005,23 +5423,23 @@ function useScheduleTaskController() {
       res.status(201).json({ message: "Schedule task created successfully.", id });
       return;
     } catch (error2) {
-      import_node_server_utils36.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils32.logger.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function getScheduleTasks(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = import_joi19.default.object({
-      page: import_joi19.default.number().min(1).optional().allow("", null),
-      limit: import_joi19.default.number().min(1).optional().allow("", null),
-      search: import_joi19.default.string().optional().allow("", null),
-      site: import_joi19.default.string().hex().required()
+    const validation = import_joi17.default.object({
+      page: import_joi17.default.number().min(1).optional().allow("", null),
+      limit: import_joi17.default.number().min(1).optional().allow("", null),
+      search: import_joi17.default.string().optional().allow("", null),
+      site: import_joi17.default.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
-      import_node_server_utils36.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils36.BadRequestError(error.message));
+      import_node_server_utils32.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils32.BadRequestError(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -6038,23 +5456,23 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      import_node_server_utils36.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils32.logger.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function getTasksForScheduleTask(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = import_joi19.default.object({
-      page: import_joi19.default.number().min(1).optional().allow("", null),
-      limit: import_joi19.default.number().min(1).optional().allow("", null),
-      search: import_joi19.default.string().optional().allow("", null),
-      site: import_joi19.default.string().hex().required()
+    const validation = import_joi17.default.object({
+      page: import_joi17.default.number().min(1).optional().allow("", null),
+      limit: import_joi17.default.number().min(1).optional().allow("", null),
+      search: import_joi17.default.string().optional().allow("", null),
+      site: import_joi17.default.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
-      import_node_server_utils36.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils36.BadRequestError(error.message));
+      import_node_server_utils32.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils32.BadRequestError(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -6071,18 +5489,18 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      import_node_server_utils36.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils32.logger.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function getScheduleTaskById(req, res, next) {
-    const validation = import_joi19.default.string().hex().required();
+    const validation = import_joi17.default.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
-      import_node_server_utils36.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils36.BadRequestError(error.message));
+      import_node_server_utils32.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils32.BadRequestError(error.message));
       return;
     }
     try {
@@ -6090,31 +5508,31 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      import_node_server_utils36.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils32.logger.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function updateScheduleTask(req, res, next) {
     const payload = { id: req.params.id, ...req.body };
-    const validation = import_joi19.default.object({
-      id: import_joi19.default.string().hex().required(),
-      title: import_joi19.default.string().optional().allow("", null),
-      time: import_joi19.default.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).optional().allow("", null),
-      startDate: import_joi19.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
-      endDate: import_joi19.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
-      description: import_joi19.default.string().optional().allow("", null),
-      areas: import_joi19.default.array().min(1).items(
-        import_joi19.default.object({
-          name: import_joi19.default.string().required(),
-          value: import_joi19.default.any().required()
+    const validation = import_joi17.default.object({
+      id: import_joi17.default.string().hex().required(),
+      title: import_joi17.default.string().optional().allow("", null),
+      time: import_joi17.default.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).optional().allow("", null),
+      startDate: import_joi17.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
+      endDate: import_joi17.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
+      description: import_joi17.default.string().optional().allow("", null),
+      areas: import_joi17.default.array().min(1).items(
+        import_joi17.default.object({
+          name: import_joi17.default.string().required(),
+          value: import_joi17.default.any().required()
         })
       ).optional()
     });
     const { error } = validation.validate(payload);
     if (error) {
-      import_node_server_utils36.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils36.BadRequestError(error.message));
+      import_node_server_utils32.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils32.BadRequestError(error.message));
       return;
     }
     try {
@@ -6123,7 +5541,7 @@ function useScheduleTaskController() {
       res.json({ message: "Schedule task updated successfully." });
       return;
     } catch (error2) {
-      import_node_server_utils36.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils32.logger.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -6142,7 +5560,6 @@ function useScheduleTaskController() {
   MAreaChecklist,
   MCheckOutItem,
   MParentChecklist,
-  MRequestItem,
   MScheduleTask,
   MStock,
   MSupply,
@@ -6150,14 +5567,12 @@ function useScheduleTaskController() {
   allowedCheckOutItemStatus,
   allowedChecklistStatus,
   allowedPeriods,
-  allowedRequestItemStatus,
   allowedStatus,
   allowedTypes,
   areaChecklistSchema,
   areaSchema,
   checkOutItemSchema,
   parentChecklistSchema,
-  requestItemSchema,
   scheduleTaskSchema,
   stockSchema,
   supplySchema,
@@ -6175,9 +5590,6 @@ function useScheduleTaskController() {
   useHygieneDashboardRepository,
   useParentChecklistController,
   useParentChecklistRepo,
-  useRequestItemController,
-  useRequestItemRepository,
-  useRequestItemService,
   useScheduleTaskController,
   useScheduleTaskRepository,
   useScheduleTaskService,