fix: rename field to column to match security-analysis-server (#54)

Signed-off-by: LE SAULNIER Kevin <[email protected]>
Co-authored-by: LE SAULNIER Kevin <[email protected]>

Author: klesaulnier

src/main/java/org/gridsuite/shortcircuit/server/dto/ResourceFilter.java

@@ -19,10 +19,10 @@
  * @param dataType the type of data we want to filter (text, number)
  * @param type the type of filter (contains, startsWith...)
  * @param value the value of the filter
- * @param field the field on which the filter will be applied
+ * @param column the column on which the filter will be applied
  * @author Florent MILLOT <[email protected]>
  */
-public record ResourceFilter(DataType dataType, Type type, Object value, String field) {
+public record ResourceFilter(DataType dataType, Type type, Object value, String column) {
 
     private static ObjectMapper objectMapper = new ObjectMapper();
 

src/main/java/org/gridsuite/shortcircuit/server/utils/SpecificationUtils.java

@@ -89,18 +89,18 @@ private static <X> Specification<X> appendTextFilterToSpecification(Specificatio
             case EQUALS -> {
                 // this type can manage one value or a list of values (with OR)
                 if (resourceFilter.value() instanceof Collection<?> valueList) {
-                    completedSpecification = completedSpecification.and(anyOf(valueList.stream().map(value -> SpecificationUtils.<X>equals(resourceFilter.field(), value.toString())).toList()));
+                    completedSpecification = completedSpecification.and(anyOf(valueList.stream().map(value -> SpecificationUtils.<X>equals(resourceFilter.column(), value.toString())).toList()));
                 } else if (resourceFilter.value() == null) {
                     // if the value is null, we build an impossible specification (trick to remove later on ?)
                     completedSpecification = completedSpecification.and(not(completedSpecification));
                 } else {
-                    completedSpecification = completedSpecification.and(equals(resourceFilter.field(), resourceFilter.value().toString()));
+                    completedSpecification = completedSpecification.and(equals(resourceFilter.column(), resourceFilter.value().toString()));
                 }
             }
             case CONTAINS ->
-                completedSpecification = completedSpecification.and(contains(resourceFilter.field(), resourceFilter.value().toString()));
+                completedSpecification = completedSpecification.and(contains(resourceFilter.column(), resourceFilter.value().toString()));
             case STARTS_WITH ->
-                completedSpecification = completedSpecification.and(startsWith(resourceFilter.field(), resourceFilter.value().toString()));
+                completedSpecification = completedSpecification.and(startsWith(resourceFilter.column(), resourceFilter.value().toString()));
             default -> throwBadFilterTypeException(resourceFilter.type(), resourceFilter.dataType());
         }
 
@@ -116,11 +116,11 @@ private static <X> Specification<X> appendNumberFilterToSpecification(Specificat
 
         switch (resourceFilter.type()) {
             case NOT_EQUAL ->
-                completedSpecification = completedSpecification.and(notEqual(resourceFilter.field(), value));
+                completedSpecification = completedSpecification.and(notEqual(resourceFilter.column(), value));
             case LESS_THAN_OR_EQUAL ->
-                completedSpecification = completedSpecification.and(lessThanOrEqual(resourceFilter.field(), value));
+                completedSpecification = completedSpecification.and(lessThanOrEqual(resourceFilter.column(), value));
             case GREATER_THAN_OR_EQUAL ->
-                completedSpecification = completedSpecification.and(greaterThanOrEqual(resourceFilter.field(), value));
+                completedSpecification = completedSpecification.and(greaterThanOrEqual(resourceFilter.column(), value));
             default -> throwBadFilterTypeException(resourceFilter.type(), resourceFilter.dataType());
         }