Bring FloatComparison filters in line with integer one

Author: graduta

lib/domain/dtos/filters/NumericalComparisonDto.js

@@ -20,4 +20,7 @@ exports.IntegerComparisonDto = Joi.object({
     limit: Joi.number().integer().min(0),
 });
 
-exports.FloatComparisonDto = Joi.object(Object.fromEntries(NUMERICAL_COMPARISON_OPERATORS.map((operator) => [operator, Joi.number()])));
+exports.FloatComparisonDto = Joi.object({
+    operator: Joi.string().valid(...NUMERICAL_COMPARISON_OPERATORS),
+    limit: Joi.number().min(0),
+});

lib/usecases/run/GetAllRunsUseCase.js

@@ -158,21 +158,25 @@ class GetAllRunsUseCase {
                     .filter((fillNumber) => parseInt(fillNumber, 10));
                 filteringQueryBuilder.where('fillNumber').oneOf(...fillNumbersList);
             }
+
             if (o2start) {
                 const from = o2start.from !== undefined ? o2start.from : 0;
                 const to = o2start.to !== undefined ? o2start.to : new Date().getTime();
                 filteringQueryBuilder.where('timeO2Start').between(from, to);
             }
+
             if (o2end) {
                 const from = o2end.from !== undefined ? o2end.from : 0;
                 const to = o2end.to !== undefined ? o2end.to : new Date().getTime();
                 filteringQueryBuilder.where('timeO2End').between(from, to);
             }
+
             if (updatedAt) {
                 const from = updatedAt.from ?? 0;
                 const to = updatedAt.to ?? new Date().getTime();
                 filteringQueryBuilder.where('updatedAt').between(from, to);
             }
+
             if (triggerValues) {
                 filteringQueryBuilder.where('triggerValue').oneOf(...triggerValues);
             }
@@ -202,6 +206,7 @@ class GetAllRunsUseCase {
             }
 
             if (muInelasticInteractionRate) {
+                const { operator, limit: muInelasticInteractionRateValue } = muInelasticInteractionRate;
                 /**
                  * The computed mu of inelastic interaction rate
                  *
@@ -215,9 +220,7 @@ class GetAllRunsUseCase {
                     `);
 
                 filteringQueryBuilder.include({ association: 'lhcFill' });
-                for (const [operator, value] of Object.entries(muInelasticInteractionRate)) {
-                    filteringQueryBuilder.where(computedColumn).applyOperator(operator, value);
-                }
+                filteringQueryBuilder.where(computedColumn).applyOperator(operator, muInelasticInteractionRateValue);
             }
 
             const inelFilters = {
@@ -226,12 +229,10 @@ class GetAllRunsUseCase {
                 inelasticInteractionRateAtMid,
                 inelasticInteractionRateAtEnd,
             };
-            for (const [property, operatorsAndValues] of Object.entries(inelFilters)) {
-                if (operatorsAndValues) {
-                    for (const [operator, value] of Object.entries(operatorsAndValues)) {
-                        filteringQueryBuilder.where(property).applyOperator(operator, value);
-                    }
-                }
+            for (const inelFilter of Object.entries(inelFilters)) {
+                if (inelFilter) continue;
+                const { operator, limit: value } = inelFilter;
+                filteringQueryBuilder.where(inelFilter).applyOperator(operator, value);
             }
 
             if (runDuration) {
@@ -255,6 +256,7 @@ class GetAllRunsUseCase {
                 // Duration limit is handled in milliseconds by the API, but the query works on microseconds
                 filteringQueryBuilder.where(computedColumn).applyOperator(operator, durationLimit * 1000);
             }
+
             if (environmentIds) {
                 // Search for multiple exact ids
                 const environmentIdList = environmentIds
@@ -263,9 +265,11 @@ class GetAllRunsUseCase {
                     .filter((environmentId) => Boolean(environmentId));
                 filteringQueryBuilder.where('environmentId').oneOf(...environmentIdList);
             }
+
             if (runQualities) {
                 filteringQueryBuilder.where('runQuality').oneOf(...runQualities);
             }
+
             const fileCountFilters = [
                 { field: 'nDetectors', value: nDetectors },
                 { field: 'nFlps', value: nFlps },
@@ -286,19 +290,23 @@ class GetAllRunsUseCase {
             } else if (ddflp === true) {
                 filteringQueryBuilder.where('dd_flp').is(ddflp);
             }
+
             if (dcs === false) {
                 filteringQueryBuilder.where('dcs').isOrNull(dcs);
             } else if (dcs === true) {
                 filteringQueryBuilder.where('dcs').is(dcs);
             }
+
             if (epn === false) {
                 filteringQueryBuilder.where('epn').isOrNull(false);
             } else if (epn === true) {
                 filteringQueryBuilder.where('epn').is(true);
             }
+
             if (odcTopologyFullName) {
                 filteringQueryBuilder.where('odcTopologyFullName').substring(odcTopologyFullName);
             }
+
             if (detectorFilter) {
                 const { operator: detectorsOperator, values: detectorsValues } = detectorFilter;
                 switch (detectorsOperator) {
@@ -315,6 +323,7 @@ class GetAllRunsUseCase {
                         break;
                 }
             }
+
             if (lhcPeriods) {
                 // Search for multiple exact ids
                 const lhcPeriodsList = lhcPeriods
@@ -351,7 +360,8 @@ class GetAllRunsUseCase {
                 const [dataPassId] = dataPassIds;
                 const gaqSummary = await gaqService.getSummary(dataPassId, { mcReproducibleAsNotBad });
 
-                for (const [operator, value] of Object.entries(gaq.notBadFraction)) {
+                if (gaq.notBadFraction) {
+                    const {operator, limit: value} = gaq.notBadFraction;
                     const runNumbers = Object.entries(gaqSummary)
                         .filter(([_, { badEffectiveRunCoverage }]) => {
                             switch (operator) {

test/api/runs.test.js

@@ -399,7 +399,7 @@ module.exports = () => {
         it('should successfully filter by GAQ notBadFraction', async () => {
             const dataPassId = 1;
             {
-                const response = await request(server).get(`/api/runs?filter[dataPassIds][]=${dataPassId}&filter[gaq][notBadFraction][<]=0.8`);
+                const response = await request(server).get(`/api/runs?filter[dataPassIds][]=${dataPassId}&filter[gaq][notBadFraction][operator]=<&filter[gaq][notBadFraction][limit]=0.8`);
 
                 expect(response.status).to.equal(200);
                 const { data: runs } = response.body;
@@ -409,7 +409,7 @@ module.exports = () => {
             }
             {
                 const response = await request(server).get(`/api/runs?filter[dataPassIds][]=${dataPassId}` +
-                    '&filter[gaq][notBadFraction][<]=0.8&filter[gaq][mcReproducibleAsNotBad]=true');
+                    '&filter[gaq][notBadFraction][operator]=<&filter[gaq][notBadFraction][limit]=0.8&filter[gaq][mcReproducibleAsNotBad]=true');
 
                 expect(response.status).to.equal(200);
                 const { data: runs } = response.body;

test/lib/usecases/run/GetAllRunsUseCase.test.js

@@ -754,7 +754,16 @@ module.exports = () => {
     for (const [property, testParameters] of Object.entries(inelasticInteractionRateFilteringTestsParameters)) {
         const { operator, value, expectedRuns } = testParameters;
         it(`should successfully filter by ${property}`, async () => {
-            const { runs } = await new GetAllRunsUseCase().execute({ query: { filter: { [property]: { [operator]: value } } } });
+            const { runs } = await new GetAllRunsUseCase().execute({
+                query: {
+                    filter: {
+                        [property]: {
+                            operator,
+                            limit: value,
+                        }
+                    }
+                }
+            });
             expect(runs).to.be.an('array');
             expect(runs.map(({ runNumber }) => runNumber)).to.have.all.members(expectedRuns);
         });
@@ -767,7 +776,7 @@ module.exports = () => {
                 query: {
                     filter: {
                         dataPassIds,
-                        gaq: { notBadFraction: { '<': 0.8 } },
+                        gaq: { notBadFraction: { operator: '<', limit: 0.8 } },
                     },
                 },
             });
@@ -779,7 +788,7 @@ module.exports = () => {
                 query: {
                     filter: {
                         dataPassIds,
-                        gaq: { notBadFraction: { '<': 0.8 }, mcReproducibleAsNotBad: true },
+                        gaq: { notBadFraction: { operator: '<', limit: 0.8 }, mcReproducibleAsNotBad: true },
                     },
                 },
             });