@7365admin1/module-hygiene 4.16.0 → 4.17.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @7365admin1/module-hygiene
 
+## 4.17.0
+
+### Minor Changes
+
+- Update hygiene app version
+
 ## 4.16.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -256,7 +256,6 @@ type TCleaningScheduleArea = {
     type: (typeof allowedTypes)[number];
     checklist: TAreaChecklist[];
     status?: (typeof allowedStatus)[number];
-    createdBy?: string | ObjectId;
     createdAt?: Date | string;
     completedAt?: Date | string;
     updatedAt?: Date | string;
@@ -279,8 +278,8 @@ type TAreaChecklistUnits = {
     completedBy?: string | ObjectId;
     timestamp?: Date | string;
 };
-type TAreaChecklistCreate = Pick<TCleaningScheduleArea, "schedule" | "serviceType" | "area" | "name" | "type" | "checklist" | "createdBy">;
-type TAreaChecklistBatchCreate = Pick<TCleaningScheduleArea, "schedule" | "createdBy"> & {
+type TAreaChecklistCreate = Pick<TCleaningScheduleArea, "schedule" | "serviceType" | "area" | "name" | "type" | "checklist">;
+type TAreaChecklistBatchCreate = Pick<TCleaningScheduleArea, "schedule"> & {
     site: string | ObjectId;
 };
 type TCleaningScheduleAreaGetQuery = {
@@ -301,7 +300,6 @@ declare function MAreaChecklist(value: TAreaChecklistCreate): {
     type: string;
     checklist: TAreaChecklist[];
     status: string;
-    createdBy: string | ObjectId | undefined;
     createdAt: Date;
     completedAt: string;
     updatedAt: string;
@@ -576,18 +574,17 @@ type TScheduleTask = {
         value: ObjectId;
     }[];
     status?: "active" | "deleted";
-    createdBy: string | ObjectId;
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
 };
-type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "serviceType" | "title" | "time" | "dates" | "description" | "areas" | "createdBy">;
+type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "serviceType" | "title" | "time" | "dates" | "description" | "areas">;
 type TScheduleTaskGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
 } & Pick<TScheduleTask, "site" | "serviceType">;
-type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "time" | "dates" | "description" | "areas" | "status" | "createdBy" | "createdAt">;
+type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "time" | "dates" | "description" | "areas" | "status" | "createdAt">;
 type TScheduleTaskUpdate = Partial<Pick<TScheduleTask, "title" | "time" | "dates" | "description" | "areas">>;
 declare const scheduleTaskSchema: Joi.ObjectSchema<any>;
 declare function MScheduleTask(value: TScheduleTaskCreate): {
@@ -602,7 +599,6 @@ declare function MScheduleTask(value: TScheduleTaskCreate): {
         value: ObjectId;
     }[];
     status: string;
-    createdBy: string | ObjectId;
     createdAt: Date;
     updatedAt: string;
     deletedAt: string;

package/dist/index.js

@@ -2788,8 +2788,7 @@ var areaChecklistSchema = import_joi8.default.object({
       isScheduleTask: import_joi8.default.boolean().optional().default(false),
       scheduleTaskId: import_joi8.default.string().hex().optional().allow(null)
     }).required()
-  ).optional().default([]),
-  createdBy: import_joi8.default.string().hex().required()
+  ).optional().default([])
 });
 function MAreaChecklist(value) {
   const { error } = areaChecklistSchema.validate(value);
@@ -2830,13 +2829,6 @@ function MAreaChecklist(value) {
       };
     });
   }
-  if (value.createdBy) {
-    try {
-      value.createdBy = new import_mongodb8.ObjectId(value.createdBy);
-    } catch (error2) {
-      throw new import_node_server_utils16.BadRequestError("Invalid createdBy ID format.");
-    }
-  }
   return {
     schedule: value.schedule,
     serviceType: value.serviceType,
@@ -2845,7 +2837,6 @@ function MAreaChecklist(value) {
     type: value.type,
     checklist: value.checklist || [],
     status: "open",
-    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     completedAt: "",
     updatedAt: ""
@@ -2988,32 +2979,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: {
@@ -3065,8 +3030,7 @@ function useAreaChecklistRepo() {
                 },
                 else: 0
               }
-            },
-            createdByName: "$createdByDoc.name"
+            }
           }
         },
         { $skip: page * limit },
@@ -4120,8 +4084,7 @@ function useAreaChecklistService() {
                   unit: unit.unit.toString(),
                   name: unit.name
                 }))
-              })),
-              createdBy: value.createdBy
+              }))
             };
             const insertedId = await _createAreaChecklist(checklistData);
             totalChecklistsCreated++;
@@ -4478,16 +4441,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 = import_joi9.default.object({
       site: import_joi9.default.string().hex().required(),
-      schedule: import_joi9.default.string().hex().required(),
-      createdBy: import_joi9.default.string().hex().required()
+      schedule: import_joi9.default.string().hex().required()
     });
     const { error, value } = validation.validate(payload);
     if (error) {
@@ -6029,8 +5989,7 @@ var scheduleTaskSchema = import_joi16.default.object({
       name: import_joi16.default.string().required(),
       value: import_joi16.default.any().required()
     })
-  ).required(),
-  createdBy: import_joi16.default.string().hex().required()
+  ).required()
 });
 function MScheduleTask(value) {
   const { error } = scheduleTaskSchema.validate(value);
@@ -6057,13 +6016,6 @@ function MScheduleTask(value) {
       }
     });
   }
-  if (value.createdBy) {
-    try {
-      value.createdBy = new import_mongodb18.ObjectId(value.createdBy);
-    } catch (error2) {
-      throw new import_node_server_utils32.BadRequestError("Invalid createdBy ID format.");
-    }
-  }
   return {
     site: value.site,
     serviceType: value.serviceType,
@@ -6073,7 +6025,6 @@ function MScheduleTask(value) {
     description: value.description,
     areas: value.areas,
     status: "active",
-    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -6586,8 +6537,7 @@ function useScheduleTaskService() {
                   area: areaId,
                   name: area.name,
                   type: areaDetails.type || "common",
-                  checklist: schedTaskSets,
-                  createdBy: scheduleTask.createdBy
+                  checklist: schedTaskSets
                 };
                 import_node_server_utils34.logger.info(
                   `Area ${area.name} (${areaId}): Creating new area checklist with schedule-task sets only`
@@ -6642,12 +6592,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) {
       import_node_server_utils35.logger.log({ level: "error", message: error.message });