@7365admin1/module-hygiene 4.15.0 → 4.16.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @7365admin1/module-hygiene
 
+## 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;
@@ -274,9 +279,7 @@ type TAreaChecklistUnits = {
     completedBy?: string | ObjectId;
     timestamp?: Date | string;
 };
-type TAreaChecklistCreate = Pick<TCleaningScheduleArea, "schedule" | "area" | "name" | "type" | "checklist" | "createdBy"> & {
-    serviceType: TServiceType;
-};
+type TAreaChecklistCreate = Pick<TCleaningScheduleArea, "schedule" | "serviceType" | "area" | "name" | "type" | "checklist" | "createdBy">;
 type TAreaChecklistBatchCreate = Pick<TCleaningScheduleArea, "schedule" | "createdBy"> & {
     site: string | ObjectId;
 };
@@ -284,10 +287,9 @@ 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>;
@@ -359,13 +361,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>>;
@@ -647,4 +649,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(),
@@ -2949,10 +2953,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 +2965,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;
@@ -3363,10 +3364,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 +3376,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 +3589,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.");
@@ -4150,10 +4157,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 +4189,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
         );