@7365admin1/module-hygiene 4.6.0 → 4.7.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @7365admin1/module-hygiene
 
+## 4.7.0
+
+### Minor Changes
+
+- Update Cleaning Schedule Area fields
+
 ## 4.6.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -217,6 +217,8 @@ type TCleaningScheduleArea = {
 type TAreaChecklist = {
     set: number;
     units: TAreaChecklistUnits[];
+    remarks?: string;
+    attachment?: string[];
 };
 type TAreaChecklistUnits = {
     unit: string | ObjectId;
@@ -242,7 +244,7 @@ type TCleaningScheduleAreaGetQuery = {
     status?: (typeof allowedStatus)[number] | "all";
 } & Pick<TCleaningScheduleArea, "schedule">;
 type TAreaChecklistUpdate = Pick<TCleaningScheduleArea, "checklist">;
-type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "approve" | "reject" | "remarks" | "completedBy">;
+type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "approve" | "reject" | "remarks" | "completedBy"> & Pick<TAreaChecklist, "attachment">;
 declare const areaChecklistSchema: Joi.ObjectSchema<any>;
 declare function MAreaChecklist(value: TCleaningScheduleArea): {
     schedule: string | ObjectId;

package/dist/index.js

@@ -3135,8 +3135,12 @@ function useAreaChecklistRepo() {
           $project: {
             _id: 0,
             set: "$checklist.set",
+            remarks: "$checklist.remarks",
+            attachment: "$checklist.attachment",
             unit: "$checklist.units.unit",
             name: "$checklist.units.name",
+            approve: "$checklist.units.approve",
+            reject: "$checklist.units.reject",
             status: {
               $switch: {
                 branches: [
@@ -3151,18 +3155,21 @@ function useAreaChecklistRepo() {
                 ],
                 default: "$checklist.units.status"
               }
-            },
-            remarks: "$checklist.units.remarks"
+            }
           }
         },
         { $sort: { set: 1, name: 1 } },
         {
           $group: {
             _id: "$set",
+            remarks: { $first: "$remarks" },
+            attachment: { $first: "$attachment" },
             units: {
               $push: {
                 unit: "$unit",
                 name: "$name",
+                approve: "$approve",
+                reject: "$reject",
                 status: "$status",
                 remarks: "$remarks"
               }
@@ -3173,6 +3180,8 @@ function useAreaChecklistRepo() {
           $project: {
             _id: 0,
             set: "$_id",
+            remarks: "$remarks",
+            attachment: "$attachment",
             units: 1
           }
         },
@@ -3276,6 +3285,12 @@ function useAreaChecklistRepo() {
       if (value.remarks) {
         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.completedBy) {
         updateValue["checklist.$[checklist].units.$[unit].completedBy"] = new import_mongodb9.ObjectId(value.completedBy);
       }
@@ -3782,6 +3797,7 @@ function useAreaChecklistController() {
       approve: import_joi9.default.boolean().optional(),
       reject: import_joi9.default.boolean().optional(),
       remarks: import_joi9.default.string().optional().allow("", null),
+      attachment: import_joi9.default.array().items(import_joi9.default.string()).optional(),
       completedBy: import_joi9.default.string().hex().required()
     });
     const { error } = validation.validate(payload);