@7365admin1/module-hygiene 4.14.0 → 4.16.0

package/dist/index.js

@@ -1240,11 +1240,13 @@ function useUnitRepository() {
   }) {
     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_mongodb5.ObjectId(site);
@@ -1253,10 +1255,6 @@ function useUnitRepository() {
     } catch (error) {
       throw new import_node_server_utils7.BadRequestError("Invalid site ID format.");
     }
-    if (serviceType) {
-      query.serviceType = serviceType;
-      cacheOptions.serviceType = serviceType;
-    }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
@@ -2678,6 +2676,7 @@ function useParentChecklistRepo() {
     getAllParentChecklist,
     getParentChecklistById,
     updateParentChecklistStatuses,
+    getHygieneSiteIds,
     closeExpiredParentChecklists,
     getTodayParentChecklists,
     getTodayParentChecklistsForAreaGen
@@ -2694,7 +2693,12 @@ function useParentChecklistController() {
   } = useParentChecklistRepo();
   async function createParentChecklist(req, res, next) {
     const payload = req.body;
-    const { error } = parentChecklistSchema.validate(payload);
+    const validation = import_joi7.default.object({
+      createdAt: import_joi7.default.alternatives().try(import_joi7.default.date(), import_joi7.default.string()).optional().allow("", null),
+      site: import_joi7.default.string().hex().required(),
+      serviceType: import_joi7.default.string().valid(...Object.values(ServiceType)).optional().allow("", null)
+    });
+    const { error } = validation.validate(payload);
     if (error) {
       import_node_server_utils15.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils15.BadRequestError(error.message));
@@ -2768,7 +2772,7 @@ var import_node_server_utils16 = require("@7365admin1/node-server-utils");
 var allowedChecklistStatus = ["open", "completed", "closed"];
 var areaChecklistSchema = import_joi8.default.object({
   schedule: import_joi8.default.string().hex().required(),
-  serviceType: import_joi8.default.string().valid(...Object.values(ServiceType)).optional(),
+  serviceType: import_joi8.default.string().valid(...Object.values(ServiceType)).required(),
   area: import_joi8.default.string().hex().required(),
   name: import_joi8.default.string().required(),
   type: import_joi8.default.string().valid(...allowedTypes).required(),
@@ -2949,10 +2953,11 @@ function useAreaChecklistRepo() {
     serviceType
   }, session) {
     page = page > 0 ? page - 1 : 0;
-    const query = {};
+    const query = { serviceType };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       query.schedule = new import_mongodb9.ObjectId(schedule);
@@ -2960,10 +2965,6 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new import_node_server_utils17.BadRequestError("Invalid parent checklist ID format.");
     }
-    if (serviceType) {
-      query.serviceType = serviceType;
-      cacheOptions.serviceType = serviceType;
-    }
     if (type && type !== "all") {
       query.type = type;
       cacheOptions.type = type;
@@ -3363,10 +3364,11 @@ function useAreaChecklistRepo() {
     _id
   }, session) {
     page = page > 0 ? page - 1 : 0;
-    const query = {};
+    const query = { serviceType };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       query._id = new import_mongodb9.ObjectId(_id);
@@ -3374,10 +3376,6 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new import_node_server_utils17.BadRequestError("Invalid area checklist ID format.");
     }
-    if (serviceType) {
-      query.serviceType = serviceType;
-      cacheOptions.serviceType = serviceType;
-    }
     if (search) {
       query.$text = { $search: search };
       cacheOptions.search = search;
@@ -3591,7 +3589,16 @@ function useAreaChecklistRepo() {
     try {
       const area = await collection.findOne(
         { _id },
-        { projection: { schedule: 1, name: 1, type: 1, status: 1 }, session }
+        {
+          projection: {
+            schedule: 1,
+            serviceType: 1,
+            name: 1,
+            type: 1,
+            status: 1
+          },
+          session
+        }
       );
       if (!area) {
         throw new import_node_server_utils17.BadRequestError("Area checklist not found.");
@@ -4150,10 +4157,14 @@ function useAreaChecklistService() {
         );
       }
       await _updateAreaChecklistUnits(_id, set, unitId, value, session);
+      const currentArea = await getAreaChecklistById(_id, session);
+      const scheduleId = currentArea.schedule;
+      const serviceType = currentArea.serviceType;
       const allUnitsResult = await getAreaChecklistUnits(
         {
           page: 1,
           limit: 1e3,
+          serviceType,
           _id: _id.toString()
         },
         session
@@ -4178,14 +4189,13 @@ function useAreaChecklistService() {
         }
       }
       await updateAreaChecklistStatus(_id, areaStatus, session);
-      const currentArea = await getAreaChecklistById(_id, session);
-      const scheduleId = currentArea.schedule;
       if (scheduleId) {
         const allAreasResult = await getAllAreaChecklist(
           {
             page: 1,
             limit: 1e3,
-            schedule: scheduleId.toString()
+            schedule: scheduleId.toString(),
+            serviceType
           },
           session
         );
@@ -4735,6 +4745,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 +4764,7 @@ function MSupply(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     name: value.name,
     unitOfMeasurement: value.unitOfMeasurement,
     qty: 0,
@@ -4776,7 +4788,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 +4844,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 +5059,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 +5072,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 +5135,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 +5167,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 +5196,7 @@ function MStock(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     supply: value.supply,
     in: value.in ?? 0,
     out: value.out ?? 0,
@@ -5205,6 +5226,7 @@ function useStockRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { supply: 1 } },
         { key: { balance: 1 } },
         { key: { status: 1 } }
@@ -5243,15 +5265,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 +5396,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 +5424,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 +5437,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 +5445,7 @@ function useStockController() {
         limit,
         search,
         site,
+        serviceType,
         supply
       });
       res.json(data);
@@ -5440,6 +5469,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 +5499,7 @@ function MCheckOutItem(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     supply: value.supply,
     supplyName: value.supplyName,
     qty: value.qty,
@@ -5497,6 +5528,7 @@ function useCheckOutItemRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { supply: 1 } },
         { key: { status: 1 } }
       ]);
@@ -5536,15 +5568,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 +5693,7 @@ function useCheckOutItemRepository() {
           {
             $project: {
               site: 1,
+              serviceType: 1,
               supply: 1,
               supplyName: 1,
               qty: 1,
@@ -5760,6 +5796,7 @@ function useCheckOutItemService() {
       const createdStocks = await createStock(
         {
           site: checkOutItem.site.toString(),
+          serviceType: checkOutItem.serviceType,
           supply: checkOutItem.supply.toString(),
           qty: checkOutItem.qty
         },
@@ -5780,7 +5817,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 +5825,7 @@ function useCheckOutItemService() {
         const createdId = await _createCheckOutItem(
           {
             site,
+            serviceType,
             supply: item.supply,
             supplyName: supplyData?.name || "",
             qty: item.qty,
@@ -5800,6 +5838,7 @@ function useCheckOutItemService() {
         await createStock(
           {
             site,
+            serviceType,
             supply: item.supply,
             qty: item.qty
           },
@@ -5848,6 +5887,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 +5922,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 +5954,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 +5967,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 +6155,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 +6294,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 +6334,8 @@ function useScheduleTaskRepository() {
     getScheduleTasks,
     getAllScheduleTask,
     getScheduleTaskById,
-    updateScheduleTask
+    updateScheduleTask,
+    deleteScheduleTask
   };
 }
 
@@ -6560,7 +6638,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 +6753,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
   };
 }