Merge pull request #1002 from ReliefApplications/2.x.x

2.x.x

Author: AntoineRelief

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.7.1](https://github.com/ReliefApplications/ems-backend/compare/v2.7.0...v2.7.1) (2024-03-04)
+
+
+### Bug Fixes
+
+* now working nested fields in reference data aggregation ([#993](https://github.com/ReliefApplications/ems-backend/issues/993)) ([0603afc](https://github.com/ReliefApplications/ems-backend/commit/0603afcf16f370fc29405622afbf1bd081aee10d))
+
 # [2.7.0](https://github.com/ReliefApplications/ems-backend/compare/v2.6.5...v2.7.0) (2024-02-23)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ems-backend",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {

package.json

@@ -11,7 +11,7 @@ import i18next from 'i18next';
 import mongoose from 'mongoose';
 import { logger } from '@services/logger.service';
 import axios from 'axios';
-import { isEqual, get, omit } from 'lodash';
+import { isEqual, get, omit, isEmpty } from 'lodash';
 import turf, { Feature, booleanPointInPolygon } from '@turf/turf';
 import dataSources, { CustomAPI } from '@server/apollo/dataSources';
 import { getAdmin0Polygons } from '@utils/gis/getCountryPolygons';
@@ -392,7 +392,7 @@ router.get('/feature', async (req, res) => {
           });
         } else if (referenceData.type === 'static') {
           let data = referenceData.data || [];
-          if (contextFilters) {
+          if (contextFilters && !isEmpty(contextFilters)) {
             data = data.filter((x) => filterReferenceData(x, contextFilters));
           }
           await getFeatures(
@@ -421,7 +421,7 @@ router.get('/feature', async (req, res) => {
               apiConfiguration,
               graphQLVariables
             )) || [];
-          if (contextFilters) {
+          if (contextFilters && !isEmpty(contextFilters)) {
             data = data.filter((x) => filterReferenceData(x, contextFilters));
           }
           await getFeatures(

src/routes/gis/index.ts

@@ -179,21 +179,21 @@ const procOperator = (data: any, operator) => {
   switch (operator.operator) {
     case 'sum':
       return {
-        sum: sum(data.map((element) => Number(element[operator.field]))),
+        sum: sum(data.map((element) => Number(get(element, operator.field)))),
       };
     case 'avg':
       return {
-        avg: mean(data.map((element) => Number(element[operator.field]))),
+        avg: mean(data.map((element) => Number(get(element, operator.field)))),
       };
     case 'count':
       return { count: size(data) };
     case 'max':
       return {
-        max: max(data.map((element) => Number(element[operator.field]))),
+        max: max(data.map((element) => Number(get(element, operator.field)))),
       };
     case 'min':
       return {
-        min: min(data.map((element) => Number(element[operator.field]))),
+        min: min(data.map((element) => Number(get(element, operator.field)))),
       };
     case 'last':
       return {
@@ -223,8 +223,8 @@ const procPipelineStep = (pipelineStep, data, sourceFields) => {
         (operator) => operator.expression
       );
       const keysToGroupBy = pipelineStep.form.groupBy.map((key) => key.field);
-      data = groupBy(data, (dataKey) =>
-        keysToGroupBy.map((key) => dataKey[key])
+      data = groupBy(data, (item) =>
+        keysToGroupBy.map((key) => get(item, key))
       );
       for (const key in data) {
         let supplementaryFields: any;
@@ -276,18 +276,18 @@ const procPipelineStep = (pipelineStep, data, sourceFields) => {
         switch (elt.expression.operator) {
           case 'add':
             data.map((obj: any) => {
-              obj[elt.name] = obj[elt.expression.field];
+              obj[elt.name] = get(obj, elt.expression.field);
             });
             break;
           case 'month':
             data.map((obj: any) => {
               try {
                 const month =
-                  new Date(obj[elt.expression.field]).getMonth() + 1;
+                  new Date(get(obj, elt.expression.field)).getMonth() + 1;
                 const monthAsString =
                   month < 10 ? '0' + month : month.toString();
                 const dateWithMonth =
-                  new Date(obj[elt.expression.field]).getFullYear() +
+                  new Date(get(obj, elt.expression.field)).getFullYear() +
                   '-' +
                   monthAsString;
                 obj[elt.name] = dateWithMonth;
@@ -299,7 +299,9 @@ const procPipelineStep = (pipelineStep, data, sourceFields) => {
           case 'year':
             data.map((obj: any) => {
               try {
-                const year = new Date(obj[elt.expression.field]).getFullYear();
+                const year = new Date(
+                  get(obj, elt.expression.field)
+                ).getFullYear();
                 const yearAsString = year.toString();
                 obj[elt.name] = yearAsString;
               } catch {
@@ -310,7 +312,7 @@ const procPipelineStep = (pipelineStep, data, sourceFields) => {
           case 'day':
             data.map((obj: any) => {
               try {
-                const date = new Date(obj[elt.expression.field]);
+                const date = new Date(get(obj, elt.expression.field));
                 const dayAsString =
                   date.getFullYear() +
                   '-' +
@@ -326,7 +328,7 @@ const procPipelineStep = (pipelineStep, data, sourceFields) => {
           case 'week':
             data.map((obj: any) => {
               try {
-                const date = new Date(obj[elt.expression.field]);
+                const date = new Date(get(obj, elt.expression.field));
                 const firstDayOfYear = new Date(date.getFullYear(), 0, 1);
                 const pastDaysOfYear =
                   (date.valueOf() - firstDayOfYear.valueOf()) / 86400000;
@@ -342,7 +344,7 @@ const procPipelineStep = (pipelineStep, data, sourceFields) => {
             break;
           case 'multiply':
             data.map((obj: any) => {
-              obj[elt.name] = obj[elt.expression.field];
+              obj[elt.name] = get(obj, elt.expression.field);
             });
             break;
         }