@7365admin1/module-hygiene 3.0.0 → 4.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @7365admin1/module-hygiene
 
+## 4.1.0
+
+### Minor Changes
+
+- Added `createdBy` field to the schedule task model and cleaning schedule area checklist model, and included it in the projected fields in the area checklist repository.
+
+## 4.0.0
+
+### Major Changes
+
+- Change import logic to expect AREA instead of NAME in area import, and UNIT instead of NAME in unit import (breaking change to Excel import format).
+
 ## 3.0.0
 
 ### Major Changes

package/dist/index.d.ts

@@ -205,6 +205,7 @@ type TCleaningScheduleArea = {
     type: (typeof allowedTypes)[number];
     checklist: TAreaChecklist[];
     status?: (typeof allowedStatus)[number];
+    createdBy?: string | ObjectId;
     createdAt?: Date | string;
     completedAt?: Date | string;
     updatedAt?: Date | string;
@@ -224,7 +225,7 @@ type TAreaChecklistUnits = {
 type TAreaChecklistCreate = Pick<TCleaningScheduleArea, "schedule" | "area"> & {
     site: string | ObjectId;
 };
-type TAreaChecklistBatchCreate = Pick<TCleaningScheduleArea, "schedule"> & {
+type TAreaChecklistBatchCreate = Pick<TCleaningScheduleArea, "schedule" | "createdBy"> & {
     site: string | ObjectId;
 };
 type TCleaningScheduleAreaGetQuery = {
@@ -244,6 +245,7 @@ declare function MAreaChecklist(value: TCleaningScheduleArea): {
     type: string;
     checklist: TAreaChecklist[];
     status: string;
+    createdBy: string | ObjectId | undefined;
     createdAt: Date;
     completedAt: string;
     updatedAt: string;
@@ -475,17 +477,18 @@ type TScheduleTask = {
         value: ObjectId;
     }[];
     status?: "active" | "deleted";
+    createdBy: string | ObjectId;
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
 };
-type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "title" | "time" | "startDate" | "endDate" | "description" | "areas">;
+type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "title" | "time" | "startDate" | "endDate" | "description" | "areas" | "createdBy">;
 type TScheduleTaskGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
 } & Pick<TScheduleTask, "site">;
-type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "time" | "startDate" | "endDate" | "description" | "areas" | "status" | "createdAt">;
+type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "time" | "startDate" | "endDate" | "description" | "areas" | "status" | "createdBy" | "createdAt">;
 type TScheduleTaskUpdate = Partial<Pick<TScheduleTask, "title" | "time" | "startDate" | "endDate" | "description" | "areas">>;
 declare const scheduleTaskSchema: Joi.ObjectSchema<any>;
 declare function MScheduleTask(value: TScheduleTaskCreate): {
@@ -500,6 +503,7 @@ declare function MScheduleTask(value: TScheduleTaskCreate): {
         value: ObjectId;
     }[];
     status: string;
+    createdBy: string | ObjectId;
     createdAt: Date;
     updatedAt: string;
     deletedAt: string;

package/dist/index.js

@@ -1111,12 +1111,12 @@ function useAreaService() {
           skippedRows.push(i + 1);
           continue;
         }
-        if (!row?.NAME) {
-          import_node_server_utils5.logger.warn(`Skipping row ${i + 1} with missing NAME:`, row);
+        if (!row?.AREA) {
+          import_node_server_utils5.logger.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) {
           import_node_server_utils5.logger.warn(`Skipping row ${i + 1} with empty ${areaType} area name`);
           skippedRows.push(i + 1);
@@ -1642,12 +1642,12 @@ function useUnitService() {
     try {
       for (let i = 0; i < dataArray.length; i++) {
         const row = dataArray[i];
-        if (!row?.NAME) {
-          import_node_server_utils9.logger.warn(`Skipping row ${i + 1} with missing NAME:`, row);
+        if (!row?.UNIT) {
+          import_node_server_utils9.logger.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) {
           import_node_server_utils9.logger.warn(`Skipping row ${i + 1} with empty unit name`);
           skippedRows.push(i + 1);
@@ -2312,7 +2312,8 @@ var areaChecklistSchema = import_joi8.default.object({
         }).required()
       ).min(1).required()
     }).required()
-  ).optional().default([])
+  ).optional().default([]),
+  createdBy: import_joi8.default.string().hex().required()
 });
 function MAreaChecklist(value) {
   const { error } = areaChecklistSchema.validate(value);
@@ -2349,6 +2350,13 @@ function MAreaChecklist(value) {
       };
     });
   }
+  if (value.createdBy) {
+    try {
+      value.createdBy = new import_mongodb8.ObjectId(value.createdBy);
+    } catch (error2) {
+      throw new import_node_server_utils14.BadRequestError("Invalid createdBy ID format.");
+    }
+  }
   return {
     schedule: value.schedule,
     area: value.area,
@@ -2356,6 +2364,7 @@ function MAreaChecklist(value) {
     type: value.type,
     checklist: value.checklist || [],
     status: "ready",
+    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     completedAt: "",
     updatedAt: ""
@@ -2486,6 +2495,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,
@@ -2517,7 +2552,8 @@ function useAreaChecklistRepo() {
                 },
                 else: 0
               }
-            }
+            },
+            createdByName: "$createdByDoc.name"
           }
         },
         { $sort: { _id: -1 } },
@@ -3150,7 +3186,8 @@ function useAreaChecklistService() {
                   unit: unit.unit.toString(),
                   name: unit.name
                 }))
-              }))
+              })),
+              createdBy: value.createdBy
             };
             const insertedId = await _createAreaChecklist(
               checklistData,
@@ -3285,13 +3322,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 = import_joi9.default.object({
       site: import_joi9.default.string().hex().required(),
-      schedule: import_joi9.default.string().hex().required()
+      schedule: import_joi9.default.string().hex().required(),
+      createdBy: import_joi9.default.string().hex().required()
     });
     const { error, value } = validation.validate(payload);
     if (error) {
@@ -4806,7 +4850,8 @@ var scheduleTaskSchema = import_joi16.default.object({
       name: import_joi16.default.string().required(),
       value: import_joi16.default.any().required()
     })
-  ).required()
+  ).required(),
+  createdBy: import_joi16.default.string().hex().required()
 });
 function MScheduleTask(value) {
   const { error } = scheduleTaskSchema.validate(value);
@@ -4833,6 +4878,13 @@ function MScheduleTask(value) {
       }
     });
   }
+  if (value.createdBy) {
+    try {
+      value.createdBy = new import_mongodb16.ObjectId(value.createdBy);
+    } catch (error2) {
+      throw new import_node_server_utils29.BadRequestError("Invalid createdBy ID format.");
+    }
+  }
   return {
     site: value.site,
     title: value.title,
@@ -4842,6 +4894,7 @@ function MScheduleTask(value) {
     description: value.description,
     areas: value.areas,
     status: "active",
+    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -5131,7 +5184,7 @@ function useScheduleTaskRepository() {
 var import_node_server_utils31 = require("@7365admin1/node-server-utils");
 function useScheduleTaskService() {
   const { createParentChecklist } = useParentChecklistRepo();
-  const { getAllScheduleTask, getScheduleTaskById } = useScheduleTaskRepository();
+  const { getAllScheduleTask } = useScheduleTaskRepository();
   const {
     createAreaChecklist,
     getAreaChecklistByAreaAndSchedule,
@@ -5329,7 +5382,8 @@ function useScheduleTaskService() {
                       set: 1,
                       units
                     }
-                  ]
+                  ],
+                  createdBy: scheduleTask.createdBy
                 };
                 import_node_server_utils31.logger.info(
                   `Area ${area.name} (${areaId}): Creating new area checklist with data: ${JSON.stringify(
@@ -5402,7 +5456,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) {
       import_node_server_utils32.logger.log({ level: "error", message: error.message });