Skip to content

Remove unused id field from GlobalFilterInfos DTO #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flomillot merged 2 commits into from
Feb 23, 2026
Merged

Remove unused id field from GlobalFilterInfos DTO #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
895d093
Remove unused `id` field from GlobalFilterInfos DTO
flomillot Feb 18, 2026
d139630
Replace `id` with `uuid` in GlobalFilterInfos DTO and update test ass…
flomillot Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/main/java/org/gridsuite/studyconfig/server/dto/GlobalFilterInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/gridsuite/studyconfig/server/ComputationResultFiltersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ void tearDown() {
}

private List<GlobalFilterInfos> 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() {
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/org/gridsuite/studyconfig/server/DtoConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
18 changes: 9 additions & 9 deletions src/test/java/org/gridsuite/studyconfig/server/SpreadsheetConfigIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand All @@ -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);
}
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -570,7 +570,7 @@ void testSetGlobalFiltersForSpreadsheetConfig() throws Exception {

// Create new filters to set
List<GlobalFilterInfos> 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
Expand Down Expand Up @@ -614,7 +614,7 @@ void testResetFiltersForSpreadsheetConfig() throws Exception {
void testSetGlobalFiltersToNonExistentConfig() throws Exception {
UUID nonExistentConfigId = UUID.randomUUID();
List<GlobalFilterInfos> 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")
Expand Down Expand Up @@ -666,14 +666,14 @@ private List<SpreadsheetColumnInfos> createUpdatedColumnsWithFilters() {

private List<GlobalFilterInfos> 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<GlobalFilterInfos> 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()
);
}

Expand Down