@7365admin1/module-hygiene 1.7.0 → 2.0.0

package/dist/index.mjs

@@ -13,7 +13,7 @@ import {
   useCache,
   makeCacheKey,
   logger
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 function useHygieneDashboardRepository() {
   const db = useAtlas.getDb();
   if (!db) {
@@ -486,7 +486,7 @@ function useHygieneDashboardRepository() {
 
 // src/controllers/hygiene-dashboard.controller.ts
 import Joi from "joi";
-import { BadRequestError as BadRequestError2, logger as logger2 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError2, logger as logger2 } from "@7365admin1/node-server-utils";
 function useHygieneDashboardController() {
   const { getHygieneDashboard: _getHygieneDashboard } = useHygieneDashboardRepository();
   async function getHygieneDashboard(req, res, next) {
@@ -539,7 +539,7 @@ function useHygieneDashboardController() {
 // src/models/hygiene-area.model.ts
 import Joi2 from "joi";
 import { ObjectId as ObjectId2 } from "mongodb";
-import { BadRequestError as BadRequestError3, logger as logger3 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError3, logger as logger3 } from "@7365admin1/node-server-utils";
 var areaSchema = Joi2.object({
   site: Joi2.string().hex().required(),
   name: Joi2.string().required(),
@@ -603,7 +603,7 @@ import {
   logger as logger4,
   makeCacheKey as makeCacheKey2,
   NotFoundError
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 
 // src/utils/capitalize-text.ts
 function capitalizeText(text) {
@@ -1017,7 +1017,7 @@ import {
   BadRequestError as BadRequestError5,
   logger as logger5,
   NotFoundError as NotFoundError2
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 function useAreaService() {
   const { createArea: _createArea } = useAreaRepo();
   async function importArea({
@@ -1132,7 +1132,7 @@ function useAreaService() {
 
 // src/controllers/hygiene-area.controller.ts
 import Joi3 from "joi";
-import { BadRequestError as BadRequestError6, logger as logger6 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError6, logger as logger6 } from "@7365admin1/node-server-utils";
 
 // src/utils/convert-excel.util.ts
 import { Readable } from "stream";
@@ -1227,14 +1227,14 @@ function useAreaController() {
   async function getAreaById(req, res, next) {
     const validation = Joi3.string().hex().required();
     const _id = req.params.id;
-    const { error } = validation.validate(_id);
+    const { error, value } = validation.validate(_id);
     if (error) {
       logger6.log({ level: "error", message: error.message });
       next(new BadRequestError6(error.message));
       return;
     }
     try {
-      const data = await _getAreaById(_id);
+      const data = await _getAreaById(value);
       res.json(data);
       return;
     } catch (error2) {
@@ -1279,14 +1279,14 @@ function useAreaController() {
   async function deleteArea(req, res, next) {
     const id = req.params.id;
     const validation = Joi3.string().hex().required();
-    const { error } = validation.validate(id);
+    const { error, value } = validation.validate(id);
     if (error) {
       logger6.log({ level: "error", message: error.message });
       next(new BadRequestError6(error.message));
       return;
     }
     try {
-      await _deleteById(id);
+      await _deleteById(value);
       res.json({ message: "Area deleted successfully." });
       return;
     } catch (error2) {
@@ -1302,7 +1302,7 @@ function useAreaController() {
     }
     const { site } = req.params;
     const schema = Joi3.string().hex().required();
-    const { error } = schema.validate(site);
+    const { error, value } = schema.validate(site);
     if (error) {
       logger6.log({ level: "error", message: error.message });
       next(new BadRequestError6(error.message));
@@ -1311,7 +1311,7 @@ function useAreaController() {
     try {
       const xlsData = await convertBufferFile(req.file.buffer);
       const dataJson = JSON.stringify(xlsData);
-      const result = await _importArea({ dataJson, site });
+      const result = await _importArea({ dataJson, site: value });
       return res.status(201).json(result);
     } catch (error2) {
       logger6.log({ level: "error", message: error2.message });
@@ -1332,7 +1332,7 @@ function useAreaController() {
 // src/models/hygiene-unit.model.ts
 import Joi4 from "joi";
 import { ObjectId as ObjectId4 } from "mongodb";
-import { BadRequestError as BadRequestError7, logger as logger7 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError7, logger as logger7 } from "@7365admin1/node-server-utils";
 var unitSchema = Joi4.object({
   site: Joi4.string().hex().required(),
   name: Joi4.string().required()
@@ -1366,7 +1366,7 @@ import {
   logger as logger9,
   NotFoundError as NotFoundError3,
   useAtlas as useAtlas4
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 
 // src/repositories/hygiene-unit.repository.ts
 import { ObjectId as ObjectId5 } from "mongodb";
@@ -1378,7 +1378,7 @@ import {
   useCache as useCache3,
   logger as logger8,
   makeCacheKey as makeCacheKey3
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 function useUnitRepository() {
   const db = useAtlas3.getDb();
   if (!db) {
@@ -1715,7 +1715,7 @@ function useUnitService() {
 
 // src/controllers/hygiene-unit.controller.ts
 import Joi5 from "joi";
-import { BadRequestError as BadRequestError10, logger as logger10 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError10, logger as logger10 } from "@7365admin1/node-server-utils";
 function useUnitController() {
   const { createUnit: _createUnit, getUnits: _getUnits } = useUnitRepository();
   const {
@@ -1802,14 +1802,14 @@ function useUnitController() {
     const validation = Joi5.object({
       id: Joi5.string().hex().required()
     });
-    const { error } = validation.validate({ id });
+    const { error, value } = validation.validate({ id });
     if (error) {
       logger10.log({ level: "error", message: error.message });
       next(new BadRequestError10(error.message));
       return;
     }
     try {
-      await _deleteUnit(id);
+      await _deleteUnit(value);
       res.json({ message: "Unit deleted successfully." });
       return;
     } catch (error2) {
@@ -1825,7 +1825,7 @@ function useUnitController() {
     }
     const { site } = req.params;
     const validation = Joi5.string().hex().required();
-    const { error } = validation.validate(site);
+    const { error, value } = validation.validate(site);
     if (error) {
       logger10.log({ level: "error", message: error.message });
       next(new BadRequestError10(error.message));
@@ -1834,7 +1834,7 @@ function useUnitController() {
     try {
       const xlsData = await convertBufferFile(req.file.buffer);
       const dataJson = JSON.stringify(xlsData);
-      const result = await _importUnit({ dataJson, site });
+      const result = await _importUnit({ dataJson, site: value });
       return res.status(201).json(result);
     } catch (error2) {
       logger10.log({ level: "error", message: error2.message });
@@ -1854,7 +1854,7 @@ function useUnitController() {
 // src/models/hygiene-parent-checklist.model.ts
 import Joi6 from "joi";
 import { ObjectId as ObjectId6 } from "mongodb";
-import { BadRequestError as BadRequestError11, logger as logger11 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError11, logger as logger11 } from "@7365admin1/node-server-utils";
 var parentChecklistSchema = Joi6.object({
   createdAt: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null),
   site: Joi6.string().hex().required()
@@ -1890,7 +1890,7 @@ import {
   logger as logger12,
   makeCacheKey as makeCacheKey4,
   BadRequestError as BadRequestError12
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 function useParentChecklistRepo() {
   const db = useAtlas5.getDb();
   if (!db) {
@@ -2181,7 +2181,7 @@ function useParentChecklistRepo() {
 
 // src/controllers/hygiene-parent-checklist.controller.ts
 import Joi7 from "joi";
-import { BadRequestError as BadRequestError13, logger as logger13 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError13, logger as logger13 } from "@7365admin1/node-server-utils";
 function useParentChecklistController() {
   const {
     createParentChecklist: _createParentChecklist,
@@ -2256,7 +2256,7 @@ function useParentChecklistController() {
 // src/models/hygiene-area-checklist.model.ts
 import Joi8 from "joi";
 import { ObjectId as ObjectId8 } from "mongodb";
-import { BadRequestError as BadRequestError14, logger as logger14 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError14, logger as logger14 } from "@7365admin1/node-server-utils";
 var allowedChecklistStatus = ["ready", "completed"];
 var areaChecklistSchema = Joi8.object({
   schedule: Joi8.string().hex().required(),
@@ -2324,7 +2324,7 @@ function MAreaChecklist(value) {
 }
 
 // src/services/hygiene-area-checklist.service.ts
-import { logger as logger16, useAtlas as useAtlas7 } from "@iservice365/node-server-utils";
+import { logger as logger16, useAtlas as useAtlas7 } from "@7365admin1/node-server-utils";
 
 // src/repositories/hygiene-area-checklist.repository.ts
 import { ObjectId as ObjectId9 } from "mongodb";
@@ -2336,7 +2336,7 @@ import {
   paginate as paginate4,
   useAtlas as useAtlas6,
   useCache as useCache5
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 function useAreaChecklistRepo() {
   const db = useAtlas6.getDb();
   if (!db) {
@@ -2979,6 +2979,7 @@ function useAreaChecklistRepo() {
     }
     try {
       const updateValue = {
+        ...value,
         updatedAt: /* @__PURE__ */ new Date()
       };
       const res = await collection.updateOne(
@@ -2987,9 +2988,7 @@ function useAreaChecklistRepo() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError5(
-          "Unable to update area checklist status."
-        );
+        throw new InternalServerError5("Unable to update area checklist.");
       }
       delNamespace().then(() => {
         logger15.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -3041,6 +3040,23 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
+  async function getMaxSetNumberForArea(areaId, session) {
+    try {
+      const _id = new ObjectId9(areaId);
+      const result = await collection.aggregate(
+        [
+          { $match: { area: _id.toString() } },
+          { $unwind: "$checklist" },
+          { $group: { _id: null, maxSet: { $max: "$checklist.set" } } }
+        ],
+        { session }
+      ).toArray();
+      return result.length > 0 && result[0].maxSet ? result[0].maxSet : 0;
+    } catch (error) {
+      logger15.error(`Error getting max set number for area ${areaId}:`, error);
+      return 0;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -3053,7 +3069,8 @@ function useAreaChecklistRepo() {
     getAreaChecklistByAreaAndSchedule,
     updateAreaChecklist,
     updateAreaChecklistStatus,
-    completeAreaChecklistUnits
+    completeAreaChecklistUnits,
+    getMaxSetNumberForArea
   };
 }
 
@@ -3066,7 +3083,8 @@ function useAreaChecklistService() {
     getAreaChecklistUnits,
     getAreaChecklistById,
     completeAreaChecklistUnits: _completeAreaChecklistUnits,
-    updateAreaChecklistStatus
+    updateAreaChecklistStatus,
+    getMaxSetNumberForArea
   } = useAreaChecklistRepo();
   const { updateParentChecklistStatuses } = useParentChecklistRepo();
   async function createAreaChecklist(value) {
@@ -3082,18 +3100,26 @@ function useAreaChecklistService() {
         for (let i = 0; i < areas.length; i += BATCH_SIZE) {
           const batch = areas.slice(i, i + BATCH_SIZE);
           const batchPromises = batch.map(async (area) => {
+            if (!area.units || area.units.length === 0) {
+              logger16.warn(
+                `Skipping area ${area.name} (${area._id}): No units defined`
+              );
+              return null;
+            }
+            const maxSet = await getMaxSetNumberForArea(area._id, session);
+            const setCount = area.set || 1;
             const checklistData = {
               schedule: value.schedule,
               area: area._id.toString(),
               name: area.name,
               type: area.type,
-              checklist: area.units && area.units.length > 0 ? Array.from({ length: area.set || 1 }, (_, index) => ({
-                set: index + 1,
+              checklist: Array.from({ length: setCount }, (_, index) => ({
+                set: maxSet + index + 1,
                 units: area.units.map((unit) => ({
                   unit: unit.unit.toString(),
                   name: unit.name
                 }))
-              })) : []
+              }))
             };
             const insertedId = await _createAreaChecklist(
               checklistData,
@@ -3103,10 +3129,10 @@ function useAreaChecklistService() {
             return insertedId;
           });
           const batchResults = await Promise.all(batchPromises);
-          results.push(...batchResults);
+          results.push(...batchResults.filter((id) => id !== null));
         }
         logger16.info(
-          `Created ${areas.length} common area checklists for site: ${value.site}`
+          `Created ${totalChecklistsCreated} area checklists out of ${areas.length} areas for site: ${value.site}`
         );
       } else {
         logger16.warn(`No common areas found for site: ${value.site}`);
@@ -3215,7 +3241,7 @@ function useAreaChecklistService() {
 
 // src/controllers/hygiene-area-checklist.controller.ts
 import Joi9 from "joi";
-import { BadRequestError as BadRequestError16, logger as logger17 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError16, logger as logger17 } from "@7365admin1/node-server-utils";
 function useAreaChecklistController() {
   const {
     getAllAreaChecklist: _getAllAreaChecklist,
@@ -3236,14 +3262,14 @@ function useAreaChecklistController() {
       site: Joi9.string().hex().required(),
       schedule: Joi9.string().hex().required()
     });
-    const { error } = validation.validate(payload);
+    const { error, value } = validation.validate(payload);
     if (error) {
       logger17.log({ level: "error", message: error.message });
       next(new BadRequestError16(error.message));
       return;
     }
     try {
-      await _createAreaChecklist(payload);
+      await _createAreaChecklist(value);
       res.status(201).json({ message: "Area checklist generated successfully." });
       return;
     } catch (error2) {
@@ -3336,14 +3362,14 @@ function useAreaChecklistController() {
   async function getAreaChecklistHistoryDetails(req, res, next) {
     const validation = Joi9.string().hex().required();
     const _id = req.params.id;
-    const { error } = validation.validate(_id);
+    const { error, value } = validation.validate(_id);
     if (error) {
       logger17.log({ level: "error", message: error.message });
       next(new BadRequestError16(error.message));
       return;
     }
     try {
-      const data = await _getAreaChecklistHistoryDetails(_id);
+      const data = await _getAreaChecklistHistoryDetails(value);
       res.json(data);
       return;
     } catch (error2) {
@@ -3438,7 +3464,7 @@ function useAreaChecklistController() {
 // src/models/hygiene-supply.model.ts
 import Joi10 from "joi";
 import { ObjectId as ObjectId10 } from "mongodb";
-import { BadRequestError as BadRequestError17, logger as logger18 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError17, logger as logger18 } from "@7365admin1/node-server-utils";
 var supplySchema = Joi10.object({
   site: Joi10.string().hex().required(),
   name: Joi10.string().required(),
@@ -3480,7 +3506,7 @@ import {
   logger as logger19,
   makeCacheKey as makeCacheKey6,
   NotFoundError as NotFoundError4
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 function useSupplyRepository() {
   const db = useAtlas8.getDb();
   if (!db) {
@@ -3723,7 +3749,7 @@ function useSupplyRepository() {
 
 // src/controllers/hygiene-supply.controller.ts
 import Joi11 from "joi";
-import { BadRequestError as BadRequestError19, logger as logger20 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError19, logger as logger20 } from "@7365admin1/node-server-utils";
 function useSupplyController() {
   const {
     createSupply: _createSupply,
@@ -3786,14 +3812,14 @@ function useSupplyController() {
   async function getSupplyById(req, res, next) {
     const validation = Joi11.string().hex().required();
     const _id = req.params.id;
-    const { error } = validation.validate(_id);
+    const { error, value } = validation.validate(_id);
     if (error) {
       logger20.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
       return;
     }
     try {
-      const data = await _getSupplyById(_id);
+      const data = await _getSupplyById(value);
       res.json(data);
       return;
     } catch (error2) {
@@ -3832,14 +3858,14 @@ function useSupplyController() {
     const validation = Joi11.object({
       id: Joi11.string().hex().required()
     });
-    const { error } = validation.validate({ id });
+    const { error, value } = validation.validate({ id });
     if (error) {
       logger20.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
       return;
     }
     try {
-      await _deleteSupply(id);
+      await _deleteSupply(value);
       res.json({ message: "Supply deleted successfully." });
       return;
     } catch (error2) {
@@ -3860,7 +3886,7 @@ function useSupplyController() {
 // src/models/hygiene-stock.model.ts
 import Joi12 from "joi";
 import { ObjectId as ObjectId12 } from "mongodb";
-import { BadRequestError as BadRequestError20, logger as logger21 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError20, logger as logger21 } from "@7365admin1/node-server-utils";
 var stockSchema = Joi12.object({
   site: Joi12.string().hex().required(),
   supply: Joi12.string().hex().required(),
@@ -3913,7 +3939,7 @@ import {
   logger as logger22,
   makeCacheKey as makeCacheKey7,
   paginate as paginate6
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 function useStockRepository() {
   const db = useAtlas9.getDb();
   if (!db) {
@@ -4039,7 +4065,7 @@ import {
   NotFoundError as NotFoundError5,
   useAtlas as useAtlas10,
   BadRequestError as BadRequestError22
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 function useStockService() {
   const { createStock: _createStock } = useStockRepository();
   const { getSupplyById, updateSupply } = useSupplyRepository();
@@ -4082,7 +4108,7 @@ function useStockService() {
 
 // src/controllers/hygiene-stock.controller.ts
 import Joi13 from "joi";
-import { BadRequestError as BadRequestError23, logger as logger23 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError23, logger as logger23 } from "@7365admin1/node-server-utils";
 function useStockController() {
   const { getStocksBySupplyId: _getStocksBySupplyId } = useStockRepository();
   const { createStock: _createStock } = useStockService();
@@ -4155,7 +4181,7 @@ function useStockController() {
 // src/models/hygiene-request-item.model.ts
 import Joi14 from "joi";
 import { ObjectId as ObjectId14 } from "mongodb";
-import { BadRequestError as BadRequestError24, logger as logger24 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError24, logger as logger24 } from "@7365admin1/node-server-utils";
 var allowedRequestItemStatus = [
   "pending",
   "approved",
@@ -4215,7 +4241,7 @@ import {
   paginate as paginate7,
   BadRequestError as BadRequestError25,
   NotFoundError as NotFoundError6
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 function useRequestItemRepository() {
   const db = useAtlas11.getDb();
   if (!db) {
@@ -4458,8 +4484,8 @@ function useRequestItemRepository() {
 }
 
 // src/services/hygiene-request-item.service.ts
-import { useUserRepo } from "@iservice365/core";
-import { BadRequestError as BadRequestError26, useAtlas as useAtlas12 } from "@iservice365/node-server-utils";
+import { useUserRepo } from "@7365admin1/core";
+import { BadRequestError as BadRequestError26, useAtlas as useAtlas12 } from "@7365admin1/node-server-utils";
 function useRequestItemService() {
   const {
     createRequestItem: _createRequestItem,
@@ -4575,7 +4601,7 @@ function useRequestItemService() {
 
 // src/controllers/hygiene-request-item.controller.ts
 import Joi15 from "joi";
-import { BadRequestError as BadRequestError27, logger as logger26 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError27, logger as logger26 } from "@7365admin1/node-server-utils";
 function useRequestItemController() {
   const {
     getRequestItems: _getRequestItems,
@@ -4693,14 +4719,14 @@ function useRequestItemController() {
   async function getRequestItemById(req, res, next) {
     const validation = Joi15.string().hex().required();
     const _id = req.params.id;
-    const { error } = validation.validate(_id);
+    const { error, value } = validation.validate(_id);
     if (error) {
       logger26.log({ level: "error", message: error.message });
       next(new BadRequestError27(error.message));
       return;
     }
     try {
-      const data = await _getRequestItemById(_id);
+      const data = await _getRequestItemById(value);
       res.json(data);
       return;
     } catch (error2) {
@@ -4764,7 +4790,7 @@ function useRequestItemController() {
 }
 
 // src/models/hygiene-schedule-task.model.ts
-import { BadRequestError as BadRequestError28, logger as logger27 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError28, logger as logger27 } from "@7365admin1/node-server-utils";
 import Joi16 from "joi";
 import { ObjectId as ObjectId16 } from "mongodb";
 var allowedFrequency = [
@@ -4868,7 +4894,7 @@ import {
   logger as logger28,
   makeCacheKey as makeCacheKey9,
   NotFoundError as NotFoundError7
-} from "@iservice365/node-server-utils";
+} from "@7365admin1/node-server-utils";
 function useScheduleTaskRepository() {
   const db = useAtlas13.getDb();
   if (!db) {
@@ -5149,7 +5175,7 @@ function useScheduleTaskRepository() {
 }
 
 // src/services/hygiene-schedule-task.service.ts
-import { logger as logger29 } from "@iservice365/node-server-utils";
+import { logger as logger29 } from "@7365admin1/node-server-utils";
 function useScheduleTaskService() {
   const { createParentChecklist } = useParentChecklistRepo();
   const { getAllScheduleTask, getScheduleTaskById } = useScheduleTaskRepository();
@@ -5496,7 +5522,7 @@ function useScheduleTaskService() {
 
 // src/controllers/hygiene-schedule-task.controller.ts
 import Joi17 from "joi";
-import { BadRequestError as BadRequestError30, logger as logger30 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError30, logger as logger30 } from "@7365admin1/node-server-utils";
 function useScheduleTaskController() {
   const {
     createScheduleTask: _createScheduleTask,
@@ -5592,14 +5618,14 @@ function useScheduleTaskController() {
   async function getScheduleTaskById(req, res, next) {
     const validation = Joi17.string().hex().required();
     const _id = req.params.id;
-    const { error } = validation.validate(_id);
+    const { error, value } = validation.validate(_id);
     if (error) {
       logger30.log({ level: "error", message: error.message });
       next(new BadRequestError30(error.message));
       return;
     }
     try {
-      const data = await _getScheduleTaskById(_id);
+      const data = await _getScheduleTaskById(value);
       res.json(data);
       return;
     } catch (error2) {