@iservice365/module-hygiene 1.0.3 → 1.1.0

package/dist/index.mjs

@@ -644,7 +644,7 @@ function useAreaController() {
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
-    const limit = parseInt(req.query.limit) ?? 20;
+    const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
     try {
@@ -1193,7 +1193,7 @@ function useUnitController() {
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
-    const limit = parseInt(req.query.limit) ?? 20;
+    const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
     try {
@@ -1607,7 +1607,7 @@ function useParentChecklistController() {
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
-    const limit = parseInt(req.query.limit) ?? 20;
+    const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
     const startDate = req.query.startDate ?? "";
@@ -2626,7 +2626,7 @@ function useAreaChecklistController() {
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
-    const limit = parseInt(req.query.limit) ?? 20;
+    const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const type = req.query.type ?? "";
     const schedule = req.params.schedule ?? "";
@@ -2664,7 +2664,7 @@ function useAreaChecklistController() {
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
-    const limit = parseInt(req.query.limit) ?? 20;
+    const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const type = req.query.type ?? "";
     const schedule = req.params.schedule ?? "";
@@ -2722,7 +2722,7 @@ function useAreaChecklistController() {
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
-    const limit = parseInt(req.query.limit) ?? 20;
+    const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const _id = req.params.id ?? "";
     try {
@@ -2797,8 +2797,7 @@ import { ObjectId as ObjectId9 } from "mongodb";
 var supplySchema = Joi9.object({
   site: Joi9.string().hex().required(),
   name: Joi9.string().required(),
-  unitOfMeasurement: Joi9.string().required(),
-  qty: Joi9.number().min(0).required()
+  unitOfMeasurement: Joi9.string().required()
 });
 function MSupply(value) {
   const { error } = supplySchema.validate(value);
@@ -2817,7 +2816,7 @@ function MSupply(value) {
     site: value.site,
     name: value.name,
     unitOfMeasurement: value.unitOfMeasurement,
-    qty: value.qty,
+    qty: 0,
     status: "active",
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: "",
@@ -2952,7 +2951,7 @@ function useSupplyRepository() {
       throw error;
     }
   }
-  async function getSupplyById(_id) {
+  async function getSupplyById(_id, session) {
     try {
       _id = new ObjectId10(_id);
     } catch (error) {
@@ -2965,10 +2964,14 @@ function useSupplyRepository() {
     const cacheKey = makeCacheKey5(namespace_collection, {
       _id: _id.toString()
     });
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger17.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
+    if (!session) {
+      const cachedData = await getCache(cacheKey);
+      if (cachedData) {
+        logger17.info(`Cache hit for key: ${cacheKey}`);
+        return cachedData;
+      }
+    } else {
+      logger17.info(`Skipping cache during transaction for key: ${cacheKey}`);
     }
     try {
       const data = await collection.aggregate([
@@ -3072,39 +3075,172 @@ function useSupplyRepository() {
   };
 }
 
-// src/services/hygiene-supply.service.ts
-import { useAtlas as useAtlas9 } from "@iservice365/node-server-utils";
-
-// src/models/hygiene-stock.model.ts
+// src/controllers/hygiene-supply.controller.ts
 import { BadRequestError as BadRequestError17, logger as logger18 } from "@iservice365/node-server-utils";
 import Joi10 from "joi";
+function useSupplyController() {
+  const {
+    createSupply: _createSupply,
+    getSupplies: _getSupplies,
+    getSupplyById: _getSupplyById,
+    updateSupply: _updateSupply,
+    deleteSupply: _deleteSupply
+  } = useSupplyRepository();
+  async function createSupply(req, res, next) {
+    const payload = { ...req.body, ...req.params };
+    const { error } = supplySchema.validate(payload);
+    if (error) {
+      logger18.log({ level: "error", message: error.message });
+      next(new BadRequestError17(error.message));
+      return;
+    }
+    try {
+      const id = await _createSupply(payload);
+      res.status(201).json({ message: "Supply created successfully.", id });
+      return;
+    } catch (error2) {
+      logger18.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getSupplies(req, res, next) {
+    const query = { ...req.query, ...req.params };
+    const validation = Joi10.object({
+      page: Joi10.number().min(1).optional().allow("", null),
+      limit: Joi10.number().min(1).optional().allow("", null),
+      search: Joi10.string().optional().allow("", null),
+      site: Joi10.string().hex().required()
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      logger18.log({ level: "error", message: error.message });
+      next(new BadRequestError17(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 _getSupplies({
+        page,
+        limit,
+        search,
+        site
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger18.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getSupplyById(req, res, next) {
+    const validation = Joi10.string().hex().required();
+    const _id = req.params.id;
+    const { error } = validation.validate(_id);
+    if (error) {
+      logger18.log({ level: "error", message: error.message });
+      next(new BadRequestError17(error.message));
+      return;
+    }
+    try {
+      const data = await _getSupplyById(_id);
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger18.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function updateSupply(req, res, next) {
+    const payload = { id: req.params.id, ...req.body };
+    const validation = Joi10.object({
+      id: Joi10.string().hex().required(),
+      name: Joi10.string().optional().allow("", null),
+      unitOfMeasurement: Joi10.string().optional().allow("", null),
+      qty: Joi10.number().min(0).optional().allow("", null)
+    });
+    const { error } = validation.validate(payload);
+    if (error) {
+      logger18.log({ level: "error", message: error.message });
+      next(new BadRequestError17(error.message));
+      return;
+    }
+    try {
+      const { id, ...value } = payload;
+      await _updateSupply(id, value);
+      res.json({ message: "Supply updated successfully." });
+      return;
+    } catch (error2) {
+      logger18.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function deleteSupply(req, res, next) {
+    const id = req.params.id;
+    const validation = Joi10.object({
+      id: Joi10.string().hex().required()
+    });
+    const { error } = validation.validate({ id });
+    if (error) {
+      logger18.log({ level: "error", message: error.message });
+      next(new BadRequestError17(error.message));
+      return;
+    }
+    try {
+      await _deleteSupply(id);
+      res.json({ message: "Supply deleted successfully." });
+      return;
+    } catch (error2) {
+      logger18.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  return {
+    createSupply,
+    getSupplies,
+    getSupplyById,
+    updateSupply,
+    deleteSupply
+  };
+}
+
+// src/models/hygiene-stock.model.ts
+import { BadRequestError as BadRequestError18, logger as logger19 } from "@iservice365/node-server-utils";
+import Joi11 from "joi";
 import { ObjectId as ObjectId11 } from "mongodb";
-var stockSchema = Joi10.object({
-  site: Joi10.string().hex().required(),
-  supply: Joi10.string().hex().required(),
-  in: Joi10.number().min(0).optional(),
-  out: Joi10.number().min(0).optional(),
-  balance: Joi10.number().min(0).required(),
-  remarks: Joi10.string().optional().allow("", null)
+var stockSchema = Joi11.object({
+  site: Joi11.string().hex().required(),
+  supply: Joi11.string().hex().required(),
+  in: Joi11.number().min(0).optional(),
+  out: Joi11.number().min(0).optional(),
+  balance: Joi11.number().min(0).required(),
+  remarks: Joi11.string().optional().allow("", null)
 });
 function MStock(value) {
   const { error } = stockSchema.validate(value);
   if (error) {
-    logger18.info(`Hygiene Stock Model: ${error.message}`);
-    throw new BadRequestError17(error.message);
+    logger19.info(`Hygiene Stock Model: ${error.message}`);
+    throw new BadRequestError18(error.message);
   }
   if (value.site) {
     try {
       value.site = new ObjectId11(value.site);
     } catch (error2) {
-      throw new BadRequestError17("Invalid site ID format.");
+      throw new BadRequestError18("Invalid site ID format.");
     }
   }
   if (value.supply) {
     try {
       value.supply = new ObjectId11(value.supply);
     } catch (error2) {
-      throw new BadRequestError17("Invalid supply ID format.");
+      throw new BadRequestError18("Invalid supply ID format.");
     }
   }
   return {
@@ -3122,12 +3258,15 @@ function MStock(value) {
 }
 
 // src/repositories/hygiene-stock.repository.ts
+import { ObjectId as ObjectId12 } from "mongodb";
 import {
   useAtlas as useAtlas8,
   InternalServerError as InternalServerError6,
-  BadRequestError as BadRequestError18,
+  BadRequestError as BadRequestError19,
   useCache as useCache6,
-  logger as logger19
+  logger as logger20,
+  makeCacheKey as makeCacheKey6,
+  paginate as paginate6
 } from "@iservice365/node-server-utils";
 function useStockRepository() {
   const db = useAtlas8.getDb();
@@ -3135,8 +3274,10 @@ function useStockRepository() {
     throw new InternalServerError6("Unable to connect to server.");
   }
   const namespace_collection = "site.supply.stocks";
+  const supply_collection = "site.supplies";
   const collection = db.collection(namespace_collection);
-  const { delNamespace } = useCache6(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache6(namespace_collection);
+  const { delNamespace: delSupplyNamespace } = useCache6(supply_collection);
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -3154,49 +3295,135 @@ function useStockRepository() {
       value = MStock(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger19.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger20.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger19.error(
+        logger20.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
       });
+      delSupplyNamespace().then(() => {
+        logger20.info(`Cache cleared for namespace: ${supply_collection}`);
+      }).catch((err) => {
+        logger20.error(
+          `Failed to clear cache for namespace: ${supply_collection}`,
+          err
+        );
+      });
       return res.insertedId;
     } catch (error) {
-      const isDuplicated = error.message.includes("duplicate");
-      if (isDuplicated) {
-        throw new BadRequestError18("Stock already exists.");
-      }
+      throw error;
+    }
+  }
+  async function getStocksBySupplyId({
+    page = 1,
+    limit = 10,
+    search = "",
+    site,
+    supply
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = {
+      status: { $ne: "deleted" }
+    };
+    const cacheOptions = {
+      page,
+      limit
+    };
+    try {
+      site = new ObjectId12(site);
+      query.site = site;
+      cacheOptions.site = site.toString();
+    } catch (error) {
+      throw new BadRequestError19("Invalid site ID format.");
+    }
+    try {
+      supply = new ObjectId12(supply);
+      query.supply = supply;
+      cacheOptions.supply = supply.toString();
+    } catch (error) {
+      throw new BadRequestError19("Invalid supply ID format.");
+    }
+    if (search) {
+      query.$text = { $search: search };
+      cacheOptions.search = search;
+    }
+    const cacheKey = makeCacheKey6(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger20.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        {
+          $project: {
+            createdAt: 1,
+            in: 1,
+            out: 1,
+            balance: 1
+          }
+        },
+        { $sort: { _id: 1 } },
+        { $skip: page * limit },
+        { $limit: limit }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = paginate6(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger20.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger20.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
       throw error;
     }
   }
   return {
     createIndex,
-    createStock
+    createStock,
+    getStocksBySupplyId
   };
 }
 
-// src/services/hygiene-supply.service.ts
-function useSupplyService() {
-  const { createSupply: _createSupply } = useSupplyRepository();
-  const { createStock } = useStockRepository();
-  async function createSupply(value) {
+// src/services/hygiene-stock.service.ts
+import {
+  NotFoundError as NotFoundError5,
+  useAtlas as useAtlas9,
+  BadRequestError as BadRequestError20
+} from "@iservice365/node-server-utils";
+function useStockService() {
+  const { createStock: _createStock } = useStockRepository();
+  const { getSupplyById, updateSupply } = useSupplyRepository();
+  async function createStock(value, out = false) {
     const session = useAtlas9.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const { qty, site } = value;
-      const supply = await _createSupply(value, session);
-      const createdSupply = await createStock(
+      const { qty, ...stockData } = value;
+      const supply = await getSupplyById(value.supply, session);
+      if (!supply || supply.qty === void 0) {
+        throw new NotFoundError5("Supply not found.");
+      }
+      const newSupplyQty = out ? supply.qty - qty : supply.qty + qty;
+      if (out && newSupplyQty < 0) {
+        throw new BadRequestError20(
+          `Insufficient stock. Available: ${supply.qty}, Requested: ${qty}`
+        );
+      }
+      await updateSupply(value.supply, { qty: newSupplyQty }, session);
+      const createdStock = await _createStock(
         {
-          site,
-          supply: supply.toString(),
-          in: qty,
-          balance: qty
+          ...stockData,
+          in: out ? 0 : qty,
+          out: out ? qty : 0,
+          balance: newSupplyQty
         },
         session
       );
       await session?.commitTransaction();
-      return createdSupply;
+      return createdStock;
     } catch (error) {
       await session?.abortTransaction();
       throw error;
@@ -3204,167 +3431,301 @@ function useSupplyService() {
       await session?.endSession();
     }
   }
-  return { createSupply };
+  return { createStock };
 }
 
-// src/controllers/hygiene-supply.controller.ts
-import { BadRequestError as BadRequestError19, logger as logger20 } from "@iservice365/node-server-utils";
-import Joi11 from "joi";
-function useSupplyController() {
-  const {
-    getSupplies: _getSupplies,
-    getSupplyById: _getSupplyById,
-    updateSupply: _updateSupply,
-    deleteSupply: _deleteSupply
-  } = useSupplyRepository();
-  const { createSupply: _createSupply } = useSupplyService();
-  async function createSupply(req, res, next) {
+// src/controllers/hygiene-stock.controller.ts
+import { BadRequestError as BadRequestError21, logger as logger21 } from "@iservice365/node-server-utils";
+import Joi12 from "joi";
+function useStockController() {
+  const { getStocksBySupplyId: _getStocksBySupplyId } = useStockRepository();
+  const { createStock: _createStock } = useStockService();
+  async function createStock(req, res, next) {
     const payload = { ...req.body, ...req.params };
-    const { error } = supplySchema.validate(payload);
+    const validation = Joi12.object({
+      site: Joi12.string().hex().required(),
+      supply: Joi12.string().hex().required(),
+      qty: Joi12.number().min(0).required(),
+      remarks: Joi12.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(payload);
     if (error) {
-      logger20.log({ level: "error", message: error.message });
-      next(new BadRequestError19(error.message));
+      logger21.log({ level: "error", message: error.message });
+      next(new BadRequestError21(error.message));
       return;
     }
     try {
-      const id = await _createSupply(payload);
-      res.status(201).json({ message: "Supply created successfully.", id });
+      const id = await _createStock(payload);
+      res.status(201).json({ message: "Stock created successfully.", id });
       return;
     } catch (error2) {
-      logger20.log({ level: "error", message: error2.message });
+      logger21.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
-  async function getSupplies(req, res, next) {
+  async function getStocksBySupplyId(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi11.object({
-      page: Joi11.number().min(1).optional().allow("", null),
-      limit: Joi11.number().min(1).optional().allow("", null),
-      search: Joi11.string().optional().allow("", null),
-      site: Joi11.string().hex().required()
+    const validation = Joi12.object({
+      page: Joi12.number().min(1).optional().allow("", null),
+      limit: Joi12.number().min(1).optional().allow("", null),
+      search: Joi12.string().optional().allow("", null),
+      site: Joi12.string().hex().required(),
+      supply: Joi12.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger20.log({ level: "error", message: error.message });
-      next(new BadRequestError19(error.message));
+      logger21.log({ level: "error", message: error.message });
+      next(new BadRequestError21(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
-    const limit = parseInt(req.query.limit) ?? 20;
+    const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const supply = req.params.supply ?? "";
     try {
-      const data = await _getSupplies({
+      const data = await _getStocksBySupplyId({
         page,
         limit,
         search,
-        site
+        site,
+        supply
       });
       res.json(data);
       return;
     } catch (error2) {
-      logger20.log({ level: "error", message: error2.message });
+      logger21.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
-  async function getSupplyById(req, res, next) {
-    const validation = Joi11.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      logger20.log({ level: "error", message: error.message });
-      next(new BadRequestError19(error.message));
-      return;
+  return {
+    createStock,
+    getStocksBySupplyId
+  };
+}
+
+// src/models/hygiene-request-item.model.ts
+import { BadRequestError as BadRequestError22, logger as logger22 } from "@iservice365/node-server-utils";
+import Joi13 from "joi";
+import { ObjectId as ObjectId13 } from "mongodb";
+var allowedRequestItemStatus = [
+  "pending",
+  "approved",
+  "disapproved"
+];
+var requestItemSchema = Joi13.object({
+  site: Joi13.string().hex().required(),
+  supply: Joi13.string().hex().required(),
+  supplyName: Joi13.string().required(),
+  qty: Joi13.number().min(0).required(),
+  createdBy: Joi13.string().hex().required(),
+  createdByName: Joi13.string().required()
+});
+function MRequestItem(value) {
+  const { error } = requestItemSchema.validate(value);
+  if (error) {
+    logger22.info(`Hygiene Request Item Model: ${error.message}`);
+    throw new BadRequestError22(error.message);
+  }
+  if (value.site) {
+    try {
+      value.site = new ObjectId13(value.site);
+    } catch (error2) {
+      throw new BadRequestError22("Invalid site ID format.");
     }
+  }
+  if (value.supply) {
     try {
-      const data = await _getSupplyById(_id);
-      res.json(data);
-      return;
+      value.supply = new ObjectId13(value.supply);
     } catch (error2) {
-      logger20.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
+      throw new BadRequestError22("Invalid supply ID format.");
     }
   }
-  async function updateSupply(req, res, next) {
-    const payload = { id: req.params.id, ...req.body };
-    const validation = Joi11.object({
-      id: Joi11.string().hex().required(),
-      name: Joi11.string().optional().allow("", null),
-      unitOfMeasurement: Joi11.string().optional().allow("", null),
-      qty: Joi11.number().min(0).optional().allow("", null)
-    });
-    const { error } = validation.validate(payload);
-    if (error) {
-      logger20.log({ level: "error", message: error.message });
-      next(new BadRequestError19(error.message));
-      return;
+  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 ObjectId14 } from "mongodb";
+import {
+  useAtlas as useAtlas10,
+  InternalServerError as InternalServerError7,
+  useCache as useCache7,
+  logger as logger23,
+  makeCacheKey as makeCacheKey7,
+  paginate as paginate7,
+  BadRequestError as BadRequestError23
+} from "@iservice365/node-server-utils";
+function useRequestItemRepository() {
+  const db = useAtlas10.getDb();
+  if (!db) {
+    throw new InternalServerError7("Unable to connect to server.");
+  }
+  const namespace_collection = "site.supply.requests";
+  const collection = db.collection(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache7(namespace_collection);
+  async function createIndex() {
+    try {
+      await collection.createIndexes([
+        { key: { site: 1 } },
+        { key: { supply: 1 } },
+        { key: { status: 1 } }
+      ]);
+    } catch (error) {
+      throw new InternalServerError7(
+        "Failed to create index on hygiene request item."
+      );
     }
+  }
+  async function createTextIndex() {
     try {
-      const { id, ...value } = payload;
-      await _updateSupply(id, value);
-      res.json({ message: "Supply updated successfully." });
-      return;
-    } catch (error2) {
-      logger20.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
+      await collection.createIndex({ supplyName: "text" });
+    } catch (error) {
+      throw new InternalServerError7(
+        "Failed to create text index on hygiene supply."
+      );
     }
   }
-  async function deleteSupply(req, res, next) {
-    const id = req.params.id;
-    const validation = Joi11.object({
-      id: Joi11.string().hex().required()
-    });
-    const { error } = validation.validate({ id });
-    if (error) {
-      logger20.log({ level: "error", message: error.message });
-      next(new BadRequestError19(error.message));
-      return;
+  async function createRequestItem(value, session) {
+    try {
+      value = MRequestItem(value);
+      const res = await collection.insertOne(value, { session });
+      delNamespace().then(() => {
+        logger23.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger23.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.insertedId;
+    } catch (error) {
+      throw error;
     }
+  }
+  async function getRequestItems({
+    page = 1,
+    limit = 10,
+    search = "",
+    site
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = {
+      status: { $ne: "deleted" }
+    };
+    const cacheOptions = {
+      page,
+      limit
+    };
     try {
-      await _deleteSupply(id);
-      res.json({ message: "Supply deleted successfully." });
-      return;
-    } catch (error2) {
-      logger20.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
+      site = new ObjectId14(site);
+      query.site = site;
+      cacheOptions.site = site.toString();
+    } catch (error) {
+      throw new BadRequestError23("Invalid site ID format.");
+    }
+    if (search) {
+      query.$text = { $search: search };
+      cacheOptions.search = search;
+    }
+    const cacheKey = makeCacheKey7(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger23.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        {
+          $project: {
+            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(() => {
+        logger23.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger23.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
     }
   }
   return {
-    createSupply,
-    getSupplies,
-    getSupplyById,
-    updateSupply,
-    deleteSupply
+    createIndex,
+    createTextIndex,
+    createRequestItem,
+    getRequestItems
   };
 }
 
-// src/services/hygiene-stock.service.ts
-import { NotFoundError as NotFoundError5, useAtlas as useAtlas10 } from "@iservice365/node-server-utils";
-function useStockService() {
-  const { createStock: _createStock } = useStockRepository();
-  const { getSupplyById, updateSupply } = useSupplyRepository();
-  async function createStock(value) {
-    const session = useAtlas10.getClient()?.startSession();
+// src/services/hygiene-request-item.service.ts
+import { useAtlas as useAtlas11 } from "@iservice365/node-server-utils";
+import { useUserRepo } from "@iservice365/core";
+function useRequestItemService() {
+  const { createRequestItem: _createRequestItem } = useRequestItemRepository();
+  const { getSupplyById } = useSupplyRepository();
+  const { getUserById } = useUserRepo();
+  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 = useAtlas11.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const { qty, ...stockData } = value;
-      const supply = await getSupplyById(value.supply);
-      if (!supply || supply.qty === void 0) {
-        throw new NotFoundError5("Supply not found.");
+      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);
       }
-      const newSupplyQty = supply.qty + qty;
-      await updateSupply(value.supply, { qty: newSupplyQty }, session);
-      const createdStock = await _createStock(
-        { ...stockData, in: qty, balance: newSupplyQty },
-        session
-      );
       await session?.commitTransaction();
-      return createdStock;
+      return createdRequestItemIds;
     } catch (error) {
       await session?.abortTransaction();
       throw error;
@@ -3372,55 +3733,143 @@ function useStockService() {
       await session?.endSession();
     }
   }
-  return { createStock };
+  return { createRequestItem, createRequestItemByBatch };
 }
 
-// src/controllers/hygiene-stock.controller.ts
-import { BadRequestError as BadRequestError20, logger as logger21 } from "@iservice365/node-server-utils";
-import Joi12 from "joi";
-function useStockController() {
-  const { createStock: _createStock } = useStockService();
-  async function createStock(req, res, next) {
-    const payload = { ...req.body, ...req.params };
-    const validation = Joi12.object({
-      site: Joi12.string().hex().required(),
-      supply: Joi12.string().hex().required(),
-      qty: Joi12.number().min(0).optional(),
-      remarks: Joi12.string().optional().allow("", null)
+// src/controllers/hygiene-request-item.controller.ts
+import { BadRequestError as BadRequestError24, logger as logger24 } from "@iservice365/node-server-utils";
+import Joi14 from "joi";
+function useRequestItemController() {
+  const { getRequestItems: _getRequestItems } = useRequestItemRepository();
+  const {
+    createRequestItem: _createRequestItem,
+    createRequestItemByBatch: _createRequestItemByBatch
+  } = 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 = Joi14.object({
+      site: Joi14.string().hex().required(),
+      supply: Joi14.string().hex().required(),
+      qty: Joi14.number().min(0).required(),
+      createdBy: Joi14.string().hex().required()
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger21.log({ level: "error", message: error.message });
-      next(new BadRequestError20(error.message));
+      logger24.log({ level: "error", message: error.message });
+      next(new BadRequestError24(error.message));
       return;
     }
     try {
-      const id = await _createStock(payload);
-      res.status(201).json({ message: "Stock created successfully.", id });
+      const id = await _createRequestItem(payload);
+      res.status(201).json({ message: "Request item created successfully.", id });
       return;
     } catch (error2) {
-      logger21.log({ level: "error", message: error2.message });
+      logger24.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 = Joi14.object({
+      site: Joi14.string().hex().required(),
+      createdBy: Joi14.string().hex().required(),
+      items: Joi14.array().items(
+        Joi14.object({
+          supply: Joi14.string().hex().required(),
+          qty: Joi14.number().min(0).required()
+        })
+      ).min(1).required()
+    });
+    const { error } = validation.validate(payload);
+    if (error) {
+      logger24.log({ level: "error", message: error.message });
+      next(new BadRequestError24(error.message));
+      return;
+    }
+    try {
+      await _createRequestItemByBatch(payload);
+      res.status(201).json({ message: "Request items created successfully." });
+      return;
+    } catch (error2) {
+      logger24.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getRequestItems(req, res, next) {
+    const query = { ...req.query, ...req.params };
+    const validation = Joi14.object({
+      page: Joi14.number().min(1).optional().allow("", null),
+      limit: Joi14.number().min(1).optional().allow("", null),
+      search: Joi14.string().optional().allow("", null),
+      site: Joi14.string().hex().required()
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      logger24.log({ level: "error", message: error.message });
+      next(new BadRequestError24(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) {
+      logger24.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   return {
-    createStock
+    createRequestItem,
+    createRequestItemByBatch,
+    getRequestItems
   };
 }
 export {
   MArea,
   MAreaChecklist,
   MParentChecklist,
+  MRequestItem,
   MStock,
   MSupply,
   MUnit,
   allowedChecklistStatus,
+  allowedRequestItemStatus,
   allowedStatus,
   allowedTypes,
   areaChecklistSchema,
   areaSchema,
   parentChecklistSchema,
+  requestItemSchema,
   stockSchema,
   supplySchema,
   unitSchema,
@@ -3432,12 +3881,14 @@ export {
   useAreaService,
   useParentChecklistController,
   useParentChecklistRepo,
+  useRequestItemController,
+  useRequestItemRepository,
+  useRequestItemService,
   useStockController,
   useStockRepository,
   useStockService,
   useSupplyController,
   useSupplyRepository,
-  useSupplyService,
   useUnitController,
   useUnitRepository,
   useUnitService