Merge branch 'fix-school-dimension-enrollment-aggregate' into 'development'

fix: update aggregateData middleware to handle base fields correctly

See merge request !447

src/libs/middlewares/aggregateData.js

@@ -67,10 +67,10 @@ function aggregateData(req, res, next) {
             'education_degree_entity',
             'receitas',
             'despesas'
-        ]
+        ];
+        const baseFields = ["school"]
         let id;
         const fields = req.query.dims.split(',');
-        console.log(fields);
         let currentAggregateField;
         let currentNonAggregateField;
     
@@ -92,7 +92,9 @@ function aggregateData(req, res, next) {
         
                         if (currentNonAggregateField) {
                             data[`${currentNonAggregateField}_id`] = r[`${currentNonAggregateField}_id`];
-                            data[`${currentNonAggregateField}_name`] = id2str[convert[currentNonAggregateField]](r[`${currentNonAggregateField}_id`]);
+                            data[`${currentNonAggregateField}_name`] = baseFields.includes(currentNonAggregateField)
+                                ? r[`${currentNonAggregateField}_name`]
+                                : id2str[convert[currentNonAggregateField]](r[`${currentNonAggregateField}_id`]);
                         }
         
                         newResult.push(data)