@7365admin1/module-hygiene 4.14.0 → 4.16.0

package/dist/index.mjs

@@ -1183,11 +1183,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 ObjectId5(site);
@@ -1196,10 +1198,6 @@ function useUnitRepository() {
     } catch (error) {
       throw new BadRequestError6("Invalid site ID format.");
     }
-    if (serviceType) {
-      query.serviceType = serviceType;
-      cacheOptions.serviceType = serviceType;
-    }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
@@ -2634,6 +2632,7 @@ function useParentChecklistRepo() {
     getAllParentChecklist,
     getParentChecklistById,
     updateParentChecklistStatuses,
+    getHygieneSiteIds,
     closeExpiredParentChecklists,
     getTodayParentChecklists,
     getTodayParentChecklistsForAreaGen
@@ -2650,7 +2649,12 @@ function useParentChecklistController() {
   } = useParentChecklistRepo();
   async function createParentChecklist(req, res, next) {
     const payload = req.body;
-    const { error } = parentChecklistSchema.validate(payload);
+    const validation = Joi7.object({
+      createdAt: Joi7.alternatives().try(Joi7.date(), Joi7.string()).optional().allow("", null),
+      site: Joi7.string().hex().required(),
+      serviceType: Joi7.string().valid(...Object.values(ServiceType)).optional().allow("", null)
+    });
+    const { error } = validation.validate(payload);
     if (error) {
       logger15.log({ level: "error", message: error.message });
       next(new BadRequestError13(error.message));
@@ -2724,7 +2728,7 @@ import { BadRequestError as BadRequestError14, logger as logger16 } from "@7365a
 var allowedChecklistStatus = ["open", "completed", "closed"];
 var areaChecklistSchema = Joi8.object({
   schedule: Joi8.string().hex().required(),
-  serviceType: Joi8.string().valid(...Object.values(ServiceType)).optional(),
+  serviceType: Joi8.string().valid(...Object.values(ServiceType)).required(),
   area: Joi8.string().hex().required(),
   name: Joi8.string().required(),
   type: Joi8.string().valid(...allowedTypes).required(),
@@ -2917,10 +2921,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 ObjectId9(schedule);
@@ -2928,10 +2933,6 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new BadRequestError15("Invalid parent checklist ID format.");
     }
-    if (serviceType) {
-      query.serviceType = serviceType;
-      cacheOptions.serviceType = serviceType;
-    }
     if (type && type !== "all") {
       query.type = type;
       cacheOptions.type = type;
@@ -3331,10 +3332,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 ObjectId9(_id);
@@ -3342,10 +3344,6 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new BadRequestError15("Invalid area checklist ID format.");
     }
-    if (serviceType) {
-      query.serviceType = serviceType;
-      cacheOptions.serviceType = serviceType;
-    }
     if (search) {
       query.$text = { $search: search };
       cacheOptions.search = search;
@@ -3559,7 +3557,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 BadRequestError15("Area checklist not found.");
@@ -4118,10 +4125,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
@@ -4146,14 +4157,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
         );
@@ -4707,6 +4717,7 @@ import { ObjectId as ObjectId12 } from "mongodb";
 import { BadRequestError as BadRequestError17, logger as logger21 } from "@7365admin1/node-server-utils";
 var supplySchema = Joi10.object({
   site: Joi10.string().hex().required(),
+  serviceType: Joi10.string().valid(...Object.values(ServiceType)).required(),
   name: Joi10.string().required(),
   unitOfMeasurement: Joi10.string().required()
 });
@@ -4725,6 +4736,7 @@ function MSupply(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     name: value.name,
     unitOfMeasurement: value.unitOfMeasurement,
     qty: 0,
@@ -4757,7 +4769,10 @@ function useSupplyRepository() {
   const { delNamespace, setCache, getCache } = useCache6(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 InternalServerError8(
         "Failed to create index on hygiene supply."
@@ -4810,15 +4825,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 ObjectId13(site);
@@ -5022,7 +5040,8 @@ function useSupplyController() {
       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()
+      site: Joi11.string().hex().required(),
+      serviceType: Joi11.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5034,12 +5053,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;
@@ -5095,10 +5116,8 @@ function useSupplyController() {
   }
   async function deleteSupply(req, res, next) {
     const id = req.params.id;
-    const validation = Joi11.object({
-      id: Joi11.string().hex().required()
-    });
-    const { error, value } = validation.validate({ id });
+    const validation = Joi11.string().hex().required();
+    const { error, value } = validation.validate(id);
     if (error) {
       logger23.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
@@ -5129,6 +5148,7 @@ import { ObjectId as ObjectId14 } from "mongodb";
 import { BadRequestError as BadRequestError20, logger as logger24 } from "@7365admin1/node-server-utils";
 var stockSchema = Joi12.object({
   site: Joi12.string().hex().required(),
+  serviceType: Joi12.string().valid(...Object.values(ServiceType)).required(),
   supply: Joi12.string().hex().required(),
   in: Joi12.number().min(0).optional(),
   out: Joi12.number().min(0).optional(),
@@ -5157,6 +5177,7 @@ function MStock(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     supply: value.supply,
     in: value.in ?? 0,
     out: value.out ?? 0,
@@ -5194,6 +5215,7 @@ function useStockRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { supply: 1 } },
         { key: { balance: 1 } },
         { key: { status: 1 } }
@@ -5232,15 +5254,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 ObjectId15(site);
@@ -5364,6 +5389,7 @@ function useStockController() {
     const payload = { ...req.body, ...req.params };
     const validation = Joi13.object({
       site: Joi13.string().hex().required(),
+      serviceType: Joi13.string().valid(...Object.values(ServiceType)).required(),
       supply: Joi13.string().hex().required(),
       qty: Joi13.number().min(0).required(),
       remarks: Joi13.string().optional().allow("", null)
@@ -5391,6 +5417,7 @@ function useStockController() {
       limit: Joi13.number().min(1).optional().allow("", null),
       search: Joi13.string().optional().allow("", null),
       site: Joi13.string().hex().required(),
+      serviceType: Joi13.string().valid(...Object.values(ServiceType)).required(),
       supply: Joi13.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -5403,6 +5430,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({
@@ -5410,6 +5438,7 @@ function useStockController() {
         limit,
         search,
         site,
+        serviceType,
         supply
       });
       res.json(data);
@@ -5433,6 +5462,7 @@ import { BadRequestError as BadRequestError24, logger as logger27 } from "@7365a
 var allowedCheckOutItemStatus = ["pending", "completed"];
 var checkOutItemSchema = Joi14.object({
   site: Joi14.string().hex().required(),
+  serviceType: Joi14.string().valid(...Object.values(ServiceType)).required(),
   supply: Joi14.string().hex().required(),
   supplyName: Joi14.string().required(),
   qty: Joi14.number().min(0).required(),
@@ -5462,6 +5492,7 @@ function MCheckOutItem(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     supply: value.supply,
     supplyName: value.supplyName,
     qty: value.qty,
@@ -5499,6 +5530,7 @@ function useCheckOutItemRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { supply: 1 } },
         { key: { status: 1 } }
       ]);
@@ -5538,15 +5570,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 ObjectId17(site);
@@ -5660,6 +5695,7 @@ function useCheckOutItemRepository() {
           {
             $project: {
               site: 1,
+              serviceType: 1,
               supply: 1,
               supplyName: 1,
               qty: 1,
@@ -5762,6 +5798,7 @@ function useCheckOutItemService() {
       const createdStocks = await createStock(
         {
           site: checkOutItem.site.toString(),
+          serviceType: checkOutItem.serviceType,
           supply: checkOutItem.supply.toString(),
           qty: checkOutItem.qty
         },
@@ -5782,7 +5819,7 @@ function useCheckOutItemService() {
     const session = useAtlas13.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) {
@@ -5790,6 +5827,7 @@ function useCheckOutItemService() {
         const createdId = await _createCheckOutItem(
           {
             site,
+            serviceType,
             supply: item.supply,
             supplyName: supplyData?.name || "",
             qty: item.qty,
@@ -5802,6 +5840,7 @@ function useCheckOutItemService() {
         await createStock(
           {
             site,
+            serviceType,
             supply: item.supply,
             qty: item.qty
           },
@@ -5850,6 +5889,7 @@ function useCheckOutItemController() {
     };
     const validation = Joi15.object({
       site: Joi15.string().hex().required(),
+      serviceType: Joi15.string().valid(...Object.values(ServiceType)).required(),
       supply: Joi15.string().hex().required(),
       qty: Joi15.number().min(0).required(),
       attachment: Joi15.array().items(Joi15.string()).optional().allow(null),
@@ -5884,6 +5924,7 @@ function useCheckOutItemController() {
     };
     const validation = Joi15.object({
       site: Joi15.string().hex().required(),
+      serviceType: Joi15.string().valid(...Object.values(ServiceType)).required(),
       createdBy: Joi15.string().hex().required(),
       items: Joi15.array().items(
         Joi15.object({
@@ -5915,7 +5956,8 @@ function useCheckOutItemController() {
       page: Joi15.number().min(1).optional().allow("", null),
       limit: Joi15.number().min(1).optional().allow("", null),
       search: Joi15.string().optional().allow("", null),
-      site: Joi15.string().hex().required()
+      site: Joi15.string().hex().required(),
+      serviceType: Joi15.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5927,12 +5969,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;
@@ -6122,7 +6166,7 @@ function useScheduleTaskRepository() {
       throw new BadRequestError29("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 = makeCacheKey9(namespace_collection, cacheOptions);
@@ -6261,6 +6305,39 @@ function useScheduleTaskRepository() {
       throw error;
     }
   }
+  async function deleteScheduleTask(_id, session) {
+    try {
+      _id = new ObjectId19(_id);
+    } catch (error) {
+      throw new BadRequestError29("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 InternalServerError11("Unable to delete schedule task.");
+      }
+      delNamespace().then(() => {
+        logger31.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger31.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.modifiedCount;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -6268,7 +6345,8 @@ function useScheduleTaskRepository() {
     getScheduleTasks,
     getAllScheduleTask,
     getScheduleTaskById,
-    updateScheduleTask
+    updateScheduleTask,
+    deleteScheduleTask
   };
 }
 
@@ -6571,7 +6649,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(
@@ -6685,11 +6764,31 @@ function useScheduleTaskController() {
       return;
     }
   }
+  async function deleteScheduleTask(req, res, next) {
+    const validation = Joi17.string().hex().required();
+    const _id = req.params.id;
+    const { error, value } = validation.validate(_id);
+    if (error) {
+      logger33.log({ level: "error", message: error.message });
+      next(new BadRequestError30(error.message));
+      return;
+    }
+    try {
+      const data = await _deleteScheduleTask(value);
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger33.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     createScheduleTask,
     getScheduleTasks,
     getScheduleTaskById,
-    updateScheduleTask
+    updateScheduleTask,
+    deleteScheduleTask
   };
 }