fixes

unicam-complex-system · Jan 23, 2024 · 52988fa · 52988fa
1 parent 9517c8d
commit 52988fa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/Backend/src/database/database.service.spec.ts b/Backend/src/database/database.service.spec.ts
@@ -21,7 +21,7 @@ describe('DatabaseService', () => {
   });
 
   it('should get aggregated data', async () => {
-    const aggregateData = await databaseService.aggregateCamera();
+    const aggregateData = await databaseService.aggregateCamera('all');
 
     expect(aggregateData).not.toBeNull();
   });

diff --git a/Backend/src/database/database.service.ts b/Backend/src/database/database.service.ts
@@ -101,9 +101,24 @@ export class DatabaseService {
     else return res.toArray();
   }
 
-  aggregateCamera(filter?: FiltersAvailable): Promise<Document[]> {
+  aggregateCamera(filter: FiltersAvailable): Promise<Document[]> {
+    console.log(this.getFilter(filter));
     return this.DB.collection('cameras')
-      .aggregate()
+      .aggregate([
+        {
+          $addFields: {
+            intrusionDetection: {
+              $cond: {
+                if: {
+                  $ifNull: ['$intrusionDetection', false],
+                },
+                then: true,
+                else: false,
+              },
+            },
+          },
+        },
+      ])
       .match(this.getFilter(filter))
       .group({
         _id: '$cameraId',
@@ -149,7 +164,7 @@ export class DatabaseService {
     });
   }
 
-  private getFilter(filter?: FiltersAvailable) {
+  private getFilter(filter: FiltersAvailable) {
     switch (filter) {
       case 'intrusionDetection':
         return {