Fix collection date span and total size

actris-cloudnet · Nov 20, 2024 · 25c428c · 25c428c
1 parent 4bdda8e
commit 25c428c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/backend/src/routes/collection.ts b/backend/src/routes/collection.ts
@@ -290,7 +290,7 @@ export class CollectionRoutes {
         [collection.uuid],
       ),
     ]);
-    return parseInt(regularFiles[0].size) + parseInt(modelFiles[0].size);
+    return parseInt(regularFiles[0].size || 0) + parseInt(modelFiles[0].size || 0);
   }
 
   private async getDateRange(collection: Collection) {
@@ -312,10 +312,11 @@ export class CollectionRoutes {
         [collection.uuid],
       ),
     ]);
+    const startDates = [regularFiles[0].startDate, modelFiles[0].startDate].filter((date) => date != null).sort();
+    const endDates = [regularFiles[0].endDate, modelFiles[0].endDate].filter((date) => date != null).sort();
     return {
-      startDate:
-        regularFiles[0].startDate < modelFiles[0].startDate ? regularFiles[0].startDate : modelFiles[0].startDate,
-      endDate: regularFiles[0].endDate < modelFiles[0].endDate ? regularFiles[0].endDate : modelFiles[0].endDate,
+      startDate: startDates[0],
+      endDate: endDates[endDates.length - 1],
     };
   }
 

diff --git a/backend/tests/integration/parallel/__snapshots__/collection.test.ts.snap b/backend/tests/integration/parallel/__snapshots__/collection.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`GET /api/collection/:uuid returns a valid collection 1`] = `
 {
   "createdAt": "2020-09-28T12:45:21.916Z",
-  "endDate": "2014-12-05",
+  "endDate": "2019-09-01",
   "files": 2,
   "pid": "",
   "products": [