@iservice365/module-hygiene 1.5.1 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/module-hygiene
 
+## 1.6.0
+
+### Minor Changes
+
+- Hygiene Module Cleanup and Filters
+
 ## 1.5.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -23,12 +23,13 @@ type TArea = {
     updatedAt?: Date | string;
     deletedAt?: Date | string;
 };
+type TAreaCreate = Pick<TArea, "site" | "name" | "type" | "set" | "units">;
 type TAreaGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
+    type?: (typeof allowedTypes)[number] | "all";
 } & Pick<TArea, "site">;
-type TAreaCreate = Pick<TArea, "site" | "name" | "type" | "set" | "units">;
 type TAreaUpdate = Partial<Pick<TArea, "name" | "type" | "set" | "units">>;
 type TAreaUpdateChecklist = {
     units: TAreaUnits[];
@@ -51,7 +52,7 @@ declare function useAreaRepo(): {
     createTextIndex: () => Promise<void>;
     createUniqueIndex: () => Promise<void>;
     createArea: (value: TAreaCreate, session?: ClientSession) => Promise<ObjectId>;
-    getAreas: ({ page, limit, search, site, }: TAreaGetQuery) => Promise<{}>;
+    getAreas: ({ page, limit, search, type, site, }: TAreaGetQuery) => Promise<{}>;
     getAreasForChecklist: (site: string | ObjectId) => Promise<{}>;
     getAreaById: (_id: string | ObjectId) => Promise<{}>;
     getAreaByMultipleId: (_id: string[] | ObjectId[]) => Promise<bson.Document[]>;
@@ -150,6 +151,14 @@ type TParentChecklist = {
     createdAt?: Date | string;
     updatedAt?: Date | string;
 };
+type TParentChecklistGetQuery = {
+    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;
@@ -161,14 +170,7 @@ 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, }: {
-        page?: number | undefined;
-        limit?: number | undefined;
-        search?: string | undefined;
-        site: ObjectId | string;
-        startDate?: string | Date | undefined;
-        endDate?: string | Date | undefined;
-    }) => Promise<{}>;
+    getAllParentChecklist: ({ page, limit, search, site, startDate, endDate, status, }: TParentChecklistGetQuery) => Promise<{}>;
     updateParentChecklistStatuses: (_id: string | ObjectId, status: (typeof allowedStatus)[number], session?: ClientSession) => Promise<number>;
 };
 
@@ -205,6 +207,13 @@ type TAreaChecklistUnits = {
 type TAreaChecklistCreate = Pick<TCleaningScheduleArea, "schedule"> & {
     site: string | ObjectId;
 };
+type TCleaningScheduleAreaGetQuery = {
+    page?: number;
+    limit?: number;
+    search?: string;
+    type?: (typeof allowedTypes)[number] | "all";
+    status?: (typeof allowedStatus)[number] | "all";
+} & Pick<TCleaningScheduleArea, "schedule">;
 type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "remarks" | "completedBy">;
 declare const areaChecklistSchema: Joi.ObjectSchema<any>;
 declare function MAreaChecklist(value: TCleaningScheduleArea): {
@@ -228,13 +237,7 @@ declare function useAreaChecklistRepo(): {
     createIndex: () => Promise<void>;
     createTextIndex: () => Promise<void>;
     createAreaChecklist: (value: TCleaningScheduleArea, session?: ClientSession) => Promise<ObjectId>;
-    getAllAreaChecklist: ({ page, limit, search, type, schedule, }: {
-        page?: number | undefined;
-        limit?: number | undefined;
-        search?: string | undefined;
-        type?: string | undefined;
-        schedule: string | ObjectId;
-    }, session?: ClientSession) => Promise<{}>;
+    getAllAreaChecklist: ({ page, limit, search, type, status, schedule, }: TCleaningScheduleAreaGetQuery, session?: ClientSession) => Promise<{}>;
     getAreaChecklistHistory: ({ page, limit, search, type, schedule, status, createdAt, }: {
         page?: number | undefined;
         limit?: number | undefined;
@@ -386,12 +389,12 @@ type TRequestItemCreateService = Pick<TRequestItem, "site" | "supply" | "qty" |
 type TRequestItemCreateByBatchService = Pick<TRequestItem, "site" | "createdBy"> & {
     items: Pick<TRequestItem, "supply" | "qty">[];
 };
-type TGetRequestItemsQuery = {
+type TRequestItemGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
 } & Pick<TRequestItem, "site">;
-type TGetRequestItemById = Pick<TRequestItem, "_id" | "site" | "supply" | "supplyName" | "qty" | "status"> & {
+type TRequestItemGetById = Pick<TRequestItem, "_id" | "site" | "supply" | "supplyName" | "qty" | "status"> & {
     unitOfMeasurement?: string;
 };
 declare const requestItemSchema: Joi.ObjectSchema<any>;
@@ -413,8 +416,8 @@ declare function useRequestItemRepository(): {
     createIndex: () => Promise<void>;
     createTextIndex: () => Promise<void>;
     createRequestItem: (value: TRequestItemCreate, session?: ClientSession) => Promise<ObjectId>;
-    getRequestItems: ({ page, limit, search, site, }: TGetRequestItemsQuery) => Promise<{}>;
-    getRequestItemById: (_id: string | ObjectId, session?: ClientSession) => Promise<TGetRequestItemById>;
+    getRequestItems: ({ page, limit, search, site, }: TRequestItemGetQuery) => Promise<{}>;
+    getRequestItemById: (_id: string | ObjectId, session?: ClientSession) => Promise<TRequestItemGetById>;
     approveRequestItem: (_id: string | ObjectId, remarks?: string, session?: ClientSession) => Promise<number>;
     disapproveRequestItem: (_id: string | ObjectId, remarks?: string, session?: ClientSession) => Promise<number>;
 };
@@ -460,13 +463,13 @@ type TScheduleTask = {
     deletedAt?: string | Date;
 };
 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 = {
+type TScheduleTaskGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
 } & Pick<TScheduleTask, "site">;
+type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "frequency" | "time" | "day" | "weekOfMonth" | "month" | "date" | "description" | "areas" | "status" | "createdAt">;
+type TScheduleTaskUpdate = Partial<Pick<TScheduleTask, "title" | "frequency" | "time" | "day" | "weekOfMonth" | "month" | "date" | "description" | "areas">>;
 declare const scheduleTaskSchema: Joi.ObjectSchema<any>;
 declare function MScheduleTask(value: TScheduleTaskCreate): {
     site: string | ObjectId;
@@ -492,9 +495,9 @@ declare function useScheduleTaskRepository(): {
     createIndex: () => Promise<void>;
     createTextIndex: () => Promise<void>;
     createScheduleTask: (value: TScheduleTaskCreate, session?: ClientSession) => Promise<ObjectId>;
-    getScheduleTasks: ({ page, limit, search, site, }: TGetScheduleTasksQuery) => Promise<{}>;
+    getScheduleTasks: ({ page, limit, search, site, }: TScheduleTaskGetQuery) => Promise<{}>;
     getAllScheduleTask: () => Promise<TScheduleTask[]>;
-    getTasksForScheduleTask: ({ page, limit, search, site, }: TGetScheduleTasksQuery) => Promise<{}>;
+    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>;
 };
@@ -520,4 +523,4 @@ declare function useScheduleTaskController(): {
     updateScheduleTask: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-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 };
+export { MArea, MAreaChecklist, MParentChecklist, MRequestItem, MScheduleTask, MStock, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaCreate, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCleaningScheduleArea, TCleaningScheduleAreaGetQuery, TGetStocksQuery, TGetSupplysQuery, TGetUnitsQuery, TParentChecklist, TParentChecklistGetQuery, TRequestItem, TRequestItemCreate, TRequestItemCreateByBatchService, TRequestItemCreateService, TRequestItemGetById, TRequestItemGetQuery, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskGetQuery, 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 };

package/dist/index.js

@@ -219,6 +219,7 @@ function useAreaRepo() {
     page = 1,
     limit = 10,
     search = "",
+    type = "all",
     site
   }) {
     page = page > 0 ? page - 1 : 0;
@@ -236,6 +237,10 @@ function useAreaRepo() {
     } catch (error) {
       throw new import_node_server_utils2.BadRequestError("Invalid site ID format.");
     }
+    if (type && type !== "all") {
+      query.type = type;
+      cacheOptions.type = type;
+    }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
@@ -724,6 +729,7 @@ function useAreaController() {
       page: import_joi2.default.number().min(1).optional().allow("", null),
       limit: import_joi2.default.number().min(1).optional().allow("", null),
       search: import_joi2.default.string().optional().allow("", null),
+      type: import_joi2.default.string().valid("all", ...allowedTypes).optional().allow("", null),
       site: import_joi2.default.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -735,12 +741,14 @@ function useAreaController() {
     const page = parseInt(req.query.page) ?? 1;
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
+    const type = req.query.type ?? "all";
     const site = req.params.site ?? "";
     try {
       const data = await _getAreas({
         page,
         limit,
         search,
+        type,
         site
       });
       res.json(data);
@@ -1480,7 +1488,8 @@ function useParentChecklistRepo() {
     search = "",
     site,
     startDate = "",
-    endDate = ""
+    endDate = "",
+    status = "all"
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {};
@@ -1513,6 +1522,10 @@ function useParentChecklistRepo() {
       query.createdAt = { $lte: new Date(endDate) };
       cacheOptions.endDate = new Date(endDate).toISOString().split("T")[0];
     }
+    if (status && status !== "all") {
+      query.status = status;
+      cacheOptions.status = status;
+    }
     const cacheKey = (0, import_node_server_utils10.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -1669,7 +1682,8 @@ function useParentChecklistController() {
       search: import_joi6.default.string().optional().allow("", null),
       site: import_joi6.default.string().hex().required(),
       startDate: import_joi6.default.alternatives().try(import_joi6.default.date(), import_joi6.default.string()).optional().allow("", null),
-      endDate: import_joi6.default.alternatives().try(import_joi6.default.date(), import_joi6.default.string()).optional().allow("", null)
+      endDate: import_joi6.default.alternatives().try(import_joi6.default.date(), import_joi6.default.string()).optional().allow("", null),
+      status: import_joi6.default.string().valid(...allowedStatus, "all").optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -1683,6 +1697,7 @@ function useParentChecklistController() {
     const site = req.params.site ?? "";
     const startDate = req.query.startDate ?? "";
     const endDate = req.query.endDate ?? "";
+    const status = req.query.status ?? "all";
     try {
       const data = await _getAllParentChecklist({
         page,
@@ -1690,7 +1705,8 @@ function useParentChecklistController() {
         search,
         site,
         startDate,
-        endDate
+        endDate,
+        status
       });
       res.json(data);
       return;
@@ -1861,7 +1877,8 @@ function useAreaChecklistRepo() {
     page = 1,
     limit = 10,
     search = "",
-    type,
+    type = "all",
+    status = "all",
     schedule
   }, session) {
     page = page > 0 ? page - 1 : 0;
@@ -1876,10 +1893,14 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new import_node_server_utils13.BadRequestError("Invalid parent checklist ID format.");
     }
-    if (type) {
+    if (type && type !== "all") {
       query.type = type;
       cacheOptions.type = type;
     }
+    if (status && status !== "all") {
+      query.status = status;
+      cacheOptions.status = status;
+    }
     if (search) {
       query.$text = { $search: search };
       cacheOptions.search = search;
@@ -2646,7 +2667,8 @@ function useAreaChecklistController() {
       page: import_joi8.default.number().min(1).optional().allow("", null),
       limit: import_joi8.default.number().min(1).optional().allow("", null),
       search: import_joi8.default.string().optional().allow("", null),
-      type: import_joi8.default.string().optional().allow("", ...allowedTypes),
+      type: import_joi8.default.string().valid(...allowedTypes, "all").optional().allow("", null),
+      status: import_joi8.default.string().valid(...allowedStatus, "all").optional().allow("", null),
       schedule: import_joi8.default.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -2658,7 +2680,8 @@ function useAreaChecklistController() {
     const page = parseInt(req.query.page) ?? 1;
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
-    const type = req.query.type ?? "";
+    const type = req.query.type ?? "all";
+    const status = req.query.status ?? "all";
     const schedule = req.params.schedule ?? "";
     try {
       const data = await _getAllAreaChecklist({
@@ -2666,6 +2689,7 @@ function useAreaChecklistController() {
         limit,
         search,
         type,
+        status,
         schedule
       });
       res.json(data);