@iservice365/module-hygiene 1.0.1 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @iservice365/module-hygiene
 
+## 1.0.3
+
+### Patch Changes
+
+- fa485c3: Update dependencies
+- 3ac64f5: Fix export modules
+
+## 1.0.2
+
+### Patch Changes
+
+- 73be6af: Update dependencies
+
 ## 1.0.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -269,12 +269,13 @@ type TSupply = {
     name: string;
     unitOfMeasurement: string;
     qty: number;
+    status?: "active" | "deleted";
     createdAt?: string;
     updatedAt?: string;
     deletedAt?: string;
-    status?: "active" | "deleted";
 };
 type TSupplyCreate = Pick<TSupply, "site" | "name" | "unitOfMeasurement" | "qty">;
+type TSupplyGetById = Pick<TSupply, "_id" | "name" | "unitOfMeasurement" | "qty">;
 type TSupplyUpdate = Partial<Pick<TSupply, "name" | "unitOfMeasurement" | "qty">>;
 type TGetSupplysQuery = {
     page?: number;
@@ -287,8 +288,8 @@ declare function MSupply(value: TSupplyCreate): {
     name: string;
     unitOfMeasurement: string;
     qty: number;
-    createdAt: Date;
     status: string;
+    createdAt: string;
     updatedAt: string;
     deletedAt: string;
 };
@@ -299,15 +300,65 @@ declare function useSupplyRepository(): {
     createUniqueIndex: () => Promise<void>;
     createSupply: (value: TSupplyCreate, session?: ClientSession) => Promise<ObjectId>;
     getSupplies: ({ page, limit, search, site, }: TGetSupplysQuery) => Promise<{}>;
+    getSupplyById: (_id: string | ObjectId) => Promise<TSupplyGetById>;
     updateSupply: (_id: string | ObjectId, value: TSupplyUpdate, session?: ClientSession) => Promise<number>;
     deleteSupply: (_id: string | ObjectId, session?: ClientSession) => Promise<number>;
 };
 
+declare function useSupplyService(): {
+    createSupply: (value: TSupplyCreate) => Promise<bson.ObjectId>;
+};
+
 declare function useSupplyController(): {
     createSupply: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getSupplies: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getSupplyById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateSupply: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteSupply: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-export { MArea, MAreaChecklist, MParentChecklist, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaCreate, TAreaGetAreasForChecklist, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCleaningScheduleArea, TGetSupplysQuery, TGetUnitsQuery, TParentChecklist, TSupply, TSupplyCreate, TSupplyUpdate, TUnit, TUnitCreate, TUnitUpdate, allowedChecklistStatus, allowedStatus, allowedTypes, areaChecklistSchema, areaSchema, parentChecklistSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaRepo, useAreaService, useParentChecklistController, useParentChecklistRepo, useSupplyController, useSupplyRepository, useUnitController, useUnitRepository, useUnitService };
+type TStock = {
+    _id?: ObjectId;
+    site: string | ObjectId;
+    supply: string | ObjectId;
+    in?: number;
+    out?: number;
+    balance: number;
+    remarks?: string;
+    status?: "active" | "deleted";
+    createdAt?: string;
+    updatedAt?: string;
+    deletedAt?: string;
+};
+type TStockCreate = Pick<TStock, "site" | "supply" | "in" | "out" | "balance" | "remarks">;
+type TStockCreateService = Pick<TStock, "site" | "supply" | "remarks"> & {
+    qty: number;
+};
+declare const stockSchema: Joi.ObjectSchema<any>;
+declare function MStock(value: TStockCreate): {
+    site: string | ObjectId;
+    supply: string | ObjectId;
+    in: number;
+    out: number;
+    balance: number;
+    remarks: string;
+    createdAt: string;
+    status: string;
+    updatedAt: string;
+    deletedAt: string;
+};
+
+declare function useStockRepository(): {
+    createIndex: () => Promise<void>;
+    createStock: (value: TStockCreate, session?: ClientSession) => Promise<bson.ObjectId>;
+};
+
+declare function useStockService(): {
+    createStock: (value: TStockCreateService) => Promise<bson.ObjectId>;
+};
+
+declare function useStockController(): {
+    createStock: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+};
+
+export { MArea, MAreaChecklist, MParentChecklist, MStock, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaCreate, TAreaGetAreasForChecklist, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCleaningScheduleArea, TGetSupplysQuery, TGetUnitsQuery, TParentChecklist, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyUpdate, TUnit, TUnitCreate, TUnitUpdate, allowedChecklistStatus, allowedStatus, allowedTypes, areaChecklistSchema, areaSchema, parentChecklistSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaRepo, useAreaService, useParentChecklistController, useParentChecklistRepo, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useSupplyService, useUnitController, useUnitRepository, useUnitService };

package/dist/index.js

@@ -33,6 +33,7 @@ __export(src_exports, {
   MArea: () => MArea,
   MAreaChecklist: () => MAreaChecklist,
   MParentChecklist: () => MParentChecklist,
+  MStock: () => MStock,
   MSupply: () => MSupply,
   MUnit: () => MUnit,
   allowedChecklistStatus: () => allowedChecklistStatus,
@@ -41,6 +42,7 @@ __export(src_exports, {
   areaChecklistSchema: () => areaChecklistSchema,
   areaSchema: () => areaSchema,
   parentChecklistSchema: () => parentChecklistSchema,
+  stockSchema: () => stockSchema,
   supplySchema: () => supplySchema,
   unitSchema: () => unitSchema,
   useAreaChecklistController: () => useAreaChecklistController,
@@ -51,8 +53,12 @@ __export(src_exports, {
   useAreaService: () => useAreaService,
   useParentChecklistController: () => useParentChecklistController,
   useParentChecklistRepo: () => useParentChecklistRepo,
+  useStockController: () => useStockController,
+  useStockRepository: () => useStockRepository,
+  useStockService: () => useStockService,
   useSupplyController: () => useSupplyController,
   useSupplyRepository: () => useSupplyRepository,
+  useSupplyService: () => useSupplyService,
   useUnitController: () => useUnitController,
   useUnitRepository: () => useUnitRepository,
   useUnitService: () => useUnitService
@@ -2837,8 +2843,8 @@ function MSupply(value) {
     name: value.name,
     unitOfMeasurement: value.unitOfMeasurement,
     qty: value.qty,
-    createdAt: /* @__PURE__ */ new Date(),
     status: "active",
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: "",
     deletedAt: ""
   };
@@ -2962,6 +2968,48 @@ function useSupplyRepository() {
       throw error;
     }
   }
+  async function getSupplyById(_id) {
+    try {
+      _id = new import_mongodb10.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils17.BadRequestError("Invalid supply ID format.");
+    }
+    const query = {
+      _id,
+      status: { $ne: "deleted" }
+    };
+    const cacheKey = (0, import_node_server_utils17.makeCacheKey)(namespace_collection, {
+      _id: _id.toString()
+    });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils17.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const data = await collection.aggregate([
+        { $match: query },
+        {
+          $project: {
+            name: 1,
+            unitOfMeasurement: 1,
+            qty: 1
+          }
+        }
+      ]).toArray();
+      if (!data || data.length === 0) {
+        throw new import_node_server_utils17.NotFoundError("Supply not found.");
+      }
+      setCache(cacheKey, data[0], 15 * 60).then(() => {
+        import_node_server_utils17.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils17.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data[0];
+    } catch (error) {
+      throw error;
+    }
+  }
   async function updateSupply(_id, value, session) {
     try {
       _id = new import_mongodb10.ObjectId(_id);
@@ -3034,27 +3082,158 @@ function useSupplyRepository() {
     createUniqueIndex,
     createSupply,
     getSupplies,
+    getSupplyById,
     updateSupply,
     deleteSupply
   };
 }
 
-// src/controllers/hygiene-supply.controller.ts
+// src/services/hygiene-supply.service.ts
+var import_node_server_utils20 = require("@iservice365/node-server-utils");
+
+// src/models/hygiene-stock.model.ts
 var import_node_server_utils18 = require("@iservice365/node-server-utils");
 var import_joi10 = __toESM(require("joi"));
+var import_mongodb11 = require("mongodb");
+var stockSchema = import_joi10.default.object({
+  site: import_joi10.default.string().hex().required(),
+  supply: import_joi10.default.string().hex().required(),
+  in: import_joi10.default.number().min(0).optional(),
+  out: import_joi10.default.number().min(0).optional(),
+  balance: import_joi10.default.number().min(0).required(),
+  remarks: import_joi10.default.string().optional().allow("", null)
+});
+function MStock(value) {
+  const { error } = stockSchema.validate(value);
+  if (error) {
+    import_node_server_utils18.logger.info(`Hygiene Stock Model: ${error.message}`);
+    throw new import_node_server_utils18.BadRequestError(error.message);
+  }
+  if (value.site) {
+    try {
+      value.site = new import_mongodb11.ObjectId(value.site);
+    } catch (error2) {
+      throw new import_node_server_utils18.BadRequestError("Invalid site ID format.");
+    }
+  }
+  if (value.supply) {
+    try {
+      value.supply = new import_mongodb11.ObjectId(value.supply);
+    } catch (error2) {
+      throw new import_node_server_utils18.BadRequestError("Invalid supply ID format.");
+    }
+  }
+  return {
+    site: value.site,
+    supply: value.supply,
+    in: value.in ?? 0,
+    out: value.out ?? 0,
+    balance: value.balance,
+    remarks: value.remarks ?? "",
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    status: "active",
+    updatedAt: "",
+    deletedAt: ""
+  };
+}
+
+// src/repositories/hygiene-stock.repository.ts
+var import_node_server_utils19 = require("@iservice365/node-server-utils");
+function useStockRepository() {
+  const db = import_node_server_utils19.useAtlas.getDb();
+  if (!db) {
+    throw new import_node_server_utils19.InternalServerError("Unable to connect to server.");
+  }
+  const namespace_collection = "site.supply.stocks";
+  const collection = db.collection(namespace_collection);
+  const { delNamespace } = (0, import_node_server_utils19.useCache)(namespace_collection);
+  async function createIndex() {
+    try {
+      await collection.createIndexes([
+        { key: { site: 1 } },
+        { key: { supply: 1 } },
+        { key: { balance: 1 } },
+        { key: { status: 1 } }
+      ]);
+    } catch (error) {
+      throw new import_node_server_utils19.InternalServerError("Failed to create index on hygiene stock.");
+    }
+  }
+  async function createStock(value, session) {
+    try {
+      value = MStock(value);
+      const res = await collection.insertOne(value, { session });
+      delNamespace().then(() => {
+        import_node_server_utils19.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        import_node_server_utils19.logger.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.insertedId;
+    } catch (error) {
+      const isDuplicated = error.message.includes("duplicate");
+      if (isDuplicated) {
+        throw new import_node_server_utils19.BadRequestError("Stock already exists.");
+      }
+      throw error;
+    }
+  }
+  return {
+    createIndex,
+    createStock
+  };
+}
+
+// src/services/hygiene-supply.service.ts
+function useSupplyService() {
+  const { createSupply: _createSupply } = useSupplyRepository();
+  const { createStock } = useStockRepository();
+  async function createSupply(value) {
+    const session = import_node_server_utils20.useAtlas.getClient()?.startSession();
+    try {
+      session?.startTransaction();
+      const { qty, site } = value;
+      const supply = await _createSupply(value, session);
+      const createdSupply = await createStock(
+        {
+          site,
+          supply: supply.toString(),
+          in: qty,
+          balance: qty
+        },
+        session
+      );
+      await session?.commitTransaction();
+      return createdSupply;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      await session?.endSession();
+    }
+  }
+  return { createSupply };
+}
+
+// src/controllers/hygiene-supply.controller.ts
+var import_node_server_utils21 = require("@iservice365/node-server-utils");
+var import_joi11 = __toESM(require("joi"));
 function useSupplyController() {
   const {
-    createSupply: _createSupply,
     getSupplies: _getSupplies,
+    getSupplyById: _getSupplyById,
     updateSupply: _updateSupply,
     deleteSupply: _deleteSupply
   } = useSupplyRepository();
+  const { createSupply: _createSupply } = useSupplyService();
   async function createSupply(req, res, next) {
     const payload = { ...req.body, ...req.params };
     const { error } = supplySchema.validate(payload);
     if (error) {
-      import_node_server_utils18.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils18.BadRequestError(error.message));
+      import_node_server_utils21.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils21.BadRequestError(error.message));
       return;
     }
     try {
@@ -3062,23 +3241,23 @@ function useSupplyController() {
       res.status(201).json({ message: "Supply created successfully.", id });
       return;
     } catch (error2) {
-      import_node_server_utils18.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils21.logger.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function getSupplies(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = import_joi10.default.object({
-      page: import_joi10.default.number().min(1).optional().allow("", null),
-      limit: import_joi10.default.number().min(1).optional().allow("", null),
-      search: import_joi10.default.string().optional().allow("", null),
-      site: import_joi10.default.string().hex().required()
+    const validation = import_joi11.default.object({
+      page: import_joi11.default.number().min(1).optional().allow("", null),
+      limit: import_joi11.default.number().min(1).optional().allow("", null),
+      search: import_joi11.default.string().optional().allow("", null),
+      site: import_joi11.default.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
-      import_node_server_utils18.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils18.BadRequestError(error.message));
+      import_node_server_utils21.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils21.BadRequestError(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -3095,23 +3274,42 @@ function useSupplyController() {
       res.json(data);
       return;
     } catch (error2) {
-      import_node_server_utils18.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils21.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getSupplyById(req, res, next) {
+    const validation = import_joi11.default.string().hex().required();
+    const _id = req.params.id;
+    const { error } = validation.validate(_id);
+    if (error) {
+      import_node_server_utils21.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils21.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getSupplyById(_id);
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils21.logger.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 = import_joi10.default.object({
-      id: import_joi10.default.string().hex().required(),
-      name: import_joi10.default.string().optional().allow("", null),
-      unitOfMeasurement: import_joi10.default.string().optional().allow("", null),
-      qty: import_joi10.default.number().min(0).optional().allow("", null)
+    const validation = import_joi11.default.object({
+      id: import_joi11.default.string().hex().required(),
+      name: import_joi11.default.string().optional().allow("", null),
+      unitOfMeasurement: import_joi11.default.string().optional().allow("", null),
+      qty: import_joi11.default.number().min(0).optional().allow("", null)
     });
     const { error } = validation.validate(payload);
     if (error) {
-      import_node_server_utils18.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils18.BadRequestError(error.message));
+      import_node_server_utils21.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils21.BadRequestError(error.message));
       return;
     }
     try {
@@ -3120,20 +3318,20 @@ function useSupplyController() {
       res.json({ message: "Supply updated successfully." });
       return;
     } catch (error2) {
-      import_node_server_utils18.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils21.logger.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
   }
   async function deleteSupply(req, res, next) {
     const id = req.params.id;
-    const validation = import_joi10.default.object({
-      id: import_joi10.default.string().hex().required()
+    const validation = import_joi11.default.object({
+      id: import_joi11.default.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      import_node_server_utils18.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils18.BadRequestError(error.message));
+      import_node_server_utils21.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils21.BadRequestError(error.message));
       return;
     }
     try {
@@ -3141,7 +3339,7 @@ function useSupplyController() {
       res.json({ message: "Supply deleted successfully." });
       return;
     } catch (error2) {
-      import_node_server_utils18.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils21.logger.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -3149,15 +3347,83 @@ function useSupplyController() {
   return {
     createSupply,
     getSupplies,
+    getSupplyById,
     updateSupply,
     deleteSupply
   };
 }
+
+// src/services/hygiene-stock.service.ts
+var import_node_server_utils22 = require("@iservice365/node-server-utils");
+function useStockService() {
+  const { createStock: _createStock } = useStockRepository();
+  const { getSupplyById, updateSupply } = useSupplyRepository();
+  async function createStock(value) {
+    const session = import_node_server_utils22.useAtlas.getClient()?.startSession();
+    try {
+      session?.startTransaction();
+      const { qty, ...stockData } = value;
+      const supply = await getSupplyById(value.supply);
+      if (!supply || supply.qty === void 0) {
+        throw new import_node_server_utils22.NotFoundError("Supply not found.");
+      }
+      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;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      await session?.endSession();
+    }
+  }
+  return { createStock };
+}
+
+// src/controllers/hygiene-stock.controller.ts
+var import_node_server_utils23 = require("@iservice365/node-server-utils");
+var import_joi12 = __toESM(require("joi"));
+function useStockController() {
+  const { createStock: _createStock } = useStockService();
+  async function createStock(req, res, next) {
+    const payload = { ...req.body, ...req.params };
+    const validation = import_joi12.default.object({
+      site: import_joi12.default.string().hex().required(),
+      supply: import_joi12.default.string().hex().required(),
+      qty: import_joi12.default.number().min(0).optional(),
+      remarks: import_joi12.default.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(payload);
+    if (error) {
+      import_node_server_utils23.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils23.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const id = await _createStock(payload);
+      res.status(201).json({ message: "Stock created successfully.", id });
+      return;
+    } catch (error2) {
+      import_node_server_utils23.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  return {
+    createStock
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   MArea,
   MAreaChecklist,
   MParentChecklist,
+  MStock,
   MSupply,
   MUnit,
   allowedChecklistStatus,
@@ -3166,6 +3432,7 @@ function useSupplyController() {
   areaChecklistSchema,
   areaSchema,
   parentChecklistSchema,
+  stockSchema,
   supplySchema,
   unitSchema,
   useAreaChecklistController,
@@ -3176,8 +3443,12 @@ function useSupplyController() {
   useAreaService,
   useParentChecklistController,
   useParentChecklistRepo,
+  useStockController,
+  useStockRepository,
+  useStockService,
   useSupplyController,
   useSupplyRepository,
+  useSupplyService,
   useUnitController,
   useUnitRepository,
   useUnitService