Improve attachments order

bcgov · Dec 24, 2024 · 8c72176 · 8c72176
1 parent 31b73ae
commit 8c72176
Showing 1 changed file with 37 additions and 4 deletions.
diff --git a/backend/src/v1/complaint/complaint.service.ts b/backend/src/v1/complaint/complaint.service.ts
@@ -2073,6 +2073,27 @@ export class ComplaintService {
       return outcomeData.getCaseFileByLeadId;
     };
 
+    const _multiFieldCompare = (first: any, second: any, compareInfo: { field: string; sort: string }[]): number => {
+      for (const item of compareInfo) {
+        if (item.sort === "asc") {
+          if (first[item.field] < second[item.field]) {
+            return -1;
+          }
+          if (first[item.field] > second[item.field]) {
+            return 1;
+          }
+        } else if (item.sort === "desc") {
+          if (first[item.field] > second[item.field]) {
+            return -1;
+          }
+          if (first[item.field] < second[item.field]) {
+            return 1;
+          }
+        }
+      }
+      return 0;
+    };
+
     try {
       if (complaintType) {
         builder = this._generateQueryBuilder(complaintType);
@@ -2196,21 +2217,33 @@ export class ComplaintService {
         .map((item) => {
           return {
             name: item.name,
-            date: _applyTimezone(item.date, tz, "datetime"),
+            date: item.date,
             fileType: getFileType(item.name),
           };
-        });
+        })
+        .sort((first, second) =>
+          _multiFieldCompare(first, second, [
+            { field: "fileType", sort: "asc" },
+            { field: "date", sort: "asc" },
+          ]),
+        );
       data.hasComplaintAttachments = data.cAtts?.length > 0;
 
       data.oAtts = attachments
         .filter((item) => item.type === AttachmentType.OUTCOME_ATTACHMENT)
         .map((item) => {
           return {
             name: item.name,
-            date: _applyTimezone(item.date, tz, "datetime"),
+            date: item.date,
             fileType: getFileType(item.name),
           };
-        });
+        })
+        .sort((first, second) =>
+          _multiFieldCompare(first, second, [
+            { field: "fileType", sort: "asc" },
+            { field: "date", sort: "asc" },
+          ]),
+        );
 
       data.hasOutcomeAttachments = data.oAtts?.length > 0;