update engagement performance to use filtering (#4366)

* update engagement performance to use filtering * remove useless await
yldio · Sep 4, 2024 · 3ff1b40 · 3ff1b40
1 parent 0bf4d50
commit 3ff1b40
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 42 deletions.
diff --git a/apps/asap-cli/src/scripts/algolia/performance/engagement.ts b/apps/asap-cli/src/scripts/algolia/performance/engagement.ts
@@ -1,5 +1,7 @@
 import { SearchIndex } from 'algoliasearch';
 
+import { timeRanges } from '@asap-hub/model';
+
 import {
   deletePreviousObjects,
   getAllHits,
@@ -19,37 +21,40 @@ export const processEngagementPerformance = async (index: SearchIndex) => {
 
   await deletePreviousObjects(index, type);
 
-  const getPaginatedHits = (page: number) =>
-    index.search<EngagementHit>('', {
-      filters: `__meta.type:"${type}"`,
-      attributesToRetrieve: [
-        'eventCount',
-        'totalSpeakerCount',
-        'uniqueAllRolesCount',
-        'uniqueKeyPersonnelCount',
-      ],
-      page,
-      hitsPerPage: 50,
-    });
-
-  const hits = await getAllHits<EngagementHit>(getPaginatedHits);
-
-  await index.saveObject(
-    {
-      events: getPerformanceMetrics(hits.map((hit) => hit.eventCount)),
-      totalSpeakers: getPerformanceMetrics(
-        hits.map((hit) => hit.totalSpeakerCount),
-      ),
-      uniqueAllRoles: getPerformanceMetrics(
-        hits.map((hit) => hit.uniqueAllRolesCount),
-      ),
-      uniqueKeyPersonnel: getPerformanceMetrics(
-        hits.map((hit) => hit.uniqueKeyPersonnelCount),
-      ),
-      __meta: {
-        type: `${type}-performance`,
+  timeRanges.forEach(async (range) => {
+    const getPaginatedHits = (page: number) =>
+      index.search<EngagementHit>('', {
+        filters: `__meta.range:"${range}" AND __meta.type:"${type}"`,
+        attributesToRetrieve: [
+          'eventCount',
+          'totalSpeakerCount',
+          'uniqueAllRolesCount',
+          'uniqueKeyPersonnelCount',
+        ],
+        page,
+        hitsPerPage: 50,
+      });
+
+    const hits = await getAllHits<EngagementHit>(getPaginatedHits);
+
+    await index.saveObject(
+      {
+        events: getPerformanceMetrics(hits.map((hit) => hit.eventCount)),
+        totalSpeakers: getPerformanceMetrics(
+          hits.map((hit) => hit.totalSpeakerCount),
+        ),
+        uniqueAllRoles: getPerformanceMetrics(
+          hits.map((hit) => hit.uniqueAllRolesCount),
+        ),
+        uniqueKeyPersonnel: getPerformanceMetrics(
+          hits.map((hit) => hit.uniqueKeyPersonnelCount),
+        ),
+        __meta: {
+          range,
+          type: `${type}-performance`,
+        },
       },
-    },
-    { autoGenerateObjectIDIfNotExist: true },
-  );
+      { autoGenerateObjectIDIfNotExist: true },
+    );
+  });
 };
diff --git a/apps/asap-cli/src/scripts/algolia/performance/tests/engagement.test.ts b/apps/asap-cli/src/scripts/algolia/performance/tests/engagement.test.ts
@@ -1,3 +1,4 @@
+import { timeRanges } from '@asap-hub/model';
 import { SearchIndex } from 'algoliasearch';
 import { processEngagementPerformance } from '../engagement';
 
@@ -48,22 +49,27 @@ describe('processEngagementPerformance', () => {
       'old-performance-3',
     ]);
 
-    expect(mockIndex.search).toHaveBeenCalledWith('', {
-      filters: `__meta.type:"engagement"`,
-      attributesToRetrieve: [
-        'eventCount',
-        'totalSpeakerCount',
-        'uniqueAllRolesCount',
-        'uniqueKeyPersonnelCount',
-      ],
-      page: expect.any(Number),
-      hitsPerPage: 50,
+    timeRanges.forEach((range) => {
+      expect(mockIndex.search).toHaveBeenCalledWith('', {
+        filters: `__meta.range:"${range}" AND __meta.type:"engagement"`,
+        attributesToRetrieve: [
+          'eventCount',
+          'totalSpeakerCount',
+          'uniqueAllRolesCount',
+          'uniqueKeyPersonnelCount',
+        ],
+        page: expect.any(Number),
+        hitsPerPage: 50,
+      });
     });
 
+    // one for each time range
+    expect(mockIndex.saveObject).toHaveBeenCalledTimes(5);
     expect(mockIndex.saveObject).toHaveBeenCalledWith(
       {
         __meta: {
           type: 'engagement-performance',
+          range: 'all',
         },
         events: {
           aboveAverageMax: -1,