@iservice365/module-hygiene 1.4.0 → 1.5.0

package/dist/index.mjs

@@ -200,12 +200,9 @@ function useAreaRepo() {
       throw error;
     }
   }
-  async function getAreasForChecklist({
-    site,
-    type
-  }) {
-    const query = { type, status: { $ne: "deleted" } };
-    const cacheOptions = { type };
+  async function getAreasForChecklist(site) {
+    const query = { status: { $ne: "deleted" } };
+    const cacheOptions = {};
     try {
       site = new ObjectId2(site);
       query.site = site;
@@ -225,6 +222,7 @@ function useAreaRepo() {
         {
           $project: {
             name: 1,
+            type: 1,
             set: 1,
             units: 1
           }
@@ -284,6 +282,28 @@ function useAreaRepo() {
       throw error;
     }
   }
+  async function getAreaByMultipleId(_id) {
+    for (let i = 0; i < _id.length; i++) {
+      try {
+        _id[i] = new ObjectId2(_id[i]);
+      } catch (error) {
+        throw new BadRequestError2("Invalid area ID format.");
+      }
+    }
+    const query = {
+      _id: { $in: _id },
+      status: { $ne: "deleted" }
+    };
+    try {
+      const data = await collection.aggregate([{ $match: query }]).toArray();
+      if (!data || data.length === 0) {
+        throw new NotFoundError("Area not found.");
+      }
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   async function verifyAreaByUnitId(unitId) {
     try {
       unitId = new ObjectId2(unitId);
@@ -445,6 +465,7 @@ function useAreaRepo() {
     getAreas,
     getAreasForChecklist,
     getAreaById,
+    getAreaByMultipleId,
     verifyAreaByUnitId,
     updateArea,
     updateAreaChecklist,
@@ -1645,6 +1666,7 @@ import { ObjectId as ObjectId7 } from "mongodb";
 var allowedChecklistStatus = ["ready", "completed"];
 var areaChecklistSchema = Joi7.object({
   schedule: Joi7.string().hex().required(),
+  area: Joi7.string().hex().required(),
   name: Joi7.string().required(),
   type: Joi7.string().valid(...allowedTypes).required(),
   checklist: Joi7.array().items(
@@ -1672,6 +1694,13 @@ function MAreaChecklist(value) {
       throw new BadRequestError12("Invalid schedule ID format.");
     }
   }
+  if (value.area) {
+    try {
+      value.area = new ObjectId7(value.area);
+    } catch (error2) {
+      throw new BadRequestError12("Invalid area ID format.");
+    }
+  }
   if (value.checklist && Array.isArray(value.checklist)) {
     value.checklist = value.checklist.map((checklistItem) => {
       return {
@@ -1689,6 +1718,7 @@ function MAreaChecklist(value) {
   }
   return {
     schedule: value.schedule,
+    area: value.area,
     name: value.name,
     type: value.type,
     checklist: value.checklist || [],
@@ -2395,19 +2425,17 @@ function useAreaChecklistService() {
       const results = [];
       let totalChecklistsCreated = 0;
       const BATCH_SIZE = 10;
-      const commonAreasResult = await getAreasForChecklist({
-        site: value.site,
-        type: "common"
-      });
-      const commonAreas = commonAreasResult || [];
-      if (commonAreas.length > 0) {
-        for (let i = 0; i < commonAreas.length; i += BATCH_SIZE) {
-          const batch = commonAreas.slice(i, i + BATCH_SIZE);
+      const areasResult = await getAreasForChecklist(value.site);
+      const areas = areasResult || [];
+      if (areas.length > 0) {
+        for (let i = 0; i < areas.length; i += BATCH_SIZE) {
+          const batch = areas.slice(i, i + BATCH_SIZE);
           const batchPromises = batch.map(async (area) => {
             const checklistData = {
               schedule: value.schedule,
+              area: area._id.toString(),
               name: area.name,
-              type: "common",
+              type: area.type,
               checklist: area.units && area.units.length > 0 ? Array.from({ length: area.set || 1 }, (_, index) => ({
                 set: index + 1,
                 units: area.units.map((unit) => ({
@@ -2427,51 +2455,11 @@ function useAreaChecklistService() {
           results.push(...batchResults);
         }
         logger14.info(
-          `Created ${commonAreas.length} common area checklists for site: ${value.site}`
+          `Created ${areas.length} common area checklists for site: ${value.site}`
         );
       } else {
         logger14.warn(`No common areas found for site: ${value.site}`);
       }
-      const toiletAreasResult = await getAreasForChecklist({
-        site: value.site,
-        type: "toilet"
-      });
-      const toiletAreas = toiletAreasResult || [];
-      if (toiletAreas.length > 0) {
-        for (let i = 0; i < toiletAreas.length; i += BATCH_SIZE) {
-          const batch = toiletAreas.slice(i, i + BATCH_SIZE);
-          const batchPromises = batch.map(async (toiletLocation) => {
-            const checklistData = {
-              schedule: value.schedule,
-              name: toiletLocation.name,
-              type: "toilet",
-              checklist: toiletLocation.units && toiletLocation.units.length > 0 ? Array.from(
-                { length: toiletLocation.set || 1 },
-                (_, index) => ({
-                  set: index + 1,
-                  units: toiletLocation.units.map((unit) => ({
-                    unit: unit.unit.toString(),
-                    name: unit.name
-                  }))
-                })
-              ) : []
-            };
-            const insertedId = await _createAreaChecklist(
-              checklistData,
-              session
-            );
-            totalChecklistsCreated++;
-            return insertedId;
-          });
-          const batchResults = await Promise.all(batchPromises);
-          results.push(...batchResults);
-        }
-        logger14.info(
-          `Created ${toiletAreas.length} toilet area checklists for site: ${value.site}`
-        );
-      } else {
-        logger14.warn(`No toilet locations found for site: ${value.site}`);
-      }
       await session?.commitTransaction();
       logger14.info(
         `Successfully created ${totalChecklistsCreated} area checklists for site: ${value.site}`
@@ -4124,24 +4112,22 @@ function useRequestItemController() {
 import { BadRequestError as BadRequestError26, logger as logger25 } from "@iservice365/node-server-utils";
 import Joi15 from "joi";
 import { ObjectId as ObjectId15 } from "mongodb";
-var allowedFrequency = ["week", "month", "quarter", "year"];
-var allowedDays = [
-  "Mon",
-  "Tue",
-  "Wed",
-  "Thu",
-  "Fri",
-  "Sat",
-  "Sun"
+var allowedFrequency = [
+  "daily",
+  "weekly",
+  "monthly",
+  "annually"
 ];
-var allowedQuarter = ["1st", "2nd", "3rd", "4th"];
-var allowedWeekOfMonth = [
-  "1st",
-  "2nd",
-  "3rd",
-  "4th",
-  "last"
+var allowedDays = [
+  "Monday",
+  "Tuesday",
+  "Wednesday",
+  "Thursday",
+  "Friday",
+  "Saturday",
+  "Sunday"
 ];
+var allowedWeekOfMonth = ["start", "end"];
 var allowedMonths = [
   "January",
   "February",
@@ -4161,22 +4147,10 @@ var scheduleTaskSchema = Joi15.object({
   title: Joi15.string().required(),
   frequency: Joi15.string().valid(...allowedFrequency).required(),
   time: Joi15.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
-  day: Joi15.string().valid(...allowedDays).required(),
-  weekOfMonth: Joi15.string().valid(...allowedWeekOfMonth).when("frequency", {
-    is: Joi15.string().valid("month", "quarter", "year"),
-    then: Joi15.required(),
-    otherwise: Joi15.optional().allow("", null)
-  }),
-  quarter: Joi15.string().valid(...allowedQuarter).when("frequency", {
-    is: "quarter",
-    then: Joi15.required(),
-    otherwise: Joi15.optional().allow("", null)
-  }),
-  month: Joi15.string().valid(...allowedMonths).when("frequency", {
-    is: Joi15.string().valid("quarter", "year"),
-    then: Joi15.required(),
-    otherwise: Joi15.optional().allow("", null)
-  }),
+  day: Joi15.array().items(Joi15.string().valid(...allowedDays)).optional().allow(null),
+  weekOfMonth: Joi15.string().valid(...allowedWeekOfMonth).optional().allow("", null),
+  month: Joi15.string().valid(...allowedMonths).optional().allow("", null),
+  date: Joi15.number().min(1).max(31).optional().allow(null),
   description: Joi15.string().optional().allow("", null),
   areas: Joi15.array().min(1).items(
     Joi15.object({
@@ -4217,8 +4191,8 @@ function MScheduleTask(value) {
     time: value.time,
     day: value.day,
     weekOfMonth: value.weekOfMonth,
-    quarter: value.quarter,
     month: value.month,
+    date: value.date,
     description: value.description,
     areas: value.areas,
     status: "active",
@@ -4343,6 +4317,73 @@ function useScheduleTaskRepository() {
       throw error;
     }
   }
+  async function getAllScheduleTask() {
+    const query = {
+      status: { $ne: "deleted" }
+    };
+    try {
+      const items = await collection.aggregate([{ $match: query }, { $sort: { _id: -1 } }]).toArray();
+      return items;
+    } catch (error) {
+      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 ObjectId16(site);
+      query.site = site;
+      cacheOptions.site = site.toString();
+    } catch (error) {
+      throw new BadRequestError27("Invalid site ID format.");
+    }
+    if (search) {
+      query.$or = [{ name: { $regex: search, $options: "i" } }];
+      cacheOptions.search = search;
+    }
+    const cacheKey = makeCacheKey8(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger26.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(() => {
+        logger26.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger26.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   async function getScheduleTaskById(_id, session) {
     try {
       _id = new ObjectId16(_id);
@@ -4375,8 +4416,8 @@ function useScheduleTaskRepository() {
             time: 1,
             day: 1,
             weekOfMonth: 1,
-            quarter: 1,
             month: 1,
+            date: 1,
             description: 1,
             areas: 1,
             status: 1,
@@ -4445,18 +4486,213 @@ function useScheduleTaskRepository() {
     createTextIndex,
     createScheduleTask,
     getScheduleTasks,
+    getAllScheduleTask,
+    getTasksForScheduleTask,
     getScheduleTaskById,
     updateScheduleTask
   };
 }
 
+// src/services/hygiene-schedule-task.service.ts
+import { logger as logger27 } from "@iservice365/node-server-utils";
+function useScheduleTaskService() {
+  const { getAllScheduleTask } = useScheduleTaskRepository();
+  const { createAreaChecklist } = useAreaChecklistService();
+  const { createParentChecklist } = useParentChecklistRepo();
+  function checkScheduleConditions(schedule, currentDate = /* @__PURE__ */ new Date()) {
+    try {
+      const now = currentDate;
+      const currentDay = now.toLocaleDateString("en-US", {
+        weekday: "long",
+        timeZone: "Asia/Singapore"
+      });
+      const currentMonth = now.toLocaleDateString("en-US", {
+        month: "long",
+        timeZone: "Asia/Singapore"
+      });
+      const currentDate_num = Number(
+        now.toLocaleDateString("en-US", {
+          day: "numeric",
+          timeZone: "Asia/Singapore"
+        })
+      );
+      const timeString = now.toLocaleTimeString("en-US", {
+        hour: "2-digit",
+        minute: "2-digit",
+        hour12: false,
+        timeZone: "Asia/Singapore"
+      });
+      const [currentHour, currentMinute] = timeString.split(":").map(Number);
+      logger27.info(
+        `Checking schedule ${schedule._id}: Current time ${currentHour}:${currentMinute}, Schedule time ${schedule.time}, Frequency ${schedule.frequency}`
+      );
+      const [scheduleHour, scheduleMinute] = schedule.time.split(":").map(Number);
+      const timeMatches = currentHour === scheduleHour && currentMinute === scheduleMinute;
+      if (!timeMatches) {
+        logger27.info(
+          `Schedule ${schedule._id}: Time does not match. Current: ${currentHour}:${currentMinute}, Expected: ${scheduleHour}:${scheduleMinute}`
+        );
+        return false;
+      }
+      logger27.info(
+        `Schedule ${schedule._id}: Time matches, checking frequency...`
+      );
+      switch (schedule.frequency) {
+        case "daily":
+          logger27.info(`Schedule ${schedule._id}: Daily frequency matched`);
+          return true;
+        case "weekly":
+          if (!schedule.day || schedule.day.length === 0) {
+            logger27.warn(
+              `Schedule ${schedule._id} is weekly but has no days specified`
+            );
+            return false;
+          }
+          const dayMatches = schedule.day.includes(currentDay);
+          logger27.info(
+            `Schedule ${schedule._id}: Weekly - Current day: ${currentDay}, Schedule days: ${schedule.day.join(
+              ", "
+            )}, Match: ${dayMatches}`
+          );
+          return dayMatches;
+        case "monthly":
+          if (!schedule.weekOfMonth) {
+            logger27.warn(
+              `Schedule ${schedule._id} is monthly but has no weekOfMonth specified`
+            );
+            return false;
+          }
+          if (schedule.weekOfMonth === "start") {
+            const matches2 = currentDate_num >= 1 && currentDate_num <= 7;
+            logger27.info(
+              `Schedule ${schedule._id}: Monthly start - Current date: ${currentDate_num}, Match: ${matches2}`
+            );
+            return matches2;
+          } else if (schedule.weekOfMonth === "end") {
+            const lastDayOfMonth = new Date(
+              now.getFullYear(),
+              now.getMonth() + 1,
+              0
+            ).getDate();
+            const matches2 = currentDate_num > lastDayOfMonth - 7;
+            logger27.info(
+              `Schedule ${schedule._id}: Monthly end - Current date: ${currentDate_num}, Last day: ${lastDayOfMonth}, Match: ${matches2}`
+            );
+            return matches2;
+          }
+          return false;
+        case "annually":
+          if (!schedule.month || !schedule.date) {
+            logger27.warn(
+              `Schedule ${schedule._id} is annually but has no month or date specified`
+            );
+            return false;
+          }
+          const matches = currentMonth === schedule.month && currentDate_num === schedule.date;
+          logger27.info(
+            `Schedule ${schedule._id}: Annually - Current: ${currentMonth} ${currentDate_num}, Expected: ${schedule.month} ${schedule.date}, Match: ${matches}`
+          );
+          return matches;
+        default:
+          logger27.warn(`Unknown frequency type: ${schedule.frequency}`);
+          return false;
+      }
+    } catch (error) {
+      logger27.error(
+        `Error checking schedule conditions for ${schedule._id}:`,
+        error
+      );
+      return false;
+    }
+  }
+  async function processScheduledTasks(currentDate) {
+    try {
+      logger27.info("Starting scheduled task processing...");
+      const scheduleTasks = await getAllScheduleTask();
+      if (!scheduleTasks || scheduleTasks.length === 0) {
+        logger27.info("No schedule tasks found to process");
+        return { processed: 0, validated: 0 };
+      }
+      logger27.info(`Found ${scheduleTasks.length} schedule tasks to check`);
+      let processedCount = 0;
+      let validatedCount = 0;
+      const validatedTasks = [];
+      for (const scheduleTask of scheduleTasks) {
+        try {
+          logger27.info(
+            `Checking schedule ${scheduleTask._id} - ${scheduleTask.title}: time=${scheduleTask.time}, frequency=${scheduleTask.frequency}`
+          );
+          const shouldRun = checkScheduleConditions(scheduleTask, currentDate);
+          if (!shouldRun) {
+            logger27.info(
+              `Schedule ${scheduleTask._id} conditions not met, skipping`
+            );
+            continue;
+          }
+          logger27.info(
+            `Schedule ${scheduleTask._id} conditions validated, creating area checklists`
+          );
+          if (!scheduleTask._id) {
+            logger27.warn(`Schedule ${scheduleTask.title} has no _id, skipping`);
+            continue;
+          }
+          if (!scheduleTask.site) {
+            logger27.warn(`Schedule ${scheduleTask._id} has no site, skipping`);
+            continue;
+          }
+          logger27.info(
+            `Getting or creating parent checklist for schedule ${scheduleTask._id} in site ${scheduleTask.site}`
+          );
+          const parentChecklistIds = await createParentChecklist({
+            site: scheduleTask.site.toString(),
+            createdAt: /* @__PURE__ */ new Date()
+          });
+          const parentChecklistId = Array.isArray(parentChecklistIds) ? parentChecklistIds[0] : parentChecklistIds;
+          logger27.info(
+            `Using parent checklist ${parentChecklistId}, now creating area checklists`
+          );
+          const createdChecklistIds = await createAreaChecklist({
+            schedule: parentChecklistId.toString(),
+            site: scheduleTask.site.toString()
+          });
+          processedCount++;
+          validatedCount++;
+          validatedTasks.push(scheduleTask);
+          logger27.info(
+            `Successfully processed schedule ${scheduleTask._id}, created parent checklist ${parentChecklistId} and ${createdChecklistIds.length} area checklists`
+          );
+        } catch (error) {
+          logger27.error(
+            `Error processing schedule task ${scheduleTask._id}:`,
+            error
+          );
+          continue;
+        }
+      }
+      logger27.info(
+        `Scheduled task processing completed. Processed: ${processedCount}, Validated: ${validatedCount} tasks`
+      );
+      return {
+        processed: processedCount,
+        validated: validatedCount,
+        tasks: validatedTasks
+      };
+    } catch (error) {
+      logger27.error("Error processing scheduled tasks:", error);
+      throw error;
+    }
+  }
+  return { checkScheduleConditions, processScheduledTasks };
+}
+
 // src/controllers/hygiene-schedule-task.controller.ts
-import { BadRequestError as BadRequestError28, logger as logger27 } from "@iservice365/node-server-utils";
+import { BadRequestError as BadRequestError28, logger as logger28 } from "@iservice365/node-server-utils";
 import Joi16 from "joi";
 function useScheduleTaskController() {
   const {
     createScheduleTask: _createScheduleTask,
     getScheduleTasks: _getScheduleTasks,
+    getTasksForScheduleTask: _getTasksForScheduleTask,
     getScheduleTaskById: _getScheduleTaskById,
     updateScheduleTask: _updateScheduleTask
   } = useScheduleTaskRepository();
@@ -4464,7 +4700,7 @@ function useScheduleTaskController() {
     const payload = { ...req.body, ...req.params };
     const { error } = scheduleTaskSchema.validate(payload);
     if (error) {
-      logger27.log({ level: "error", message: error.message });
+      logger28.log({ level: "error", message: error.message });
       next(new BadRequestError28(error.message));
       return;
     }
@@ -4473,7 +4709,7 @@ function useScheduleTaskController() {
       res.status(201).json({ message: "Schedule task created successfully.", id });
       return;
     } catch (error2) {
-      logger27.log({ level: "error", message: error2.message });
+      logger28.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4488,7 +4724,7 @@ function useScheduleTaskController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger27.log({ level: "error", message: error.message });
+      logger28.log({ level: "error", message: error.message });
       next(new BadRequestError28(error.message));
       return;
     }
@@ -4506,7 +4742,40 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger27.log({ level: "error", message: error2.message });
+      logger28.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getTasksForScheduleTask(req, res, next) {
+    const query = { ...req.query, ...req.params };
+    const validation = Joi16.object({
+      page: Joi16.number().min(1).optional().allow("", null),
+      limit: Joi16.number().min(1).optional().allow("", null),
+      search: Joi16.string().optional().allow("", null),
+      site: Joi16.string().hex().required()
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      logger28.log({ level: "error", message: error.message });
+      next(new BadRequestError28(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
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger28.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4516,7 +4785,7 @@ function useScheduleTaskController() {
     const _id = req.params.id;
     const { error } = validation.validate(_id);
     if (error) {
-      logger27.log({ level: "error", message: error.message });
+      logger28.log({ level: "error", message: error.message });
       next(new BadRequestError28(error.message));
       return;
     }
@@ -4525,7 +4794,7 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger27.log({ level: "error", message: error2.message });
+      logger28.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4537,10 +4806,10 @@ function useScheduleTaskController() {
       title: Joi16.string().optional().allow("", null),
       frequency: Joi16.string().valid(...allowedFrequency).optional().allow("", null),
       time: Joi16.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).optional().allow("", null),
-      day: Joi16.string().valid(...allowedDays).optional().allow("", null),
+      day: Joi16.array().items(Joi16.string().valid(...allowedDays)).optional().allow(null),
       weekOfMonth: Joi16.string().valid(...allowedWeekOfMonth).optional().allow("", null),
-      quarter: Joi16.string().valid(...allowedQuarter).optional().allow("", null),
       month: Joi16.string().valid(...allowedMonths).optional().allow("", null),
+      date: Joi16.number().min(1).max(31).optional().allow(null),
       description: Joi16.string().optional().allow("", null),
       areas: Joi16.array().min(1).items(
         Joi16.object({
@@ -4551,7 +4820,7 @@ function useScheduleTaskController() {
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger27.log({ level: "error", message: error.message });
+      logger28.log({ level: "error", message: error.message });
       next(new BadRequestError28(error.message));
       return;
     }
@@ -4561,7 +4830,7 @@ function useScheduleTaskController() {
       res.json({ message: "Schedule task updated successfully." });
       return;
     } catch (error2) {
-      logger27.log({ level: "error", message: error2.message });
+      logger28.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4569,6 +4838,7 @@ function useScheduleTaskController() {
   return {
     createScheduleTask,
     getScheduleTasks,
+    getTasksForScheduleTask,
     getScheduleTaskById,
     updateScheduleTask
   };
@@ -4586,7 +4856,6 @@ export {
   allowedDays,
   allowedFrequency,
   allowedMonths,
-  allowedQuarter,
   allowedRequestItemStatus,
   allowedStatus,
   allowedTypes,
@@ -4612,6 +4881,7 @@ export {
   useRequestItemService,
   useScheduleTaskController,
   useScheduleTaskRepository,
+  useScheduleTaskService,
   useStockController,
   useStockRepository,
   useStockService,