@7365admin1/module-hygiene 4.2.0 → 4.3.0

package/dist/index.mjs

@@ -4230,27 +4230,24 @@ function useStockController() {
   };
 }
 
-// src/models/hygiene-request-item.model.ts
+// src/models/hygiene-checkout-item.model.ts
 import Joi14 from "joi";
 import { ObjectId as ObjectId14 } from "mongodb";
 import { BadRequestError as BadRequestError24, logger as logger24 } from "@7365admin1/node-server-utils";
-var allowedRequestItemStatus = [
-  "pending",
-  "approved",
-  "disapproved"
-];
-var requestItemSchema = Joi14.object({
+var allowedCheckOutItemStatus = ["pending", "completed"];
+var checkOutItemSchema = Joi14.object({
   site: Joi14.string().hex().required(),
   supply: Joi14.string().hex().required(),
   supplyName: Joi14.string().required(),
   qty: Joi14.number().min(0).required(),
+  attachment: Joi14.array().items(Joi14.string()).optional().allow(null),
   createdBy: Joi14.string().hex().required(),
   createdByName: Joi14.string().required()
 });
-function MRequestItem(value) {
-  const { error } = requestItemSchema.validate(value);
+function MCheckOutItem(value) {
+  const { error } = checkOutItemSchema.validate(value);
   if (error) {
-    logger24.info(`Hygiene Request Item Model: ${error.message}`);
+    logger24.info(`Hygiene Check Out Item Model: ${error.message}`);
     throw new BadRequestError24(error.message);
   }
   if (value.site) {
@@ -4264,615 +4261,7 @@ function MRequestItem(value) {
     try {
       value.supply = new ObjectId14(value.supply);
     } catch (error2) {
-      throw new BadRequestError24("Invalid supply ID format.");
-    }
-  }
-  return {
-    site: value.site,
-    supply: value.supply,
-    supplyName: value.supplyName,
-    qty: value.qty,
-    remarks: "",
-    createdBy: value.createdBy,
-    createdByName: value.createdByName,
-    status: "pending",
-    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-    updatedAt: "",
-    deletedAt: ""
-  };
-}
-
-// src/repositories/hygiene-request-item.repository.ts
-import { ObjectId as ObjectId15 } from "mongodb";
-import {
-  useAtlas as useAtlas11,
-  InternalServerError as InternalServerError8,
-  useCache as useCache8,
-  logger as logger25,
-  makeCacheKey as makeCacheKey8,
-  paginate as paginate7,
-  BadRequestError as BadRequestError25,
-  NotFoundError as NotFoundError6
-} from "@7365admin1/node-server-utils";
-function useRequestItemRepository() {
-  const db = useAtlas11.getDb();
-  if (!db) {
-    throw new InternalServerError8("Unable to connect to server.");
-  }
-  const namespace_collection = "site.supply.requests";
-  const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache } = useCache8(namespace_collection);
-  async function createIndex() {
-    try {
-      await collection.createIndexes([
-        { key: { site: 1 } },
-        { key: { supply: 1 } },
-        { key: { status: 1 } }
-      ]);
-    } catch (error) {
-      throw new InternalServerError8(
-        "Failed to create index on hygiene request item."
-      );
-    }
-  }
-  async function createTextIndex() {
-    try {
-      await collection.createIndex({ supplyName: "text" });
-    } catch (error) {
-      throw new InternalServerError8(
-        "Failed to create text index on hygiene supply."
-      );
-    }
-  }
-  async function createRequestItem(value, session) {
-    try {
-      value = MRequestItem(value);
-      const res = await collection.insertOne(value, { session });
-      delNamespace().then(() => {
-        logger25.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        logger25.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
-      });
-      return res.insertedId;
-    } catch (error) {
-      throw error;
-    }
-  }
-  async function getRequestItems({
-    page = 1,
-    limit = 10,
-    search = "",
-    site
-  }) {
-    page = page > 0 ? page - 1 : 0;
-    const query = {
-      status: { $ne: "deleted" }
-    };
-    const cacheOptions = {
-      page,
-      limit
-    };
-    try {
-      site = new ObjectId15(site);
-      query.site = site;
-      cacheOptions.site = site.toString();
-    } catch (error) {
-      throw new BadRequestError25("Invalid site ID format.");
-    }
-    if (search) {
-      query.$text = { $search: search };
-      cacheOptions.search = search;
-    }
-    const cacheKey = makeCacheKey8(namespace_collection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger25.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
-    try {
-      const items = await collection.aggregate([
-        { $match: query },
-        {
-          $project: {
-            supplyName: 1,
-            createdAt: 1,
-            status: 1
-          }
-        },
-        { $sort: { _id: -1 } },
-        { $skip: page * limit },
-        { $limit: limit }
-      ]).toArray();
-      const length = await collection.countDocuments(query);
-      const data = paginate7(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger25.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
-      return data;
-    } catch (error) {
-      throw error;
-    }
-  }
-  async function getRequestItemById(_id, session) {
-    try {
-      _id = new ObjectId15(_id);
-    } catch (error) {
-      throw new BadRequestError25("Invalid request item ID format.");
-    }
-    const query = { _id };
-    const cacheKey = makeCacheKey8(namespace_collection, {
-      _id: _id.toString()
-    });
-    if (!session) {
-      const cachedData = await getCache(cacheKey);
-      if (cachedData) {
-        logger25.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
-      }
-    } else {
-      logger25.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 NotFoundError6("Request item not found.");
-      }
-      setCache(cacheKey, data[0], 15 * 60).then(() => {
-        logger25.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
-      return data[0];
-    } catch (error) {
-      throw error;
-    }
-  }
-  async function approveRequestItem(_id, remarks, session) {
-    try {
-      _id = new ObjectId15(_id);
-    } catch (error) {
-      throw new BadRequestError25("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 InternalServerError8("Unable to approve request item.");
-      }
-      delNamespace().then(() => {
-        logger25.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        logger25.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
-      });
-      return res.modifiedCount;
-    } catch (error) {
-      throw error;
-    }
-  }
-  async function disapproveRequestItem(_id, remarks, session) {
-    try {
-      _id = new ObjectId15(_id);
-    } catch (error) {
-      throw new BadRequestError25("Invalid request item ID format.");
-    }
-    try {
-      const updateValue = {
-        status: "disapproved",
-        remarks: remarks || "",
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-      };
-      const res = await collection.updateOne(
-        { _id },
-        { $set: updateValue },
-        { session }
-      );
-      if (res.modifiedCount === 0) {
-        throw new InternalServerError8("Unable to disapprove request item.");
-      }
-      delNamespace().then(() => {
-        logger25.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        logger25.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
-      });
-      return res.modifiedCount;
-    } catch (error) {
-      throw error;
-    }
-  }
-  return {
-    createIndex,
-    createTextIndex,
-    createRequestItem,
-    getRequestItems,
-    getRequestItemById,
-    approveRequestItem,
-    disapproveRequestItem
-  };
-}
-
-// src/services/hygiene-request-item.service.ts
-import { useUserRepo } from "@7365admin1/core";
-import { BadRequestError as BadRequestError26, useAtlas as useAtlas12 } from "@7365admin1/node-server-utils";
-function useRequestItemService() {
-  const {
-    createRequestItem: _createRequestItem,
-    getRequestItemById: _getRequestItemById,
-    approveRequestItem: _approveRequestItem,
-    disapproveRequestItem: _disapproveRequestItem
-  } = useRequestItemRepository();
-  const { getSupplyById } = useSupplyRepository();
-  const { getUserById } = 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 = useAtlas12.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) {
-    const session = useAtlas12.getClient()?.startSession();
-    try {
-      session?.startTransaction();
-      await _approveRequestItem(id, remarks, session);
-      const requestItem = await _getRequestItemById(id, session);
-      if (requestItem.status !== "pending") {
-        throw new BadRequestError26(
-          "Only 'pending' request items can be approved."
-        );
-      }
-      const createdStocks = await createStock(
-        {
-          site: requestItem.site.toString(),
-          supply: requestItem.supply.toString(),
-          qty: requestItem.qty,
-          remarks
-        },
-        true
-      );
-      await session?.commitTransaction();
-      return createdStocks;
-    } catch (error) {
-      await session?.abortTransaction();
-      throw error;
-    } finally {
-      await session?.endSession();
-    }
-  }
-  async function disapproveRequestItem(id, remarks) {
-    const session = useAtlas12.getClient()?.startSession();
-    try {
-      session?.startTransaction();
-      const result = await _disapproveRequestItem(id, remarks, session);
-      const requestItem = await _getRequestItemById(id, session);
-      if (requestItem.status !== "pending") {
-        throw new BadRequestError26(
-          "Only 'pending' request items can be disapproved."
-        );
-      }
-      await session?.commitTransaction();
-      return result;
-    } catch (error) {
-      await session?.abortTransaction();
-      throw error;
-    } finally {
-      await session?.endSession();
-    }
-  }
-  return {
-    createRequestItem,
-    createRequestItemByBatch,
-    approveRequestItem,
-    disapproveRequestItem
-  };
-}
-
-// src/controllers/hygiene-request-item.controller.ts
-import Joi15 from "joi";
-import { BadRequestError as BadRequestError27, logger as logger26 } from "@7365admin1/node-server-utils";
-function useRequestItemController() {
-  const {
-    getRequestItems: _getRequestItems,
-    getRequestItemById: _getRequestItemById
-  } = useRequestItemRepository();
-  const {
-    createRequestItem: _createRequestItem,
-    createRequestItemByBatch: _createRequestItemByBatch,
-    approveRequestItem: _approveRequestItem,
-    disapproveRequestItem: _disapproveRequestItem
-  } = useRequestItemService();
-  async function createRequestItem(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 = Joi15.object({
-      site: Joi15.string().hex().required(),
-      supply: Joi15.string().hex().required(),
-      qty: Joi15.number().min(0).required(),
-      createdBy: Joi15.string().hex().required()
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      logger26.log({ level: "error", message: error.message });
-      next(new BadRequestError27(error.message));
-      return;
-    }
-    try {
-      const id = await _createRequestItem(payload);
-      res.status(201).json({ message: "Request item created successfully.", id });
-      return;
-    } catch (error2) {
-      logger26.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function createRequestItemByBatch(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 = Joi15.object({
-      site: Joi15.string().hex().required(),
-      createdBy: Joi15.string().hex().required(),
-      items: Joi15.array().items(
-        Joi15.object({
-          supply: Joi15.string().hex().required(),
-          qty: Joi15.number().min(0).required()
-        })
-      ).min(1).required()
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      logger26.log({ level: "error", message: error.message });
-      next(new BadRequestError27(error.message));
-      return;
-    }
-    try {
-      await _createRequestItemByBatch(payload);
-      res.status(201).json({ message: "Request items created successfully." });
-      return;
-    } catch (error2) {
-      logger26.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function getRequestItems(req, res, next) {
-    const query = { ...req.query, ...req.params };
-    const validation = Joi15.object({
-      page: Joi15.number().min(1).optional().allow("", null),
-      limit: Joi15.number().min(1).optional().allow("", null),
-      search: Joi15.string().optional().allow("", null),
-      site: Joi15.string().hex().required()
-    });
-    const { error } = validation.validate(query);
-    if (error) {
-      logger26.log({ level: "error", message: error.message });
-      next(new BadRequestError27(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 _getRequestItems({
-        page,
-        limit,
-        search,
-        site
-      });
-      res.json(data);
-      return;
-    } catch (error2) {
-      logger26.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function getRequestItemById(req, res, next) {
-    const validation = Joi15.string().hex().required();
-    const _id = req.params.id;
-    const { error, value } = validation.validate(_id);
-    if (error) {
-      logger26.log({ level: "error", message: error.message });
-      next(new BadRequestError27(error.message));
-      return;
-    }
-    try {
-      const data = await _getRequestItemById(value);
-      res.json(data);
-      return;
-    } catch (error2) {
-      logger26.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function approveRequestItem(req, res, next) {
-    const payload = { ...req.params, ...req.body };
-    const validation = Joi15.object({
-      id: Joi15.string().hex().required(),
-      remarks: Joi15.string().optional().allow("", null)
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      logger26.log({ level: "error", message: error.message });
-      next(new BadRequestError27(error.message));
-      return;
-    }
-    try {
-      await _approveRequestItem(payload.id, payload.remarks);
-      res.json({ message: "Request item approved successfully." });
-      return;
-    } catch (error2) {
-      logger26.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function disapproveRequestItem(req, res, next) {
-    const payload = { ...req.params, ...req.body };
-    const validation = Joi15.object({
-      id: Joi15.string().hex().required(),
-      remarks: Joi15.string().optional().allow("", null)
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      logger26.log({ level: "error", message: error.message });
-      next(new BadRequestError27(error.message));
-      return;
-    }
-    try {
-      await _disapproveRequestItem(payload.id, payload.remarks);
-      res.json({ message: "Request item disapproved successfully." });
-      return;
-    } catch (error2) {
-      logger26.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  return {
-    createRequestItem,
-    createRequestItemByBatch,
-    getRequestItems,
-    getRequestItemById,
-    approveRequestItem,
-    disapproveRequestItem
-  };
-}
-
-// src/models/hygiene-checkout-item.model.ts
-import Joi16 from "joi";
-import { ObjectId as ObjectId16 } from "mongodb";
-import { BadRequestError as BadRequestError28, logger as logger27 } from "@7365admin1/node-server-utils";
-var allowedCheckOutItemStatus = ["pending", "completed"];
-var checkOutItemSchema = Joi16.object({
-  site: Joi16.string().hex().required(),
-  supply: Joi16.string().hex().required(),
-  supplyName: Joi16.string().required(),
-  qty: Joi16.number().min(0).required(),
-  attachment: Joi16.string().optional().allow("", null),
-  createdBy: Joi16.string().hex().required(),
-  createdByName: Joi16.string().required()
-});
-function MCheckOutItem(value) {
-  const { error } = checkOutItemSchema.validate(value);
-  if (error) {
-    logger27.info(`Hygiene Check Out Item Model: ${error.message}`);
-    throw new BadRequestError28(error.message);
-  }
-  if (value.site) {
-    try {
-      value.site = new ObjectId16(value.site);
-    } catch (error2) {
-      throw new BadRequestError28("Invalid site ID format.");
-    }
-  }
-  if (value.supply) {
-    try {
-      value.supply = new ObjectId16(value.supply);
-    } catch (error2) {
-      throw new BadRequestError28("Invalid supply ID format.");
+      throw new BadRequestError24("Invalid supply ID format.");
     }
   }
   return {
@@ -4880,7 +4269,7 @@ function MCheckOutItem(value) {
     supply: value.supply,
     supplyName: value.supplyName,
     qty: value.qty,
-    attachment: "",
+    attachment: value.attachment || [],
     createdBy: value.createdBy,
     createdByName: value.createdByName,
     status: "pending",
@@ -4891,25 +4280,25 @@ function MCheckOutItem(value) {
 }
 
 // src/repositories/hygiene-checkout-item.repository.ts
-import { ObjectId as ObjectId17 } from "mongodb";
+import { ObjectId as ObjectId15 } from "mongodb";
 import {
-  useAtlas as useAtlas13,
-  InternalServerError as InternalServerError9,
-  useCache as useCache9,
-  logger as logger28,
-  makeCacheKey as makeCacheKey9,
-  paginate as paginate8,
-  BadRequestError as BadRequestError29,
-  NotFoundError as NotFoundError7
+  useAtlas as useAtlas11,
+  InternalServerError as InternalServerError8,
+  useCache as useCache8,
+  logger as logger25,
+  makeCacheKey as makeCacheKey8,
+  paginate as paginate7,
+  BadRequestError as BadRequestError25,
+  NotFoundError as NotFoundError6
 } from "@7365admin1/node-server-utils";
 function useCheckOutItemRepository() {
-  const db = useAtlas13.getDb();
+  const db = useAtlas11.getDb();
   if (!db) {
-    throw new InternalServerError9("Unable to connect to server.");
+    throw new InternalServerError8("Unable to connect to server.");
   }
   const namespace_collection = "site.supply.checkouts";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache } = useCache9(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache8(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -4918,7 +4307,7 @@ function useCheckOutItemRepository() {
         { key: { status: 1 } }
       ]);
     } catch (error) {
-      throw new InternalServerError9(
+      throw new InternalServerError8(
         "Failed to create index on hygiene check out item."
       );
     }
@@ -4927,7 +4316,7 @@ function useCheckOutItemRepository() {
     try {
       await collection.createIndex({ supplyName: "text" });
     } catch (error) {
-      throw new InternalServerError9(
+      throw new InternalServerError8(
         "Failed to create text index on hygiene supply."
       );
     }
@@ -4937,9 +4326,9 @@ function useCheckOutItemRepository() {
       value = MCheckOutItem(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger28.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger25.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger28.error(
+        logger25.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -4964,20 +4353,20 @@ function useCheckOutItemRepository() {
       limit
     };
     try {
-      site = new ObjectId17(site);
+      site = new ObjectId15(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
-      throw new BadRequestError29("Invalid site ID format.");
+      throw new BadRequestError25("Invalid site ID format.");
     }
     if (search) {
       query.$text = { $search: search };
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey9(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey8(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger28.info(`Cache hit for key: ${cacheKey}`);
+      logger25.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -5009,37 +4398,11 @@ function useCheckOutItemRepository() {
             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",
+            checkOutByName: "$createdByName",
             checkOutQty: "$qty",
             createdAt: 1,
             status: 1
@@ -5050,11 +4413,11 @@ function useCheckOutItemRepository() {
         { $limit: limit }
       ]).toArray();
       const length = await collection.countDocuments(query);
-      const data = paginate8(items, page, limit, length);
+      const data = paginate7(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger28.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger28.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -5063,86 +4426,124 @@ function useCheckOutItemRepository() {
   }
   async function getCheckOutItemById(_id, session) {
     try {
-      _id = new ObjectId17(_id);
+      _id = new ObjectId15(_id);
     } catch (error) {
-      throw new BadRequestError29("Invalid check out item ID format.");
+      throw new BadRequestError25("Invalid check out item ID format.");
     }
     const query = { _id };
-    const cacheKey = makeCacheKey9(namespace_collection, {
+    const cacheKey = makeCacheKey8(namespace_collection, {
       _id: _id.toString()
     });
     if (!session) {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger28.info(`Cache hit for key: ${cacheKey}`);
+        logger25.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
     } else {
-      logger28.info(`Skipping cache during transaction for key: ${cacheKey}`);
+      logger25.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 NotFoundError7("Check out item not found.");
+        throw new NotFoundError6("Check out item not found.");
       }
       setCache(cacheKey, data[0], 15 * 60).then(() => {
-        logger28.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger28.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data[0];
     } catch (error) {
       throw error;
     }
   }
+  async function completeCheckOutItem(_id, session) {
+    try {
+      _id = new ObjectId15(_id);
+    } catch (error) {
+      throw new BadRequestError25("Invalid check out item ID format.");
+    }
+    try {
+      const updateValue = {
+        status: "completed",
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
+      if (res.modifiedCount === 0) {
+        throw new InternalServerError8("Unable to complete check out item.");
+      }
+      delNamespace().then(() => {
+        logger25.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger25.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.modifiedCount;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
     createCheckOutItem,
     getCheckOutItems,
-    getCheckOutItemById
+    getCheckOutItemById,
+    completeCheckOutItem
   };
 }
 
 // src/services/hygiene-checkout-item.service.ts
-import { useUserRepo as useUserRepo2 } from "@7365admin1/core";
-import { BadRequestError as BadRequestError30, useAtlas as useAtlas14 } from "@7365admin1/node-server-utils";
+import { useUserRepo } from "@7365admin1/core";
+import { BadRequestError as BadRequestError26, useAtlas as useAtlas12 } from "@7365admin1/node-server-utils";
 function useCheckOutItemService() {
   const {
     createCheckOutItem: _createCheckOutItem,
-    getCheckOutItemById: _getCheckOutItemById
+    getCheckOutItemById: _getCheckOutItemById,
+    completeCheckOutItem
   } = useCheckOutItemRepository();
   const { getSupplyById } = useSupplyRepository();
-  const { getUserById } = useUserRepo2();
+  const { getUserById } = useUserRepo();
   const { createStock } = useStockService();
   async function createCheckOutItem(value) {
-    const session = useAtlas14.getClient()?.startSession();
+    const session = useAtlas12.getClient()?.startSession();
     try {
       session?.startTransaction();
       const supplyData = await getSupplyById(value.supply);
@@ -5155,9 +4556,12 @@ function useCheckOutItemService() {
         },
         session
       );
-      const checkOutItem = await _getCheckOutItemById(checkOutItemId, session);
+      const checkOutItem = await _getCheckOutItemById(
+        checkOutItemId.toString(),
+        session
+      );
       if (!checkOutItem) {
-        throw new BadRequestError30("Failed to create check out item.");
+        throw new BadRequestError26("Failed to create check out item.");
       }
       const createdStocks = await createStock(
         {
@@ -5168,6 +4572,7 @@ function useCheckOutItemService() {
         true,
         session
       );
+      await completeCheckOutItem(checkOutItemId.toString(), session);
       await session?.commitTransaction();
       return createdStocks;
     } catch (error) {
@@ -5178,10 +4583,10 @@ function useCheckOutItemService() {
     }
   }
   async function createCheckOutItemByBatch(value) {
-    const session = useAtlas14.getClient()?.startSession();
+    const session = useAtlas12.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const { site, createdBy, items } = value;
+      const { site, attachment, createdBy, items } = value;
       const createdByData = await getUserById(createdBy);
       const createdCheckOutItemIds = [];
       for (const item of items) {
@@ -5192,7 +4597,7 @@ function useCheckOutItemService() {
             supply: item.supply,
             supplyName: supplyData?.name || "",
             qty: item.qty,
-            attachment: item.attachment || "",
+            attachment,
             createdBy,
             createdByName: createdByData?.name || ""
           },
@@ -5225,8 +4630,8 @@ function useCheckOutItemService() {
 }
 
 // src/controllers/hygiene-checkout-item.controller.ts
-import Joi17 from "joi";
-import { BadRequestError as BadRequestError31, logger as logger29 } from "@7365admin1/node-server-utils";
+import Joi15 from "joi";
+import { BadRequestError as BadRequestError27, logger as logger26 } from "@7365admin1/node-server-utils";
 function useCheckOutItemController() {
   const {
     getCheckOutItems: _getCheckOutItems,
@@ -5247,17 +4652,17 @@ function useCheckOutItemController() {
       ...req.params,
       createdBy
     };
-    const validation = Joi17.object({
-      site: Joi17.string().hex().required(),
-      supply: Joi17.string().hex().required(),
-      qty: Joi17.number().min(0).required(),
-      attachment: Joi17.string().optional().allow("", null),
-      createdBy: Joi17.string().hex().required()
+    const validation = Joi15.object({
+      site: Joi15.string().hex().required(),
+      supply: Joi15.string().hex().required(),
+      qty: Joi15.number().min(0).required(),
+      attachment: Joi15.array().items(Joi15.string()).optional().allow(null),
+      createdBy: Joi15.string().hex().required()
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger29.log({ level: "error", message: error.message });
-      next(new BadRequestError31(error.message));
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError27(error.message));
       return;
     }
     try {
@@ -5265,7 +4670,7 @@ function useCheckOutItemController() {
       res.status(201).json({ message: "Check out item created successfully.", id });
       return;
     } catch (error2) {
-      logger29.log({ level: "error", message: error2.message });
+      logger26.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -5281,21 +4686,21 @@ function useCheckOutItemController() {
       ...req.params,
       createdBy
     };
-    const validation = Joi17.object({
-      site: Joi17.string().hex().required(),
-      createdBy: Joi17.string().hex().required(),
-      items: Joi17.array().items(
-        Joi17.object({
-          supply: Joi17.string().hex().required(),
-          qty: Joi17.number().min(0).required(),
-          attachment: Joi17.string().optional().allow("", null)
+    const validation = Joi15.object({
+      site: Joi15.string().hex().required(),
+      attachment: Joi15.array().items(Joi15.string()).optional().allow(null),
+      createdBy: Joi15.string().hex().required(),
+      items: Joi15.array().items(
+        Joi15.object({
+          supply: Joi15.string().hex().required(),
+          qty: Joi15.number().min(0).required()
         })
       ).min(1).required()
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger29.log({ level: "error", message: error.message });
-      next(new BadRequestError31(error.message));
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError27(error.message));
       return;
     }
     try {
@@ -5303,23 +4708,23 @@ function useCheckOutItemController() {
       res.status(201).json({ message: "Check out items created successfully." });
       return;
     } catch (error2) {
-      logger29.log({ level: "error", message: error2.message });
+      logger26.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function getCheckOutItems(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi17.object({
-      page: Joi17.number().min(1).optional().allow("", null),
-      limit: Joi17.number().min(1).optional().allow("", null),
-      search: Joi17.string().optional().allow("", null),
-      site: Joi17.string().hex().required()
+    const validation = Joi15.object({
+      page: Joi15.number().min(1).optional().allow("", null),
+      limit: Joi15.number().min(1).optional().allow("", null),
+      search: Joi15.string().optional().allow("", null),
+      site: Joi15.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger29.log({ level: "error", message: error.message });
-      next(new BadRequestError31(error.message));
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError27(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -5336,18 +4741,18 @@ function useCheckOutItemController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger29.log({ level: "error", message: error2.message });
+      logger26.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function getCheckOutItemById(req, res, next) {
-    const validation = Joi17.string().hex().required();
+    const validation = Joi15.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
-      logger29.log({ level: "error", message: error.message });
-      next(new BadRequestError31(error.message));
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError27(error.message));
       return;
     }
     try {
@@ -5355,7 +4760,7 @@ function useCheckOutItemController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger29.log({ level: "error", message: error2.message });
+      logger26.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -5369,35 +4774,35 @@ function useCheckOutItemController() {
 }
 
 // src/models/hygiene-schedule-task.model.ts
-import { BadRequestError as BadRequestError32, logger as logger30 } from "@7365admin1/node-server-utils";
-import Joi18 from "joi";
-import { ObjectId as ObjectId18 } from "mongodb";
-var scheduleTaskSchema = Joi18.object({
-  site: Joi18.string().hex().required(),
-  title: Joi18.string().required(),
-  time: Joi18.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
-  startDate: Joi18.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required(),
-  endDate: Joi18.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
-  description: Joi18.string().optional().allow("", null),
-  areas: Joi18.array().min(1).items(
-    Joi18.object({
-      name: Joi18.string().required(),
-      value: Joi18.any().required()
+import { BadRequestError as BadRequestError28, logger as logger27 } from "@7365admin1/node-server-utils";
+import Joi16 from "joi";
+import { ObjectId as ObjectId16 } from "mongodb";
+var scheduleTaskSchema = Joi16.object({
+  site: Joi16.string().hex().required(),
+  title: Joi16.string().required(),
+  time: Joi16.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
+  startDate: Joi16.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required(),
+  endDate: Joi16.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
+  description: Joi16.string().optional().allow("", null),
+  areas: Joi16.array().min(1).items(
+    Joi16.object({
+      name: Joi16.string().required(),
+      value: Joi16.any().required()
     })
   ).required(),
-  createdBy: Joi18.string().hex().required()
+  createdBy: Joi16.string().hex().required()
 });
 function MScheduleTask(value) {
   const { error } = scheduleTaskSchema.validate(value);
   if (error) {
-    logger30.info(`Hygiene Schedule Task Model: ${error.message}`);
-    throw new BadRequestError32(error.message);
+    logger27.info(`Hygiene Schedule Task Model: ${error.message}`);
+    throw new BadRequestError28(error.message);
   }
   if (value.site) {
     try {
-      value.site = new ObjectId18(value.site);
+      value.site = new ObjectId16(value.site);
     } catch (error2) {
-      throw new BadRequestError32("Invalid site ID format.");
+      throw new BadRequestError28("Invalid site ID format.");
     }
   }
   if (value.areas && Array.isArray(value.areas)) {
@@ -5405,18 +4810,18 @@ function MScheduleTask(value) {
       try {
         return {
           name: area.name,
-          value: new ObjectId18(area.value.toString())
+          value: new ObjectId16(area.value.toString())
         };
       } catch (error2) {
-        throw new BadRequestError32(`Invalid area value format: ${area.name}`);
+        throw new BadRequestError28(`Invalid area value format: ${area.name}`);
       }
     });
   }
   if (value.createdBy) {
     try {
-      value.createdBy = new ObjectId18(value.createdBy);
+      value.createdBy = new ObjectId16(value.createdBy);
     } catch (error2) {
-      throw new BadRequestError32("Invalid createdBy ID format.");
+      throw new BadRequestError28("Invalid createdBy ID format.");
     }
   }
   return {
@@ -5436,25 +4841,25 @@ function MScheduleTask(value) {
 }
 
 // src/repositories/hygiene-schedule-task.repository.ts
-import { ObjectId as ObjectId19 } from "mongodb";
+import { ObjectId as ObjectId17 } from "mongodb";
 import {
-  useAtlas as useAtlas15,
-  InternalServerError as InternalServerError10,
-  paginate as paginate9,
-  BadRequestError as BadRequestError33,
-  useCache as useCache10,
-  logger as logger31,
-  makeCacheKey as makeCacheKey10,
-  NotFoundError as NotFoundError8
+  useAtlas as useAtlas13,
+  InternalServerError as InternalServerError9,
+  paginate as paginate8,
+  BadRequestError as BadRequestError29,
+  useCache as useCache9,
+  logger as logger28,
+  makeCacheKey as makeCacheKey9,
+  NotFoundError as NotFoundError7
 } from "@7365admin1/node-server-utils";
 function useScheduleTaskRepository() {
-  const db = useAtlas15.getDb();
+  const db = useAtlas13.getDb();
   if (!db) {
-    throw new InternalServerError10("Unable to connect to server.");
+    throw new InternalServerError9("Unable to connect to server.");
   }
   const namespace_collection = "site.schedule-tasks";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache } = useCache10(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache9(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -5462,7 +4867,7 @@ function useScheduleTaskRepository() {
         { key: { status: 1 } }
       ]);
     } catch (error) {
-      throw new InternalServerError10(
+      throw new InternalServerError9(
         "Failed to create index on hygiene schedule task."
       );
     }
@@ -5471,7 +4876,7 @@ function useScheduleTaskRepository() {
     try {
       await collection.createIndex({ title: "text", description: "text" });
     } catch (error) {
-      throw new InternalServerError10(
+      throw new InternalServerError9(
         "Failed to create text index on hygiene schedule task."
       );
     }
@@ -5481,9 +4886,9 @@ function useScheduleTaskRepository() {
       value = MScheduleTask(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger31.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger28.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger31.error(
+        logger28.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -5508,20 +4913,20 @@ function useScheduleTaskRepository() {
       limit
     };
     try {
-      site = new ObjectId19(site);
+      site = new ObjectId17(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
-      throw new BadRequestError33("Invalid site ID format.");
+      throw new BadRequestError29("Invalid site ID format.");
     }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey10(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey9(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger31.info(`Cache hit for key: ${cacheKey}`);
+      logger28.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -5539,11 +4944,11 @@ function useScheduleTaskRepository() {
         { $limit: limit }
       ]).toArray();
       const length = await collection.countDocuments(query);
-      const data = paginate9(items, page, limit, length);
+      const data = paginate8(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger31.info(`Cache set for key: ${cacheKey}`);
+        logger28.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger31.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger28.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -5576,20 +4981,20 @@ function useScheduleTaskRepository() {
       limit
     };
     try {
-      site = new ObjectId19(site);
+      site = new ObjectId17(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
-      throw new BadRequestError33("Invalid site ID format.");
+      throw new BadRequestError29("Invalid site ID format.");
     }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey10(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey9(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger31.info(`Cache hit for key: ${cacheKey}`);
+      logger28.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -5606,11 +5011,11 @@ function useScheduleTaskRepository() {
         { $limit: limit }
       ]).toArray();
       const length = await collection.countDocuments(query);
-      const data = paginate9(items, page, limit, length);
+      const data = paginate8(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger31.info(`Cache set for key: ${cacheKey}`);
+        logger28.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger31.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger28.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -5619,25 +5024,25 @@ function useScheduleTaskRepository() {
   }
   async function getScheduleTaskById(_id, session) {
     try {
-      _id = new ObjectId19(_id);
+      _id = new ObjectId17(_id);
     } catch (error) {
-      throw new BadRequestError33("Invalid schedule task ID format.");
+      throw new BadRequestError29("Invalid schedule task ID format.");
     }
     const query = {
       _id,
       status: { $ne: "deleted" }
     };
-    const cacheKey = makeCacheKey10(namespace_collection, {
+    const cacheKey = makeCacheKey9(namespace_collection, {
       _id: _id.toString()
     });
     if (!session) {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger31.info(`Cache hit for key: ${cacheKey}`);
+        logger28.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
     } else {
-      logger31.info(`Skipping cache during transaction for key: ${cacheKey}`);
+      logger28.info(`Skipping cache during transaction for key: ${cacheKey}`);
     }
     try {
       const data = await collection.aggregate([
@@ -5656,12 +5061,12 @@ function useScheduleTaskRepository() {
         }
       ]).toArray();
       if (!data || data.length === 0) {
-        throw new NotFoundError8("Schedule task not found.");
+        throw new NotFoundError7("Schedule task not found.");
       }
       setCache(cacheKey, data[0], 15 * 60).then(() => {
-        logger31.info(`Cache set for key: ${cacheKey}`);
+        logger28.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger31.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger28.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data[0];
     } catch (error) {
@@ -5670,19 +5075,19 @@ function useScheduleTaskRepository() {
   }
   async function updateScheduleTask(_id, value, session) {
     try {
-      _id = new ObjectId19(_id);
+      _id = new ObjectId17(_id);
     } catch (error) {
-      throw new BadRequestError33("Invalid schedule task ID format.");
+      throw new BadRequestError29("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 ObjectId19(area.value.toString())
+            value: new ObjectId17(area.value.toString())
           };
         } catch (error) {
-          throw new BadRequestError33(`Invalid area value format: ${area.name}`);
+          throw new BadRequestError29(`Invalid area value format: ${area.name}`);
         }
       });
     }
@@ -5694,14 +5099,14 @@ function useScheduleTaskRepository() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError10(
+        throw new InternalServerError9(
           "Unable to update hygiene schedule task."
         );
       }
       delNamespace().then(() => {
-        logger31.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger28.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger31.error(
+        logger28.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -5724,7 +5129,7 @@ function useScheduleTaskRepository() {
 }
 
 // src/services/hygiene-schedule-task.service.ts
-import { logger as logger32 } from "@7365admin1/node-server-utils";
+import { logger as logger29 } from "@7365admin1/node-server-utils";
 function useScheduleTaskService() {
   const { createParentChecklist } = useParentChecklistRepo();
   const { getAllScheduleTask } = useScheduleTaskRepository();
@@ -5747,13 +5152,13 @@ function useScheduleTaskService() {
       const currentDateString = now.toLocaleDateString("en-US", {
         timeZone: "Asia/Singapore"
       });
-      logger32.info(
+      logger29.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) {
-        logger32.info(
+        logger29.info(
           `Schedule ${schedule._id}: Current date ${currentDateString} is before start date ${schedule.startDate}`
         );
         return false;
@@ -5761,7 +5166,7 @@ function useScheduleTaskService() {
       if (schedule.endDate) {
         const endDate = /* @__PURE__ */ new Date(schedule.endDate + "T00:00:00");
         if (currentDateOnly > endDate) {
-          logger32.info(
+          logger29.info(
             `Schedule ${schedule._id}: Current date ${currentDateString} is after end date ${schedule.endDate}`
           );
           return false;
@@ -5770,17 +5175,17 @@ function useScheduleTaskService() {
       const [scheduleHour, scheduleMinute] = schedule.time.split(":").map(Number);
       const timeMatches = currentHour === scheduleHour && currentMinute === scheduleMinute;
       if (!timeMatches) {
-        logger32.info(
+        logger29.info(
           `Schedule ${schedule._id}: Time does not match. Current: ${currentHour}:${currentMinute}, Expected: ${scheduleHour}:${scheduleMinute}`
         );
         return false;
       }
-      logger32.info(
+      logger29.info(
         `Schedule ${schedule._id}: All conditions matched - Date is within range and time matches`
       );
       return true;
     } catch (error) {
-      logger32.error(
+      logger29.error(
         `Error checking schedule conditions for ${schedule._id}:`,
         error
       );
@@ -5789,40 +5194,40 @@ function useScheduleTaskService() {
   }
   async function processScheduledTasks(currentDate) {
     try {
-      logger32.info("Starting scheduled task processing...");
+      logger29.info("Starting scheduled task processing...");
       const scheduleTasks = await getAllScheduleTask();
       if (!scheduleTasks || scheduleTasks.length === 0) {
-        logger32.info("No schedule tasks found to process");
+        logger29.info("No schedule tasks found to process");
         return { processed: 0, validated: 0 };
       }
-      logger32.info(`Found ${scheduleTasks.length} schedule tasks to check`);
+      logger29.info(`Found ${scheduleTasks.length} schedule tasks to check`);
       let processedCount = 0;
       let validatedCount = 0;
       const validatedTasks = [];
       for (const scheduleTask of scheduleTasks) {
         try {
-          logger32.info(
+          logger29.info(
             `Checking schedule ${scheduleTask._id} - ${scheduleTask.title}: time=${scheduleTask.time}, startDate=${scheduleTask.startDate}, endDate=${scheduleTask.endDate}`
           );
           const shouldRun = checkScheduleConditions(scheduleTask, currentDate);
           if (!shouldRun) {
-            logger32.info(
+            logger29.info(
               `Schedule ${scheduleTask._id} conditions not met, skipping`
             );
             continue;
           }
-          logger32.info(
+          logger29.info(
             `Schedule ${scheduleTask._id} conditions validated, creating area checklists`
           );
           if (!scheduleTask._id) {
-            logger32.warn(`Schedule ${scheduleTask.title} has no _id, skipping`);
+            logger29.warn(`Schedule ${scheduleTask.title} has no _id, skipping`);
             continue;
           }
           if (!scheduleTask.site) {
-            logger32.warn(`Schedule ${scheduleTask._id} has no site, skipping`);
+            logger29.warn(`Schedule ${scheduleTask._id} has no site, skipping`);
             continue;
           }
-          logger32.info(
+          logger29.info(
             `Getting or creating parent checklist for schedule ${scheduleTask._id} in site ${scheduleTask.site}`
           );
           const parentChecklistIds = await createParentChecklist({
@@ -5830,7 +5235,7 @@ function useScheduleTaskService() {
             createdAt: /* @__PURE__ */ new Date()
           });
           const parentChecklistId = Array.isArray(parentChecklistIds) ? parentChecklistIds[0] : parentChecklistIds;
-          logger32.info(
+          logger29.info(
             `Using parent checklist ${parentChecklistId}, now creating/updating area checklists`
           );
           for (const area of scheduleTask.areas) {
@@ -5843,14 +5248,14 @@ function useScheduleTaskService() {
                   unit: unit.unit.toString(),
                   name: unit.name
                 }));
-                logger32.info(
+                logger29.info(
                   `Area ${area.name} (${areaId}): Using units from area details: ${JSON.stringify(
                     units
                   )}`
                 );
               }
               if (units.length === 0) {
-                logger32.warn(
+                logger29.warn(
                   `Area ${area.name} (${areaId}): No units found, skipping area.`
                 );
                 continue;
@@ -5861,11 +5266,11 @@ function useScheduleTaskService() {
                   parentChecklistId.toString(),
                   areaId
                 );
-                logger32.info(
+                logger29.info(
                   `Area ${area.name} (${areaId}): Existing area checklist found: ${existingAreaChecklist ? "Yes" : "No"}`
                 );
                 if (existingAreaChecklist) {
-                  logger32.info(
+                  logger29.info(
                     `Area ${area.name} (${areaId}): Existing checklist content: ${JSON.stringify(
                       existingAreaChecklist.checklist
                     )}`
@@ -5873,7 +5278,7 @@ function useScheduleTaskService() {
                 }
               } catch (error) {
                 existingAreaChecklist = null;
-                logger32.info(
+                logger29.info(
                   `Area ${area.name} (${areaId}): No existing area checklist found (exception).`
                 );
               }
@@ -5887,7 +5292,7 @@ function useScheduleTaskService() {
                   ...existingAreaChecklist.checklist || [],
                   newSet
                 ];
-                logger32.info(
+                logger29.info(
                   `Area ${area.name} (${areaId}): Appending new set ${newSet.set} to checklist. Updated checklist: ${JSON.stringify(
                     updatedChecklist
                   )}`
@@ -5895,7 +5300,7 @@ function useScheduleTaskService() {
                 await updateAreaChecklist(existingAreaChecklist._id, {
                   checklist: updatedChecklist
                 });
-                logger32.info(
+                logger29.info(
                   `Appended set ${newSet.set} to area checklist for area ${area.name}`
                 );
                 try {
@@ -5903,13 +5308,13 @@ function useScheduleTaskService() {
                     parentChecklistId.toString(),
                     areaId
                   );
-                  logger32.info(
+                  logger29.info(
                     `Area ${area.name} (${areaId}): Checklist after update: ${JSON.stringify(
                       verifyChecklist.checklist
                     )}`
                   );
                 } catch (verifyError) {
-                  logger32.warn(
+                  logger29.warn(
                     `Area ${area.name} (${areaId}): Error verifying checklist after update:`,
                     verifyError
                   );
@@ -5928,50 +5333,50 @@ function useScheduleTaskService() {
                   ],
                   createdBy: scheduleTask.createdBy
                 };
-                logger32.info(
+                logger29.info(
                   `Area ${area.name} (${areaId}): Creating new area checklist with data: ${JSON.stringify(
                     checklistData
                   )}`
                 );
                 await createAreaChecklist(checklistData);
-                logger32.info(`Created new area checklist for area ${area.name}`);
+                logger29.info(`Created new area checklist for area ${area.name}`);
                 try {
                   const verifyChecklist = await getAreaChecklistByAreaAndSchedule(
                     parentChecklistId.toString(),
                     areaId
                   );
-                  logger32.info(
+                  logger29.info(
                     `Area ${area.name} (${areaId}): Checklist after creation: ${JSON.stringify(
                       verifyChecklist.checklist
                     )}`
                   );
                 } catch (verifyError) {
-                  logger32.warn(
+                  logger29.warn(
                     `Area ${area.name} (${areaId}): Error verifying checklist after creation:`,
                     verifyError
                   );
                 }
               }
             } catch (error) {
-              logger32.error(`Error processing area ${area.name}:`, error);
+              logger29.error(`Error processing area ${area.name}:`, error);
               continue;
             }
           }
           processedCount++;
           validatedCount++;
           validatedTasks.push(scheduleTask);
-          logger32.info(
+          logger29.info(
             `Successfully processed schedule ${scheduleTask._id}, created/updated area checklists for all areas.`
           );
         } catch (error) {
-          logger32.error(
+          logger29.error(
             `Error processing schedule task ${scheduleTask._id}:`,
             error
           );
           continue;
         }
       }
-      logger32.info(
+      logger29.info(
         `Scheduled task processing completed. Processed: ${processedCount}, Validated: ${validatedCount} tasks`
       );
       return {
@@ -5980,7 +5385,7 @@ function useScheduleTaskService() {
         tasks: validatedTasks
       };
     } catch (error) {
-      logger32.error("Error processing scheduled tasks:", error);
+      logger29.error("Error processing scheduled tasks:", error);
       throw error;
     }
   }
@@ -5988,8 +5393,8 @@ function useScheduleTaskService() {
 }
 
 // src/controllers/hygiene-schedule-task.controller.ts
-import Joi19 from "joi";
-import { BadRequestError as BadRequestError34, logger as logger33 } from "@7365admin1/node-server-utils";
+import Joi17 from "joi";
+import { BadRequestError as BadRequestError30, logger as logger30 } from "@7365admin1/node-server-utils";
 function useScheduleTaskController() {
   const {
     createScheduleTask: _createScheduleTask,
@@ -6007,8 +5412,8 @@ function useScheduleTaskController() {
     const payload = { ...req.body, ...req.params, createdBy };
     const { error } = scheduleTaskSchema.validate(payload);
     if (error) {
-      logger33.log({ level: "error", message: error.message });
-      next(new BadRequestError34(error.message));
+      logger30.log({ level: "error", message: error.message });
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
@@ -6016,23 +5421,23 @@ function useScheduleTaskController() {
       res.status(201).json({ message: "Schedule task created successfully.", id });
       return;
     } catch (error2) {
-      logger33.log({ level: "error", message: error2.message });
+      logger30.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function getScheduleTasks(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi19.object({
-      page: Joi19.number().min(1).optional().allow("", null),
-      limit: Joi19.number().min(1).optional().allow("", null),
-      search: Joi19.string().optional().allow("", null),
-      site: Joi19.string().hex().required()
+    const validation = Joi17.object({
+      page: Joi17.number().min(1).optional().allow("", null),
+      limit: Joi17.number().min(1).optional().allow("", null),
+      search: Joi17.string().optional().allow("", null),
+      site: Joi17.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger33.log({ level: "error", message: error.message });
-      next(new BadRequestError34(error.message));
+      logger30.log({ level: "error", message: error.message });
+      next(new BadRequestError30(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -6049,23 +5454,23 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger33.log({ level: "error", message: error2.message });
+      logger30.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function getTasksForScheduleTask(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi19.object({
-      page: Joi19.number().min(1).optional().allow("", null),
-      limit: Joi19.number().min(1).optional().allow("", null),
-      search: Joi19.string().optional().allow("", null),
-      site: Joi19.string().hex().required()
+    const validation = Joi17.object({
+      page: Joi17.number().min(1).optional().allow("", null),
+      limit: Joi17.number().min(1).optional().allow("", null),
+      search: Joi17.string().optional().allow("", null),
+      site: Joi17.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger33.log({ level: "error", message: error.message });
-      next(new BadRequestError34(error.message));
+      logger30.log({ level: "error", message: error.message });
+      next(new BadRequestError30(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -6082,18 +5487,18 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger33.log({ level: "error", message: error2.message });
+      logger30.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function getScheduleTaskById(req, res, next) {
-    const validation = Joi19.string().hex().required();
+    const validation = Joi17.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
-      logger33.log({ level: "error", message: error.message });
-      next(new BadRequestError34(error.message));
+      logger30.log({ level: "error", message: error.message });
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
@@ -6101,31 +5506,31 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger33.log({ level: "error", message: error2.message });
+      logger30.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 = Joi19.object({
-      id: Joi19.string().hex().required(),
-      title: Joi19.string().optional().allow("", null),
-      time: Joi19.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).optional().allow("", null),
-      startDate: Joi19.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
-      endDate: Joi19.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
-      description: Joi19.string().optional().allow("", null),
-      areas: Joi19.array().min(1).items(
-        Joi19.object({
-          name: Joi19.string().required(),
-          value: Joi19.any().required()
+    const validation = Joi17.object({
+      id: Joi17.string().hex().required(),
+      title: Joi17.string().optional().allow("", null),
+      time: Joi17.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).optional().allow("", null),
+      startDate: Joi17.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
+      endDate: Joi17.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
+      description: Joi17.string().optional().allow("", null),
+      areas: Joi17.array().min(1).items(
+        Joi17.object({
+          name: Joi17.string().required(),
+          value: Joi17.any().required()
         })
       ).optional()
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger33.log({ level: "error", message: error.message });
-      next(new BadRequestError34(error.message));
+      logger30.log({ level: "error", message: error.message });
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
@@ -6134,7 +5539,7 @@ function useScheduleTaskController() {
       res.json({ message: "Schedule task updated successfully." });
       return;
     } catch (error2) {
-      logger33.log({ level: "error", message: error2.message });
+      logger30.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -6152,7 +5557,6 @@ export {
   MAreaChecklist,
   MCheckOutItem,
   MParentChecklist,
-  MRequestItem,
   MScheduleTask,
   MStock,
   MSupply,
@@ -6160,14 +5564,12 @@ export {
   allowedCheckOutItemStatus,
   allowedChecklistStatus,
   allowedPeriods,
-  allowedRequestItemStatus,
   allowedStatus,
   allowedTypes,
   areaChecklistSchema,
   areaSchema,
   checkOutItemSchema,
   parentChecklistSchema,
-  requestItemSchema,
   scheduleTaskSchema,
   stockSchema,
   supplySchema,
@@ -6185,9 +5587,6 @@ export {
   useHygieneDashboardRepository,
   useParentChecklistController,
   useParentChecklistRepo,
-  useRequestItemController,
-  useRequestItemRepository,
-  useRequestItemService,
   useScheduleTaskController,
   useScheduleTaskRepository,
   useScheduleTaskService,