@7365admin1/module-hygiene 4.13.0 → 4.15.0

package/dist/index.mjs

@@ -763,13 +763,10 @@ function useAreaRepo() {
   }
   async function getAreasForChecklist(site, serviceType) {
     const query = {
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      serviceType
     };
-    const cacheOptions = {};
-    if (serviceType) {
-      query.serviceType = serviceType;
-      cacheOptions.serviceType = serviceType;
-    }
+    const cacheOptions = { serviceType };
     try {
       site = new ObjectId3(site);
       query.site = site;
@@ -2224,6 +2221,7 @@ function useParentChecklistRepo() {
   async function createIndex() {
     try {
       await collection.createIndexes([
+        { key: { serviceType: 1 } },
         { key: { createdAt: 1 } },
         { key: { site: 1 } },
         { key: { status: 1 } }
@@ -2241,44 +2239,63 @@ function useParentChecklistRepo() {
       startOfDay.setUTCHours(0, 0, 0, 0);
       const endOfDay = new Date(currentDate);
       endOfDay.setUTCHours(23, 59, 59, 999);
-      const existingQuery = {
-        createdAt: {
-          $gte: startOfDay,
-          $lte: endOfDay
-        }
-      };
+      const allServiceTypes = Object.values(ServiceType);
+      const dateStr = currentDate.toISOString().split("T")[0];
       if (value.site) {
+        let siteObjectId;
         try {
-          existingQuery.site = new ObjectId7(value.site);
-          logger14.info(
-            `createParentChecklist: Looking for existing checklist with query: ${JSON.stringify(
-              { ...existingQuery, site: value.site }
-            )}`
-          );
+          siteObjectId = new ObjectId7(value.site);
         } catch (error) {
           throw new BadRequestError12("Invalid site ID format.");
         }
-      } else {
-        logger14.info(
-          `createParentChecklist: Looking for existing checklist with query (no site filter): ${JSON.stringify(
-            existingQuery
-          )}`
-        );
-      }
-      const existingChecklist = await collection.findOne(existingQuery);
-      if (existingChecklist) {
-        const dateStr2 = currentDate.toISOString().split("T")[0];
-        logger14.info(
-          `Parent checklist already exists for ${value.site ? `site ${value.site} on` : ""} today: ${dateStr2}. Found checklist: ${JSON.stringify({
-            _id: existingChecklist._id,
-            site: existingChecklist.site
-          })}`
+        if (value.serviceType) {
+          const existingChecklist = await collection.findOne({
+            createdAt: { $gte: startOfDay, $lte: endOfDay },
+            site: siteObjectId,
+            serviceType: value.serviceType
+          });
+          if (existingChecklist) {
+            logger14.info(
+              `Parent checklist already exists for site ${value.site} / ${value.serviceType} on ${dateStr}. _id: ${existingChecklist._id}`
+            );
+            return existingChecklist._id;
+          }
+          const doc = MParentChecklist({
+            site: value.site,
+            createdAt: currentDate,
+            serviceType: value.serviceType
+          });
+          const result3 = await collection.insertOne(doc, { session });
+          delNamespace().catch((err) => {
+            logger14.error(
+              `Failed to clear cache for namespace: ${namespace_collection}`,
+              err
+            );
+          });
+          logger14.info(
+            `Created parent checklist for site ${value.site} / ${value.serviceType} for today: ${dateStr}`
+          );
+          return result3.insertedId;
+        }
+        const existingServiceTypes = await collection.distinct("serviceType", {
+          createdAt: { $gte: startOfDay, $lte: endOfDay },
+          site: siteObjectId,
+          serviceType: { $exists: true, $ne: null }
+        });
+        const missingServiceTypes = allServiceTypes.filter(
+          (st) => !existingServiceTypes.includes(st)
         );
-        return existingChecklist._id;
-      }
-      const allServiceTypes = Object.values(ServiceType);
-      if (value.site) {
-        const checklistDocs2 = allServiceTypes.map(
+        if (missingServiceTypes.length === 0) {
+          logger14.info(
+            `All serviceType checklists already exist for site ${value.site} on ${dateStr}`
+          );
+          const first = await collection.findOne({
+            createdAt: { $gte: startOfDay, $lte: endOfDay },
+            site: siteObjectId
+          });
+          return first._id;
+        }
+        const checklistDocs2 = missingServiceTypes.map(
           (serviceType) => MParentChecklist({
             site: value.site,
             createdAt: currentDate,
@@ -2286,17 +2303,14 @@ function useParentChecklistRepo() {
           })
         );
         const result2 = await collection.insertMany(checklistDocs2, { session });
-        delNamespace().then(() => {
-          logger14.info(`Cache cleared for namespace: ${namespace_collection}`);
-        }).catch((err) => {
+        delNamespace().catch((err) => {
           logger14.error(
             `Failed to clear cache for namespace: ${namespace_collection}`,
             err
           );
         });
-        const dateStr2 = currentDate.toISOString().split("T")[0];
         logger14.info(
-          `Created ${checklistDocs2.length} parent checklists for site ${value.site} for today: ${dateStr2}`
+          `Created ${checklistDocs2.length} parent checklists for site ${value.site} for today: ${dateStr}`
         );
         return Object.values(result2.insertedIds);
       }
@@ -2309,18 +2323,41 @@ function useParentChecklistRepo() {
         logger14.warn("No sites found for creating parent checklist");
         throw new BadRequestError12("No sites available for checklist creation");
       }
+      const existingPairs = await collection.find(
+        {
+          createdAt: { $gte: startOfDay, $lte: endOfDay },
+          serviceType: { $exists: true, $ne: null }
+        },
+        { projection: { site: 1, serviceType: 1 } }
+      ).toArray();
+      const existingSet = new Set(
+        existingPairs.map(
+          (doc) => `${doc.site?.toString()}|${doc.serviceType}`
+        )
+      );
       const checklistDocs = [];
       for (const site of siteIds) {
         for (const serviceType of allServiceTypes) {
-          checklistDocs.push(
-            MParentChecklist({
-              site,
-              createdAt: currentDate,
-              serviceType
-            })
-          );
+          if (!existingSet.has(`${site}|${serviceType}`)) {
+            checklistDocs.push(
+              MParentChecklist({
+                site,
+                createdAt: currentDate,
+                serviceType
+              })
+            );
+          }
         }
       }
+      if (checklistDocs.length === 0) {
+        logger14.info(
+          `All site+serviceType checklists already exist for today: ${dateStr}`
+        );
+        return [];
+      }
+      logger14.info(
+        `createParentChecklist: Creating ${checklistDocs.length} missing site+serviceType checklist(s) for today: ${dateStr}`
+      );
       const result = await collection.insertMany(checklistDocs, { session });
       delNamespace().then(() => {
         logger14.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -2330,7 +2367,6 @@ function useParentChecklistRepo() {
           err
         );
       });
-      const dateStr = currentDate.toISOString().split("T")[0];
       logger14.info(
         `Created ${Object.keys(result.insertedIds).length} parent checklists for today: ${dateStr}`
       );
@@ -2438,6 +2474,23 @@ function useParentChecklistRepo() {
       throw error;
     }
   }
+  async function getParentChecklistById(_id) {
+    try {
+      _id = new ObjectId7(_id);
+    } catch (error) {
+      throw new BadRequestError12("Invalid parent checklist ID format.");
+    }
+    try {
+      const data = await collection.findOne({ _id });
+      if (!data) {
+        throw new BadRequestError12("Parent checklist not found.");
+      }
+      return data;
+    } catch (error) {
+      logger14.error("Failed to get parent checklist by ID", error);
+      throw error;
+    }
+  }
   async function updateParentChecklistStatuses(_id, status, session) {
     try {
       _id = new ObjectId7(_id);
@@ -2552,13 +2605,38 @@ function useParentChecklistRepo() {
       throw error;
     }
   }
+  async function getTodayParentChecklistsForAreaGen() {
+    const now = /* @__PURE__ */ new Date();
+    const start = new Date(now);
+    start.setUTCHours(0, 0, 0, 0);
+    const end = new Date(now);
+    end.setUTCHours(23, 59, 59, 999);
+    try {
+      const items = await collection.find(
+        {
+          createdAt: { $gte: start, $lte: end },
+          serviceType: { $exists: true, $ne: null }
+        },
+        { projection: { _id: 1, site: 1, serviceType: 1 } }
+      ).toArray();
+      return items;
+    } catch (error) {
+      logger14.error(
+        "Failed to get today's parent checklists for area generation",
+        error
+      );
+      throw error;
+    }
+  }
   return {
     createIndex,
     createParentChecklist,
     getAllParentChecklist,
+    getParentChecklistById,
     updateParentChecklistStatuses,
     closeExpiredParentChecklists,
-    getTodayParentChecklists
+    getTodayParentChecklists,
+    getTodayParentChecklistsForAreaGen
   };
 }
 
@@ -2646,6 +2724,7 @@ import { BadRequestError as BadRequestError14, logger as logger16 } from "@7365a
 var allowedChecklistStatus = ["open", "completed", "closed"];
 var areaChecklistSchema = Joi8.object({
   schedule: Joi8.string().hex().required(),
+  serviceType: Joi8.string().valid(...Object.values(ServiceType)).optional(),
   area: Joi8.string().hex().required(),
   name: Joi8.string().required(),
   type: Joi8.string().valid(...allowedTypes).required(),
@@ -2712,6 +2791,7 @@ function MAreaChecklist(value) {
   }
   return {
     schedule: value.schedule,
+    serviceType: value.serviceType,
     area: value.area,
     name: value.name,
     type: value.type,
@@ -2833,7 +2913,8 @@ function useAreaChecklistRepo() {
     search = "",
     type = "all",
     status = "all",
-    schedule
+    schedule,
+    serviceType
   }, session) {
     page = page > 0 ? page - 1 : 0;
     const query = {};
@@ -2847,6 +2928,10 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new BadRequestError15("Invalid parent checklist ID format.");
     }
+    if (serviceType) {
+      query.serviceType = serviceType;
+      cacheOptions.serviceType = serviceType;
+    }
     if (type && type !== "all") {
       query.type = type;
       cacheOptions.type = type;
@@ -3242,6 +3327,7 @@ function useAreaChecklistRepo() {
     page = 1,
     limit = 10,
     search = "",
+    serviceType,
     _id
   }, session) {
     page = page > 0 ? page - 1 : 0;
@@ -3256,6 +3342,10 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new BadRequestError15("Invalid area checklist ID format.");
     }
+    if (serviceType) {
+      query.serviceType = serviceType;
+      cacheOptions.serviceType = serviceType;
+    }
     if (search) {
       query.$text = { $search: search };
       cacheOptions.search = search;
@@ -3479,7 +3569,12 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
-  async function getAreaChecklistByAreaAndSchedule(schedule, area, session) {
+  async function getAreaChecklistByAreaAndSchedule({
+    schedule,
+    serviceType,
+    area,
+    session
+  }) {
     try {
       schedule = new ObjectId9(schedule);
       area = new ObjectId9(area);
@@ -3487,7 +3582,10 @@ function useAreaChecklistRepo() {
       throw new BadRequestError15("Invalid area checklist ID format.");
     }
     try {
-      const data = await collection.findOne({ schedule, area }, { session });
+      const data = await collection.findOne(
+        { schedule, serviceType, area },
+        { session }
+      );
       if (!data) {
         throw new BadRequestError15("Area checklist not found.");
       }
@@ -3696,7 +3794,7 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
-  async function pushScheduleTaskSets(scheduleId, areaId, scheduleTaskId, newSets) {
+  async function pushScheduleTaskSets(scheduleId, serviceType, areaId, scheduleTaskId, newSets) {
     try {
       const schedule = new ObjectId9(scheduleId);
       const area = new ObjectId9(areaId);
@@ -3704,6 +3802,7 @@ function useAreaChecklistRepo() {
       const result = await collection.updateOne(
         {
           schedule,
+          serviceType,
           area,
           checklist: { $not: { $elemMatch: { scheduleTaskId: taskId } } }
         },
@@ -3726,13 +3825,14 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
-  async function insertAutoGenSets(scheduleId, areaId, newSets) {
+  async function insertAutoGenSets(scheduleId, serviceType, areaId, newSets) {
     try {
       const schedule = new ObjectId9(scheduleId);
       const area = new ObjectId9(areaId);
       const result = await collection.updateOne(
         {
           schedule,
+          serviceType,
           area,
           checklist: {
             $not: { $elemMatch: { isScheduleTask: { $ne: true } } }
@@ -3878,14 +3978,25 @@ function useAreaChecklistService() {
     updateAreaChecklistStatus,
     insertAutoGenSets
   } = useAreaChecklistRepo();
-  const { updateParentChecklistStatuses } = useParentChecklistRepo();
+  const { updateParentChecklistStatuses, getParentChecklistById } = useParentChecklistRepo();
   const { getUserById } = useUserRepo();
   async function createAreaChecklist(value) {
     const results = [];
     let totalChecklistsCreated = 0;
     try {
       const BATCH_SIZE = 10;
-      const areasResult = await getAreasForChecklist(value.site);
+      const schedule = await getParentChecklistById(value.schedule.toString());
+      const serviceType = schedule.serviceType;
+      if (!serviceType) {
+        logger18.warn(
+          `createAreaChecklist: Parent checklist ${value.schedule} has no serviceType, skipping area checklist generation`
+        );
+        return results;
+      }
+      const areasResult = await getAreasForChecklist(
+        value.site,
+        serviceType
+      );
       const areas = areasResult || [];
       if (areas.length > 0) {
         for (let i = 0; i < areas.length; i += BATCH_SIZE) {
@@ -3899,10 +4010,11 @@ function useAreaChecklistService() {
             }
             let existing = null;
             try {
-              existing = await getAreaChecklistByAreaAndSchedule(
-                value.schedule.toString(),
-                area._id.toString()
-              );
+              existing = await getAreaChecklistByAreaAndSchedule({
+                schedule: value.schedule.toString(),
+                serviceType,
+                area: area._id.toString()
+              });
             } catch (_) {
             }
             if (existing) {
@@ -3950,6 +4062,7 @@ function useAreaChecklistService() {
               );
               await insertAutoGenSets(
                 value.schedule.toString(),
+                serviceType,
                 area._id.toString(),
                 autoGenSets
               );
@@ -3958,6 +4071,7 @@ function useAreaChecklistService() {
             const setCount = Number(area.set) || 1;
             const checklistData = {
               schedule: value.schedule,
+              serviceType,
               area: area._id.toString(),
               name: area.name,
               type: area.type,
@@ -4088,7 +4202,11 @@ function useAreaChecklistService() {
 
 // src/controllers/hygiene-area-checklist.controller.ts
 import Joi9 from "joi";
-import { BadRequestError as BadRequestError16, InternalServerError as InternalServerError7, logger as logger20 } from "@7365admin1/node-server-utils";
+import {
+  BadRequestError as BadRequestError16,
+  InternalServerError as InternalServerError7,
+  logger as logger20
+} from "@7365admin1/node-server-utils";
 
 // src/services/hygiene-checklist-pdf.service.ts
 import { launch } from "puppeteer";
@@ -4357,7 +4475,8 @@ function useAreaChecklistController() {
       search: Joi9.string().optional().allow("", null),
       type: Joi9.string().valid(...allowedTypes, "all").optional().allow("", null),
       status: Joi9.string().valid(...allowedStatus, "all").optional().allow("", null),
-      schedule: Joi9.string().hex().required()
+      schedule: Joi9.string().hex().required(),
+      serviceType: Joi9.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -4371,6 +4490,7 @@ function useAreaChecklistController() {
     const type = req.query.type ?? "all";
     const status = req.query.status ?? "all";
     const schedule = req.params.schedule ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getAllAreaChecklist({
         page,
@@ -4378,7 +4498,8 @@ function useAreaChecklistController() {
         search,
         type,
         status,
-        schedule
+        schedule,
+        serviceType
       });
       res.json(data);
       return;
@@ -4455,6 +4576,7 @@ function useAreaChecklistController() {
       page: Joi9.number().min(1).optional().allow("", null),
       limit: Joi9.number().min(1).optional().allow("", null),
       search: Joi9.string().optional().allow("", null),
+      serviceType: Joi9.string().valid(...Object.values(ServiceType)).required(),
       id: Joi9.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -4466,12 +4588,14 @@ function useAreaChecklistController() {
     const page = parseInt(req.query.page) ?? 1;
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
+    const serviceType = req.query.serviceType ?? "";
     const _id = req.params.id ?? "";
     try {
       const data = await _getAreaChecklistUnits({
         page,
         limit,
         search,
+        serviceType,
         _id
       });
       res.json(data);
@@ -4543,12 +4667,15 @@ function useAreaChecklistController() {
     try {
       const pdfBuffer = await _generateChecklistPdf(value);
       if (!pdfBuffer || pdfBuffer.length === 0) {
-        throw new InternalServerError7("Generated checklist PDF is empty or invalid.");
+        throw new InternalServerError7(
+          "Generated checklist PDF is empty or invalid."
+        );
       }
       const date = /* @__PURE__ */ new Date();
-      const formattedDate = `${String(date.getDate()).padStart(2, "0")}_${String(
-        date.getMonth() + 1
-      ).padStart(2, "0")}_${date.getFullYear()}`;
+      const formattedDate = `${String(date.getDate()).padStart(
+        2,
+        "0"
+      )}_${String(date.getMonth() + 1).padStart(2, "0")}_${date.getFullYear()}`;
       res.setHeader("Content-Type", "application/pdf");
       res.setHeader(
         "Content-Disposition",
@@ -4580,6 +4707,7 @@ import { ObjectId as ObjectId12 } from "mongodb";
 import { BadRequestError as BadRequestError17, logger as logger21 } from "@7365admin1/node-server-utils";
 var supplySchema = Joi10.object({
   site: Joi10.string().hex().required(),
+  serviceType: Joi10.string().valid(...Object.values(ServiceType)).required(),
   name: Joi10.string().required(),
   unitOfMeasurement: Joi10.string().required()
 });
@@ -4598,6 +4726,7 @@ function MSupply(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     name: value.name,
     unitOfMeasurement: value.unitOfMeasurement,
     qty: 0,
@@ -4630,7 +4759,10 @@ function useSupplyRepository() {
   const { delNamespace, setCache, getCache } = useCache6(namespace_collection);
   async function createIndex() {
     try {
-      await collection.createIndexes([{ key: { site: 1 } }]);
+      await collection.createIndexes([
+        { key: { site: 1 } },
+        { key: { serviceType: 1 } }
+      ]);
     } catch (error) {
       throw new InternalServerError8(
         "Failed to create index on hygiene supply."
@@ -4683,15 +4815,18 @@ function useSupplyRepository() {
     page = 1,
     limit = 10,
     search = "",
-    site
+    site,
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      serviceType
     };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new ObjectId13(site);
@@ -4895,7 +5030,8 @@ function useSupplyController() {
       page: Joi11.number().min(1).optional().allow("", null),
       limit: Joi11.number().min(1).optional().allow("", null),
       search: Joi11.string().optional().allow("", null),
-      site: Joi11.string().hex().required()
+      site: Joi11.string().hex().required(),
+      serviceType: Joi11.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -4907,12 +5043,14 @@ function useSupplyController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getSupplies({
         page,
         limit,
         search,
-        site
+        site,
+        serviceType
       });
       res.json(data);
       return;
@@ -4968,10 +5106,8 @@ function useSupplyController() {
   }
   async function deleteSupply(req, res, next) {
     const id = req.params.id;
-    const validation = Joi11.object({
-      id: Joi11.string().hex().required()
-    });
-    const { error, value } = validation.validate({ id });
+    const validation = Joi11.string().hex().required();
+    const { error, value } = validation.validate(id);
     if (error) {
       logger23.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
@@ -5002,6 +5138,7 @@ import { ObjectId as ObjectId14 } from "mongodb";
 import { BadRequestError as BadRequestError20, logger as logger24 } from "@7365admin1/node-server-utils";
 var stockSchema = Joi12.object({
   site: Joi12.string().hex().required(),
+  serviceType: Joi12.string().valid(...Object.values(ServiceType)).required(),
   supply: Joi12.string().hex().required(),
   in: Joi12.number().min(0).optional(),
   out: Joi12.number().min(0).optional(),
@@ -5030,6 +5167,7 @@ function MStock(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     supply: value.supply,
     in: value.in ?? 0,
     out: value.out ?? 0,
@@ -5067,6 +5205,7 @@ function useStockRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { supply: 1 } },
         { key: { balance: 1 } },
         { key: { status: 1 } }
@@ -5105,15 +5244,18 @@ function useStockRepository() {
     limit = 10,
     search = "",
     site,
+    serviceType,
     supply
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      serviceType
     };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new ObjectId15(site);
@@ -5237,6 +5379,7 @@ function useStockController() {
     const payload = { ...req.body, ...req.params };
     const validation = Joi13.object({
       site: Joi13.string().hex().required(),
+      serviceType: Joi13.string().valid(...Object.values(ServiceType)).required(),
       supply: Joi13.string().hex().required(),
       qty: Joi13.number().min(0).required(),
       remarks: Joi13.string().optional().allow("", null)
@@ -5264,6 +5407,7 @@ function useStockController() {
       limit: Joi13.number().min(1).optional().allow("", null),
       search: Joi13.string().optional().allow("", null),
       site: Joi13.string().hex().required(),
+      serviceType: Joi13.string().valid(...Object.values(ServiceType)).required(),
       supply: Joi13.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -5276,6 +5420,7 @@ function useStockController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     const supply = req.params.supply ?? "";
     try {
       const data = await _getStocksBySupplyId({
@@ -5283,6 +5428,7 @@ function useStockController() {
         limit,
         search,
         site,
+        serviceType,
         supply
       });
       res.json(data);
@@ -5306,6 +5452,7 @@ import { BadRequestError as BadRequestError24, logger as logger27 } from "@7365a
 var allowedCheckOutItemStatus = ["pending", "completed"];
 var checkOutItemSchema = Joi14.object({
   site: Joi14.string().hex().required(),
+  serviceType: Joi14.string().valid(...Object.values(ServiceType)).required(),
   supply: Joi14.string().hex().required(),
   supplyName: Joi14.string().required(),
   qty: Joi14.number().min(0).required(),
@@ -5335,6 +5482,7 @@ function MCheckOutItem(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     supply: value.supply,
     supplyName: value.supplyName,
     qty: value.qty,
@@ -5372,6 +5520,7 @@ function useCheckOutItemRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { supply: 1 } },
         { key: { status: 1 } }
       ]);
@@ -5411,15 +5560,18 @@ function useCheckOutItemRepository() {
     page = 1,
     limit = 10,
     search = "",
-    site
+    site,
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      serviceType
     };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new ObjectId17(site);
@@ -5533,6 +5685,7 @@ function useCheckOutItemRepository() {
           {
             $project: {
               site: 1,
+              serviceType: 1,
               supply: 1,
               supplyName: 1,
               qty: 1,
@@ -5635,6 +5788,7 @@ function useCheckOutItemService() {
       const createdStocks = await createStock(
         {
           site: checkOutItem.site.toString(),
+          serviceType: checkOutItem.serviceType,
           supply: checkOutItem.supply.toString(),
           qty: checkOutItem.qty
         },
@@ -5655,7 +5809,7 @@ function useCheckOutItemService() {
     const session = useAtlas13.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const { site, createdBy, items } = value;
+      const { site, serviceType, createdBy, items } = value;
       const createdByData = await getUserById(createdBy);
       const createdCheckOutItemIds = [];
       for (const item of items) {
@@ -5663,6 +5817,7 @@ function useCheckOutItemService() {
         const createdId = await _createCheckOutItem(
           {
             site,
+            serviceType,
             supply: item.supply,
             supplyName: supplyData?.name || "",
             qty: item.qty,
@@ -5675,6 +5830,7 @@ function useCheckOutItemService() {
         await createStock(
           {
             site,
+            serviceType,
             supply: item.supply,
             qty: item.qty
           },
@@ -5723,6 +5879,7 @@ function useCheckOutItemController() {
     };
     const validation = Joi15.object({
       site: Joi15.string().hex().required(),
+      serviceType: Joi15.string().valid(...Object.values(ServiceType)).required(),
       supply: Joi15.string().hex().required(),
       qty: Joi15.number().min(0).required(),
       attachment: Joi15.array().items(Joi15.string()).optional().allow(null),
@@ -5757,6 +5914,7 @@ function useCheckOutItemController() {
     };
     const validation = Joi15.object({
       site: Joi15.string().hex().required(),
+      serviceType: Joi15.string().valid(...Object.values(ServiceType)).required(),
       createdBy: Joi15.string().hex().required(),
       items: Joi15.array().items(
         Joi15.object({
@@ -5788,7 +5946,8 @@ function useCheckOutItemController() {
       page: Joi15.number().min(1).optional().allow("", null),
       limit: Joi15.number().min(1).optional().allow("", null),
       search: Joi15.string().optional().allow("", null),
-      site: Joi15.string().hex().required()
+      site: Joi15.string().hex().required(),
+      serviceType: Joi15.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5800,12 +5959,14 @@ function useCheckOutItemController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getCheckOutItems({
         page,
         limit,
         search,
-        site
+        site,
+        serviceType
       });
       res.json(data);
       return;
@@ -5848,6 +6009,7 @@ import Joi16 from "joi";
 import { ObjectId as ObjectId18 } from "mongodb";
 var scheduleTaskSchema = Joi16.object({
   site: Joi16.string().hex().required(),
+  serviceType: Joi16.string().valid(...Object.values(ServiceType)).required(),
   title: Joi16.string().required(),
   time: Joi16.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
   dates: Joi16.array().min(1).items(
@@ -5896,6 +6058,7 @@ function MScheduleTask(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     title: value.title,
     time: value.time,
     dates: value.dates,
@@ -5933,6 +6096,7 @@ function useScheduleTaskRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { status: 1 } }
       ]);
     } catch (error) {
@@ -5971,15 +6135,18 @@ function useScheduleTaskRepository() {
     page = 1,
     limit = 10,
     search = "",
-    site
+    site,
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      serviceType
     };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new ObjectId19(site);
@@ -5989,7 +6156,7 @@ function useScheduleTaskRepository() {
       throw new BadRequestError29("Invalid site ID format.");
     }
     if (search) {
-      query.$or = [{ name: { $regex: search, $options: "i" } }];
+      query.$or = [{ title: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
     const cacheKey = makeCacheKey9(namespace_collection, cacheOptions);
@@ -6035,62 +6202,6 @@ function useScheduleTaskRepository() {
       throw error;
     }
   }
-  async function getTasksForScheduleTask({
-    page = 1,
-    limit = 10,
-    search = "",
-    site
-  }) {
-    page = page > 0 ? page - 1 : 0;
-    const query = {
-      status: { $ne: "deleted" }
-    };
-    const cacheOptions = {
-      page,
-      limit
-    };
-    try {
-      site = new ObjectId19(site);
-      query.site = site;
-      cacheOptions.site = site.toString();
-    } catch (error) {
-      throw new BadRequestError29("Invalid site ID format.");
-    }
-    if (search) {
-      query.$or = [{ name: { $regex: search, $options: "i" } }];
-      cacheOptions.search = search;
-    }
-    const cacheKey = makeCacheKey9(namespace_collection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger31.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
-    try {
-      const items = await collection.aggregate([
-        { $match: query },
-        {
-          $project: {
-            createdAt: 1,
-            title: 1
-          }
-        },
-        { $sort: { _id: -1 } },
-        { $skip: page * limit },
-        { $limit: limit }
-      ]).toArray();
-      const length = await collection.countDocuments(query);
-      const data = paginate8(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger31.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger31.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
-      return data;
-    } catch (error) {
-      throw error;
-    }
-  }
   async function getScheduleTaskById(_id, session) {
     try {
       _id = new ObjectId19(_id);
@@ -6184,15 +6295,48 @@ function useScheduleTaskRepository() {
       throw error;
     }
   }
+  async function deleteScheduleTask(_id, session) {
+    try {
+      _id = new ObjectId19(_id);
+    } catch (error) {
+      throw new BadRequestError29("Invalid schedule task ID format.");
+    }
+    try {
+      const updateValue = {
+        status: "deleted",
+        updatedAt: /* @__PURE__ */ new Date(),
+        deletedAt: /* @__PURE__ */ new Date()
+      };
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
+      if (res.modifiedCount === 0) {
+        throw new InternalServerError11("Unable to delete schedule task.");
+      }
+      delNamespace().then(() => {
+        logger31.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger31.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.modifiedCount;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
     createScheduleTask,
     getScheduleTasks,
     getAllScheduleTask,
-    getTasksForScheduleTask,
     getScheduleTaskById,
-    updateScheduleTask
+    updateScheduleTask,
+    deleteScheduleTask
   };
 }
 
@@ -6208,7 +6352,7 @@ function useScheduleTaskService() {
     pushScheduleTaskSets
   } = useAreaChecklistRepo();
   const { getAreaById } = useAreaRepo();
-  function checkScheduleConditions(schedule, currentDate = /* @__PURE__ */ new Date()) {
+  function checkScheduleConditions(schedule, serviceType, currentDate = /* @__PURE__ */ new Date()) {
     try {
       const now = currentDate;
       const timeString = now.toLocaleTimeString("en-US", {
@@ -6299,12 +6443,17 @@ function useScheduleTaskService() {
       const validatedTasks = [];
       for (const scheduleTask of scheduleTasks) {
         try {
+          const serviceType = scheduleTask.serviceType;
           logger32.info(
             `Checking schedule ${scheduleTask._id} - ${scheduleTask.title}: time=${scheduleTask.time}, dates=${JSON.stringify(
               scheduleTask.dates
             )}`
           );
-          const shouldRun = checkScheduleConditions(scheduleTask, currentDate);
+          const shouldRun = checkScheduleConditions(
+            scheduleTask,
+            serviceType,
+            currentDate
+          );
           if (!shouldRun) {
             logger32.info(
               `Schedule ${scheduleTask._id} conditions not met, skipping`
@@ -6327,6 +6476,7 @@ function useScheduleTaskService() {
           );
           const parentChecklistIds = await createParentChecklist({
             site: scheduleTask.site.toString(),
+            serviceType,
             createdAt: /* @__PURE__ */ new Date()
           });
           const parentChecklistId = Array.isArray(parentChecklistIds) ? parentChecklistIds[0] : parentChecklistIds;
@@ -6364,8 +6514,11 @@ function useScheduleTaskService() {
               let existingAreaChecklist;
               try {
                 existingAreaChecklist = await getAreaChecklistByAreaAndSchedule(
-                  parentChecklistId.toString(),
-                  areaId
+                  {
+                    schedule: parentChecklistId.toString(),
+                    serviceType,
+                    area: areaId
+                  }
                 );
                 logger32.info(
                   `Area ${area.name} (${areaId}): Existing area checklist found: ${existingAreaChecklist ? "Yes" : "No"}`
@@ -6402,6 +6555,7 @@ function useScheduleTaskService() {
                 );
                 const modified = await pushScheduleTaskSets(
                   parentChecklistId.toString(),
+                  serviceType,
                   areaId,
                   scheduleTask._id.toString(),
                   newSets
@@ -6429,6 +6583,7 @@ function useScheduleTaskService() {
                 );
                 const checklistData = {
                   schedule: parentChecklistId.toString(),
+                  serviceType,
                   area: areaId,
                   name: area.name,
                   type: areaDetails.type || "common",
@@ -6483,9 +6638,9 @@ function useScheduleTaskController() {
   const {
     createScheduleTask: _createScheduleTask,
     getScheduleTasks: _getScheduleTasks,
-    getTasksForScheduleTask: _getTasksForScheduleTask,
     getScheduleTaskById: _getScheduleTaskById,
-    updateScheduleTask: _updateScheduleTask
+    updateScheduleTask: _updateScheduleTask,
+    deleteScheduleTask: _deleteScheduleTask
   } = useScheduleTaskRepository();
   async function createScheduleTask(req, res, next) {
     const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
@@ -6516,7 +6671,8 @@ function useScheduleTaskController() {
       page: Joi17.number().min(1).optional().allow("", null),
       limit: Joi17.number().min(1).optional().allow("", null),
       search: Joi17.string().optional().allow("", null),
-      site: Joi17.string().hex().required()
+      site: Joi17.string().hex().required(),
+      serviceType: Joi17.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -6528,45 +6684,14 @@ function useScheduleTaskController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getScheduleTasks({
         page,
         limit,
         search,
-        site
-      });
-      res.json(data);
-      return;
-    } catch (error2) {
-      logger33.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function getTasksForScheduleTask(req, res, next) {
-    const query = { ...req.query, ...req.params };
-    const validation = Joi17.object({
-      page: Joi17.number().min(1).optional().allow("", null),
-      limit: Joi17.number().min(1).optional().allow("", null),
-      search: Joi17.string().optional().allow("", null),
-      site: Joi17.string().hex().required()
-    });
-    const { error } = validation.validate(query);
-    if (error) {
-      logger33.log({ level: "error", message: error.message });
-      next(new BadRequestError30(error.message));
-      return;
-    }
-    const page = parseInt(req.query.page) ?? 1;
-    const limit = parseInt(req.query.limit) ?? 10;
-    const search = req.query.search ?? "";
-    const site = req.params.site ?? "";
-    try {
-      const data = await _getTasksForScheduleTask({
-        page,
-        limit,
-        search,
-        site
+        site,
+        serviceType
       });
       res.json(data);
       return;
@@ -6629,12 +6754,31 @@ function useScheduleTaskController() {
       return;
     }
   }
+  async function deleteScheduleTask(req, res, next) {
+    const validation = Joi17.string().hex().required();
+    const _id = req.params.id;
+    const { error, value } = validation.validate(_id);
+    if (error) {
+      logger33.log({ level: "error", message: error.message });
+      next(new BadRequestError30(error.message));
+      return;
+    }
+    try {
+      const data = await _deleteScheduleTask(value);
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger33.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     createScheduleTask,
     getScheduleTasks,
-    getTasksForScheduleTask,
     getScheduleTaskById,
-    updateScheduleTask
+    updateScheduleTask,
+    deleteScheduleTask
   };
 }