Case insensitive filtering and restrict the limit violation enum valu…

…es. (#51) Signed-off-by: Florent MILLOT <millotflo@gmail.com>
gridsuite · Nov 3, 2023 · 9325a15 · 9325a15
1 parent a25c0f1
commit 9325a15
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/main/java/org/gridsuite/shortcircuit/server/ShortCircuitController.java b/src/main/java/org/gridsuite/shortcircuit/server/ShortCircuitController.java
@@ -162,8 +162,8 @@ public ResponseEntity<FaultType[]> getFaultTypes() {
     @GetMapping(value = "/limit-violation-types", produces = APPLICATION_JSON_VALUE)
     @Operation(summary = "Get list of limit violation types")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The list of limit violation types")})
-    public ResponseEntity<LimitViolationType[]> getLimitTypes() {
-        return ResponseEntity.ok().body(LimitViolationType.values());
+    public ResponseEntity<List<LimitViolationType>> getLimitTypes() {
+        return ResponseEntity.ok().body(List.of(LimitViolationType.LOW_SHORT_CIRCUIT_CURRENT, LimitViolationType.HIGH_SHORT_CIRCUIT_CURRENT));
     }
 
 }
diff --git a/src/main/java/org/gridsuite/shortcircuit/server/utils/SpecificationUtils.java b/src/main/java/org/gridsuite/shortcircuit/server/utils/SpecificationUtils.java
@@ -34,15 +34,15 @@ private SpecificationUtils() {
 
     // we use .as(String.class) to be able to works on enum fields
     public static <X> Specification<X> equals(String field, String value) {
-        return (root, cq, cb) -> cb.equal(getColumnPath(root, field).as(String.class), value);
+        return (root, cq, cb) -> cb.equal(cb.upper(getColumnPath(root, field)).as(String.class), value.toUpperCase());
     }
 
     public static <X> Specification<X> contains(String field, String value) {
-        return (root, cq, cb) -> cb.like(getColumnPath(root, field), "%" + EscapeCharacter.DEFAULT.escape(value) + "%", EscapeCharacter.DEFAULT.getEscapeCharacter());
+        return (root, cq, cb) -> cb.like(cb.upper(getColumnPath(root, field)), "%" + EscapeCharacter.DEFAULT.escape(value).toUpperCase() + "%", EscapeCharacter.DEFAULT.getEscapeCharacter());
     }
 
     public static <X> Specification<X> startsWith(String field, String value) {
-        return (root, cq, cb) -> cb.like(getColumnPath(root, field), EscapeCharacter.DEFAULT.escape(value) + "%", EscapeCharacter.DEFAULT.getEscapeCharacter());
+        return (root, cq, cb) -> cb.like(cb.upper(getColumnPath(root, field)), EscapeCharacter.DEFAULT.escape(value).toUpperCase() + "%", EscapeCharacter.DEFAULT.getEscapeCharacter());
     }
 
     public static <X> Specification<X> notEqual(String field, Double value) {

diff --git a/src/test/java/org/gridsuite/shortcircuit/server/repositories/FeederResultRepositoryTest.java b/src/test/java/org/gridsuite/shortcircuit/server/repositories/FeederResultRepositoryTest.java
@@ -169,7 +169,13 @@ private Stream<Arguments> provideContainsFilters() {
                 resultMagnitudeEntity,
                 List.of(
                     new ResourceFilter(ResourceFilter.DataType.TEXT, ResourceFilter.Type.CONTAINS, "_D_1", "connectableId")),
-                List.of())
+                List.of()),
+            // case insensitive
+            Arguments.of(
+                resultMagnitudeEntity,
+                List.of(
+                    new ResourceFilter(ResourceFilter.DataType.TEXT, ResourceFilter.Type.CONTAINS, "id_2", "connectableId")),
+                List.of(feederResultEntity2))
         );
     }
 
@@ -195,7 +201,13 @@ private Stream<Arguments> provideStartsWithFilters() {
                 List.of(
                     new ResourceFilter(ResourceFilter.DataType.TEXT, ResourceFilter.Type.STARTS_WITH, "A_CONN", "connectableId"),
                     new ResourceFilter(ResourceFilter.DataType.TEXT, ResourceFilter.Type.STARTS_WITH, "B_CONN", "connectableId")),
-                List.of())
+                List.of()),
+            // case insensitive
+            Arguments.of(
+                resultMagnitudeEntity,
+                List.of(
+                    new ResourceFilter(ResourceFilter.DataType.TEXT, ResourceFilter.Type.STARTS_WITH, "a_conn", "connectableId")),
+                List.of(feederResultEntity1, feederResultEntity2))
         );
     }