add more metadata to restore colors in GUI

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

Author: basseche

src/main/java/org/gridsuite/actions/server/ContingencyListController.java

@@ -159,6 +159,17 @@ public ResponseEntity<PersistentContingencyList> createFilterBasedContingencyLis
             .body(service.createFilterBasedContingencyList(id, filterBasedContingencyList));
     }
 
+    @GetMapping(value = "/filter-based-contingency-lists/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
+    @Operation(summary = "Get filter based contingency list by id")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The filter based contingency list"),
+        @ApiResponse(responseCode = "404", description = "The filter based contingency list does not exists")})
+    public ResponseEntity<PersistentContingencyList> getFilterBasedContingencylist(@PathVariable("id") UUID id) {
+        return service.getFilterBasedContingencyList(id).map(contingencyList -> ResponseEntity.ok()
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(contingencyList))
+            .orElse(ResponseEntity.notFound().build());
+    }
+
     @PostMapping(value = "/form-contingency-lists", params = "duplicateFrom")
     @Operation(summary = "Create a form contingency list from another existing one")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The form contingency list have been duplicated successfully"),

src/main/java/org/gridsuite/actions/server/ContingencyListService.java

@@ -134,6 +134,16 @@ private Optional<PersistentContingencyList> doGetIdBasedContingencyList(UUID id,
         return idBasedContingencyListRepository.findById(id).map(idBasedContingencyListEntity -> fromIdBasedContingencyListEntity(idBasedContingencyListEntity, network));
     }
 
+    @Transactional(readOnly = true)
+    public Optional<PersistentContingencyList> getFilterBasedContingencyList(UUID id) {
+        return doGetFilterBasedContingencyList(id);
+    }
+
+    private Optional<PersistentContingencyList> doGetFilterBasedContingencyList(UUID id) {
+        Objects.requireNonNull(id);
+        return filterBasedContingencyListRepository.findById(id).map(ContingencyListService::fromFilterBasedContingencyListEntity);
+    }
+
     private List<Contingency> getPowsyblContingencies(PersistentContingencyList contingencyList, Network network) {
         ContingencyList powsyblContingencyList = contingencyList.toPowsyblContingencyList(network);
         return powsyblContingencyList == null ? Collections.emptyList() : powsyblContingencyList.getContingencies(network);
@@ -302,7 +312,7 @@ public void deleteContingencyList(UUID id) throws EmptyResultDataAccessException
         if (formContingencyListRepository.deleteFormContingencyListEntityById(id) == 0
             && idBasedContingencyListRepository.deleteIdBasedContingencyListEntityById(id) == 0
             && filterBasedContingencyListRepository.deleteFilterBasedContingencyListEntityById(id) == 0) {
-                    throw new EmptyResultDataAccessException("No element found", 1);
+            throw new EmptyResultDataAccessException("No element found", 1);
         }
     }
 
@@ -327,8 +337,8 @@ private static IdBasedContingencyList fromIdBasedContingencyListEntity(IdBasedCo
     }
 
     private static FilterBasedContingencyList fromFilterBasedContingencyListEntity(FilterBasedContingencyListEntity entity) {
-        List<UUID> filterList = new ArrayList<>();
-        entity.getFiltersListEntities().forEach(f -> filterList.add(f.getId()));
+        List<FilterMetaData> filterList = new ArrayList<>();
+        entity.getFiltersListEntities().forEach(f -> filterList.add(new FilterMetaData(f.getFilterId(), f.getName(), f.getEquipmentType())));
         return new FilterBasedContingencyList(entity.getId(), entity.getModificationDate(), filterList);
     }
 

src/main/java/org/gridsuite/actions/server/dto/FilterBasedContingencyList.java

@@ -25,9 +25,9 @@
 public class FilterBasedContingencyList extends AbstractContingencyList {
 
     @Schema(description = "filter list")
-    private List<UUID> filterList;
+    private List<FilterMetaData> filterList;
 
-    public FilterBasedContingencyList(UUID uuid, Instant date, List<UUID> filterList) {
+    public FilterBasedContingencyList(UUID uuid, Instant date, List<FilterMetaData> filterList) {
         super(new ContingencyListMetadataImpl(uuid, ContingencyListType.FILTERS, date));
         this.filterList = filterList;
     }

src/main/java/org/gridsuite/actions/server/dto/FilterMetaData.java

@@ -0,0 +1,23 @@
+package org.gridsuite.actions.server.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "Metadata on filters composing filter based contingency list")
+public class FilterMetaData {
+    @Schema(description = "filter uuid in filter data base")
+    private UUID id;
+
+    @Schema(description = "filter name")
+    private String name;
+
+    @Schema(description = "equipment type")
+    private String equipmentType;
+}

src/main/java/org/gridsuite/actions/server/entities/FilterBasedContingencyListEntity.java

@@ -28,14 +28,17 @@
 public class FilterBasedContingencyListEntity extends AbstractContingencyEntity {
 
     @OneToMany(cascade = CascadeType.ALL)
-    private List<FilterEntity> filtersListEntities;
+    private List<FilterMetaDataEntity> filtersListEntities;
 
     public FilterBasedContingencyListEntity(FilterBasedContingencyList contingencyList) {
         super();
         if (CollectionUtils.isEmpty(contingencyList.getFilterList())) {
             return;
         }
         filtersListEntities = new ArrayList<>();
-        contingencyList.getFilterList().forEach(f -> filtersListEntities.add(new FilterEntity(UUID.randomUUID(), f)));
+        contingencyList.getFilterList().forEach(f ->
+            filtersListEntities.add(
+                new FilterMetaDataEntity(UUID.randomUUID(), f.getId(), f.getName(), f.getEquipmentType()))
+        );
     }
 }

src/main/java/org/gridsuite/actions/server/entities/FilterEntity.java renamed to src/main/java/org/gridsuite/actions/server/entities/FilterMetaDataEntity.java

@@ -18,13 +18,19 @@
 @Getter
 @Setter
 @Entity
-@Table(name = "filter")
-public class FilterEntity {
+@Table(name = "filter_metadata")
+public class FilterMetaDataEntity {
     @Id
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.AUTO)
     private UUID id;
 
     @Column(name = "filter-id")
     private UUID filterId;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "equipment-type")
+    private String equipmentType;
 }

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

@@ -1,13 +1,19 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <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="elcheikhbas (generated)" id="1756734757338-7">
-        <createTable tableName="filter">
+        <createTable tableName="filter_metadata">
             <column name="id" type="UUID">
                 <constraints nullable="false" primaryKey="true" primaryKeyName="filterPK"/>
             </column>
             <column name="filter-id" type="UUID">
                 <constraints nullable="false"/>
             </column>
+            <column name="name" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="equipment-type" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
         </createTable>
     </changeSet>
     <changeSet author="elcheikhbas (generated)" id="1756734757338-8">
@@ -35,6 +41,6 @@
         <addForeignKeyConstraint baseColumnNames="filter_based_contingency_list_entity_id" baseTableName="filter_based_contingency_list_filters_list_entities" constraintName="FK9edqyxdc33w1i725puwjjfhf5" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="filter_based_contingency_list" validate="true"/>
     </changeSet>
     <changeSet author="elcheikhbas (generated)" id="1756734757338-15">
-        <addForeignKeyConstraint baseColumnNames="filters_list_entities_id" baseTableName="filter_based_contingency_list_filters_list_entities" constraintName="FKgvj11ba8of2teiuumbgfho6c8" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="filter" validate="true"/>
+        <addForeignKeyConstraint baseColumnNames="filters_list_entities_id" baseTableName="filter_based_contingency_list_filters_list_entities" constraintName="FKgvj11ba8of2teiuumbgfho6c8" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="filter_metadata" validate="true"/>
     </changeSet>
 </databaseChangeLog>