@7365admin1/module-hygiene 1.7.1 → 2.0.0

package/CHANGELOG.md

@@ -1,4 +1,10 @@
-# @iservice365/module-hygiene
+# @7365admin1/module-hygiene
+
+## 2.0.0
+
+### Major Changes
+
+- Renamed package from @iservice365/module-hygiene to @7365admin1/module-hygiene and updated all imports accordingly.
 
 ## 1.7.1
 

package/dist/index.d.ts

@@ -280,6 +280,7 @@ declare function useAreaChecklistRepo(): {
     updateAreaChecklist: (_id: string | ObjectId, value: TAreaChecklistUpdate, session?: ClientSession) => Promise<number>;
     updateAreaChecklistStatus: (_id: string | ObjectId, status: (typeof allowedStatus)[number], session?: ClientSession) => Promise<number>;
     completeAreaChecklistUnits: (_id: string | ObjectId, set: number, unitId: string | ObjectId, value: TAreaChecklistUnitsUpdate, session?: ClientSession) => Promise<number>;
+    getMaxSetNumberForArea: (areaId: string | ObjectId, session?: ClientSession) => Promise<any>;
 };
 
 declare function useAreaChecklistController(): {

package/dist/index.js

@@ -90,7 +90,7 @@ var allowedPeriods = ["today", "thisWeek", "thisMonth"];
 // src/repositories/hygiene-dashboard.repository.ts
 var import_moment_timezone = __toESM(require("moment-timezone"));
 var import_mongodb = require("mongodb");
-var import_node_server_utils = require("@iservice365/node-server-utils");
+var import_node_server_utils = require("@7365admin1/node-server-utils");
 function useHygieneDashboardRepository() {
   const db = import_node_server_utils.useAtlas.getDb();
   if (!db) {
@@ -563,7 +563,7 @@ function useHygieneDashboardRepository() {
 
 // src/controllers/hygiene-dashboard.controller.ts
 var import_joi = __toESM(require("joi"));
-var import_node_server_utils2 = require("@iservice365/node-server-utils");
+var import_node_server_utils2 = require("@7365admin1/node-server-utils");
 function useHygieneDashboardController() {
   const { getHygieneDashboard: _getHygieneDashboard } = useHygieneDashboardRepository();
   async function getHygieneDashboard(req, res, next) {
@@ -616,7 +616,7 @@ function useHygieneDashboardController() {
 // src/models/hygiene-area.model.ts
 var import_joi2 = __toESM(require("joi"));
 var import_mongodb2 = require("mongodb");
-var import_node_server_utils3 = require("@iservice365/node-server-utils");
+var import_node_server_utils3 = require("@7365admin1/node-server-utils");
 var areaSchema = import_joi2.default.object({
   site: import_joi2.default.string().hex().required(),
   name: import_joi2.default.string().required(),
@@ -671,7 +671,7 @@ function MArea(value) {
 
 // src/repositories/hygiene-area.repository.ts
 var import_mongodb3 = require("mongodb");
-var import_node_server_utils4 = require("@iservice365/node-server-utils");
+var import_node_server_utils4 = require("@7365admin1/node-server-utils");
 
 // src/utils/capitalize-text.ts
 function capitalizeText(text) {
@@ -1081,7 +1081,7 @@ function useAreaRepo() {
 }
 
 // src/services/hygiene-area.service.ts
-var import_node_server_utils5 = require("@iservice365/node-server-utils");
+var import_node_server_utils5 = require("@7365admin1/node-server-utils");
 function useAreaService() {
   const { createArea: _createArea } = useAreaRepo();
   async function importArea({
@@ -1196,7 +1196,7 @@ function useAreaService() {
 
 // src/controllers/hygiene-area.controller.ts
 var import_joi3 = __toESM(require("joi"));
-var import_node_server_utils6 = require("@iservice365/node-server-utils");
+var import_node_server_utils6 = require("@7365admin1/node-server-utils");
 
 // src/utils/convert-excel.util.ts
 var import_stream = require("stream");
@@ -1291,14 +1291,14 @@ function useAreaController() {
   async function getAreaById(req, res, next) {
     const validation = import_joi3.default.string().hex().required();
     const _id = req.params.id;
-    const { error } = validation.validate(_id);
+    const { error, value } = validation.validate(_id);
     if (error) {
       import_node_server_utils6.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils6.BadRequestError(error.message));
       return;
     }
     try {
-      const data = await _getAreaById(_id);
+      const data = await _getAreaById(value);
       res.json(data);
       return;
     } catch (error2) {
@@ -1343,14 +1343,14 @@ function useAreaController() {
   async function deleteArea(req, res, next) {
     const id = req.params.id;
     const validation = import_joi3.default.string().hex().required();
-    const { error } = validation.validate(id);
+    const { error, value } = validation.validate(id);
     if (error) {
       import_node_server_utils6.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils6.BadRequestError(error.message));
       return;
     }
     try {
-      await _deleteById(id);
+      await _deleteById(value);
       res.json({ message: "Area deleted successfully." });
       return;
     } catch (error2) {
@@ -1366,7 +1366,7 @@ function useAreaController() {
     }
     const { site } = req.params;
     const schema = import_joi3.default.string().hex().required();
-    const { error } = schema.validate(site);
+    const { error, value } = schema.validate(site);
     if (error) {
       import_node_server_utils6.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils6.BadRequestError(error.message));
@@ -1375,7 +1375,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) {
       import_node_server_utils6.logger.log({ level: "error", message: error2.message });
@@ -1396,7 +1396,7 @@ function useAreaController() {
 // src/models/hygiene-unit.model.ts
 var import_joi4 = __toESM(require("joi"));
 var import_mongodb4 = require("mongodb");
-var import_node_server_utils7 = require("@iservice365/node-server-utils");
+var import_node_server_utils7 = require("@7365admin1/node-server-utils");
 var unitSchema = import_joi4.default.object({
   site: import_joi4.default.string().hex().required(),
   name: import_joi4.default.string().required()
@@ -1425,11 +1425,11 @@ function MUnit(value) {
 }
 
 // src/services/hygiene-unit.service.ts
-var import_node_server_utils9 = require("@iservice365/node-server-utils");
+var import_node_server_utils9 = require("@7365admin1/node-server-utils");
 
 // src/repositories/hygiene-unit.repository.ts
 var import_mongodb5 = require("mongodb");
-var import_node_server_utils8 = require("@iservice365/node-server-utils");
+var import_node_server_utils8 = require("@7365admin1/node-server-utils");
 function useUnitRepository() {
   const db = import_node_server_utils8.useAtlas.getDb();
   if (!db) {
@@ -1766,7 +1766,7 @@ function useUnitService() {
 
 // src/controllers/hygiene-unit.controller.ts
 var import_joi5 = __toESM(require("joi"));
-var import_node_server_utils10 = require("@iservice365/node-server-utils");
+var import_node_server_utils10 = require("@7365admin1/node-server-utils");
 function useUnitController() {
   const { createUnit: _createUnit, getUnits: _getUnits } = useUnitRepository();
   const {
@@ -1853,14 +1853,14 @@ function useUnitController() {
     const validation = import_joi5.default.object({
       id: import_joi5.default.string().hex().required()
     });
-    const { error } = validation.validate({ id });
+    const { error, value } = validation.validate({ id });
     if (error) {
       import_node_server_utils10.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils10.BadRequestError(error.message));
       return;
     }
     try {
-      await _deleteUnit(id);
+      await _deleteUnit(value);
       res.json({ message: "Unit deleted successfully." });
       return;
     } catch (error2) {
@@ -1876,7 +1876,7 @@ function useUnitController() {
     }
     const { site } = req.params;
     const validation = import_joi5.default.string().hex().required();
-    const { error } = validation.validate(site);
+    const { error, value } = validation.validate(site);
     if (error) {
       import_node_server_utils10.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils10.BadRequestError(error.message));
@@ -1885,7 +1885,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) {
       import_node_server_utils10.logger.log({ level: "error", message: error2.message });
@@ -1905,7 +1905,7 @@ function useUnitController() {
 // src/models/hygiene-parent-checklist.model.ts
 var import_joi6 = __toESM(require("joi"));
 var import_mongodb6 = require("mongodb");
-var import_node_server_utils11 = require("@iservice365/node-server-utils");
+var import_node_server_utils11 = require("@7365admin1/node-server-utils");
 var parentChecklistSchema = import_joi6.default.object({
   createdAt: import_joi6.default.alternatives().try(import_joi6.default.date(), import_joi6.default.string()).optional().allow("", null),
   site: import_joi6.default.string().hex().required()
@@ -1933,7 +1933,7 @@ function MParentChecklist(value) {
 
 // src/repositories/hygiene-parent-checklist.repository.ts
 var import_mongodb7 = require("mongodb");
-var import_node_server_utils12 = require("@iservice365/node-server-utils");
+var import_node_server_utils12 = require("@7365admin1/node-server-utils");
 function useParentChecklistRepo() {
   const db = import_node_server_utils12.useAtlas.getDb();
   if (!db) {
@@ -2224,7 +2224,7 @@ function useParentChecklistRepo() {
 
 // src/controllers/hygiene-parent-checklist.controller.ts
 var import_joi7 = __toESM(require("joi"));
-var import_node_server_utils13 = require("@iservice365/node-server-utils");
+var import_node_server_utils13 = require("@7365admin1/node-server-utils");
 function useParentChecklistController() {
   const {
     createParentChecklist: _createParentChecklist,
@@ -2299,7 +2299,7 @@ function useParentChecklistController() {
 // src/models/hygiene-area-checklist.model.ts
 var import_joi8 = __toESM(require("joi"));
 var import_mongodb8 = require("mongodb");
-var import_node_server_utils14 = require("@iservice365/node-server-utils");
+var import_node_server_utils14 = require("@7365admin1/node-server-utils");
 var allowedChecklistStatus = ["ready", "completed"];
 var areaChecklistSchema = import_joi8.default.object({
   schedule: import_joi8.default.string().hex().required(),
@@ -2367,11 +2367,11 @@ function MAreaChecklist(value) {
 }
 
 // src/services/hygiene-area-checklist.service.ts
-var import_node_server_utils16 = require("@iservice365/node-server-utils");
+var import_node_server_utils16 = require("@7365admin1/node-server-utils");
 
 // src/repositories/hygiene-area-checklist.repository.ts
 var import_mongodb9 = require("mongodb");
-var import_node_server_utils15 = require("@iservice365/node-server-utils");
+var import_node_server_utils15 = require("@7365admin1/node-server-utils");
 function useAreaChecklistRepo() {
   const db = import_node_server_utils15.useAtlas.getDb();
   if (!db) {
@@ -3014,6 +3014,7 @@ function useAreaChecklistRepo() {
     }
     try {
       const updateValue = {
+        ...value,
         updatedAt: /* @__PURE__ */ new Date()
       };
       const res = await collection.updateOne(
@@ -3022,9 +3023,7 @@ function useAreaChecklistRepo() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new import_node_server_utils15.InternalServerError(
-          "Unable to update area checklist status."
-        );
+        throw new import_node_server_utils15.InternalServerError("Unable to update area checklist.");
       }
       delNamespace().then(() => {
         import_node_server_utils15.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -3076,6 +3075,23 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
+  async function getMaxSetNumberForArea(areaId, session) {
+    try {
+      const _id = new import_mongodb9.ObjectId(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) {
+      import_node_server_utils15.logger.error(`Error getting max set number for area ${areaId}:`, error);
+      return 0;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -3088,7 +3104,8 @@ function useAreaChecklistRepo() {
     getAreaChecklistByAreaAndSchedule,
     updateAreaChecklist,
     updateAreaChecklistStatus,
-    completeAreaChecklistUnits
+    completeAreaChecklistUnits,
+    getMaxSetNumberForArea
   };
 }
 
@@ -3101,7 +3118,8 @@ function useAreaChecklistService() {
     getAreaChecklistUnits,
     getAreaChecklistById,
     completeAreaChecklistUnits: _completeAreaChecklistUnits,
-    updateAreaChecklistStatus
+    updateAreaChecklistStatus,
+    getMaxSetNumberForArea
   } = useAreaChecklistRepo();
   const { updateParentChecklistStatuses } = useParentChecklistRepo();
   async function createAreaChecklist(value) {
@@ -3117,18 +3135,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) {
+              import_node_server_utils16.logger.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,
@@ -3138,10 +3164,10 @@ function useAreaChecklistService() {
             return insertedId;
           });
           const batchResults = await Promise.all(batchPromises);
-          results.push(...batchResults);
+          results.push(...batchResults.filter((id) => id !== null));
         }
         import_node_server_utils16.logger.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 {
         import_node_server_utils16.logger.warn(`No common areas found for site: ${value.site}`);
@@ -3250,7 +3276,7 @@ function useAreaChecklistService() {
 
 // src/controllers/hygiene-area-checklist.controller.ts
 var import_joi9 = __toESM(require("joi"));
-var import_node_server_utils17 = require("@iservice365/node-server-utils");
+var import_node_server_utils17 = require("@7365admin1/node-server-utils");
 function useAreaChecklistController() {
   const {
     getAllAreaChecklist: _getAllAreaChecklist,
@@ -3271,14 +3297,14 @@ function useAreaChecklistController() {
       site: import_joi9.default.string().hex().required(),
       schedule: import_joi9.default.string().hex().required()
     });
-    const { error } = validation.validate(payload);
+    const { error, value } = validation.validate(payload);
     if (error) {
       import_node_server_utils17.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils17.BadRequestError(error.message));
       return;
     }
     try {
-      await _createAreaChecklist(payload);
+      await _createAreaChecklist(value);
       res.status(201).json({ message: "Area checklist generated successfully." });
       return;
     } catch (error2) {
@@ -3371,14 +3397,14 @@ function useAreaChecklistController() {
   async function getAreaChecklistHistoryDetails(req, res, next) {
     const validation = import_joi9.default.string().hex().required();
     const _id = req.params.id;
-    const { error } = validation.validate(_id);
+    const { error, value } = validation.validate(_id);
     if (error) {
       import_node_server_utils17.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils17.BadRequestError(error.message));
       return;
     }
     try {
-      const data = await _getAreaChecklistHistoryDetails(_id);
+      const data = await _getAreaChecklistHistoryDetails(value);
       res.json(data);
       return;
     } catch (error2) {
@@ -3473,7 +3499,7 @@ function useAreaChecklistController() {
 // src/models/hygiene-supply.model.ts
 var import_joi10 = __toESM(require("joi"));
 var import_mongodb10 = require("mongodb");
-var import_node_server_utils18 = require("@iservice365/node-server-utils");
+var import_node_server_utils18 = require("@7365admin1/node-server-utils");
 var supplySchema = import_joi10.default.object({
   site: import_joi10.default.string().hex().required(),
   name: import_joi10.default.string().required(),
@@ -3506,7 +3532,7 @@ function MSupply(value) {
 
 // src/repositories/hygiene-supply.repository.ts
 var import_mongodb11 = require("mongodb");
-var import_node_server_utils19 = require("@iservice365/node-server-utils");
+var import_node_server_utils19 = require("@7365admin1/node-server-utils");
 function useSupplyRepository() {
   const db = import_node_server_utils19.useAtlas.getDb();
   if (!db) {
@@ -3749,7 +3775,7 @@ function useSupplyRepository() {
 
 // src/controllers/hygiene-supply.controller.ts
 var import_joi11 = __toESM(require("joi"));
-var import_node_server_utils20 = require("@iservice365/node-server-utils");
+var import_node_server_utils20 = require("@7365admin1/node-server-utils");
 function useSupplyController() {
   const {
     createSupply: _createSupply,
@@ -3812,14 +3838,14 @@ function useSupplyController() {
   async function getSupplyById(req, res, next) {
     const validation = import_joi11.default.string().hex().required();
     const _id = req.params.id;
-    const { error } = validation.validate(_id);
+    const { error, value } = validation.validate(_id);
     if (error) {
       import_node_server_utils20.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils20.BadRequestError(error.message));
       return;
     }
     try {
-      const data = await _getSupplyById(_id);
+      const data = await _getSupplyById(value);
       res.json(data);
       return;
     } catch (error2) {
@@ -3858,14 +3884,14 @@ function useSupplyController() {
     const validation = import_joi11.default.object({
       id: import_joi11.default.string().hex().required()
     });
-    const { error } = validation.validate({ id });
+    const { error, value } = validation.validate({ id });
     if (error) {
       import_node_server_utils20.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils20.BadRequestError(error.message));
       return;
     }
     try {
-      await _deleteSupply(id);
+      await _deleteSupply(value);
       res.json({ message: "Supply deleted successfully." });
       return;
     } catch (error2) {
@@ -3886,7 +3912,7 @@ function useSupplyController() {
 // src/models/hygiene-stock.model.ts
 var import_joi12 = __toESM(require("joi"));
 var import_mongodb12 = require("mongodb");
-var import_node_server_utils21 = require("@iservice365/node-server-utils");
+var import_node_server_utils21 = require("@7365admin1/node-server-utils");
 var stockSchema = import_joi12.default.object({
   site: import_joi12.default.string().hex().required(),
   supply: import_joi12.default.string().hex().required(),
@@ -3931,7 +3957,7 @@ function MStock(value) {
 
 // src/repositories/hygiene-stock.repository.ts
 var import_mongodb13 = require("mongodb");
-var import_node_server_utils22 = require("@iservice365/node-server-utils");
+var import_node_server_utils22 = require("@7365admin1/node-server-utils");
 function useStockRepository() {
   const db = import_node_server_utils22.useAtlas.getDb();
   if (!db) {
@@ -4053,7 +4079,7 @@ function useStockRepository() {
 }
 
 // src/services/hygiene-stock.service.ts
-var import_node_server_utils23 = require("@iservice365/node-server-utils");
+var import_node_server_utils23 = require("@7365admin1/node-server-utils");
 function useStockService() {
   const { createStock: _createStock } = useStockRepository();
   const { getSupplyById, updateSupply } = useSupplyRepository();
@@ -4096,7 +4122,7 @@ function useStockService() {
 
 // src/controllers/hygiene-stock.controller.ts
 var import_joi13 = __toESM(require("joi"));
-var import_node_server_utils24 = require("@iservice365/node-server-utils");
+var import_node_server_utils24 = require("@7365admin1/node-server-utils");
 function useStockController() {
   const { getStocksBySupplyId: _getStocksBySupplyId } = useStockRepository();
   const { createStock: _createStock } = useStockService();
@@ -4169,7 +4195,7 @@ function useStockController() {
 // src/models/hygiene-request-item.model.ts
 var import_joi14 = __toESM(require("joi"));
 var import_mongodb14 = require("mongodb");
-var import_node_server_utils25 = require("@iservice365/node-server-utils");
+var import_node_server_utils25 = require("@7365admin1/node-server-utils");
 var allowedRequestItemStatus = [
   "pending",
   "approved",
@@ -4220,7 +4246,7 @@ function MRequestItem(value) {
 
 // src/repositories/hygiene-request-item.repository.ts
 var import_mongodb15 = require("mongodb");
-var import_node_server_utils26 = require("@iservice365/node-server-utils");
+var import_node_server_utils26 = require("@7365admin1/node-server-utils");
 function useRequestItemRepository() {
   const db = import_node_server_utils26.useAtlas.getDb();
   if (!db) {
@@ -4463,8 +4489,8 @@ function useRequestItemRepository() {
 }
 
 // src/services/hygiene-request-item.service.ts
-var import_core = require("@iservice365/core");
-var import_node_server_utils27 = require("@iservice365/node-server-utils");
+var import_core = require("@7365admin1/core");
+var import_node_server_utils27 = require("@7365admin1/node-server-utils");
 function useRequestItemService() {
   const {
     createRequestItem: _createRequestItem,
@@ -4580,7 +4606,7 @@ function useRequestItemService() {
 
 // src/controllers/hygiene-request-item.controller.ts
 var import_joi15 = __toESM(require("joi"));
-var import_node_server_utils28 = require("@iservice365/node-server-utils");
+var import_node_server_utils28 = require("@7365admin1/node-server-utils");
 function useRequestItemController() {
   const {
     getRequestItems: _getRequestItems,
@@ -4698,14 +4724,14 @@ function useRequestItemController() {
   async function getRequestItemById(req, res, next) {
     const validation = import_joi15.default.string().hex().required();
     const _id = req.params.id;
-    const { error } = validation.validate(_id);
+    const { error, value } = validation.validate(_id);
     if (error) {
       import_node_server_utils28.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils28.BadRequestError(error.message));
       return;
     }
     try {
-      const data = await _getRequestItemById(_id);
+      const data = await _getRequestItemById(value);
       res.json(data);
       return;
     } catch (error2) {
@@ -4769,7 +4795,7 @@ function useRequestItemController() {
 }
 
 // src/models/hygiene-schedule-task.model.ts
-var import_node_server_utils29 = require("@iservice365/node-server-utils");
+var import_node_server_utils29 = require("@7365admin1/node-server-utils");
 var import_joi16 = __toESM(require("joi"));
 var import_mongodb16 = require("mongodb");
 var allowedFrequency = [
@@ -4864,7 +4890,7 @@ function MScheduleTask(value) {
 
 // src/repositories/hygiene-schedule-task.repository.ts
 var import_mongodb17 = require("mongodb");
-var import_node_server_utils30 = require("@iservice365/node-server-utils");
+var import_node_server_utils30 = require("@7365admin1/node-server-utils");
 function useScheduleTaskRepository() {
   const db = import_node_server_utils30.useAtlas.getDb();
   if (!db) {
@@ -5145,7 +5171,7 @@ function useScheduleTaskRepository() {
 }
 
 // src/services/hygiene-schedule-task.service.ts
-var import_node_server_utils31 = require("@iservice365/node-server-utils");
+var import_node_server_utils31 = require("@7365admin1/node-server-utils");
 function useScheduleTaskService() {
   const { createParentChecklist } = useParentChecklistRepo();
   const { getAllScheduleTask, getScheduleTaskById } = useScheduleTaskRepository();
@@ -5492,7 +5518,7 @@ function useScheduleTaskService() {
 
 // src/controllers/hygiene-schedule-task.controller.ts
 var import_joi17 = __toESM(require("joi"));
-var import_node_server_utils32 = require("@iservice365/node-server-utils");
+var import_node_server_utils32 = require("@7365admin1/node-server-utils");
 function useScheduleTaskController() {
   const {
     createScheduleTask: _createScheduleTask,
@@ -5588,14 +5614,14 @@ function useScheduleTaskController() {
   async function getScheduleTaskById(req, res, next) {
     const validation = import_joi17.default.string().hex().required();
     const _id = req.params.id;
-    const { error } = validation.validate(_id);
+    const { error, value } = validation.validate(_id);
     if (error) {
       import_node_server_utils32.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils32.BadRequestError(error.message));
       return;
     }
     try {
-      const data = await _getScheduleTaskById(_id);
+      const data = await _getScheduleTaskById(value);
       res.json(data);
       return;
     } catch (error2) {