Refactor column visibility handling to use primitive boolean type

Signed-off-by: achour94 <[email protected]>

Author: achour94

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

@@ -54,5 +54,5 @@ public record ColumnInfos(
     Double filterTolerance,
 
     @Schema(description = "Column visibility", defaultValue = "true")
-    Boolean visible
+    boolean visible
 ) { }

src/main/java/org/gridsuite/studyconfig/server/entities/ColumnEntity.java

@@ -63,5 +63,5 @@ public class ColumnEntity {
 
     @Column(name = "visible", nullable = false)
     @Builder.Default
-    private Boolean visible = true;
+    private boolean visible = true;
 }

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

@@ -74,7 +74,7 @@ public static ColumnInfos toColumnDto(ColumnEntity entity) {
                 entity.getFilterType(),
                 entity.getFilterValue(),
                 entity.getFilterTolerance(),
-                entity.getVisible()
+                entity.isVisible()
                 );
     }
 
@@ -90,7 +90,7 @@ public static ColumnEntity toColumnEntity(ColumnInfos dto) {
                 .filterType(dto.filterType())
                 .filterValue(dto.filterValue())
                 .filterTolerance(dto.filterTolerance())
-                .visible(dto.visible() != null ? dto.visible() : true)
+                .visible(dto.visible())
                 .build();
     }
 

src/main/java/org/gridsuite/studyconfig/server/service/SpreadsheetConfigService.java

@@ -333,7 +333,7 @@ public void updateColumn(UUID id, UUID columnId, ColumnInfos dto) {
         columnEntity.setFilterType(dto.filterType());
         columnEntity.setFilterValue(dto.filterValue());
         columnEntity.setFilterTolerance(dto.filterTolerance());
-        columnEntity.setVisible(dto.visible() != null ? dto.visible() : true);
+        columnEntity.setVisible(dto.visible());
 
         spreadsheetConfigRepository.save(entity);
     }
@@ -381,11 +381,13 @@ public void updateColumnStates(UUID id, List<ColumnStateUpdateInfos> columnState
         }
 
         // Reorder columns based on the provided states
-        List<UUID> orderedColumnIds = columnStates.stream()
-                .sorted(Comparator.comparingInt(ColumnStateUpdateInfos::order))
-                .map(ColumnStateUpdateInfos::columnId)
-                .toList();
-        reorderColumns(orderedColumnIds, columns);
+        columns.sort(Comparator.comparing(column ->
+            columnStates.stream()
+                    .filter(state -> state.columnId().equals(column.getUuid()))
+                    .findFirst()
+                    .map(ColumnStateUpdateInfos::order)
+                    .orElse(Integer.MAX_VALUE)
+        ));
     }
 
     private SpreadsheetConfigCollectionInfos readDefaultSpreadsheetConfigCollection() throws IOException {

src/main/resources/db/changelog/changesets/changelog_20250606T123216Z.xml

@@ -2,17 +2,9 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
     <changeSet author="berrahmaach (generated)" id="1749213150568-4">
         <addColumn tableName="spreadsheet_column">
-            <column name="visible" type="boolean" defaultValueBoolean="true">
+            <column name="visible" type="boolean" defaultValueBoolean="true" valueBoolean="true">
                 <constraints nullable="false"/>
             </column>
         </addColumn>
     </changeSet>
-
-    <!-- Set default value for existing rows -->
-    <changeSet author="berrahmaach" id="1749213150568-5">
-        <update tableName="spreadsheet_column">
-            <column name="visible" valueBoolean="true"/>
-            <where>visible IS NULL</where>
-        </update>
-    </changeSet>
 </databaseChangeLog>

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

@@ -133,7 +133,7 @@ void testConversionToEntityOfSpreadsheetConfig() {
                         assertThat(e.getColumns().get(0).getFilterType()).isEqualTo("greaterThan");
                         assertThat(e.getColumns().get(0).getFilterValue()).isEqualTo("100");
                         assertThat(e.getColumns().get(0).getFilterTolerance()).isEqualTo(0.5);
-                        assertThat(e.getColumns().get(0).getVisible()).isTrue();
+                        assertThat(e.getColumns().get(0).isVisible()).isTrue();
 
                         assertThat(e.getColumns().get(1).getName()).isEqualTo("Column2");
                         assertThat(e.getColumns().get(1).getFormula()).isEqualTo("Z*W");
@@ -143,7 +143,7 @@ void testConversionToEntityOfSpreadsheetConfig() {
                         assertThat(e.getColumns().get(1).getFilterType()).isNull();
                         assertThat(e.getColumns().get(1).getFilterValue()).isNull();
                         assertThat(e.getColumns().get(1).getFilterTolerance()).isNull();
-                        assertThat(e.getColumns().get(1).getVisible()).isTrue();
+                        assertThat(e.getColumns().get(1).isVisible()).isTrue();
 
                         // Global filter assertions
                         assertThat(e.getGlobalFilters()).hasSize(1);
@@ -212,7 +212,7 @@ void testConversionToEntityOfColumnWithFilter() {
                         assertThat(e.getFilterType()).isEqualTo("lessThan");
                         assertThat(e.getFilterValue()).isEqualTo("50.5");
                         assertThat(e.getFilterTolerance()).isEqualTo(0.1);
-                        assertThat(e.getVisible()).isTrue();
+                        assertThat(e.isVisible()).isTrue();
                     });
         }