Merge branch 'main' into FilterBasedContingencyList

Author: basseche

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    uses: powsybl/github-ci/.github/workflows/build-backend-app-generic.yml@69b162754c0728d9aeb2ea568eaf47f28f60fafb
+    uses: powsybl/github-ci/.github/workflows/build-backend-app-generic.yml@aaae75875296657028f2805e7a3fbdb1418b8b95
     with:
       dockerImage: docker.io/gridsuite/filter-server
       dockerUsername: gridsuiteci

.github/workflows/patch.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   run-patch:
-    uses: powsybl/github-ci/.github/workflows/patch-backend-app-generic.yml@69b162754c0728d9aeb2ea568eaf47f28f60fafb
+    uses: powsybl/github-ci/.github/workflows/patch-backend-app-generic.yml@aaae75875296657028f2805e7a3fbdb1418b8b95
     with:
       githubappId: ${{ vars.GRIDSUITE_ACTIONS_APPID }}
       dockerImage: docker.io/gridsuite/filter-server

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   run-release:
-    uses: powsybl/github-ci/.github/workflows/release-backend-app-generic.yml@69b162754c0728d9aeb2ea568eaf47f28f60fafb
+    uses: powsybl/github-ci/.github/workflows/release-backend-app-generic.yml@aaae75875296657028f2805e7a3fbdb1418b8b95
     with:
       githubappId: ${{ vars.GRIDSUITE_ACTIONS_APPID }}
       dockerImage: docker.io/gridsuite/filter-server

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>org.gridsuite</groupId>
     <artifactId>gridsuite-filter-server</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Filter server</name>
@@ -42,9 +42,7 @@
     </developers>
 
     <properties>
-        <gridsuite-dependencies.version>42.0.0</gridsuite-dependencies.version>
-        <!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
-        <gridsuite-filter.version>1.7.0</gridsuite-filter.version>
+        <gridsuite-dependencies.version>43.0.0</gridsuite-dependencies.version>
 
         <string-template.version>4.3.1</string-template.version>
         <liquibase-hibernate-package>org.gridsuite.filter.server</liquibase-hibernate-package>
@@ -107,7 +105,6 @@
         <dependency>
             <groupId>org.gridsuite</groupId>
             <artifactId>gridsuite-filter</artifactId>
-            <version>${gridsuite-filter.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

src/main/java/org/gridsuite/filter/server/entities/identifierlistfilter/IdentifierListFilterEntity.java

@@ -34,5 +34,6 @@ public class IdentifierListFilterEntity extends AbstractFilterEntity {
     private EquipmentType equipmentType;
 
     @OneToMany(cascade = CascadeType.ALL)
+    @OrderColumn(name = "equipmentId_order")
     private List<IdentifierListFilterEquipmentEntity> filterEquipmentEntityList;
 }

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

@@ -0,0 +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="braquartdav (generated)" id="1756286054988-1">
+        <addColumn tableName="identifier_list_filter_filter_equipment_entity_list">
+            <column name="equipment_id_order" type="integer"/>
+        </addColumn>
+        <!-- mandatory: init this new column with a default order -->
+        <sql dbms="postgresql">
+            WITH ordered_filters AS (
+                SELECT filter_equipment_entity_list_id, ROW_NUMBER() OVER (PARTITION BY identifier_list_filter_entity_id ORDER BY filter_equipment_entity_list_id) - 1 as id_order
+                FROM identifier_list_filter_filter_equipment_entity_list
+            )
+            UPDATE identifier_list_filter_filter_equipment_entity_list f
+            SET equipment_id_order = of.id_order
+            FROM ordered_filters of
+            WHERE f.filter_equipment_entity_list_id = of.filter_equipment_entity_list_id;
+        </sql>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -58,4 +58,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20250704T101510Z.xml
       relativeToChangelogFile: true
-
+  - include:
+      file: changesets/changelog_20250827T091345Z.xml
+      relativeToChangelogFile: true