@7365admin1/module-hygiene 4.15.0 → 4.17.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @7365admin1/module-hygiene
 
+## 4.17.0
+
+### Minor Changes
+
+- Update hygiene app version
+
+## 4.16.0
+
+### Minor Changes
+
+- Update Hygiene Package
+
 ## 4.15.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -135,19 +135,19 @@ type TUnit = {
     status?: "active" | "deleted";
 };
 type TUnitCreate = {
-    serviceType?: TServiceType;
+    serviceType: TServiceType;
 } & Pick<TUnit, "site" | "name">;
 type TUnitGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
-    serviceType?: TServiceType;
+    serviceType: TServiceType;
 } & Pick<TUnit, "site">;
 type TUnitUpdate = Pick<TUnit, "name">;
 declare const unitSchema: Joi.ObjectSchema<any>;
 declare function MUnit(value: TUnitCreate): {
     site: string | ObjectId;
-    serviceType: ServiceType | undefined;
+    serviceType: ServiceType;
     name: string;
     status: string;
     createdAt: Date;
@@ -159,7 +159,7 @@ declare function useUnitService(): {
     importUnit: ({ dataJson, site, serviceType, }: {
         dataJson: string;
         site: string | ObjectId;
-        serviceType?: ServiceType | undefined;
+        serviceType: TServiceType;
     }) => Promise<{
         message: string;
     }>;
@@ -167,7 +167,7 @@ declare function useUnitService(): {
     deleteUnit: (_id: string | ObjectId) => Promise<number>;
     exportUnits: ({ site, serviceType, }: {
         site: string | ObjectId;
-        serviceType?: ServiceType | undefined;
+        serviceType: TServiceType;
     }) => Promise<Buffer>;
 };
 
@@ -192,12 +192,16 @@ declare function useUnitController(): {
 
 type TParentChecklist = {
     _id?: ObjectId;
-    site?: string | ObjectId;
-    serviceType?: TServiceType;
+    site: string | ObjectId;
+    serviceType: TServiceType;
     status?: (typeof allowedStatus)[number];
     createdAt?: Date | string;
     updatedAt?: Date | string;
 };
+type TParentChecklistCreate = {
+    site?: string | ObjectId;
+    serviceType?: TServiceType;
+} & Pick<TParentChecklist, "createdAt">;
 type TParentChecklistGetQuery = {
     site: string | ObjectId;
     serviceType: TServiceType;
@@ -209,8 +213,8 @@ type TParentChecklistGetQuery = {
 } & Pick<TParentChecklist, "status">;
 declare const parentChecklistSchema: Joi.ObjectSchema<any>;
 declare function MParentChecklist(value: TParentChecklist): {
-    site: string | ObjectId | undefined;
-    serviceType: ServiceType | undefined;
+    site: string | ObjectId;
+    serviceType: ServiceType;
     status: string;
     createdAt: string | Date;
     updatedAt: string | Date;
@@ -218,12 +222,13 @@ declare function MParentChecklist(value: TParentChecklist): {
 
 declare function useParentChecklistRepo(): {
     createIndex: () => Promise<void>;
-    createParentChecklist: (value: TParentChecklist, session?: ClientSession) => Promise<ObjectId | ObjectId[]>;
+    createParentChecklist: (value: TParentChecklistCreate, session?: ClientSession) => Promise<ObjectId | ObjectId[]>;
     getAllParentChecklist: ({ page, limit, search, site, startDate, endDate, status, serviceType, }: TParentChecklistGetQuery) => Promise<{}>;
     getParentChecklistById: (_id: string | ObjectId) => Promise<TParentChecklist & {
         _id: ObjectId;
     }>;
     updateParentChecklistStatuses: (_id: string | ObjectId, status: (typeof allowedStatus)[number], session?: ClientSession) => Promise<number>;
+    getHygieneSiteIds: () => Promise<any[]>;
     closeExpiredParentChecklists: () => Promise<number>;
     getTodayParentChecklists: () => Promise<{
         _id: ObjectId;
@@ -251,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;
@@ -274,20 +278,17 @@ type TAreaChecklistUnits = {
     completedBy?: string | ObjectId;
     timestamp?: Date | string;
 };
-type TAreaChecklistCreate = Pick<TCleaningScheduleArea, "schedule" | "area" | "name" | "type" | "checklist" | "createdBy"> & {
-    serviceType: TServiceType;
-};
-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 = {
     page?: number;
     limit?: number;
     search?: string;
-    serviceType?: TServiceType;
     type?: (typeof allowedTypes)[number] | "all";
     status?: (typeof allowedStatus)[number] | "all";
-} & Pick<TCleaningScheduleArea, "schedule">;
+} & Pick<TCleaningScheduleArea, "schedule" | "serviceType">;
 type TAreaChecklistUpdate = Pick<TCleaningScheduleArea, "checklist">;
 type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "approve" | "reject" | "remarks" | "completedBy"> & Pick<TAreaChecklist, "attachment">;
 declare const areaChecklistSchema: Joi.ObjectSchema<any>;
@@ -299,7 +300,6 @@ declare function MAreaChecklist(value: TAreaChecklistCreate): {
     type: string;
     checklist: TAreaChecklist[];
     status: string;
-    createdBy: string | ObjectId | undefined;
     createdAt: Date;
     completedAt: string;
     updatedAt: string;
@@ -359,13 +359,13 @@ declare function useAreaChecklistRepo(): {
         page?: number | undefined;
         limit?: number | undefined;
         search?: string | undefined;
-        serviceType?: ServiceType | undefined;
+        serviceType: TServiceType;
         _id: string | ObjectId;
     }, session?: ClientSession) => Promise<{}>;
     getAreaChecklistById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document>>;
     getAreaChecklistByAreaAndSchedule: ({ schedule, serviceType, area, session, }: {
         schedule: string | ObjectId;
-        serviceType?: ServiceType | undefined;
+        serviceType: TServiceType;
         area: string | ObjectId;
         session?: ClientSession | undefined;
     }) => Promise<mongodb.WithId<bson.Document>>;
@@ -574,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): {
@@ -600,7 +599,6 @@ declare function MScheduleTask(value: TScheduleTaskCreate): {
         value: ObjectId;
     }[];
     status: string;
-    createdBy: string | ObjectId;
     createdAt: Date;
     updatedAt: string;
     deletedAt: string;
@@ -647,4 +645,4 @@ declare function useQRController(): {
     generateQR: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-export { MArea, MAreaChecklist, MCheckOutItem, MParentChecklist, MScheduleTask, MStock, MSupply, MUnit, ServiceType, TArea, TAreaChecklist, TAreaChecklistBatchCreate, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaChecklistUpdate, TAreaCreate, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCheckOutItem, TCheckOutItemCreate, TCheckOutItemCreateByBatchService, TCheckOutItemCreateService, TCheckOutItemGetById, TCheckOutItemGetQuery, TCleaningScheduleArea, TCleaningScheduleAreaGetQuery, TGetStocksQuery, TParentChecklist, TParentChecklistGetQuery, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskGetQuery, TScheduleTaskUpdate, TServiceType, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyGetQuery, TSupplyUpdate, TUnit, TUnitCreate, TUnitGetQuery, TUnitUpdate, allowedCheckOutItemStatus, allowedChecklistStatus, allowedPeriods, allowedStatus, allowedTypes, areaChecklistSchema, areaSchema, checkOutItemSchema, parentChecklistSchema, scheduleTaskSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaExportService, useAreaRepo, useAreaService, useCheckOutItemController, useCheckOutItemRepository, useCheckOutItemService, useHygieneDashboardController, useHygieneDashboardRepository, useParentChecklistController, useParentChecklistRepo, useQRController, useQRService, useScheduleTaskController, useScheduleTaskRepository, useScheduleTaskService, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useUnitController, useUnitExportService, useUnitRepository, useUnitService };
+export { MArea, MAreaChecklist, MCheckOutItem, MParentChecklist, MScheduleTask, MStock, MSupply, MUnit, ServiceType, TArea, TAreaChecklist, TAreaChecklistBatchCreate, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaChecklistUpdate, TAreaCreate, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCheckOutItem, TCheckOutItemCreate, TCheckOutItemCreateByBatchService, TCheckOutItemCreateService, TCheckOutItemGetById, TCheckOutItemGetQuery, TCleaningScheduleArea, TCleaningScheduleAreaGetQuery, TGetStocksQuery, TParentChecklist, TParentChecklistCreate, TParentChecklistGetQuery, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskGetQuery, TScheduleTaskUpdate, TServiceType, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyGetQuery, TSupplyUpdate, TUnit, TUnitCreate, TUnitGetQuery, TUnitUpdate, allowedCheckOutItemStatus, allowedChecklistStatus, allowedPeriods, allowedStatus, allowedTypes, areaChecklistSchema, areaSchema, checkOutItemSchema, parentChecklistSchema, scheduleTaskSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaExportService, useAreaRepo, useAreaService, useCheckOutItemController, useCheckOutItemRepository, useCheckOutItemService, useHygieneDashboardController, useHygieneDashboardRepository, useParentChecklistController, useParentChecklistRepo, useQRController, useQRService, useScheduleTaskController, useScheduleTaskRepository, useScheduleTaskService, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useUnitController, useUnitExportService, useUnitRepository, useUnitService };

package/dist/index.js

@@ -1240,11 +1240,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 import_mongodb5.ObjectId(site);
@@ -1253,10 +1255,6 @@ function useUnitRepository() {
     } catch (error) {
       throw new import_node_server_utils7.BadRequestError("Invalid site ID format.");
     }
-    if (serviceType) {
-      query.serviceType = serviceType;
-      cacheOptions.serviceType = serviceType;
-    }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
@@ -2678,6 +2676,7 @@ function useParentChecklistRepo() {
     getAllParentChecklist,
     getParentChecklistById,
     updateParentChecklistStatuses,
+    getHygieneSiteIds,
     closeExpiredParentChecklists,
     getTodayParentChecklists,
     getTodayParentChecklistsForAreaGen
@@ -2694,7 +2693,12 @@ function useParentChecklistController() {
   } = useParentChecklistRepo();
   async function createParentChecklist(req, res, next) {
     const payload = req.body;
-    const { error } = parentChecklistSchema.validate(payload);
+    const validation = import_joi7.default.object({
+      createdAt: import_joi7.default.alternatives().try(import_joi7.default.date(), import_joi7.default.string()).optional().allow("", null),
+      site: import_joi7.default.string().hex().required(),
+      serviceType: import_joi7.default.string().valid(...Object.values(ServiceType)).optional().allow("", null)
+    });
+    const { error } = validation.validate(payload);
     if (error) {
       import_node_server_utils15.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils15.BadRequestError(error.message));
@@ -2768,7 +2772,7 @@ var import_node_server_utils16 = require("@7365admin1/node-server-utils");
 var allowedChecklistStatus = ["open", "completed", "closed"];
 var areaChecklistSchema = import_joi8.default.object({
   schedule: import_joi8.default.string().hex().required(),
-  serviceType: import_joi8.default.string().valid(...Object.values(ServiceType)).optional(),
+  serviceType: import_joi8.default.string().valid(...Object.values(ServiceType)).required(),
   area: import_joi8.default.string().hex().required(),
   name: import_joi8.default.string().required(),
   type: import_joi8.default.string().valid(...allowedTypes).required(),
@@ -2784,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);
@@ -2826,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,
@@ -2841,7 +2837,6 @@ function MAreaChecklist(value) {
     type: value.type,
     checklist: value.checklist || [],
     status: "open",
-    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     completedAt: "",
     updatedAt: ""
@@ -2949,10 +2944,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 import_mongodb9.ObjectId(schedule);
@@ -2960,10 +2956,6 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new import_node_server_utils17.BadRequestError("Invalid parent checklist ID format.");
     }
-    if (serviceType) {
-      query.serviceType = serviceType;
-      cacheOptions.serviceType = serviceType;
-    }
     if (type && type !== "all") {
       query.type = type;
       cacheOptions.type = type;
@@ -2987,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: {
@@ -3064,8 +3030,7 @@ function useAreaChecklistRepo() {
                 },
                 else: 0
               }
-            },
-            createdByName: "$createdByDoc.name"
+            }
           }
         },
         { $skip: page * limit },
@@ -3363,10 +3328,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 import_mongodb9.ObjectId(_id);
@@ -3374,10 +3340,6 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new import_node_server_utils17.BadRequestError("Invalid area checklist ID format.");
     }
-    if (serviceType) {
-      query.serviceType = serviceType;
-      cacheOptions.serviceType = serviceType;
-    }
     if (search) {
       query.$text = { $search: search };
       cacheOptions.search = search;
@@ -3591,7 +3553,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 import_node_server_utils17.BadRequestError("Area checklist not found.");
@@ -4113,8 +4084,7 @@ function useAreaChecklistService() {
                   unit: unit.unit.toString(),
                   name: unit.name
                 }))
-              })),
-              createdBy: value.createdBy
+              }))
             };
             const insertedId = await _createAreaChecklist(checklistData);
             totalChecklistsCreated++;
@@ -4150,10 +4120,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
@@ -4178,14 +4152,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
         );
@@ -4468,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) {
@@ -6019,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);
@@ -6047,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,
@@ -6063,7 +6025,6 @@ function MScheduleTask(value) {
     description: value.description,
     areas: value.areas,
     status: "active",
-    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -6576,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`
@@ -6632,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 });