@7365admin1/module-hygiene 4.14.0 → 4.15.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @7365admin1/module-hygiene
 
+## 4.15.0
+
+### Minor Changes
+
+- Update module hygiene version
+
 ## 4.14.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -393,6 +393,7 @@ declare function useAreaChecklistController(): {
 type TSupply = {
     _id?: ObjectId;
     site: string | ObjectId;
+    serviceType: TServiceType;
     name: string;
     unitOfMeasurement: string;
     qty: number;
@@ -401,17 +402,18 @@ type TSupply = {
     updatedAt?: string;
     deletedAt?: string;
 };
-type TSupplyCreate = Pick<TSupply, "site" | "name" | "unitOfMeasurement">;
+type TSupplyCreate = Pick<TSupply, "site" | "serviceType" | "name" | "unitOfMeasurement">;
 type TSupplyGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
-} & Pick<TSupply, "site">;
+} & Pick<TSupply, "site" | "serviceType">;
 type TSupplyGetById = Pick<TSupply, "_id" | "name" | "unitOfMeasurement" | "qty">;
 type TSupplyUpdate = Partial<Pick<TSupply, "name" | "unitOfMeasurement" | "qty">>;
 declare const supplySchema: Joi.ObjectSchema<any>;
 declare function MSupply(value: TSupplyCreate): {
     site: string | ObjectId;
+    serviceType: ServiceType;
     name: string;
     unitOfMeasurement: string;
     qty: number;
@@ -426,7 +428,7 @@ declare function useSupplyRepository(): {
     createTextIndex: () => Promise<void>;
     createUniqueIndex: () => Promise<void>;
     createSupply: (value: TSupplyCreate, session?: ClientSession) => Promise<ObjectId>;
-    getSupplies: ({ page, limit, search, site, }: TSupplyGetQuery) => Promise<{}>;
+    getSupplies: ({ page, limit, search, site, serviceType, }: TSupplyGetQuery) => Promise<{}>;
     getSupplyById: (_id: string | ObjectId, session?: ClientSession) => Promise<TSupplyGetById>;
     updateSupply: (_id: string | ObjectId, value: TSupplyUpdate, session?: ClientSession) => Promise<number>;
     deleteSupply: (_id: string | ObjectId, session?: ClientSession) => Promise<number>;
@@ -443,6 +445,7 @@ declare function useSupplyController(): {
 type TStock = {
     _id?: ObjectId;
     site: string | ObjectId;
+    serviceType: TServiceType;
     supply: string | ObjectId;
     in?: number;
     out?: number;
@@ -453,18 +456,19 @@ type TStock = {
     updatedAt?: string;
     deletedAt?: string;
 };
-type TStockCreate = Pick<TStock, "site" | "supply" | "in" | "out" | "balance" | "remarks">;
-type TStockCreateService = Pick<TStock, "site" | "supply" | "remarks"> & {
+type TStockCreate = Pick<TStock, "site" | "serviceType" | "supply" | "in" | "out" | "balance" | "remarks">;
+type TStockCreateService = Pick<TStock, "site" | "serviceType" | "supply" | "remarks"> & {
     qty: number;
 };
 type TGetStocksQuery = {
     page?: number;
     limit?: number;
     search?: string;
-} & Pick<TStock, "site" | "supply">;
+} & Pick<TStock, "site" | "serviceType" | "supply">;
 declare const stockSchema: Joi.ObjectSchema<any>;
 declare function MStock(value: TStockCreate): {
     site: string | ObjectId;
+    serviceType: ServiceType;
     supply: string | ObjectId;
     in: number;
     out: number;
@@ -479,7 +483,7 @@ declare function MStock(value: TStockCreate): {
 declare function useStockRepository(): {
     createIndex: () => Promise<void>;
     createStock: (value: TStockCreate, session?: ClientSession) => Promise<ObjectId>;
-    getStocksBySupplyId: ({ page, limit, search, site, supply, }: TGetStocksQuery) => Promise<{}>;
+    getStocksBySupplyId: ({ page, limit, search, site, serviceType, supply, }: TGetStocksQuery) => Promise<{}>;
 };
 
 declare function useStockService(): {
@@ -495,6 +499,7 @@ declare const allowedCheckOutItemStatus: string[];
 type TCheckOutItem = {
     _id?: ObjectId;
     site: string | ObjectId;
+    serviceType: TServiceType;
     supply: string | ObjectId;
     supplyName: string;
     qty: number;
@@ -506,22 +511,23 @@ type TCheckOutItem = {
     updatedAt?: string;
     deletedAt?: string;
 };
-type TCheckOutItemCreate = Pick<TCheckOutItem, "site" | "supply" | "supplyName" | "qty" | "attachment" | "createdBy" | "createdByName">;
-type TCheckOutItemCreateService = Pick<TCheckOutItem, "site" | "supply" | "qty" | "attachment" | "createdBy">;
-type TCheckOutItemCreateByBatchService = Pick<TCheckOutItem, "site" | "createdBy"> & {
+type TCheckOutItemCreate = Pick<TCheckOutItem, "site" | "serviceType" | "supply" | "supplyName" | "qty" | "attachment" | "createdBy" | "createdByName">;
+type TCheckOutItemCreateService = Pick<TCheckOutItem, "site" | "serviceType" | "supply" | "qty" | "attachment" | "createdBy">;
+type TCheckOutItemCreateByBatchService = Pick<TCheckOutItem, "site" | "serviceType" | "createdBy"> & {
     items: Pick<TCheckOutItem, "supply" | "qty" | "attachment">[];
 };
 type TCheckOutItemGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
-} & Pick<TCheckOutItem, "site">;
-type TCheckOutItemGetById = Pick<TCheckOutItem, "_id" | "site" | "supply" | "supplyName" | "qty" | "status"> & {
+} & Pick<TCheckOutItem, "site" | "serviceType">;
+type TCheckOutItemGetById = Pick<TCheckOutItem, "_id" | "site" | "serviceType" | "supply" | "supplyName" | "qty" | "status"> & {
     unitOfMeasurement?: string;
 };
 declare const checkOutItemSchema: Joi.ObjectSchema<any>;
 declare function MCheckOutItem(value: TCheckOutItemCreate): {
     site: string | ObjectId;
+    serviceType: ServiceType;
     supply: string | ObjectId;
     supplyName: string;
     qty: number;
@@ -538,7 +544,7 @@ declare function useCheckOutItemRepository(): {
     createIndex: () => Promise<void>;
     createTextIndex: () => Promise<void>;
     createCheckOutItem: (value: TCheckOutItemCreate, session?: ClientSession) => Promise<ObjectId>;
-    getCheckOutItems: ({ page, limit, search, site, }: TCheckOutItemGetQuery) => Promise<{}>;
+    getCheckOutItems: ({ page, limit, search, site, serviceType, }: TCheckOutItemGetQuery) => Promise<{}>;
     getCheckOutItemById: (_id: string | ObjectId, session?: ClientSession) => Promise<TCheckOutItemGetById>;
     completeCheckOutItem: (_id: string | ObjectId, session?: ClientSession) => Promise<number>;
 };
@@ -608,6 +614,7 @@ declare function useScheduleTaskRepository(): {
     getAllScheduleTask: () => Promise<TScheduleTask[]>;
     getScheduleTaskById: (_id: string | ObjectId, session?: ClientSession) => Promise<TScheduleTaskGetById>;
     updateScheduleTask: (_id: string | ObjectId, value: TScheduleTaskUpdate, session?: ClientSession) => Promise<number>;
+    deleteScheduleTask: (_id: string | ObjectId, session?: ClientSession) => Promise<number>;
 };
 
 declare function useScheduleTaskService(): {
@@ -628,6 +635,7 @@ declare function useScheduleTaskController(): {
     getScheduleTasks: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getScheduleTaskById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateScheduleTask: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    deleteScheduleTask: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare function useQRService(): {

package/dist/index.js

@@ -4735,6 +4735,7 @@ var import_mongodb12 = require("mongodb");
 var import_node_server_utils21 = require("@7365admin1/node-server-utils");
 var supplySchema = import_joi10.default.object({
   site: import_joi10.default.string().hex().required(),
+  serviceType: import_joi10.default.string().valid(...Object.values(ServiceType)).required(),
   name: import_joi10.default.string().required(),
   unitOfMeasurement: import_joi10.default.string().required()
 });
@@ -4753,6 +4754,7 @@ function MSupply(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     name: value.name,
     unitOfMeasurement: value.unitOfMeasurement,
     qty: 0,
@@ -4776,7 +4778,10 @@ function useSupplyRepository() {
   const { delNamespace, setCache, getCache } = (0, import_node_server_utils22.useCache)(namespace_collection);
   async function createIndex() {
     try {
-      await collection.createIndexes([{ key: { site: 1 } }]);
+      await collection.createIndexes([
+        { key: { site: 1 } },
+        { key: { serviceType: 1 } }
+      ]);
     } catch (error) {
       throw new import_node_server_utils22.InternalServerError(
         "Failed to create index on hygiene supply."
@@ -4829,15 +4834,18 @@ function useSupplyRepository() {
     page = 1,
     limit = 10,
     search = "",
-    site
+    site,
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      serviceType
     };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new import_mongodb13.ObjectId(site);
@@ -5041,7 +5049,8 @@ function useSupplyController() {
       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()
+      site: import_joi11.default.string().hex().required(),
+      serviceType: import_joi11.default.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5053,12 +5062,14 @@ function useSupplyController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getSupplies({
         page,
         limit,
         search,
-        site
+        site,
+        serviceType
       });
       res.json(data);
       return;
@@ -5114,10 +5125,8 @@ function useSupplyController() {
   }
   async function deleteSupply(req, res, next) {
     const id = req.params.id;
-    const validation = import_joi11.default.object({
-      id: import_joi11.default.string().hex().required()
-    });
-    const { error, value } = validation.validate({ id });
+    const validation = import_joi11.default.string().hex().required();
+    const { error, value } = validation.validate(id);
     if (error) {
       import_node_server_utils23.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils23.BadRequestError(error.message));
@@ -5148,6 +5157,7 @@ var import_mongodb14 = require("mongodb");
 var import_node_server_utils24 = require("@7365admin1/node-server-utils");
 var stockSchema = import_joi12.default.object({
   site: import_joi12.default.string().hex().required(),
+  serviceType: import_joi12.default.string().valid(...Object.values(ServiceType)).required(),
   supply: import_joi12.default.string().hex().required(),
   in: import_joi12.default.number().min(0).optional(),
   out: import_joi12.default.number().min(0).optional(),
@@ -5176,6 +5186,7 @@ function MStock(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     supply: value.supply,
     in: value.in ?? 0,
     out: value.out ?? 0,
@@ -5205,6 +5216,7 @@ function useStockRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { supply: 1 } },
         { key: { balance: 1 } },
         { key: { status: 1 } }
@@ -5243,15 +5255,18 @@ function useStockRepository() {
     limit = 10,
     search = "",
     site,
+    serviceType,
     supply
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      serviceType
     };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new import_mongodb15.ObjectId(site);
@@ -5371,6 +5386,7 @@ function useStockController() {
     const payload = { ...req.body, ...req.params };
     const validation = import_joi13.default.object({
       site: import_joi13.default.string().hex().required(),
+      serviceType: import_joi13.default.string().valid(...Object.values(ServiceType)).required(),
       supply: import_joi13.default.string().hex().required(),
       qty: import_joi13.default.number().min(0).required(),
       remarks: import_joi13.default.string().optional().allow("", null)
@@ -5398,6 +5414,7 @@ function useStockController() {
       limit: import_joi13.default.number().min(1).optional().allow("", null),
       search: import_joi13.default.string().optional().allow("", null),
       site: import_joi13.default.string().hex().required(),
+      serviceType: import_joi13.default.string().valid(...Object.values(ServiceType)).required(),
       supply: import_joi13.default.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -5410,6 +5427,7 @@ function useStockController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     const supply = req.params.supply ?? "";
     try {
       const data = await _getStocksBySupplyId({
@@ -5417,6 +5435,7 @@ function useStockController() {
         limit,
         search,
         site,
+        serviceType,
         supply
       });
       res.json(data);
@@ -5440,6 +5459,7 @@ var import_node_server_utils28 = require("@7365admin1/node-server-utils");
 var allowedCheckOutItemStatus = ["pending", "completed"];
 var checkOutItemSchema = import_joi14.default.object({
   site: import_joi14.default.string().hex().required(),
+  serviceType: import_joi14.default.string().valid(...Object.values(ServiceType)).required(),
   supply: import_joi14.default.string().hex().required(),
   supplyName: import_joi14.default.string().required(),
   qty: import_joi14.default.number().min(0).required(),
@@ -5469,6 +5489,7 @@ function MCheckOutItem(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     supply: value.supply,
     supplyName: value.supplyName,
     qty: value.qty,
@@ -5497,6 +5518,7 @@ function useCheckOutItemRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { supply: 1 } },
         { key: { status: 1 } }
       ]);
@@ -5536,15 +5558,18 @@ function useCheckOutItemRepository() {
     page = 1,
     limit = 10,
     search = "",
-    site
+    site,
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      serviceType
     };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new import_mongodb17.ObjectId(site);
@@ -5658,6 +5683,7 @@ function useCheckOutItemRepository() {
           {
             $project: {
               site: 1,
+              serviceType: 1,
               supply: 1,
               supplyName: 1,
               qty: 1,
@@ -5760,6 +5786,7 @@ function useCheckOutItemService() {
       const createdStocks = await createStock(
         {
           site: checkOutItem.site.toString(),
+          serviceType: checkOutItem.serviceType,
           supply: checkOutItem.supply.toString(),
           qty: checkOutItem.qty
         },
@@ -5780,7 +5807,7 @@ function useCheckOutItemService() {
     const session = import_node_server_utils30.useAtlas.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const { site, createdBy, items } = value;
+      const { site, serviceType, createdBy, items } = value;
       const createdByData = await getUserById(createdBy);
       const createdCheckOutItemIds = [];
       for (const item of items) {
@@ -5788,6 +5815,7 @@ function useCheckOutItemService() {
         const createdId = await _createCheckOutItem(
           {
             site,
+            serviceType,
             supply: item.supply,
             supplyName: supplyData?.name || "",
             qty: item.qty,
@@ -5800,6 +5828,7 @@ function useCheckOutItemService() {
         await createStock(
           {
             site,
+            serviceType,
             supply: item.supply,
             qty: item.qty
           },
@@ -5848,6 +5877,7 @@ function useCheckOutItemController() {
     };
     const validation = import_joi15.default.object({
       site: import_joi15.default.string().hex().required(),
+      serviceType: import_joi15.default.string().valid(...Object.values(ServiceType)).required(),
       supply: import_joi15.default.string().hex().required(),
       qty: import_joi15.default.number().min(0).required(),
       attachment: import_joi15.default.array().items(import_joi15.default.string()).optional().allow(null),
@@ -5882,6 +5912,7 @@ function useCheckOutItemController() {
     };
     const validation = import_joi15.default.object({
       site: import_joi15.default.string().hex().required(),
+      serviceType: import_joi15.default.string().valid(...Object.values(ServiceType)).required(),
       createdBy: import_joi15.default.string().hex().required(),
       items: import_joi15.default.array().items(
         import_joi15.default.object({
@@ -5913,7 +5944,8 @@ function useCheckOutItemController() {
       page: import_joi15.default.number().min(1).optional().allow("", null),
       limit: import_joi15.default.number().min(1).optional().allow("", null),
       search: import_joi15.default.string().optional().allow("", null),
-      site: import_joi15.default.string().hex().required()
+      site: import_joi15.default.string().hex().required(),
+      serviceType: import_joi15.default.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5925,12 +5957,14 @@ function useCheckOutItemController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getCheckOutItems({
         page,
         limit,
         search,
-        site
+        site,
+        serviceType
       });
       res.json(data);
       return;
@@ -6111,7 +6145,7 @@ function useScheduleTaskRepository() {
       throw new import_node_server_utils33.BadRequestError("Invalid site ID format.");
     }
     if (search) {
-      query.$or = [{ name: { $regex: search, $options: "i" } }];
+      query.$or = [{ title: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
     const cacheKey = (0, import_node_server_utils33.makeCacheKey)(namespace_collection, cacheOptions);
@@ -6250,6 +6284,39 @@ function useScheduleTaskRepository() {
       throw error;
     }
   }
+  async function deleteScheduleTask(_id, session) {
+    try {
+      _id = new import_mongodb19.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils33.BadRequestError("Invalid schedule task ID format.");
+    }
+    try {
+      const updateValue = {
+        status: "deleted",
+        updatedAt: /* @__PURE__ */ new Date(),
+        deletedAt: /* @__PURE__ */ new Date()
+      };
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
+      if (res.modifiedCount === 0) {
+        throw new import_node_server_utils33.InternalServerError("Unable to delete schedule task.");
+      }
+      delNamespace().then(() => {
+        import_node_server_utils33.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        import_node_server_utils33.logger.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.modifiedCount;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -6257,7 +6324,8 @@ function useScheduleTaskRepository() {
     getScheduleTasks,
     getAllScheduleTask,
     getScheduleTaskById,
-    updateScheduleTask
+    updateScheduleTask,
+    deleteScheduleTask
   };
 }
 
@@ -6560,7 +6628,8 @@ function useScheduleTaskController() {
     createScheduleTask: _createScheduleTask,
     getScheduleTasks: _getScheduleTasks,
     getScheduleTaskById: _getScheduleTaskById,
-    updateScheduleTask: _updateScheduleTask
+    updateScheduleTask: _updateScheduleTask,
+    deleteScheduleTask: _deleteScheduleTask
   } = useScheduleTaskRepository();
   async function createScheduleTask(req, res, next) {
     const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
@@ -6674,11 +6743,31 @@ function useScheduleTaskController() {
       return;
     }
   }
+  async function deleteScheduleTask(req, res, next) {
+    const validation = import_joi17.default.string().hex().required();
+    const _id = req.params.id;
+    const { error, value } = validation.validate(_id);
+    if (error) {
+      import_node_server_utils35.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils35.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _deleteScheduleTask(value);
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils35.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     createScheduleTask,
     getScheduleTasks,
     getScheduleTaskById,
-    updateScheduleTask
+    updateScheduleTask,
+    deleteScheduleTask
   };
 }