@7365admin1/module-hygiene 4.23.1 → 4.24.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @7365admin1/module-hygiene
 
+## 4.24.1
+
+### Patch Changes
+
+- Update module hygiene package
+
+## 4.24.0
+
+### Minor Changes
+
+- Update hygiene package
+
 ## 4.23.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -209,6 +209,7 @@ type TParentChecklist = {
     status?: (typeof allowedStatus)[number];
     createdAt?: Date | string;
     updatedAt?: Date | string;
+    dateStr?: string;
 };
 type TParentChecklistCreate = {
     site?: string | ObjectId;
@@ -228,13 +229,14 @@ declare function MParentChecklist(value: TParentChecklist): {
     site: string | ObjectId;
     serviceType: AppServiceType;
     status: string;
-    createdAt: string | Date;
+    createdAt: Date;
     updatedAt: string | Date;
+    dateStr: string;
 };
 
 declare function useParentChecklistRepo(): {
     createIndex: () => Promise<void>;
-    createParentChecklist: (value: TParentChecklistCreate, session?: ClientSession) => Promise<ObjectId | ObjectId[]>;
+    createParentChecklist: (value: TParentChecklistCreate, session?: ClientSession) => Promise<any>;
     getAllParentChecklist: ({ page, limit, search, site, startDate, endDate, status, serviceType, }: TParentChecklistGetQuery) => Promise<{}>;
     getParentChecklistById: (_id: string | ObjectId) => Promise<TParentChecklist & {
         _id: ObjectId;
@@ -287,6 +289,7 @@ type TAreaChecklistUnits = {
     reject?: boolean;
     status?: (typeof allowedChecklistStatus)[number];
     remarks?: string;
+    attachment?: string[];
     completedBy?: string | ObjectId;
     timestamp?: Date | string;
 };
@@ -302,7 +305,7 @@ type TCleaningScheduleAreaGetQuery = {
     status?: (typeof allowedStatus)[number] | "all";
 } & Pick<TCleaningScheduleArea, "schedule" | "serviceType">;
 type TAreaChecklistUpdate = Pick<TCleaningScheduleArea, "checklist">;
-type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "approve" | "reject" | "remarks" | "completedBy"> & Pick<TAreaChecklist, "attachment">;
+type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "approve" | "reject" | "remarks" | "attachment" | "completedBy">;
 declare const areaChecklistSchema: Joi.ObjectSchema<any>;
 declare function MAreaChecklist(value: TAreaChecklistCreate): {
     schedule: string | ObjectId;

package/dist/index.js

@@ -2523,7 +2523,8 @@ var import_core6 = require("@7365admin1/core");
 var parentChecklistSchema = import_joi6.default.object({
   createdAt: import_joi6.default.alternatives().try(import_joi6.default.date(), import_joi6.default.string()).optional().allow("", null),
   site: import_joi6.default.string().hex().required(),
-  serviceType: import_joi6.default.string().valid(...Object.values(import_core6.AppServiceType)).required()
+  serviceType: import_joi6.default.string().valid(...Object.values(import_core6.AppServiceType)).required(),
+  dateStr: import_joi6.default.string().optional().allow("", null)
 });
 function MParentChecklist(value) {
   const { error } = parentChecklistSchema.validate(value);
@@ -2538,18 +2539,22 @@ function MParentChecklist(value) {
       throw new import_node_server_utils13.BadRequestError(`Invalid site ID format: ${value.site}`);
     }
   }
+  const currentDate = value.createdAt ? new Date(value.createdAt) : /* @__PURE__ */ new Date();
+  const sgOffset = 8 * 60 * 60 * 1e3;
+  const sgTime = new Date(currentDate.getTime() + sgOffset);
+  const dateStr = `${sgTime.getUTCFullYear()}-${String(sgTime.getUTCMonth() + 1).padStart(2, "0")}-${String(sgTime.getUTCDate()).padStart(2, "0")}`;
   return {
     site: value.site,
     serviceType: value.serviceType,
     status: "open",
-    createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
-    updatedAt: value.updatedAt ?? ""
+    createdAt: currentDate,
+    updatedAt: value.updatedAt ?? "",
+    dateStr
   };
 }
 
 // src/repositories/hygiene-parent-checklist.repository.ts
 var import_mongodb7 = require("mongodb");
-var import_moment_timezone2 = __toESM(require("moment-timezone"));
 var import_node_server_utils14 = require("@7365admin1/node-server-utils");
 var import_core7 = require("@7365admin1/core");
 function useParentChecklistRepo() {
@@ -2564,13 +2569,55 @@ function useParentChecklistRepo() {
   const { delNamespace, setCache, getCache } = (0, import_node_server_utils14.useCache)(namespace_collection);
   async function createIndex() {
     try {
+      await collection.updateMany(
+        { dateStr: { $exists: false } },
+        [
+          {
+            $set: {
+              dateStr: {
+                $let: {
+                  vars: {
+                    sgTime: { $add: ["$createdAt", 8 * 60 * 60 * 1e3] }
+                  },
+                  in: {
+                    $dateToString: {
+                      format: "%Y-%m-%d",
+                      date: "$$sgTime",
+                      timezone: "UTC"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        ]
+      );
+      const duplicates = await collection.aggregate([
+        {
+          $group: {
+            _id: { site: "$site", serviceType: "$serviceType", dateStr: "$dateStr" },
+            docs: { $push: "$_id" },
+            count: { $sum: 1 }
+          }
+        },
+        { $match: { count: { $gt: 1 } } }
+      ]).toArray();
+      for (const group of duplicates) {
+        const toDelete = group.docs.slice(1);
+        await collection.deleteMany({ _id: { $in: toDelete } });
+        import_node_server_utils14.logger.info(
+          `Deleted ${toDelete.length} duplicate parent checklists for site ${group._id.site} / ${group._id.serviceType} on date ${group._id.dateStr}`
+        );
+      }
       await collection.createIndexes([
         { key: { serviceType: 1 } },
         { key: { createdAt: 1 } },
         { key: { site: 1 } },
-        { key: { status: 1 } }
+        { key: { status: 1 } },
+        { key: { site: 1, serviceType: 1, dateStr: 1 }, unique: true }
       ]);
     } catch (error) {
+      import_node_server_utils14.logger.error("Failed to create index/backfill on hygiene parent checklist:", error);
       throw new import_node_server_utils14.InternalServerError(
         "Failed to create index on hygiene parent checklist."
       );
@@ -2579,10 +2626,13 @@ function useParentChecklistRepo() {
   async function createParentChecklist(value, session) {
     try {
       const currentDate = value.createdAt ? new Date(value.createdAt) : /* @__PURE__ */ new Date();
-      const startOfDay = (0, import_moment_timezone2.default)(currentDate).tz("Asia/Singapore").startOf("day").toDate();
-      const endOfDay = (0, import_moment_timezone2.default)(currentDate).tz("Asia/Singapore").endOf("day").toDate();
+      const sgOffset = 8 * 60 * 60 * 1e3;
+      const sgTime = new Date(currentDate.getTime() + sgOffset);
+      const startOfDay = new Date(Date.UTC(sgTime.getUTCFullYear(), sgTime.getUTCMonth(), sgTime.getUTCDate(), 0, 0, 0, 0) - sgOffset);
+      const endOfDay = new Date(Date.UTC(sgTime.getUTCFullYear(), sgTime.getUTCMonth(), sgTime.getUTCDate(), 23, 59, 59, 999) - sgOffset);
+      const targetDateStr = `${sgTime.getUTCFullYear()}-${String(sgTime.getUTCMonth() + 1).padStart(2, "0")}-${String(sgTime.getUTCDate()).padStart(2, "0")}`;
+      const dateStr = targetDateStr;
       const allServiceTypes = Object.values(import_core7.AppServiceType);
-      const dateStr = currentDate.toISOString().split("T")[0];
       if (value.site) {
         let siteObjectId;
         try {
@@ -2592,9 +2642,12 @@ function useParentChecklistRepo() {
         }
         if (value.serviceType) {
           const existingChecklist = await collection.findOne({
-            createdAt: { $gte: startOfDay, $lte: endOfDay },
             site: siteObjectId,
-            serviceType: value.serviceType
+            serviceType: value.serviceType,
+            $or: [
+              { dateStr: targetDateStr },
+              { createdAt: { $gte: startOfDay, $lte: endOfDay } }
+            ]
           });
           if (existingChecklist) {
             import_node_server_utils14.logger.info(
@@ -2607,22 +2660,41 @@ function useParentChecklistRepo() {
             createdAt: currentDate,
             serviceType: value.serviceType
           });
-          const result3 = await collection.insertOne(doc, { session });
-          delNamespace().catch((err) => {
-            import_node_server_utils14.logger.error(
-              `Failed to clear cache for namespace: ${namespace_collection}`,
-              err
+          let insertedId;
+          try {
+            const result = await collection.insertOne(doc, { session });
+            insertedId = result.insertedId;
+            delNamespace().catch((err) => {
+              import_node_server_utils14.logger.error(
+                `Failed to clear cache for namespace: ${namespace_collection}`,
+                err
+              );
+            });
+            import_node_server_utils14.logger.info(
+              `Created parent checklist for site ${value.site} / ${value.serviceType} for today: ${dateStr}`
             );
-          });
-          import_node_server_utils14.logger.info(
-            `Created parent checklist for site ${value.site} / ${value.serviceType} for today: ${dateStr}`
-          );
-          return result3.insertedId;
+          } catch (error) {
+            if (error.code === 11e3) {
+              const existingChecklist2 = await collection.findOne({
+                site: siteObjectId,
+                serviceType: value.serviceType,
+                dateStr: targetDateStr
+              });
+              if (existingChecklist2) {
+                return existingChecklist2._id;
+              }
+            }
+            throw error;
+          }
+          return insertedId;
         }
         const existingServiceTypes = await collection.distinct("serviceType", {
-          createdAt: { $gte: startOfDay, $lte: endOfDay },
           site: siteObjectId,
-          serviceType: { $exists: true, $ne: null }
+          serviceType: { $exists: true, $ne: null },
+          $or: [
+            { dateStr: targetDateStr },
+            { createdAt: { $gte: startOfDay, $lte: endOfDay } }
+          ]
         });
         const missingServiceTypes = allServiceTypes.filter(
           (st) => !existingServiceTypes.includes(st)
@@ -2632,8 +2704,11 @@ function useParentChecklistRepo() {
             `All serviceType checklists already exist for site ${value.site} on ${dateStr}`
           );
           const first = await collection.findOne({
-            createdAt: { $gte: startOfDay, $lte: endOfDay },
-            site: siteObjectId
+            site: siteObjectId,
+            $or: [
+              { dateStr: targetDateStr },
+              { createdAt: { $gte: startOfDay, $lte: endOfDay } }
+            ]
           });
           return first._id;
         }
@@ -2644,17 +2719,30 @@ function useParentChecklistRepo() {
             serviceType
           })
         );
-        const result2 = await collection.insertMany(checklistDocs2, { session });
-        delNamespace().catch((err) => {
-          import_node_server_utils14.logger.error(
-            `Failed to clear cache for namespace: ${namespace_collection}`,
-            err
+        let insertedIds2 = [];
+        try {
+          const result = await collection.insertMany(checklistDocs2, { session, ordered: false });
+          insertedIds2 = Object.values(result.insertedIds);
+          delNamespace().catch((err) => {
+            import_node_server_utils14.logger.error(
+              `Failed to clear cache for namespace: ${namespace_collection}`,
+              err
+            );
+          });
+          import_node_server_utils14.logger.info(
+            `Created ${checklistDocs2.length} parent checklists for site ${value.site} for today: ${dateStr}`
           );
-        });
-        import_node_server_utils14.logger.info(
-          `Created ${checklistDocs2.length} parent checklists for site ${value.site} for today: ${dateStr}`
-        );
-        return Object.values(result2.insertedIds);
+        } catch (error) {
+          if (error.code === 11e3 || error.writeErrors) {
+            const existing = await collection.find({
+              site: siteObjectId,
+              dateStr: targetDateStr
+            }).toArray();
+            return existing.map((e) => e._id);
+          }
+          throw error;
+        }
+        return insertedIds2;
       }
       const siteIds = await getHygieneSiteIds();
       if (!Array.isArray(siteIds)) {
@@ -2667,8 +2755,11 @@ function useParentChecklistRepo() {
       }
       const existingPairs = await collection.find(
         {
-          createdAt: { $gte: startOfDay, $lte: endOfDay },
-          serviceType: { $exists: true, $ne: null }
+          serviceType: { $exists: true, $ne: null },
+          $or: [
+            { dateStr: targetDateStr },
+            { createdAt: { $gte: startOfDay, $lte: endOfDay } }
+          ]
         },
         { projection: { site: 1, serviceType: 1 } }
       ).toArray();
@@ -2700,19 +2791,31 @@ function useParentChecklistRepo() {
       import_node_server_utils14.logger.info(
         `createParentChecklist: Creating ${checklistDocs.length} missing site+serviceType checklist(s) for today: ${dateStr}`
       );
-      const result = await collection.insertMany(checklistDocs, { session });
-      delNamespace().then(() => {
-        import_node_server_utils14.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        import_node_server_utils14.logger.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
+      let insertedIds = [];
+      try {
+        const result = await collection.insertMany(checklistDocs, { session, ordered: false });
+        insertedIds = Object.values(result.insertedIds);
+        delNamespace().then(() => {
+          import_node_server_utils14.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
+        }).catch((err) => {
+          import_node_server_utils14.logger.error(
+            `Failed to clear cache for namespace: ${namespace_collection}`,
+            err
+          );
+        });
+        import_node_server_utils14.logger.info(
+          `Created ${Object.keys(result.insertedIds).length} parent checklists for today: ${dateStr}`
         );
-      });
-      import_node_server_utils14.logger.info(
-        `Created ${Object.keys(result.insertedIds).length} parent checklists for today: ${dateStr}`
-      );
-      return Object.values(result.insertedIds);
+      } catch (error) {
+        if (error.code === 11e3 || error.writeErrors) {
+          const existing = await collection.find({
+            dateStr: targetDateStr
+          }).toArray();
+          return existing.map((e) => e._id);
+        }
+        throw error;
+      }
+      return insertedIds;
     } catch (error) {
       import_node_server_utils14.logger.error("Failed to create daily parent checklist", error);
       throw error;
@@ -2931,8 +3034,11 @@ function useParentChecklistRepo() {
     }
   }
   async function getTodayParentChecklists() {
-    const start = (0, import_moment_timezone2.default)().tz("Asia/Singapore").startOf("day").toDate();
-    const end = (0, import_moment_timezone2.default)().tz("Asia/Singapore").endOf("day").toDate();
+    const sgOffset = 8 * 60 * 60 * 1e3;
+    const now = /* @__PURE__ */ new Date();
+    const sgTime = new Date(now.getTime() + sgOffset);
+    const start = new Date(Date.UTC(sgTime.getUTCFullYear(), sgTime.getUTCMonth(), sgTime.getUTCDate(), 0, 0, 0, 0) - sgOffset);
+    const end = new Date(Date.UTC(sgTime.getUTCFullYear(), sgTime.getUTCMonth(), sgTime.getUTCDate(), 23, 59, 59, 999) - sgOffset);
     try {
       const items = await collection.find(
         { createdAt: { $gte: start, $lte: end } },
@@ -2945,8 +3051,11 @@ function useParentChecklistRepo() {
     }
   }
   async function getTodayParentChecklistsForAreaGen() {
-    const start = (0, import_moment_timezone2.default)().tz("Asia/Singapore").startOf("day").toDate();
-    const end = (0, import_moment_timezone2.default)().tz("Asia/Singapore").endOf("day").toDate();
+    const sgOffset = 8 * 60 * 60 * 1e3;
+    const now = /* @__PURE__ */ new Date();
+    const sgTime = new Date(now.getTime() + sgOffset);
+    const start = new Date(Date.UTC(sgTime.getUTCFullYear(), sgTime.getUTCMonth(), sgTime.getUTCDate(), 0, 0, 0, 0) - sgOffset);
+    const end = new Date(Date.UTC(sgTime.getUTCFullYear(), sgTime.getUTCMonth(), sgTime.getUTCDate(), 23, 59, 59, 999) - sgOffset);
     try {
       const items = await collection.find(
         {
@@ -3119,6 +3228,7 @@ function MAreaChecklist(value) {
           reject: false,
           status: "open",
           remarks: "",
+          attachment: [],
           completedBy: "",
           timestamp: ""
         }))
@@ -3544,7 +3654,12 @@ function useAreaChecklistRepo() {
             },
             unit: "$checklist.units.unit",
             name: "$checklist.units.name",
+            approve: "$checklist.units.approve",
+            reject: "$checklist.units.reject",
             remarks: "$checklist.units.remarks",
+            attachment: {
+              $ifNull: ["$checklist.units.attachment", []]
+            },
             status: {
               $switch: {
                 branches: [
@@ -3577,8 +3692,11 @@ function useAreaChecklistRepo() {
               $push: {
                 unit: "$unit",
                 name: "$name",
+                approve: "$approve",
+                reject: "$reject",
                 status: "$status",
                 remarks: "$remarks",
+                attachment: "$attachment",
                 completedByName: "$completedByName",
                 timestamp: "$timestamp"
               }
@@ -3730,6 +3848,10 @@ function useAreaChecklistRepo() {
             name: "$checklist.units.name",
             approve: "$checklist.units.approve",
             reject: "$checklist.units.reject",
+            unitRemarks: "$checklist.units.remarks",
+            unitAttachment: {
+              $ifNull: ["$checklist.units.attachment", []]
+            },
             timestamp: "$checklist.units.timestamp",
             status: {
               $switch: {
@@ -3769,7 +3891,8 @@ function useAreaChecklistRepo() {
                 reject: "$reject",
                 timestamp: "$timestamp",
                 status: "$status",
-                remarks: "$remarks",
+                remarks: "$unitRemarks",
+                attachment: "$unitAttachment",
                 completedByName: "$completedByName"
               }
             }
@@ -3917,16 +4040,13 @@ function useAreaChecklistRepo() {
       } else if (value.reject === true) {
         updateValue["checklist.$[checklist].units.$[unit].approve"] = false;
         updateValue["checklist.$[checklist].units.$[unit].reject"] = true;
-        updateValue["checklist.$[checklist].units.$[unit].status"] = "open";
+        updateValue["checklist.$[checklist].units.$[unit].status"] = "completed";
       }
-      if (value.remarks) {
-        updateValue["checklist.$[checklist].units.$[unit].remarks"] = value.remarks;
+      if (value.remarks !== void 0) {
+        updateValue["checklist.$[checklist].units.$[unit].remarks"] = value.remarks ?? "";
       }
-      if (value.attachment) {
-        updateValue["checklist.$[checklist].attachment"] = value.attachment;
-        if (value.remarks) {
-          updateValue["checklist.$[checklist].remarks"] = value.remarks;
-        }
+      if (value.attachment !== void 0) {
+        updateValue["checklist.$[checklist].units.$[unit].attachment"] = value.attachment ?? [];
       }
       if (value.completedBy) {
         updateValue["checklist.$[checklist].units.$[unit].completedBy"] = new import_mongodb9.ObjectId(value.completedBy);
@@ -4354,6 +4474,7 @@ function useAreaChecklistService() {
                     reject: false,
                     status: "open",
                     remarks: "",
+                    attachment: [],
                     completedBy: "",
                     timestamp: ""
                   }))
@@ -6784,6 +6905,7 @@ function useScheduleTaskService() {
                   reject: false,
                   status: "open",
                   remarks: "",
+                  attachment: [],
                   completedBy: "",
                   timestamp: ""
                 }));