@iservice365/module-hygiene 1.4.0 → 1.5.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/module-hygiene
 
+## 1.5.1
+
+### Patch Changes
+
+- Add supply name field in display request items
+
+## 1.5.0
+
+### Minor Changes
+
+- Hygiene Schedule Task - Release
+
 ## 1.4.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import Joi from 'joi';
 import * as mongodb from 'mongodb';
 import { ObjectId, ClientSession } from 'mongodb';
-import { Request, Response, NextFunction } from 'express';
 import * as bson from 'bson';
+import { Request, Response, NextFunction } from 'express';
 
 declare const allowedTypes: string[];
 declare const allowedStatus: string[];
@@ -30,7 +30,6 @@ type TAreaGetQuery = {
 } & Pick<TArea, "site">;
 type TAreaCreate = Pick<TArea, "site" | "name" | "type" | "set" | "units">;
 type TAreaUpdate = Partial<Pick<TArea, "name" | "type" | "set" | "units">>;
-type TAreaGetAreasForChecklist = Pick<TArea, "site" | "type">;
 type TAreaUpdateChecklist = {
     units: TAreaUnits[];
 };
@@ -53,8 +52,9 @@ declare function useAreaRepo(): {
     createUniqueIndex: () => Promise<void>;
     createArea: (value: TAreaCreate, session?: ClientSession) => Promise<ObjectId>;
     getAreas: ({ page, limit, search, site, }: TAreaGetQuery) => Promise<{}>;
-    getAreasForChecklist: ({ site, type, }: TAreaGetAreasForChecklist) => Promise<{}>;
+    getAreasForChecklist: (site: string | ObjectId) => 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>;
@@ -181,6 +181,7 @@ declare const allowedChecklistStatus: string[];
 type TCleaningScheduleArea = {
     _id?: ObjectId;
     schedule: string | ObjectId;
+    area: string | ObjectId;
     name: string;
     type: (typeof allowedTypes)[number];
     checklist: TAreaChecklist[];
@@ -208,6 +209,7 @@ type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "remarks" | "complete
 declare const areaChecklistSchema: Joi.ObjectSchema<any>;
 declare function MAreaChecklist(value: TCleaningScheduleArea): {
     schedule: string | ObjectId;
+    area: string | ObjectId;
     name: string;
     type: string;
     checklist: TAreaChecklist[];
@@ -435,7 +437,6 @@ declare function useRequestItemController(): {
 
 declare const allowedFrequency: string[];
 declare const allowedDays: string[];
-declare const allowedQuarter: string[];
 declare const allowedWeekOfMonth: string[];
 declare const allowedMonths: string[];
 type TScheduleTask = {
@@ -444,10 +445,10 @@ type TScheduleTask = {
     title: string;
     frequency: (typeof allowedFrequency)[number];
     time: string;
-    day: (typeof allowedDays)[number];
+    day?: (typeof allowedDays)[number][];
     weekOfMonth?: (typeof allowedWeekOfMonth)[number];
-    quarter?: (typeof allowedQuarter)[number];
     month?: (typeof allowedMonths)[number];
+    date?: number;
     description?: string;
     areas: {
         name: string;
@@ -458,9 +459,9 @@ type TScheduleTask = {
     updatedAt?: string | Date;
     deletedAt?: string | Date;
 };
-type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "title" | "frequency" | "time" | "day" | "weekOfMonth" | "quarter" | "month" | "description" | "areas">;
-type TScheduleTaskUpdate = Partial<Pick<TScheduleTask, "title" | "frequency" | "time" | "day" | "weekOfMonth" | "quarter" | "month" | "description" | "areas">>;
-type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "frequency" | "time" | "day" | "weekOfMonth" | "quarter" | "month" | "description" | "areas" | "createdAt">;
+type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "title" | "frequency" | "time" | "day" | "weekOfMonth" | "month" | "date" | "description" | "areas">;
+type TScheduleTaskUpdate = Partial<Pick<TScheduleTask, "title" | "frequency" | "time" | "day" | "weekOfMonth" | "month" | "date" | "description" | "areas">>;
+type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "frequency" | "time" | "day" | "weekOfMonth" | "month" | "date" | "description" | "areas" | "status" | "createdAt">;
 type TGetScheduleTasksQuery = {
     page?: number;
     limit?: number;
@@ -472,10 +473,10 @@ declare function MScheduleTask(value: TScheduleTaskCreate): {
     title: string;
     frequency: string;
     time: string;
-    day: string;
+    day: string[] | undefined;
     weekOfMonth: string | undefined;
-    quarter: string | undefined;
     month: string | undefined;
+    date: number | undefined;
     description: string | undefined;
     areas: {
         name: string;
@@ -492,15 +493,31 @@ declare function useScheduleTaskRepository(): {
     createTextIndex: () => Promise<void>;
     createScheduleTask: (value: TScheduleTaskCreate, session?: ClientSession) => Promise<ObjectId>;
     getScheduleTasks: ({ page, limit, search, site, }: TGetScheduleTasksQuery) => Promise<{}>;
+    getAllScheduleTask: () => Promise<TScheduleTask[]>;
+    getTasksForScheduleTask: ({ page, limit, search, site, }: TGetScheduleTasksQuery) => 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;
+    processScheduledTasks: (currentDate?: Date) => Promise<{
+        processed: number;
+        validated: number;
+        tasks?: undefined;
+    } | {
+        processed: number;
+        validated: number;
+        tasks: TScheduleTask[];
+    }>;
+};
+
 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>;
 };
 
-export { MArea, MAreaChecklist, MParentChecklist, MRequestItem, MScheduleTask, MStock, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaCreate, TAreaGetAreasForChecklist, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCleaningScheduleArea, TGetRequestItemById, TGetRequestItemsQuery, TGetScheduleTasksQuery, TGetStocksQuery, TGetSupplysQuery, TGetUnitsQuery, TParentChecklist, TRequestItem, TRequestItemCreate, TRequestItemCreateByBatchService, TRequestItemCreateService, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskUpdate, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyUpdate, TUnit, TUnitCreate, TUnitUpdate, allowedChecklistStatus, allowedDays, allowedFrequency, allowedMonths, allowedQuarter, allowedRequestItemStatus, allowedStatus, allowedTypes, allowedWeekOfMonth, areaChecklistSchema, areaSchema, parentChecklistSchema, requestItemSchema, scheduleTaskSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaRepo, useAreaService, useParentChecklistController, useParentChecklistRepo, useRequestItemController, useRequestItemRepository, useRequestItemService, useScheduleTaskController, useScheduleTaskRepository, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useUnitController, useUnitRepository, useUnitService };
+export { MArea, MAreaChecklist, MParentChecklist, MRequestItem, MScheduleTask, MStock, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaCreate, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCleaningScheduleArea, TGetRequestItemById, TGetRequestItemsQuery, TGetScheduleTasksQuery, TGetStocksQuery, TGetSupplysQuery, TGetUnitsQuery, TParentChecklist, TRequestItem, TRequestItemCreate, TRequestItemCreateByBatchService, TRequestItemCreateService, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskUpdate, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyUpdate, TUnit, TUnitCreate, TUnitUpdate, allowedChecklistStatus, allowedDays, allowedFrequency, allowedMonths, allowedRequestItemStatus, allowedStatus, allowedTypes, allowedWeekOfMonth, areaChecklistSchema, areaSchema, parentChecklistSchema, requestItemSchema, scheduleTaskSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaRepo, useAreaService, useParentChecklistController, useParentChecklistRepo, useRequestItemController, useRequestItemRepository, useRequestItemService, useScheduleTaskController, useScheduleTaskRepository, useScheduleTaskService, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useUnitController, useUnitRepository, useUnitService };