From 895d09388f7a8d03ca3d4157015d13721220e79a Mon Sep 17 00:00:00 2001 From: Florent MILLOT <75525996+flomillot@users.noreply.github.com> Date: Wed, 18 Feb 2026 14:53:53 +0100 Subject: [PATCH 1/2] Remove unused `id` field from GlobalFilterInfos DTO Signed-off-by: Florent MILLOT <75525996+flomillot@users.noreply.github.com> --- .../gridsuite/studyconfig/server/dto/GlobalFilterInfos.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/GlobalFilterInfos.java b/src/main/java/org/gridsuite/studyconfig/server/dto/GlobalFilterInfos.java index 32061724..defd1617 100644 --- a/src/main/java/org/gridsuite/studyconfig/server/dto/GlobalFilterInfos.java +++ b/src/main/java/org/gridsuite/studyconfig/server/dto/GlobalFilterInfos.java @@ -20,10 +20,6 @@ @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, From d139630d57ac834e4e95adf25ed807f67b01b30e Mon Sep 17 00:00:00 2001 From: Florent MILLOT <75525996+flomillot@users.noreply.github.com> Date: Wed, 18 Feb 2026 15:05:08 +0100 Subject: [PATCH 2/2] Replace `id` with `uuid` in GlobalFilterInfos DTO and update test assertions Signed-off-by: Florent MILLOT <75525996+flomillot@users.noreply.github.com> --- .../server/ComputationResultFiltersTest.java | 4 ++-- .../studyconfig/server/DtoConverterTest.java | 2 -- .../SpreadsheetConfigIntegrationTest.java | 18 +++++++++--------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/test/java/org/gridsuite/studyconfig/server/ComputationResultFiltersTest.java b/src/test/java/org/gridsuite/studyconfig/server/ComputationResultFiltersTest.java index 352422ed..7d8e923a 100644 --- a/src/test/java/org/gridsuite/studyconfig/server/ComputationResultFiltersTest.java +++ b/src/test/java/org/gridsuite/studyconfig/server/ComputationResultFiltersTest.java @@ -51,8 +51,8 @@ void tearDown() { } private List createGlobalFilters() { - return List.of(GlobalFilterInfos.builder().id(UUID.randomUUID()).filterType("country").label("Filter 1").recent(false).build(), - GlobalFilterInfos.builder().id(UUID.randomUUID()).filterType("country").label("Filter 2").recent(false).build()); + return List.of(GlobalFilterInfos.builder().uuid(UUID.randomUUID()).filterType("country").label("Filter 1").recent(false).build(), + GlobalFilterInfos.builder().uuid(UUID.randomUUID()).filterType("country").label("Filter 2").recent(false).build()); } private ComputationResultColumnFilterInfos createColumnFilter() { diff --git a/src/test/java/org/gridsuite/studyconfig/server/DtoConverterTest.java b/src/test/java/org/gridsuite/studyconfig/server/DtoConverterTest.java index ebd9ce13..5e5c6102 100644 --- a/src/test/java/org/gridsuite/studyconfig/server/DtoConverterTest.java +++ b/src/test/java/org/gridsuite/studyconfig/server/DtoConverterTest.java @@ -273,10 +273,8 @@ void testConversionToDtoOfGlobalFilter() { @Test void testConversionToEntityOfGlobalFilter() { - UUID uuid = UUID.randomUUID(); UUID filterId = UUID.randomUUID(); GlobalFilterInfos dto = GlobalFilterInfos.builder() - .id(uuid) .uuid(filterId) .filterType("country") .label("TestGlobalFilter") diff --git a/src/test/java/org/gridsuite/studyconfig/server/SpreadsheetConfigIntegrationTest.java b/src/test/java/org/gridsuite/studyconfig/server/SpreadsheetConfigIntegrationTest.java index 4e372167..22531949 100644 --- a/src/test/java/org/gridsuite/studyconfig/server/SpreadsheetConfigIntegrationTest.java +++ b/src/test/java/org/gridsuite/studyconfig/server/SpreadsheetConfigIntegrationTest.java @@ -70,7 +70,7 @@ void testCreate() throws Exception { assertThat(createdConfig) .usingRecursiveComparison() - .ignoringFields("columns.uuid", "id", "columns.id", "globalFilters.id") + .ignoringFields("columns.uuid", "id", "columns.id") .isEqualTo(configToCreate); assertThat(createdConfig.id()).isNotNull(); } @@ -97,7 +97,7 @@ void testRead() throws Exception { assertThat(receivedConfig) .usingRecursiveComparison() - .ignoringFields("columns.uuid", "id", "columns.id", "globalFilters.id") + .ignoringFields("columns.uuid", "id", "columns.id") .isEqualTo(configToRead); assertThat(receivedConfig.id()).isEqualTo(configUuid); } @@ -170,7 +170,7 @@ void testUpdate() throws Exception { assertThat(retrievedConfig) .usingRecursiveComparison() - .ignoringFields("columns.uuid", "columns.id", "globalFilters.id", "id") + .ignoringFields("columns.uuid", "columns.id", "id") .isEqualTo(updatedConfig); } @@ -219,7 +219,7 @@ void testDuplicate() throws Exception { SpreadsheetConfigInfos duplicatedConfig = getSpreadsheetConfig(duplicatedConfigUuid); assertThat(duplicatedConfig) .usingRecursiveComparison() - .ignoringFields("columns.uuid", "id", "columns.id", "globalFilters.id") + .ignoringFields("columns.uuid", "id", "columns.id") .isEqualTo(configToCreate); assertThat(duplicatedConfig.id()).isNotEqualTo(configUuid); } @@ -570,7 +570,7 @@ void testSetGlobalFiltersForSpreadsheetConfig() throws Exception { // Create new filters to set List filtersToSet = List.of( - GlobalFilterInfos.builder().id(UUID.randomUUID()).filterType("country").label("Replacement Filter").recent(false).build() + GlobalFilterInfos.builder().uuid(UUID.randomUUID()).filterType("country").label("Replacement Filter").recent(false).build() ); // Call the endpoint to set the filters @@ -614,7 +614,7 @@ void testResetFiltersForSpreadsheetConfig() throws Exception { void testSetGlobalFiltersToNonExistentConfig() throws Exception { UUID nonExistentConfigId = UUID.randomUUID(); List filtersToAdd = List.of( - GlobalFilterInfos.builder().id(UUID.randomUUID()).filterType("country").label("Test Filter").recent(false).build() + GlobalFilterInfos.builder().uuid(UUID.randomUUID()).filterType("country").label("Test Filter").recent(false).build() ); mockMvc.perform(post(URI_SPREADSHEET_CONFIG_GET_PUT + nonExistentConfigId + "/global-filters") @@ -666,14 +666,14 @@ private List createUpdatedColumnsWithFilters() { private List createGlobalFilters() { return Arrays.asList( - GlobalFilterInfos.builder().id(UUID.randomUUID()).filterType("country").label("Global Filter 1").recent(false).build(), - GlobalFilterInfos.builder().id(UUID.randomUUID()).filterType("country").label("Global Filter 2").recent(false).build() + GlobalFilterInfos.builder().uuid(UUID.randomUUID()).filterType("country").label("Global Filter 1").recent(false).build(), + GlobalFilterInfos.builder().uuid(UUID.randomUUID()).filterType("country").label("Global Filter 2").recent(false).build() ); } private List createUpdatedGlobalFilters() { return List.of( - GlobalFilterInfos.builder().id(UUID.randomUUID()).filterType("country").label("Updated Global Filter").recent(false).build() + GlobalFilterInfos.builder().uuid(UUID.randomUUID()).filterType("country").label("Updated Global Filter").recent(false).build() ); }