Remove id check from tests

Author: Hugo Marcellin

src/main/java/org/gridsuite/studyconfig/server/dto/GlobalFilterInfos.java

@@ -20,6 +20,10 @@
 @Schema(name = "GlobalFilterDto", description = "Global filter configuration")
 public record GlobalFilterInfos(
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @Schema(description = "Global filter UUID")
+    UUID id,
+
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @Schema(description = "Generic filter ID")
     UUID uuid,

src/main/java/org/gridsuite/studyconfig/server/mapper/SpreadsheetConfigMapper.java

@@ -93,15 +93,16 @@ public static ColumnEntity toColumnEntity(ColumnInfos dto) {
     }
 
     public static GlobalFilterInfos toGlobalFilterDto(GlobalFilterEntity entity) {
-        return new GlobalFilterInfos(
-                entity.getUuid(),
-                entity.getFilterType(),
-                entity.getFilterSubtype(),
-                entity.getLabel(),
-                entity.isRecent(),
-                entity.getEquipmentType(),
-                entity.getPath()
-        );
+        return GlobalFilterInfos.builder()
+                .uuid(entity.getUuid())
+                .filterType(entity.getFilterType())
+                .filterSubtype(entity.getFilterSubtype())
+                .label(entity.getLabel())
+                .recent(entity.isRecent())
+                .equipmentType(entity.getEquipmentType())
+                .path(entity.getPath())
+                .build();
+
     }
 
     public static GlobalFilterEntity toGlobalFilterEntity(GlobalFilterInfos dto) {

src/test/java/org/gridsuite/studyconfig/server/DtoConverterTest.java

@@ -84,10 +84,7 @@ void testConversionToDtoOfSpreadsheetConfig() {
                         assertThat(d.columns().get(1).filterValue()).isNull();
                         // Global filters assertions
                         assertThat(d.globalFilters()).hasSize(2);
-                        assertThat(d.globalFilters().get(0).id()).isNotNull();
                         assertThat(d.globalFilters().get(0).label()).isEqualTo("GlobalFilter1");
-
-                        assertThat(d.globalFilters().get(1).id()).isNotNull();
                         assertThat(d.globalFilters().get(1).label()).isEqualTo("GlobalFilter2");
                     });
         }
@@ -249,7 +246,6 @@ void testConversionToDtoOfGlobalFilter() {
             assertThat(dto)
                     .as("DTO conversion result")
                     .satisfies(d -> {
-                        assertThat(d.id()).isEqualTo(uuid);
                         assertThat(d.uuid()).isEqualTo(filterId);
                         assertThat(d.label()).isEqualTo("TestGlobalFilter");
                     });