diff --git a/src/main/java/org/gridsuite/computation/utils/SpecificationUtils.java b/src/main/java/org/gridsuite/computation/utils/SpecificationUtils.java index 74abf2c..7a9d6b1 100644 --- a/src/main/java/org/gridsuite/computation/utils/SpecificationUtils.java +++ b/src/main/java/org/gridsuite/computation/utils/SpecificationUtils.java @@ -1,10 +1,3 @@ -/** - * Copyright (c) 2025, RTE (http://www.rte-france.com) - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - /** * Copyright (c) 2025, RTE (http://www.rte-france.com) * This Source Code Form is subject to the terms of the Mozilla Public @@ -236,6 +229,8 @@ private static Specification appendNumberFilterToSpecification(Specificat specification.and(lessThanOrEqual(resourceFilter.column(), valueDouble, tolerance)); case GREATER_THAN_OR_EQUAL -> specification.and(greaterThanOrEqual(resourceFilter.column(), valueDouble, tolerance)); + case EQUALS -> specification.and(greaterThanOrEqual(resourceFilter.column(), valueDouble, tolerance)) + .and(lessThanOrEqual(resourceFilter.column(), valueDouble, tolerance)); default -> throw new IllegalArgumentException("The filter type " + resourceFilter.type() + " is not supported with the data type " + resourceFilter.dataType()); }; diff --git a/src/test/java/org/gridsuite/computation/specification/CommonSpecificationBuilderTest.java b/src/test/java/org/gridsuite/computation/specification/CommonSpecificationBuilderTest.java index d603b2c..389b68a 100644 --- a/src/test/java/org/gridsuite/computation/specification/CommonSpecificationBuilderTest.java +++ b/src/test/java/org/gridsuite/computation/specification/CommonSpecificationBuilderTest.java @@ -86,7 +86,8 @@ void testBuildSpecification() { new ResourceFilterDTO(TEXT, CONTAINS, List.of("partialValue1", "partialValue2"), "dummyColumn"), new ResourceFilterDTO(NUMBER, LESS_THAN_OR_EQUAL, 100.0157, "dummyNumberColumn"), new ResourceFilterDTO(NUMBER, GREATER_THAN_OR_EQUAL, 10, "dummyNumberColumn", 0.1), - new ResourceFilterDTO(NUMBER, NOT_EQUAL, 10, "parent.dummyNumberColumn") + new ResourceFilterDTO(NUMBER, NOT_EQUAL, 10, "parent.dummyNumberColumn"), + new ResourceFilterDTO(NUMBER, EQUALS, 42.000, "dummyNumberColumn") ); List resourceFiltersWithChildren = List.of( new ResourceFilterDTO(NUMBER, NOT_EQUAL, 10, "parent.dummyNumberColumn")