@iservice365/module-hygiene 1.5.0 → 1.6.0

package/dist/index.mjs

@@ -3,9 +3,9 @@ var allowedTypes = ["common", "toilet"];
 var allowedStatus = ["ready", "ongoing", "completed"];
 
 // src/models/hygiene-area.model.ts
-import { BadRequestError, logger } from "@iservice365/node-server-utils";
 import Joi from "joi";
 import { ObjectId } from "mongodb";
+import { BadRequestError, logger } from "@iservice365/node-server-utils";
 var areaSchema = Joi.object({
   site: Joi.string().hex().required(),
   name: Joi.string().required(),
@@ -147,6 +147,7 @@ function useAreaRepo() {
     page = 1,
     limit = 10,
     search = "",
+    type = "all",
     site
   }) {
     page = page > 0 ? page - 1 : 0;
@@ -164,6 +165,10 @@ function useAreaRepo() {
     } catch (error) {
       throw new BadRequestError2("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;
@@ -592,8 +597,8 @@ function useAreaService() {
 }
 
 // src/controllers/hygiene-area.controller.ts
-import { BadRequestError as BadRequestError4, logger as logger4 } from "@iservice365/node-server-utils";
 import Joi2 from "joi";
+import { BadRequestError as BadRequestError4, logger as logger4 } from "@iservice365/node-server-utils";
 
 // src/utils/convert-excel.util.ts
 import { Readable } from "stream";
@@ -656,6 +661,7 @@ function useAreaController() {
       page: Joi2.number().min(1).optional().allow("", null),
       limit: Joi2.number().min(1).optional().allow("", null),
       search: Joi2.string().optional().allow("", null),
+      type: Joi2.string().valid("all", ...allowedTypes).optional().allow("", null),
       site: Joi2.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -667,12 +673,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);
@@ -788,9 +796,9 @@ function useAreaController() {
 }
 
 // src/models/hygiene-unit.model.ts
-import { BadRequestError as BadRequestError5, logger as logger5 } from "@iservice365/node-server-utils";
 import Joi3 from "joi";
 import { ObjectId as ObjectId3 } from "mongodb";
+import { BadRequestError as BadRequestError5, logger as logger5 } from "@iservice365/node-server-utils";
 var unitSchema = Joi3.object({
   site: Joi3.string().hex().required(),
   name: Joi3.string().required()
@@ -1027,12 +1035,12 @@ function useUnitRepository() {
 
 // src/services/hygiene-unit.service.ts
 function useUnitService() {
+  const { verifyAreaByUnitId, updateAreaChecklist } = useAreaRepo();
   const {
     createUnit: _createUnit,
     updateUnit: _updateUnit,
     deleteUnit: _deleteUnit
   } = useUnitRepository();
-  const { verifyAreaByUnitId, updateAreaChecklist } = useAreaRepo();
   async function importUnit({
     dataJson,
     site
@@ -1172,8 +1180,8 @@ function useUnitService() {
 }
 
 // src/controllers/hygiene-unit.controller.ts
-import { BadRequestError as BadRequestError8, logger as logger8 } from "@iservice365/node-server-utils";
 import Joi4 from "joi";
+import { BadRequestError as BadRequestError8, logger as logger8 } from "@iservice365/node-server-utils";
 function useUnitController() {
   const { createUnit: _createUnit, getUnits: _getUnits } = useUnitRepository();
   const {
@@ -1310,9 +1318,9 @@ function useUnitController() {
 }
 
 // src/models/hygiene-parent-checklist.model.ts
-import { BadRequestError as BadRequestError9, logger as logger9 } from "@iservice365/node-server-utils";
 import Joi5 from "joi";
 import { ObjectId as ObjectId5 } from "mongodb";
+import { BadRequestError as BadRequestError9, logger as logger9 } from "@iservice365/node-server-utils";
 var parentChecklistSchema = Joi5.object({
   createdAt: Joi5.alternatives().try(Joi5.date(), Joi5.string()).optional().allow("", null),
   site: Joi5.string().hex().required()
@@ -1433,7 +1441,8 @@ function useParentChecklistRepo() {
     search = "",
     site,
     startDate = "",
-    endDate = ""
+    endDate = "",
+    status = "all"
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {};
@@ -1466,6 +1475,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 = makeCacheKey3(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -1589,8 +1602,8 @@ function useParentChecklistRepo() {
 }
 
 // src/controllers/hygiene-parent-checklist.controller.ts
-import { BadRequestError as BadRequestError11, logger as logger11 } from "@iservice365/node-server-utils";
 import Joi6 from "joi";
+import { BadRequestError as BadRequestError11, logger as logger11 } from "@iservice365/node-server-utils";
 function useParentChecklistController() {
   const {
     createParentChecklist: _createParentChecklist,
@@ -1622,7 +1635,8 @@ function useParentChecklistController() {
       search: Joi6.string().optional().allow("", null),
       site: Joi6.string().hex().required(),
       startDate: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null),
-      endDate: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null)
+      endDate: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null),
+      status: Joi6.string().valid(...allowedStatus, "all").optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -1636,6 +1650,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,
@@ -1643,7 +1658,8 @@ function useParentChecklistController() {
         search,
         site,
         startDate,
-        endDate
+        endDate,
+        status
       });
       res.json(data);
       return;
@@ -1660,9 +1676,9 @@ function useParentChecklistController() {
 }
 
 // src/models/hygiene-area-checklist.model.ts
-import { BadRequestError as BadRequestError12, logger as logger12 } from "@iservice365/node-server-utils";
 import Joi7 from "joi";
 import { ObjectId as ObjectId7 } from "mongodb";
+import { BadRequestError as BadRequestError12, logger as logger12 } from "@iservice365/node-server-utils";
 var allowedChecklistStatus = ["ready", "completed"];
 var areaChecklistSchema = Joi7.object({
   schedule: Joi7.string().hex().required(),
@@ -1733,6 +1749,7 @@ function MAreaChecklist(value) {
 import { logger as logger14, useAtlas as useAtlas6 } from "@iservice365/node-server-utils";
 
 // src/repositories/hygiene-area-checklist.repository.ts
+import { ObjectId as ObjectId8 } from "mongodb";
 import {
   BadRequestError as BadRequestError13,
   InternalServerError as InternalServerError4,
@@ -1742,7 +1759,6 @@ import {
   useAtlas as useAtlas5,
   useCache as useCache4
 } from "@iservice365/node-server-utils";
-import { ObjectId as ObjectId8 } from "mongodb";
 function useAreaChecklistRepo() {
   const db = useAtlas5.getDb();
   if (!db) {
@@ -1822,7 +1838,8 @@ function useAreaChecklistRepo() {
     page = 1,
     limit = 10,
     search = "",
-    type,
+    type = "all",
+    status = "all",
     schedule
   }, session) {
     page = page > 0 ? page - 1 : 0;
@@ -1837,10 +1854,14 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new BadRequestError13("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;
@@ -2408,6 +2429,7 @@ function useAreaChecklistRepo() {
 
 // src/services/hygiene-area-checklist.service.ts
 function useAreaChecklistService() {
+  const { getAreasForChecklist } = useAreaRepo();
   const {
     createAreaChecklist: _createAreaChecklist,
     getAllAreaChecklist,
@@ -2416,7 +2438,6 @@ function useAreaChecklistService() {
     completeAreaChecklistUnits: _completeAreaChecklistUnits,
     updateAreaChecklistStatus
   } = useAreaChecklistRepo();
-  const { getAreasForChecklist } = useAreaRepo();
   const { updateParentChecklistStatuses } = useParentChecklistRepo();
   async function createAreaChecklist(value) {
     const session = useAtlas6.getClient()?.startSession();
@@ -2563,8 +2584,8 @@ function useAreaChecklistService() {
 }
 
 // src/controllers/hygiene-area-checklist.controller.ts
-import { BadRequestError as BadRequestError14, logger as logger15 } from "@iservice365/node-server-utils";
 import Joi8 from "joi";
+import { BadRequestError as BadRequestError14, logger as logger15 } from "@iservice365/node-server-utils";
 function useAreaChecklistController() {
   const {
     getAllAreaChecklist: _getAllAreaChecklist,
@@ -2607,7 +2628,8 @@ function useAreaChecklistController() {
       page: Joi8.number().min(1).optional().allow("", null),
       limit: Joi8.number().min(1).optional().allow("", null),
       search: Joi8.string().optional().allow("", null),
-      type: Joi8.string().optional().allow("", ...allowedTypes),
+      type: Joi8.string().valid(...allowedTypes, "all").optional().allow("", null),
+      status: Joi8.string().valid(...allowedStatus, "all").optional().allow("", null),
       schedule: Joi8.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -2619,7 +2641,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({
@@ -2627,6 +2650,7 @@ function useAreaChecklistController() {
         limit,
         search,
         type,
+        status,
         schedule
       });
       res.json(data);
@@ -2782,9 +2806,9 @@ function useAreaChecklistController() {
 }
 
 // src/models/hygiene-supply.model.ts
-import { BadRequestError as BadRequestError15, logger as logger16 } from "@iservice365/node-server-utils";
 import Joi9 from "joi";
 import { ObjectId as ObjectId9 } from "mongodb";
+import { BadRequestError as BadRequestError15, logger as logger16 } from "@iservice365/node-server-utils";
 var supplySchema = Joi9.object({
   site: Joi9.string().hex().required(),
   name: Joi9.string().required(),
@@ -3068,8 +3092,8 @@ function useSupplyRepository() {
 }
 
 // src/controllers/hygiene-supply.controller.ts
-import { BadRequestError as BadRequestError17, logger as logger18 } from "@iservice365/node-server-utils";
 import Joi10 from "joi";
+import { BadRequestError as BadRequestError17, logger as logger18 } from "@iservice365/node-server-utils";
 function useSupplyController() {
   const {
     createSupply: _createSupply,
@@ -3204,9 +3228,9 @@ function useSupplyController() {
 }
 
 // src/models/hygiene-stock.model.ts
-import { BadRequestError as BadRequestError18, logger as logger19 } from "@iservice365/node-server-utils";
 import Joi11 from "joi";
 import { ObjectId as ObjectId11 } from "mongodb";
+import { BadRequestError as BadRequestError18, logger as logger19 } from "@iservice365/node-server-utils";
 var stockSchema = Joi11.object({
   site: Joi11.string().hex().required(),
   supply: Joi11.string().hex().required(),
@@ -3427,8 +3451,8 @@ function useStockService() {
 }
 
 // src/controllers/hygiene-stock.controller.ts
-import { BadRequestError as BadRequestError21, logger as logger21 } from "@iservice365/node-server-utils";
 import Joi12 from "joi";
+import { BadRequestError as BadRequestError21, logger as logger21 } from "@iservice365/node-server-utils";
 function useStockController() {
   const { getStocksBySupplyId: _getStocksBySupplyId } = useStockRepository();
   const { createStock: _createStock } = useStockService();
@@ -3499,9 +3523,9 @@ function useStockController() {
 }
 
 // src/models/hygiene-request-item.model.ts
-import { BadRequestError as BadRequestError22, logger as logger22 } from "@iservice365/node-server-utils";
 import Joi13 from "joi";
 import { ObjectId as ObjectId13 } from "mongodb";
+import { BadRequestError as BadRequestError22, logger as logger22 } from "@iservice365/node-server-utils";
 var allowedRequestItemStatus = [
   "pending",
   "approved",
@@ -3645,6 +3669,7 @@ function useRequestItemRepository() {
         { $match: query },
         {
           $project: {
+            supplyName: 1,
             createdAt: 1,
             status: 1
           }
@@ -3803,8 +3828,8 @@ function useRequestItemRepository() {
 }
 
 // src/services/hygiene-request-item.service.ts
-import { BadRequestError as BadRequestError24, useAtlas as useAtlas11 } from "@iservice365/node-server-utils";
 import { useUserRepo } from "@iservice365/core";
+import { BadRequestError as BadRequestError24, useAtlas as useAtlas11 } from "@iservice365/node-server-utils";
 function useRequestItemService() {
   const {
     createRequestItem: _createRequestItem,
@@ -3919,8 +3944,8 @@ function useRequestItemService() {
 }
 
 // src/controllers/hygiene-request-item.controller.ts
-import { BadRequestError as BadRequestError25, logger as logger24 } from "@iservice365/node-server-utils";
 import Joi14 from "joi";
+import { BadRequestError as BadRequestError25, logger as logger24 } from "@iservice365/node-server-utils";
 function useRequestItemController() {
   const {
     getRequestItems: _getRequestItems,
@@ -4496,9 +4521,9 @@ function useScheduleTaskRepository() {
 // src/services/hygiene-schedule-task.service.ts
 import { logger as logger27 } from "@iservice365/node-server-utils";
 function useScheduleTaskService() {
+  const { createParentChecklist } = useParentChecklistRepo();
   const { getAllScheduleTask } = useScheduleTaskRepository();
   const { createAreaChecklist } = useAreaChecklistService();
-  const { createParentChecklist } = useParentChecklistRepo();
   function checkScheduleConditions(schedule, currentDate = /* @__PURE__ */ new Date()) {
     try {
       const now = currentDate;
@@ -4686,8 +4711,8 @@ function useScheduleTaskService() {
 }
 
 // src/controllers/hygiene-schedule-task.controller.ts
-import { BadRequestError as BadRequestError28, logger as logger28 } from "@iservice365/node-server-utils";
 import Joi16 from "joi";
+import { BadRequestError as BadRequestError28, logger as logger28 } from "@iservice365/node-server-utils";
 function useScheduleTaskController() {
   const {
     createScheduleTask: _createScheduleTask,