Skip to content

Clean up global filter dto #56

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
merged 3 commits into from
Jun 12, 2025
Merged

Clean up global filter dto #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3fa770
Clean up global filter dto
Jun 11, 2025
2f931f0
Remove id check from tests
Jun 11, 2025
0424e5a
Remove NON NULL annotation from primitive
Jun 12, 2025
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
6 changes: 6 additions & 0 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 @@ -6,6 +6,7 @@
*/
package org.gridsuite.studyconfig.server.dto;

import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Builder;
Expand All @@ -19,16 +20,19 @@
@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,

@NotNull(message = "Filter type is mandatory")
@Schema(description = "Filter type")
String filterType,

@JsonInclude(JsonInclude.Include.NON_NULL)
@Schema(description = "Filter subtype")
String filterSubtype,

Expand All @@ -39,9 +43,11 @@ public record GlobalFilterInfos(
@Schema(description = "Was filter recently applied")
boolean recent,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

boolean (primitive) can not be null


@JsonInclude(JsonInclude.Include.NON_NULL)
@Schema(description = "Generic filter related equipment type")
String equipmentType,

@JsonInclude(JsonInclude.Include.NON_NULL)
@Schema(description = "Generic filter path")
String path

Expand Down
20 changes: 10 additions & 10 deletions src/main/java/org/gridsuite/studyconfig/server/mapper/SpreadsheetConfigMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,16 @@ public static ColumnEntity toColumnEntity(ColumnInfos dto) {
}

public static GlobalFilterInfos toGlobalFilterDto(GlobalFilterEntity entity) {
return new GlobalFilterInfos(
entity.getId(),
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) {
Expand Down
4 changes: 0 additions & 4 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 @@ -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");
});
}
Expand Down Expand Up @@ -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");
});
Expand Down