@7365admin1/module-hygiene 4.15.0 → 4.17.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(),
@@ -2740,8 +2744,7 @@ var areaChecklistSchema = Joi8.object({
       isScheduleTask: Joi8.boolean().optional().default(false),
       scheduleTaskId: Joi8.string().hex().optional().allow(null)
     }).required()
-  ).optional().default([]),
-  createdBy: Joi8.string().hex().required()
+  ).optional().default([])
 });
 function MAreaChecklist(value) {
   const { error } = areaChecklistSchema.validate(value);
@@ -2782,13 +2785,6 @@ function MAreaChecklist(value) {
       };
     });
   }
-  if (value.createdBy) {
-    try {
-      value.createdBy = new ObjectId8(value.createdBy);
-    } catch (error2) {
-      throw new BadRequestError14("Invalid createdBy ID format.");
-    }
-  }
   return {
     schedule: value.schedule,
     serviceType: value.serviceType,
@@ -2797,7 +2793,6 @@ function MAreaChecklist(value) {
     type: value.type,
     checklist: value.checklist || [],
     status: "open",
-    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     completedAt: "",
     updatedAt: ""
@@ -2917,10 +2912,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 +2924,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;
@@ -2955,32 +2947,6 @@ function useAreaChecklistRepo() {
     try {
       const pipeline = [
         { $match: query },
-        {
-          $lookup: {
-            from: "users",
-            let: { createdById: "$createdBy" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: {
-                    $and: [
-                      { $ne: ["$$createdById", ""] },
-                      { $eq: ["$_id", "$$createdById"] }
-                    ]
-                  }
-                }
-              },
-              { $project: { name: 1 } }
-            ],
-            as: "createdByDoc"
-          }
-        },
-        {
-          $unwind: {
-            path: "$createdByDoc",
-            preserveNullAndEmptyArrays: true
-          }
-        },
         {
           $addFields: {
             statusOrder: {
@@ -3032,8 +2998,7 @@ function useAreaChecklistRepo() {
                 },
                 else: 0
               }
-            },
-            createdByName: "$createdByDoc.name"
+            }
           }
         },
         { $skip: page * limit },
@@ -3331,10 +3296,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 +3308,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 +3521,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.");
@@ -4081,8 +4052,7 @@ function useAreaChecklistService() {
                   unit: unit.unit.toString(),
                   name: unit.name
                 }))
-              })),
-              createdBy: value.createdBy
+              }))
             };
             const insertedId = await _createAreaChecklist(checklistData);
             totalChecklistsCreated++;
@@ -4118,10 +4088,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 +4120,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
         );
@@ -4440,16 +4413,13 @@ function useAreaChecklistController() {
       (acc, [key, value2]) => ({ ...acc, [key]: value2 }),
       {}
     ) : {};
-    const createdBy = cookies["user"] || "";
     const payload = {
       site: req.params.site,
-      schedule: req.params.schedule,
-      createdBy
+      schedule: req.params.schedule
     };
     const validation = Joi9.object({
       site: Joi9.string().hex().required(),
-      schedule: Joi9.string().hex().required(),
-      createdBy: Joi9.string().hex().required()
+      schedule: Joi9.string().hex().required()
     });
     const { error, value } = validation.validate(payload);
     if (error) {
@@ -6021,8 +5991,7 @@ var scheduleTaskSchema = Joi16.object({
       name: Joi16.string().required(),
       value: Joi16.any().required()
     })
-  ).required(),
-  createdBy: Joi16.string().hex().required()
+  ).required()
 });
 function MScheduleTask(value) {
   const { error } = scheduleTaskSchema.validate(value);
@@ -6049,13 +6018,6 @@ function MScheduleTask(value) {
       }
     });
   }
-  if (value.createdBy) {
-    try {
-      value.createdBy = new ObjectId18(value.createdBy);
-    } catch (error2) {
-      throw new BadRequestError28("Invalid createdBy ID format.");
-    }
-  }
   return {
     site: value.site,
     serviceType: value.serviceType,
@@ -6065,7 +6027,6 @@ function MScheduleTask(value) {
     description: value.description,
     areas: value.areas,
     status: "active",
-    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -6587,8 +6548,7 @@ function useScheduleTaskService() {
                   area: areaId,
                   name: area.name,
                   type: areaDetails.type || "common",
-                  checklist: schedTaskSets,
-                  createdBy: scheduleTask.createdBy
+                  checklist: schedTaskSets
                 };
                 logger32.info(
                   `Area ${area.name} (${areaId}): Creating new area checklist with schedule-task sets only`
@@ -6643,12 +6603,7 @@ function useScheduleTaskController() {
     deleteScheduleTask: _deleteScheduleTask
   } = useScheduleTaskRepository();
   async function createScheduleTask(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 payload = { ...req.body, ...req.params };
     const { error } = scheduleTaskSchema.validate(payload);
     if (error) {
       logger33.log({ level: "error", message: error.message });