Merge pull request #14 from unicam-complex-system/glydric

Added api for step counter
unicam-complex-system · Jan 23, 2024 · dc5567b · dc5567b
2 parents 5219121 + 9517c8d
commit dc5567b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/Backend/src/app/frontend/frontend.controller.ts b/Backend/src/app/frontend/frontend.controller.ts
@@ -77,12 +77,20 @@ export class FrontendController {
     type: 'number',
     example: 10,
   })
-  @Get(`:filter(${filters.join('|')})/:limit(\\d+)`)
+  @ApiParam({
+    name: 'step',
+    type: 'number',
+    example: 0,
+    description:
+      'if 0 returns the first values, if 1 returns the second values, etc... . When no data is found it simply return an empty string',
+  })
+  @Get(`:filter(${filters.join('|')})/:limit(\\d+)/:step(\\d+)`)
   getValuesLimit(
     @Param('filter', FiltersValidator) filter: FiltersAvailable,
     @Param('limit', PositiveNumberValidator) limit: number,
+    @Param('step', PositiveNumberValidator) step: number,
   ) {
-    return this.databaseService.getData(filter, limit);
+    return this.databaseService.getData(filter, limit, step);
   }
 
   @ApiParam({

diff --git a/Backend/src/database/database.service.ts b/Backend/src/database/database.service.ts
@@ -74,25 +74,31 @@ export class DatabaseService {
   getData(
     filter: FiltersAvailable,
     limit: number = undefined,
+    step: number = undefined,
   ): Promise<Document[]> {
-    const res = this.DB.collection('cameras').aggregate([
-      {
-        $addFields: {
-          intrusionDetection: {
-            $cond: {
-              if: {
-                $ifNull: ['$intrusionDetection', false],
+    const res = this.DB.collection('cameras')
+      .aggregate([
+        {
+          $addFields: {
+            intrusionDetection: {
+              $cond: {
+                if: {
+                  $ifNull: ['$intrusionDetection', false],
+                },
+                then: true,
+                else: false,
               },
-              then: true,
-              else: false,
             },
           },
         },
-      },
-    ]);
-    if (limit != undefined)
-      return res.limit(limit).match(this.getFilter(filter)).toArray();
-    else return res.match(this.getFilter(filter)).toArray();
+      ])
+      .match(this.getFilter(filter));
+    if (limit != undefined && step != undefined)
+      return res
+        .skip(limit * step)
+        .limit(limit)
+        .toArray();
+    else return res.toArray();
   }
 
   aggregateCamera(filter?: FiltersAvailable): Promise<Document[]> {