@7365admin1/module-hygiene 4.29.1-staging.17 → 4.29.1-staging.18

package/.changeset/extra-visits-fixes.md

@@ -0,0 +1,5 @@
+---
+"@7365admin1/module-hygiene": patch
+---
+
+Extra visits: editing a repeating visit no longer fails; one extra visit adds one round; an area or day already Done is reopened when an extra round is added; Next visit is right for a task saved after today's time.

package/dist/index.d.ts

@@ -242,6 +242,7 @@ declare function useParentChecklistRepo(): {
         _id: ObjectId;
     }>;
     updateParentChecklistStatuses: (_id: string | ObjectId, status: (typeof allowedStatus)[number], session?: ClientSession) => Promise<number>;
+    reopenParentChecklist: (_id: string | ObjectId) => Promise<number>;
     getHygieneSiteIds: () => Promise<any[]>;
     closeExpiredParentChecklists: () => Promise<number>;
     getTodayParentChecklists: () => Promise<{

package/dist/index.js

@@ -3015,6 +3015,18 @@ function useParentChecklistRepo() {
       throw error;
     }
   }
+  async function reopenParentChecklist(_id) {
+    const res = await collection.updateOne(
+      { _id: new import_mongodb7.ObjectId(_id), status: "completed" },
+      { $set: { status: "ongoing", updatedAt: /* @__PURE__ */ new Date() }, $unset: { completedAt: "" } }
+    );
+    if (res.modifiedCount > 0) {
+      delNamespace().catch((err) => {
+        import_node_server_utils14.logger.error(`Failed to clear cache for namespace: ${namespace_collection}`, err);
+      });
+    }
+    return res.modifiedCount;
+  }
   async function getHygieneSiteIds() {
     const query = {
       status: { $ne: "deleted" }
@@ -3121,6 +3133,7 @@ function useParentChecklistRepo() {
     getAllParentChecklist,
     getParentChecklistById,
     updateParentChecklistStatuses,
+    reopenParentChecklist,
     getHygieneSiteIds,
     closeExpiredParentChecklists,
     getTodayParentChecklists,
@@ -4337,6 +4350,10 @@ function useAreaChecklistRepo() {
         }
       );
       if (result.modifiedCount > 0) {
+        await collection.updateOne(
+          { schedule, serviceType, area, status: "completed" },
+          { $set: { status: "ongoing", updatedAt: /* @__PURE__ */ new Date() }, $unset: { completedAt: "" } }
+        );
         delNamespace().catch((err) => {
           import_node_server_utils17.logger.error(
             `Failed to clear cache for namespace: ${namespace_collection}`,
@@ -4633,6 +4650,9 @@ function validateScheduleRules(task, now = /* @__PURE__ */ new Date()) {
   }
   if (task.endDate && task.endDate < today)
     return "The end date has already passed.";
+  if (!repeating && !(task.dates ?? []).length) {
+    return "Pick at least one date, or choose a repeat.";
+  }
   if (!repeating) {
     const dates = (task.dates ?? []).filter((d) => !task.endDate || d <= task.endDate);
     if (dates.length && dates.every((d) => d < today)) {
@@ -7050,7 +7070,11 @@ var SCHEDULE_FIELDS = {
   startDate: 1,
   endDate: 1,
   paused: 1,
-  lastRunDate: 1
+  lastRunDate: 1,
+  // when it was saved: a task saved after its time today waits for its next
+  // day, so Next visit must know it (else it says "today" for a visit that never comes)
+  createdAt: 1,
+  updatedAt: 1
 };
 function useScheduleTaskRepository() {
   const db = import_node_server_utils33.useAtlas.getDb();
@@ -7295,7 +7319,6 @@ function useScheduleTaskRepository() {
             description: 1,
             areas: 1,
             status: 1,
-            createdAt: 1,
             site: 1,
             serviceType: 1,
             ...SCHEDULE_FIELDS
@@ -7421,7 +7444,7 @@ function useScheduleTaskRepository() {
 }
 
 // src/utils/schedule-task-set.util.ts
-function buildScheduleTaskSets(task, units, startSet, count) {
+function buildScheduleTaskSets(task, units, startSet, count = 1) {
   return Array.from({ length: count }, (_, i) => ({
     set: startSet + i,
     units,
@@ -7436,7 +7459,7 @@ function buildScheduleTaskSets(task, units, startSet, count) {
 var import_mongodb20 = require("mongodb");
 var import_node_server_utils34 = require("@7365admin1/node-server-utils");
 function useScheduleTaskService() {
-  const { createParentChecklist } = useParentChecklistRepo();
+  const { createParentChecklist, reopenParentChecklist } = useParentChecklistRepo();
   const { getAllScheduleTask, markScheduleTaskRan } = useScheduleTaskRepository();
   const {
     createAreaChecklist,
@@ -7507,7 +7530,7 @@ function useScheduleTaskService() {
           const parentChecklistIds = await createParentChecklist({
             site: scheduleTask.site.toString(),
             serviceType,
-            createdAt: /* @__PURE__ */ new Date()
+            createdAt: currentDate ?? /* @__PURE__ */ new Date()
           });
           const parentChecklistId = Array.isArray(parentChecklistIds) ? parentChecklistIds[0] : parentChecklistIds;
           import_node_server_utils34.logger.info(
@@ -7570,14 +7593,13 @@ function useScheduleTaskService() {
                 );
               }
               if (existingAreaChecklist) {
-                const areaSetConfig = Number(areaDetails.set) || 1;
                 const maxSetInChecklist = existingAreaChecklist.checklist?.length ? Math.max(
                   ...existingAreaChecklist.checklist.map(
                     (c) => c.set
                   )
                 ) : 0;
                 const startSetNumber = maxSetInChecklist + 1;
-                const newSets = buildScheduleTaskSets(scheduleTask, units, startSetNumber, areaSetConfig);
+                const newSets = buildScheduleTaskSets(scheduleTask, units, startSetNumber);
                 const modified = await pushScheduleTaskSets(
                   parentChecklistId.toString(),
                   serviceType,
@@ -7588,7 +7610,7 @@ function useScheduleTaskService() {
                 if (modified > 0) {
                   addedAreas.push(area.name);
                   import_node_server_utils34.logger.info(
-                    `Appended ${areaSetConfig} set(s) starting from ${startSetNumber} to area checklist for area ${area.name}`
+                    `Appended extra-visit set ${startSetNumber} to area checklist for area ${area.name}`
                   );
                 } else {
                   import_node_server_utils34.logger.info(
@@ -7596,8 +7618,7 @@ function useScheduleTaskService() {
                   );
                 }
               } else {
-                const areaSetConfig = Number(areaDetails.set) || 1;
-                const schedTaskSets = buildScheduleTaskSets(scheduleTask, units, 1, areaSetConfig);
+                const schedTaskSets = buildScheduleTaskSets(scheduleTask, units, 1);
                 const checklistData = {
                   schedule: parentChecklistId.toString(),
                   serviceType,
@@ -7619,6 +7640,13 @@ function useScheduleTaskService() {
               continue;
             }
           }
+          if (addedAreas.length > 0) {
+            try {
+              await reopenParentChecklist(parentChecklistId);
+            } catch (error) {
+              import_node_server_utils34.logger.error(`Could not reopen day list ${parentChecklistId}`, error);
+            }
+          }
           const attemptKey = `${scheduleTask._id}:${today}`;
           const tried = (attempts.get(attemptKey) ?? 0) + 1;
           attempts.set(attemptKey, tried);
@@ -7768,8 +7796,8 @@ function useScheduleTaskController() {
     const optional = Object.fromEntries(
       Object.entries(scheduleTaskFields).map(([key, rule]) => [
         key,
-        key === "dates" ? import_joi19.default.array().min(1).items(scheduleDate).optional().messages({
-          "array.min": "Pick at least one date, or choose a repeat."
+        key === "dates" ? import_joi19.default.array().items(scheduleDate).optional().messages({
+          "array.base": "Dates must be a list of dates."
         }) : rule.optional()
       ])
     );