@7365admin1/module-hygiene 4.13.0 → 4.14.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @7365admin1/module-hygiene
 
+## 4.14.0
+
+### Minor Changes
+
+- Hygiene Cleaning Schedule Enhancement Release
+
 ## 4.13.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -83,7 +83,7 @@ declare function useAreaRepo(): {
     createUniqueIndex: () => Promise<void>;
     createArea: (value: TAreaCreate, session?: ClientSession) => Promise<ObjectId>;
     getAreas: ({ page, limit, search, type, site, serviceType, }: TAreaGetQuery) => Promise<{}>;
-    getAreasForChecklist: (site: string | ObjectId, serviceType?: TServiceType) => Promise<{}>;
+    getAreasForChecklist: (site: string | ObjectId, serviceType: TServiceType) => Promise<{}>;
     getAreaById: (_id: string | ObjectId) => Promise<{}>;
     verifyAreaByUnitId: (unitId: string | ObjectId) => Promise<{}>;
     updateArea: (_id: string | ObjectId, value: TAreaUpdate, session?: ClientSession) => Promise<number>;
@@ -220,12 +220,20 @@ declare function useParentChecklistRepo(): {
     createIndex: () => Promise<void>;
     createParentChecklist: (value: TParentChecklist, 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>;
     closeExpiredParentChecklists: () => Promise<number>;
     getTodayParentChecklists: () => Promise<{
         _id: ObjectId;
         site: ObjectId;
     }[]>;
+    getTodayParentChecklistsForAreaGen: () => Promise<{
+        _id: ObjectId;
+        site: ObjectId;
+        serviceType: string;
+    }[]>;
 };
 
 declare function useParentChecklistController(): {
@@ -237,6 +245,7 @@ declare const allowedChecklistStatus: string[];
 type TCleaningScheduleArea = {
     _id?: ObjectId;
     schedule: string | ObjectId;
+    serviceType: TServiceType;
     area: string | ObjectId;
     name: string;
     type: (typeof allowedTypes)[number];
@@ -265,8 +274,8 @@ type TAreaChecklistUnits = {
     completedBy?: string | ObjectId;
     timestamp?: Date | string;
 };
-type TAreaChecklistCreate = Pick<TCleaningScheduleArea, "schedule" | "area"> & {
-    site: string | ObjectId;
+type TAreaChecklistCreate = Pick<TCleaningScheduleArea, "schedule" | "area" | "name" | "type" | "checklist" | "createdBy"> & {
+    serviceType: TServiceType;
 };
 type TAreaChecklistBatchCreate = Pick<TCleaningScheduleArea, "schedule" | "createdBy"> & {
     site: string | ObjectId;
@@ -275,14 +284,16 @@ type TCleaningScheduleAreaGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
+    serviceType?: TServiceType;
     type?: (typeof allowedTypes)[number] | "all";
     status?: (typeof allowedStatus)[number] | "all";
 } & Pick<TCleaningScheduleArea, "schedule">;
 type TAreaChecklistUpdate = Pick<TCleaningScheduleArea, "checklist">;
 type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "approve" | "reject" | "remarks" | "completedBy"> & Pick<TAreaChecklist, "attachment">;
 declare const areaChecklistSchema: Joi.ObjectSchema<any>;
-declare function MAreaChecklist(value: TCleaningScheduleArea): {
+declare function MAreaChecklist(value: TAreaChecklistCreate): {
     schedule: string | ObjectId;
+    serviceType: ServiceType;
     area: string | ObjectId;
     name: string;
     type: string;
@@ -332,8 +343,8 @@ declare function useAreaChecklistRepo(): {
     createIndex: () => Promise<void>;
     createTextIndex: () => Promise<void>;
     createUniqueIndex: () => Promise<void>;
-    createAreaChecklist: (value: TCleaningScheduleArea, session?: ClientSession) => Promise<ObjectId>;
-    getAllAreaChecklist: ({ page, limit, search, type, status, schedule, }: TCleaningScheduleAreaGetQuery, session?: ClientSession) => Promise<{}>;
+    createAreaChecklist: (value: TAreaChecklistCreate, session?: ClientSession) => Promise<ObjectId>;
+    getAllAreaChecklist: ({ page, limit, search, type, status, schedule, serviceType, }: TCleaningScheduleAreaGetQuery, session?: ClientSession) => Promise<{}>;
     getAreaChecklistHistory: ({ page, limit, search, type, schedule, status, createdAt, }: {
         page?: number | undefined;
         limit?: number | undefined;
@@ -344,22 +355,28 @@ declare function useAreaChecklistRepo(): {
         createdAt?: string | Date | undefined;
     }) => Promise<{}>;
     getAreaChecklistHistoryDetails: (_id: string | ObjectId) => Promise<{}>;
-    getAreaChecklistUnits: ({ page, limit, search, _id, }: {
+    getAreaChecklistUnits: ({ page, limit, search, serviceType, _id, }: {
         page?: number | undefined;
         limit?: number | undefined;
         search?: string | undefined;
+        serviceType?: ServiceType | undefined;
         _id: string | ObjectId;
     }, session?: ClientSession) => Promise<{}>;
     getAreaChecklistById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document>>;
-    getAreaChecklistByAreaAndSchedule: (schedule: string | ObjectId, area: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document>>;
+    getAreaChecklistByAreaAndSchedule: ({ schedule, serviceType, area, session, }: {
+        schedule: string | ObjectId;
+        serviceType?: ServiceType | undefined;
+        area: string | ObjectId;
+        session?: ClientSession | undefined;
+    }) => Promise<mongodb.WithId<bson.Document>>;
     getAreaChecklistSetOwner: (_id: string | ObjectId, set: number, session?: ClientSession) => Promise<any>;
     updateAreaChecklist: (_id: string | ObjectId, value: TAreaChecklistUpdate, session?: ClientSession) => Promise<number>;
     updateAreaChecklistStatus: (_id: string | ObjectId, status: (typeof allowedStatus)[number], session?: ClientSession) => Promise<number>;
     updateAreaChecklistUnits: (_id: string | ObjectId, set: number, unitId: string | ObjectId, value: TAreaChecklistUnitsUpdate, session?: ClientSession) => Promise<number>;
     getMaxSetNumberForArea: (areaId: string | ObjectId, session?: ClientSession) => Promise<any>;
     closeExpiredAreaChecklists: () => Promise<number>;
-    pushScheduleTaskSets: (scheduleId: string | ObjectId, areaId: string | ObjectId, scheduleTaskId: string | ObjectId, newSets: TAreaChecklist[]) => Promise<number>;
-    insertAutoGenSets: (scheduleId: string | ObjectId, areaId: string | ObjectId, newSets: any[]) => Promise<number>;
+    pushScheduleTaskSets: (scheduleId: string | ObjectId, serviceType: TServiceType, areaId: string | ObjectId, scheduleTaskId: string | ObjectId, newSets: TAreaChecklist[]) => Promise<number>;
+    insertAutoGenSets: (scheduleId: string | ObjectId, serviceType: TServiceType, areaId: string | ObjectId, newSets: any[]) => Promise<number>;
     trimOverflowSets: () => Promise<number>;
 };
 
@@ -541,6 +558,7 @@ declare function useCheckOutItemController(): {
 type TScheduleTask = {
     _id?: ObjectId;
     site: string | ObjectId;
+    serviceType: TServiceType;
     title: string;
     time: string;
     dates: string[];
@@ -555,17 +573,18 @@ type TScheduleTask = {
     updatedAt?: string | Date;
     deletedAt?: string | Date;
 };
-type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "title" | "time" | "dates" | "description" | "areas" | "createdBy">;
+type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "serviceType" | "title" | "time" | "dates" | "description" | "areas" | "createdBy">;
 type TScheduleTaskGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
-} & Pick<TScheduleTask, "site">;
+} & Pick<TScheduleTask, "site" | "serviceType">;
 type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "time" | "dates" | "description" | "areas" | "status" | "createdBy" | "createdAt">;
 type TScheduleTaskUpdate = Partial<Pick<TScheduleTask, "title" | "time" | "dates" | "description" | "areas">>;
 declare const scheduleTaskSchema: Joi.ObjectSchema<any>;
 declare function MScheduleTask(value: TScheduleTaskCreate): {
     site: string | ObjectId;
+    serviceType: ServiceType;
     title: string;
     time: string;
     dates: string[];
@@ -585,15 +604,14 @@ declare function useScheduleTaskRepository(): {
     createIndex: () => Promise<void>;
     createTextIndex: () => Promise<void>;
     createScheduleTask: (value: TScheduleTaskCreate, session?: ClientSession) => Promise<ObjectId>;
-    getScheduleTasks: ({ page, limit, search, site, }: TScheduleTaskGetQuery) => Promise<{}>;
+    getScheduleTasks: ({ page, limit, search, site, serviceType, }: TScheduleTaskGetQuery) => Promise<{}>;
     getAllScheduleTask: () => Promise<TScheduleTask[]>;
-    getTasksForScheduleTask: ({ page, limit, search, site, }: TScheduleTaskGetQuery) => Promise<{}>;
     getScheduleTaskById: (_id: string | ObjectId, session?: ClientSession) => Promise<TScheduleTaskGetById>;
     updateScheduleTask: (_id: string | ObjectId, value: TScheduleTaskUpdate, session?: ClientSession) => Promise<number>;
 };
 
 declare function useScheduleTaskService(): {
-    checkScheduleConditions: (schedule: any, currentDate?: Date) => boolean;
+    checkScheduleConditions: (schedule: any, serviceType: TServiceType, currentDate?: Date) => boolean;
     processScheduledTasks: (currentDate?: Date) => Promise<{
         processed: number;
         validated: number;
@@ -608,7 +626,6 @@ declare function useScheduleTaskService(): {
 declare function useScheduleTaskController(): {
     createScheduleTask: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getScheduleTasks: (req: Request, res: Response, next: NextFunction) => Promise<void>;
-    getTasksForScheduleTask: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getScheduleTaskById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateScheduleTask: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };