@7365admin1/module-hygiene 3.0.0 → 4.1.0

package/dist/index.mjs

@@ -1051,12 +1051,12 @@ function useAreaService() {
           skippedRows.push(i + 1);
           continue;
         }
-        if (!row?.NAME) {
-          logger5.warn(`Skipping row ${i + 1} with missing NAME:`, row);
+        if (!row?.AREA) {
+          logger5.warn(`Skipping row ${i + 1} with missing AREA:`, row);
           skippedRows.push(i + 1);
           continue;
         }
-        const areaName = String(row.NAME).trim();
+        const areaName = String(row.AREA).trim();
         if (!areaName) {
           logger5.warn(`Skipping row ${i + 1} with empty ${areaType} area name`);
           skippedRows.push(i + 1);
@@ -1595,12 +1595,12 @@ function useUnitService() {
     try {
       for (let i = 0; i < dataArray.length; i++) {
         const row = dataArray[i];
-        if (!row?.NAME) {
-          logger9.warn(`Skipping row ${i + 1} with missing NAME:`, row);
+        if (!row?.UNIT) {
+          logger9.warn(`Skipping row ${i + 1} with missing UNIT:`, row);
           skippedRows.push(i + 1);
           continue;
         }
-        const unitName = String(row.NAME).trim();
+        const unitName = String(row.UNIT).trim();
         if (!unitName) {
           logger9.warn(`Skipping row ${i + 1} with empty unit name`);
           skippedRows.push(i + 1);
@@ -2273,7 +2273,8 @@ var areaChecklistSchema = Joi8.object({
         }).required()
       ).min(1).required()
     }).required()
-  ).optional().default([])
+  ).optional().default([]),
+  createdBy: Joi8.string().hex().required()
 });
 function MAreaChecklist(value) {
   const { error } = areaChecklistSchema.validate(value);
@@ -2310,6 +2311,13 @@ 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,
     area: value.area,
@@ -2317,6 +2325,7 @@ function MAreaChecklist(value) {
     type: value.type,
     checklist: value.checklist || [],
     status: "ready",
+    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     completedAt: "",
     updatedAt: ""
@@ -2455,6 +2464,32 @@ 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
+          }
+        },
         {
           $project: {
             name: 1,
@@ -2486,7 +2521,8 @@ function useAreaChecklistRepo() {
                 },
                 else: 0
               }
-            }
+            },
+            createdByName: "$createdByDoc.name"
           }
         },
         { $sort: { _id: -1 } },
@@ -3119,7 +3155,8 @@ function useAreaChecklistService() {
                   unit: unit.unit.toString(),
                   name: unit.name
                 }))
-              }))
+              })),
+              createdBy: value.createdBy
             };
             const insertedId = await _createAreaChecklist(
               checklistData,
@@ -3254,13 +3291,20 @@ function useAreaChecklistController() {
     completeAreaChecklistUnits: _completeAreaChecklistUnits
   } = useAreaChecklistService();
   async function createAreaChecklist(req, res, next) {
+    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value2]) => ({ ...acc, [key]: value2 }),
+      {}
+    ) : {};
+    const createdBy = cookies["user"] || "";
     const payload = {
       site: req.params.site,
-      schedule: req.params.schedule
+      schedule: req.params.schedule,
+      createdBy
     };
     const validation = Joi9.object({
       site: Joi9.string().hex().required(),
-      schedule: Joi9.string().hex().required()
+      schedule: Joi9.string().hex().required(),
+      createdBy: Joi9.string().hex().required()
     });
     const { error, value } = validation.validate(payload);
     if (error) {
@@ -4805,7 +4849,8 @@ var scheduleTaskSchema = Joi16.object({
       name: Joi16.string().required(),
       value: Joi16.any().required()
     })
-  ).required()
+  ).required(),
+  createdBy: Joi16.string().hex().required()
 });
 function MScheduleTask(value) {
   const { error } = scheduleTaskSchema.validate(value);
@@ -4832,6 +4877,13 @@ function MScheduleTask(value) {
       }
     });
   }
+  if (value.createdBy) {
+    try {
+      value.createdBy = new ObjectId16(value.createdBy);
+    } catch (error2) {
+      throw new BadRequestError28("Invalid createdBy ID format.");
+    }
+  }
   return {
     site: value.site,
     title: value.title,
@@ -4841,6 +4893,7 @@ function MScheduleTask(value) {
     description: value.description,
     areas: value.areas,
     status: "active",
+    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -5139,7 +5192,7 @@ function useScheduleTaskRepository() {
 import { logger as logger29 } from "@7365admin1/node-server-utils";
 function useScheduleTaskService() {
   const { createParentChecklist } = useParentChecklistRepo();
-  const { getAllScheduleTask, getScheduleTaskById } = useScheduleTaskRepository();
+  const { getAllScheduleTask } = useScheduleTaskRepository();
   const {
     createAreaChecklist,
     getAreaChecklistByAreaAndSchedule,
@@ -5337,7 +5390,8 @@ function useScheduleTaskService() {
                       set: 1,
                       units
                     }
-                  ]
+                  ],
+                  createdBy: scheduleTask.createdBy
                 };
                 logger29.info(
                   `Area ${area.name} (${areaId}): Creating new area checklist with data: ${JSON.stringify(
@@ -5410,7 +5464,12 @@ function useScheduleTaskController() {
     updateScheduleTask: _updateScheduleTask
   } = useScheduleTaskRepository();
   async function createScheduleTask(req, res, next) {
-    const payload = { ...req.body, ...req.params };
+    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 { error } = scheduleTaskSchema.validate(payload);
     if (error) {
       logger30.log({ level: "error", message: error.message });