@7365admin1/module-hygiene 2.0.1 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @7365admin1/module-hygiene
 
+## 3.0.0
+
+### Major Changes
+
+- Update TScheduleTask model to remove frequency-based fields and add startDate/endDate
+
 ## 2.0.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -462,52 +462,42 @@ declare function useRequestItemController(): {
     disapproveRequestItem: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-declare const allowedFrequency: string[];
-declare const allowedDays: string[];
-declare const allowedWeekOfMonth: string[];
-declare const allowedMonths: string[];
 type TScheduleTask = {
     _id?: ObjectId;
     site: string | ObjectId;
     title: string;
-    frequency: (typeof allowedFrequency)[number];
     time: string;
-    day?: (typeof allowedDays)[number][];
-    weekOfMonth?: (typeof allowedWeekOfMonth)[number];
-    month?: (typeof allowedMonths)[number];
-    date?: number;
+    startDate: string;
+    endDate?: string;
     description?: string;
     areas: {
         name: string;
-        value: Object;
+        value: ObjectId;
     }[];
     status?: "active" | "deleted";
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
 };
-type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "title" | "frequency" | "time" | "day" | "weekOfMonth" | "month" | "date" | "description" | "areas">;
+type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "title" | "time" | "startDate" | "endDate" | "description" | "areas">;
 type TScheduleTaskGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
 } & Pick<TScheduleTask, "site">;
-type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "frequency" | "time" | "day" | "weekOfMonth" | "month" | "date" | "description" | "areas" | "status" | "createdAt">;
-type TScheduleTaskUpdate = Partial<Pick<TScheduleTask, "title" | "frequency" | "time" | "day" | "weekOfMonth" | "month" | "date" | "description" | "areas">>;
+type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "time" | "startDate" | "endDate" | "description" | "areas" | "status" | "createdAt">;
+type TScheduleTaskUpdate = Partial<Pick<TScheduleTask, "title" | "time" | "startDate" | "endDate" | "description" | "areas">>;
 declare const scheduleTaskSchema: Joi.ObjectSchema<any>;
 declare function MScheduleTask(value: TScheduleTaskCreate): {
     site: string | ObjectId;
     title: string;
-    frequency: string;
     time: string;
-    day: string[] | undefined;
-    weekOfMonth: string | undefined;
-    month: string | undefined;
-    date: number | undefined;
+    startDate: string;
+    endDate: string | undefined;
     description: string | undefined;
     areas: {
         name: string;
-        value: Object;
+        value: ObjectId;
     }[];
     status: string;
     createdAt: Date;
@@ -547,4 +537,4 @@ declare function useScheduleTaskController(): {
     updateScheduleTask: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-export { MArea, MAreaChecklist, MParentChecklist, MRequestItem, MScheduleTask, MStock, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistBatchCreate, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaChecklistUpdate, TAreaCreate, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCleaningScheduleArea, TCleaningScheduleAreaGetQuery, TGetStocksQuery, TParentChecklist, TParentChecklistGetQuery, TRequestItem, TRequestItemCreate, TRequestItemCreateByBatchService, TRequestItemCreateService, TRequestItemGetById, TRequestItemGetQuery, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskGetQuery, TScheduleTaskUpdate, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyGetQuery, TSupplyUpdate, TUnit, TUnitCreate, TUnitGetQuery, TUnitUpdate, allowedChecklistStatus, allowedDays, allowedFrequency, allowedMonths, allowedPeriods, allowedRequestItemStatus, allowedStatus, allowedTypes, allowedWeekOfMonth, areaChecklistSchema, areaSchema, parentChecklistSchema, requestItemSchema, scheduleTaskSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaRepo, useAreaService, useHygieneDashboardController, useHygieneDashboardRepository, useParentChecklistController, useParentChecklistRepo, useRequestItemController, useRequestItemRepository, useRequestItemService, useScheduleTaskController, useScheduleTaskRepository, useScheduleTaskService, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useUnitController, useUnitRepository, useUnitService };
+export { MArea, MAreaChecklist, MParentChecklist, MRequestItem, MScheduleTask, MStock, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistBatchCreate, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaChecklistUpdate, TAreaCreate, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCleaningScheduleArea, TCleaningScheduleAreaGetQuery, TGetStocksQuery, TParentChecklist, TParentChecklistGetQuery, TRequestItem, TRequestItemCreate, TRequestItemCreateByBatchService, TRequestItemCreateService, TRequestItemGetById, TRequestItemGetQuery, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskGetQuery, TScheduleTaskUpdate, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyGetQuery, TSupplyUpdate, TUnit, TUnitCreate, TUnitGetQuery, TUnitUpdate, allowedChecklistStatus, allowedPeriods, allowedRequestItemStatus, allowedStatus, allowedTypes, areaChecklistSchema, areaSchema, parentChecklistSchema, requestItemSchema, scheduleTaskSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaRepo, useAreaService, useHygieneDashboardController, useHygieneDashboardRepository, useParentChecklistController, useParentChecklistRepo, useRequestItemController, useRequestItemRepository, useRequestItemService, useScheduleTaskController, useScheduleTaskRepository, useScheduleTaskService, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useUnitController, useUnitRepository, useUnitService };

package/dist/index.js

@@ -39,14 +39,10 @@ __export(src_exports, {
   MSupply: () => MSupply,
   MUnit: () => MUnit,
   allowedChecklistStatus: () => allowedChecklistStatus,
-  allowedDays: () => allowedDays,
-  allowedFrequency: () => allowedFrequency,
-  allowedMonths: () => allowedMonths,
   allowedPeriods: () => allowedPeriods,
   allowedRequestItemStatus: () => allowedRequestItemStatus,
   allowedStatus: () => allowedStatus,
   allowedTypes: () => allowedTypes,
-  allowedWeekOfMonth: () => allowedWeekOfMonth,
   areaChecklistSchema: () => areaChecklistSchema,
   areaSchema: () => areaSchema,
   parentChecklistSchema: () => parentChecklistSchema,
@@ -4798,45 +4794,12 @@ function useRequestItemController() {
 var import_node_server_utils29 = require("@7365admin1/node-server-utils");
 var import_joi16 = __toESM(require("joi"));
 var import_mongodb16 = require("mongodb");
-var allowedFrequency = [
-  "daily",
-  "weekly",
-  "monthly",
-  "annually"
-];
-var allowedDays = [
-  "Monday",
-  "Tuesday",
-  "Wednesday",
-  "Thursday",
-  "Friday",
-  "Saturday",
-  "Sunday"
-];
-var allowedWeekOfMonth = ["start", "end"];
-var allowedMonths = [
-  "January",
-  "February",
-  "March",
-  "April",
-  "May",
-  "June",
-  "July",
-  "August",
-  "September",
-  "October",
-  "November",
-  "December"
-];
 var scheduleTaskSchema = import_joi16.default.object({
   site: import_joi16.default.string().hex().required(),
   title: import_joi16.default.string().required(),
-  frequency: import_joi16.default.string().valid(...allowedFrequency).required(),
   time: import_joi16.default.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
-  day: import_joi16.default.array().items(import_joi16.default.string().valid(...allowedDays)).optional().allow(null),
-  weekOfMonth: import_joi16.default.string().valid(...allowedWeekOfMonth).optional().allow("", null),
-  month: import_joi16.default.string().valid(...allowedMonths).optional().allow("", null),
-  date: import_joi16.default.number().min(1).max(31).optional().allow(null),
+  startDate: import_joi16.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required(),
+  endDate: import_joi16.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
   description: import_joi16.default.string().optional().allow("", null),
   areas: import_joi16.default.array().min(1).items(
     import_joi16.default.object({
@@ -4873,12 +4836,9 @@ function MScheduleTask(value) {
   return {
     site: value.site,
     title: value.title,
-    frequency: value.frequency,
     time: value.time,
-    day: value.day,
-    weekOfMonth: value.weekOfMonth,
-    month: value.month,
-    date: value.date,
+    startDate: value.startDate,
+    endDate: value.endDate,
     description: value.description,
     areas: value.areas,
     status: "active",
@@ -5089,12 +5049,9 @@ function useScheduleTaskRepository() {
         {
           $project: {
             title: 1,
-            frequency: 1,
             time: 1,
-            day: 1,
-            weekOfMonth: 1,
-            month: 1,
-            date: 1,
+            startDate: 1,
+            endDate: 1,
             description: 1,
             areas: 1,
             status: 1,
@@ -5184,20 +5141,6 @@ function useScheduleTaskService() {
   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",
@@ -5205,9 +5148,29 @@ function useScheduleTaskService() {
         timeZone: "Asia/Singapore"
       });
       const [currentHour, currentMinute] = timeString.split(":").map(Number);
+      const currentDateString = now.toLocaleDateString("en-US", {
+        timeZone: "Asia/Singapore"
+      });
       import_node_server_utils31.logger.info(
-        `Checking schedule ${schedule._id}: Current time ${currentHour}:${currentMinute}, Schedule time ${schedule.time}, Frequency ${schedule.frequency}`
+        `Checking schedule ${schedule._id}: Current time ${currentHour}:${currentMinute}, Current date ${currentDateString}, Schedule time ${schedule.time}, Start date ${schedule.startDate}, End date ${schedule.endDate}`
       );
+      const startDate = /* @__PURE__ */ new Date(schedule.startDate + "T00:00:00");
+      const currentDateOnly = /* @__PURE__ */ new Date(currentDateString + "T00:00:00");
+      if (currentDateOnly < startDate) {
+        import_node_server_utils31.logger.info(
+          `Schedule ${schedule._id}: Current date ${currentDateString} is before start date ${schedule.startDate}`
+        );
+        return false;
+      }
+      if (schedule.endDate) {
+        const endDate = /* @__PURE__ */ new Date(schedule.endDate + "T00:00:00");
+        if (currentDateOnly > endDate) {
+          import_node_server_utils31.logger.info(
+            `Schedule ${schedule._id}: Current date ${currentDateString} is after end date ${schedule.endDate}`
+          );
+          return false;
+        }
+      }
       const [scheduleHour, scheduleMinute] = schedule.time.split(":").map(Number);
       const timeMatches = currentHour === scheduleHour && currentMinute === scheduleMinute;
       if (!timeMatches) {
@@ -5217,68 +5180,9 @@ function useScheduleTaskService() {
         return false;
       }
       import_node_server_utils31.logger.info(
-        `Schedule ${schedule._id}: Time matches, checking frequency...`
+        `Schedule ${schedule._id}: All conditions matched - Date is within range and time matches`
       );
-      switch (schedule.frequency) {
-        case "daily":
-          import_node_server_utils31.logger.info(`Schedule ${schedule._id}: Daily frequency matched`);
-          return true;
-        case "weekly":
-          if (!schedule.day || schedule.day.length === 0) {
-            import_node_server_utils31.logger.warn(
-              `Schedule ${schedule._id} is weekly but has no days specified`
-            );
-            return false;
-          }
-          const dayMatches = schedule.day.includes(currentDay);
-          import_node_server_utils31.logger.info(
-            `Schedule ${schedule._id}: Weekly - Current day: ${currentDay}, Schedule days: ${schedule.day.join(
-              ", "
-            )}, Match: ${dayMatches}`
-          );
-          return dayMatches;
-        case "monthly":
-          if (!schedule.weekOfMonth) {
-            import_node_server_utils31.logger.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;
-            import_node_server_utils31.logger.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;
-            import_node_server_utils31.logger.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) {
-            import_node_server_utils31.logger.warn(
-              `Schedule ${schedule._id} is annually but has no month or date specified`
-            );
-            return false;
-          }
-          const matches = currentMonth === schedule.month && currentDate_num === schedule.date;
-          import_node_server_utils31.logger.info(
-            `Schedule ${schedule._id}: Annually - Current: ${currentMonth} ${currentDate_num}, Expected: ${schedule.month} ${schedule.date}, Match: ${matches}`
-          );
-          return matches;
-        default:
-          import_node_server_utils31.logger.warn(`Unknown frequency type: ${schedule.frequency}`);
-          return false;
-      }
+      return true;
     } catch (error) {
       import_node_server_utils31.logger.error(
         `Error checking schedule conditions for ${schedule._id}:`,
@@ -5302,7 +5206,7 @@ function useScheduleTaskService() {
       for (const scheduleTask of scheduleTasks) {
         try {
           import_node_server_utils31.logger.info(
-            `Checking schedule ${scheduleTask._id} - ${scheduleTask.title}: time=${scheduleTask.time}, frequency=${scheduleTask.frequency}`
+            `Checking schedule ${scheduleTask._id} - ${scheduleTask.title}: time=${scheduleTask.time}, startDate=${scheduleTask.startDate}, endDate=${scheduleTask.endDate}`
           );
           const shouldRun = checkScheduleConditions(scheduleTask, currentDate);
           if (!shouldRun) {
@@ -5333,48 +5237,18 @@ function useScheduleTaskService() {
           import_node_server_utils31.logger.info(
             `Using parent checklist ${parentChecklistId}, now creating/updating area checklists`
           );
-          const fullScheduleTask = await getScheduleTaskById(
-            scheduleTask._id.toString()
-          );
-          const tasksMap = /* @__PURE__ */ new Map();
-          if (fullScheduleTask.tasks && Array.isArray(fullScheduleTask.tasks)) {
-            for (const task of fullScheduleTask.tasks) {
-              const areaId = task.area?.toString();
-              if (areaId) {
-                if (!tasksMap.has(areaId)) {
-                  tasksMap.set(areaId, []);
-                }
-                tasksMap.get(areaId).push(task);
-              }
-            }
-          }
           for (const area of scheduleTask.areas) {
             try {
               const areaId = area.value.toString();
               const areaDetails = await getAreaById(areaId);
               let units = [];
-              const areaTasks = tasksMap.get(areaId);
-              if (areaTasks && areaTasks.length > 0) {
-                import_node_server_utils31.logger.info(
-                  `Area ${area.name} (${areaId}): Found ${areaTasks.length} tasks, using units from first task.`
-                );
-                units = areaTasks[0].units.map((unit) => ({
-                  unit: unit.unit.toString(),
-                  name: unit.name
-                }));
-                import_node_server_utils31.logger.info(
-                  `Area ${area.name} (${areaId}): Units from task: ${JSON.stringify(units)}`
-                );
-              } else if (areaDetails.units && areaDetails.units.length > 0) {
-                import_node_server_utils31.logger.info(
-                  `Area ${area.name} (${areaId}): No tasks found, using units from area details.`
-                );
+              if (areaDetails.units && areaDetails.units.length > 0) {
                 units = areaDetails.units.map((unit) => ({
                   unit: unit.unit.toString(),
                   name: unit.name
                 }));
                 import_node_server_utils31.logger.info(
-                  `Area ${area.name} (${areaId}): Units from area details: ${JSON.stringify(
+                  `Area ${area.name} (${areaId}): Using units from area details: ${JSON.stringify(
                     units
                   )}`
                 );
@@ -5635,12 +5509,9 @@ function useScheduleTaskController() {
     const validation = import_joi17.default.object({
       id: import_joi17.default.string().hex().required(),
       title: import_joi17.default.string().optional().allow("", null),
-      frequency: import_joi17.default.string().valid(...allowedFrequency).optional().allow("", null),
       time: import_joi17.default.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).optional().allow("", null),
-      day: import_joi17.default.array().items(import_joi17.default.string().valid(...allowedDays)).optional().allow(null),
-      weekOfMonth: import_joi17.default.string().valid(...allowedWeekOfMonth).optional().allow("", null),
-      month: import_joi17.default.string().valid(...allowedMonths).optional().allow("", null),
-      date: import_joi17.default.number().min(1).max(31).optional().allow(null),
+      startDate: import_joi17.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
+      endDate: import_joi17.default.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
       description: import_joi17.default.string().optional().allow("", null),
       areas: import_joi17.default.array().min(1).items(
         import_joi17.default.object({
@@ -5685,14 +5556,10 @@ function useScheduleTaskController() {
   MSupply,
   MUnit,
   allowedChecklistStatus,
-  allowedDays,
-  allowedFrequency,
-  allowedMonths,
   allowedPeriods,
   allowedRequestItemStatus,
   allowedStatus,
   allowedTypes,
-  allowedWeekOfMonth,
   areaChecklistSchema,
   areaSchema,
   parentChecklistSchema,