@7365admin1/module-hygiene 4.12.0 → 4.14.0

package/CHANGELOG.md

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

package/dist/index.d.ts

@@ -4,6 +4,17 @@ import { Request, Response, NextFunction } from 'express';
 import Joi from 'joi';
 import * as bson from 'bson';
 
+declare enum ServiceType {
+    REAL_ESTATE_DEVELOPER = "real_estate_developer",
+    PROPERTY_MANAGEMENT_AGENCY = "property_management_agency",
+    SECURITY_AGENCY = "security_agency",
+    CLEANING_SERVICES = "cleaning_services",
+    MECHANICAL_ELECTRICAL_SERVICES = "mechanical_electrical_services",
+    LANDSCAPING_SERVICES = "landscaping_services",
+    PEST_CONTROL_SERVICES = "pest_control_services",
+    POOL_MAINTENANCE_SERVICES = "pool_maintenance_services"
+}
+type TServiceType = ServiceType;
 declare const allowedTypes: string[];
 declare const allowedStatus: string[];
 declare const allowedPeriods: string[];
@@ -31,6 +42,7 @@ type TAreaUnits = {
 type TArea = {
     _id?: ObjectId;
     site: string | ObjectId;
+    serviceType: TServiceType;
     name: string;
     type: (typeof allowedTypes)[number];
     set?: number;
@@ -40,13 +52,13 @@ type TArea = {
     updatedAt?: Date | string;
     deletedAt?: Date | string;
 };
-type TAreaCreate = Pick<TArea, "site" | "name" | "type" | "set" | "units">;
+type TAreaCreate = Pick<TArea, "site" | "serviceType" | "name" | "type" | "set" | "units">;
 type TAreaGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
     type?: (typeof allowedTypes)[number] | "all";
-} & Pick<TArea, "site">;
+} & Pick<TArea, "site" | "serviceType">;
 type TAreaUpdate = Partial<Pick<TArea, "name" | "type" | "set" | "units">>;
 type TAreaUpdateChecklist = {
     units: TAreaUnits[];
@@ -54,6 +66,7 @@ type TAreaUpdateChecklist = {
 declare const areaSchema: Joi.ObjectSchema<any>;
 declare function MArea(value: TAreaCreate): {
     site: string | ObjectId;
+    serviceType: ServiceType;
     name: string;
     type: string;
     set: number;
@@ -69,10 +82,9 @@ declare function useAreaRepo(): {
     createTextIndex: () => Promise<void>;
     createUniqueIndex: () => Promise<void>;
     createArea: (value: TAreaCreate, session?: ClientSession) => Promise<ObjectId>;
-    getAreas: ({ page, limit, search, type, site, }: TAreaGetQuery) => Promise<{}>;
-    getAreasForChecklist: (site: string | ObjectId) => Promise<{}>;
+    getAreas: ({ page, limit, search, type, site, serviceType, }: TAreaGetQuery) => Promise<{}>;
+    getAreasForChecklist: (site: string | ObjectId, serviceType: TServiceType) => Promise<{}>;
     getAreaById: (_id: string | ObjectId) => Promise<{}>;
-    getAreaByMultipleId: (_id: string[] | ObjectId[]) => Promise<bson.Document[]>;
     verifyAreaByUnitId: (unitId: string | ObjectId) => Promise<{}>;
     updateArea: (_id: string | ObjectId, value: TAreaUpdate, session?: ClientSession) => Promise<number>;
     updateAreaChecklist: (unitId: string | ObjectId, name: string, session?: ClientSession) => Promise<number>;
@@ -80,13 +92,17 @@ declare function useAreaRepo(): {
 };
 
 declare function useAreaService(): {
-    importArea: ({ dataJson, site, }: {
+    importArea: ({ dataJson, site, serviceType, }: {
         dataJson: string;
         site: string | ObjectId;
+        serviceType: TServiceType;
     }) => Promise<{
         message: string;
     }>;
-    exportAreas: (site: string | ObjectId) => Promise<Buffer>;
+    exportAreas: ({ site, serviceType, }: {
+        site: string | ObjectId;
+        serviceType: TServiceType;
+    }) => Promise<Buffer>;
 };
 
 interface MulterRequest extends Request {
@@ -111,22 +127,27 @@ declare function useAreaController(): {
 type TUnit = {
     _id?: ObjectId;
     site: string | ObjectId;
+    serviceType: TServiceType;
     name: string;
     createdAt?: string;
     updatedAt?: string;
     deletedAt?: string;
     status?: "active" | "deleted";
 };
-type TUnitCreate = Pick<TUnit, "site" | "name">;
+type TUnitCreate = {
+    serviceType?: TServiceType;
+} & Pick<TUnit, "site" | "name">;
 type TUnitGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
+    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;
     name: string;
     status: string;
     createdAt: Date;
@@ -135,15 +156,19 @@ declare function MUnit(value: TUnitCreate): {
 };
 
 declare function useUnitService(): {
-    importUnit: ({ dataJson, site, }: {
+    importUnit: ({ dataJson, site, serviceType, }: {
         dataJson: string;
         site: string | ObjectId;
+        serviceType?: ServiceType | undefined;
     }) => Promise<{
         message: string;
     }>;
     updateUnit: (_id: string | ObjectId, value: TUnitUpdate) => Promise<number>;
     deleteUnit: (_id: string | ObjectId) => Promise<number>;
-    exportUnits: (site: string | ObjectId) => Promise<Buffer>;
+    exportUnits: ({ site, serviceType, }: {
+        site: string | ObjectId;
+        serviceType?: ServiceType | undefined;
+    }) => Promise<Buffer>;
 };
 
 declare function useUnitRepository(): {
@@ -151,7 +176,7 @@ declare function useUnitRepository(): {
     createTextIndex: () => Promise<void>;
     createUniqueIndex: () => Promise<void>;
     createUnit: (value: TUnitCreate, session?: ClientSession) => Promise<ObjectId>;
-    getUnits: ({ page, limit, search, site, }: TUnitGetQuery) => Promise<{}>;
+    getUnits: ({ page, limit, search, site, serviceType, }: TUnitGetQuery) => Promise<{}>;
     updateUnit: (_id: string | ObjectId, value: TUnitUpdate, session?: ClientSession) => Promise<number>;
     deleteUnit: (_id: string | ObjectId, session?: ClientSession) => Promise<number>;
 };
@@ -168,21 +193,24 @@ declare function useUnitController(): {
 type TParentChecklist = {
     _id?: ObjectId;
     site?: string | ObjectId;
+    serviceType?: TServiceType;
     status?: (typeof allowedStatus)[number];
     createdAt?: Date | string;
     updatedAt?: Date | string;
 };
 type TParentChecklistGetQuery = {
+    site: string | ObjectId;
+    serviceType: TServiceType;
     page?: number;
     limit?: number;
     search?: string;
-    site: string | ObjectId;
     startDate?: string | Date;
     endDate?: string | Date;
 } & Pick<TParentChecklist, "status">;
 declare const parentChecklistSchema: Joi.ObjectSchema<any>;
 declare function MParentChecklist(value: TParentChecklist): {
     site: string | ObjectId | undefined;
+    serviceType: ServiceType | undefined;
     status: string;
     createdAt: string | Date;
     updatedAt: string | Date;
@@ -191,13 +219,21 @@ declare function MParentChecklist(value: TParentChecklist): {
 declare function useParentChecklistRepo(): {
     createIndex: () => Promise<void>;
     createParentChecklist: (value: TParentChecklist, session?: ClientSession) => Promise<ObjectId | ObjectId[]>;
-    getAllParentChecklist: ({ page, limit, search, site, startDate, endDate, status, }: TParentChecklistGetQuery) => Promise<{}>;
+    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(): {
@@ -209,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];
@@ -237,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;
@@ -247,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;
@@ -304,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;
@@ -316,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>;
 };
 
@@ -513,6 +558,7 @@ declare function useCheckOutItemController(): {
 type TScheduleTask = {
     _id?: ObjectId;
     site: string | ObjectId;
+    serviceType: TServiceType;
     title: string;
     time: string;
     dates: string[];
@@ -527,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[];
@@ -557,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;
@@ -580,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>;
 };
@@ -594,4 +639,4 @@ declare function useQRController(): {
     generateQR: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-export { MArea, MAreaChecklist, MCheckOutItem, MParentChecklist, MScheduleTask, MStock, MSupply, MUnit, 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, 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, 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 };