chore(indicatorrecord): Adds a feature toggle to indicator record cal…

…culation Now, wether the old stored functions, or the new API generated SQL queries are used for the calculations of indicator records at import time, is toggable via environment variable, SIMPLE_IMPORT_CALCULATIONS
Vizzuality · Aug 30, 2022 · 8fa4631 · 8fa4631
1 parent 4b15ffa
commit 8fa4631
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/api/config/custom-environment-variables.json b/api/config/custom-environment-variables.json
@@ -48,5 +48,8 @@
   },
   "map": {
     "distributed": "DISTRIBUTED_MAP"
+  },
+  "featureFlags": {
+    "simpleImportCalculations": "SIMPLE_IMPORT_CALCULATIONS"
   }
 }
diff --git a/api/config/default.json b/api/config/default.json
@@ -57,5 +57,8 @@
 
   "map": {
     "distributed": true
+  },
+  "featureFlags": {
+    "simpleImportCalculations": "false"
   }
 }
diff --git a/api/config/test.json b/api/config/test.json
@@ -24,5 +24,8 @@
   },
   "geolocation": {
     "gmapsApiKey": "myVeryBadJWTSecretForTests"
+  },
+  "featureFlags": {
+    "simpleImportCalculations": "true"
   }
 }
diff --git a/api/src/modules/indicator-records/indicator-records.service.ts b/api/src/modules/indicator-records/indicator-records.service.ts
@@ -166,9 +166,11 @@ export class IndicatorRecordsService extends AppBaseService<
       INDICATOR_TYPES.BIODIVERSITY_LOSS,
     ];
 
-    const rawData: SourcingRecordsWithIndicatorRawDataDto[] =
-      //await this.indicatorRecordRepository.getIndicatorRawDataForAllSourcingRecords();
-      await this.impactCalculatorService.calculateAllSourcingRecords();
+    const rawData: SourcingRecordsWithIndicatorRawDataDto[] = config.get(
+      'featureFlags.simpleImportCalculations',
+    )
+      ? await this.indicatorRecordRepository.getIndicatorRawDataForAllSourcingRecords()
+      : await this.impactCalculatorService.calculateAllSourcingRecords();
 
     const calculatedData2: IndicatorRecordCalculatedValuesDto[] = rawData.map(
       (sourcingRecordData: SourcingRecordsWithIndicatorRawDataDto) => {

diff --git a/api/test/integration/indicator-record/indicator-records.service.spec.ts b/api/test/integration/indicator-record/indicator-records.service.spec.ts
@@ -817,8 +817,10 @@ describe('Indicator Records Service', () => {
     expect(indicatorRecords.length).toEqual(1);
     expect(indicatorRecords[0].sourcingRecordId).toEqual(sourcingRecordId);
     expect(indicatorRecords[0].status).toEqual(INDICATOR_RECORD_STATUS.SUCCESS);
-    expect(indicatorRecords[0].value).toEqual(recordValue);
-    expect(indicatorRecords[0].scaler).toEqual(scalerValue);
+    expect(indicatorRecords[0].value).toBeCloseTo(recordValue, 5);
+    if (scalerValue) {
+      expect(indicatorRecords[0].scaler).toBeCloseTo(scalerValue, 5);
+    }
     expect(indicatorRecords[0].materialH3DataId).toEqual(
       materialH3Data.h3DataId,
     );
@@ -843,7 +845,7 @@ describe('Indicator Records Service', () => {
     expect(cachedData).toBeDefined();
     expect(cachedData?.data).toBeDefined();
     expect(cachedData?.type).toEqual(type);
-    expect((cachedData?.data as CachedRawValue).rawValue).toEqual(value);
+    expect((cachedData?.data as CachedRawValue).rawValue).toBeCloseTo(value, 5);
   }
 
   async function createPreconditions(): Promise<any> {