upgrade powsybl network store v1.22.0 and add regulating point for ratio and phase tap changers

network-store-server/src/main/java/com/powsybl/network/store/server/QueryCatalog.java

@@ -34,6 +34,7 @@ public final class QueryCatalog {
     static final String EQUIPMENT_TYPE_COLUMN = "equipmentType";
     static final String REGULATING_EQUIPMENT_TYPE_COLUMN = "regulatingEquipmentType";
     static final String REGULATED_EQUIPMENT_TYPE_COLUMN = "regulatedEquipmentType";
+    static final String REGULATING_EQUIPMENT_SUB_TYPE_COLUMN = "regulatingResourceSubType";
     static final String EQUIPMENT_ID_COLUMN = "equipmentId";
     static final String REGULATING_EQUIPMENT_ID = "regulatingEquipmentId";
     static final String INDEX_COLUMN = "index";
@@ -46,6 +47,7 @@ public final class QueryCatalog {
     static final String REGULATION_MODE = "regulationMode";
     static final String SIDE_COLUMN = "side";
     static final String LIMIT_TYPE_COLUMN = "limitType";
+    static final String REGULATING = "regulating";
 
     private QueryCatalog() {
     }
@@ -496,16 +498,19 @@ public static String buildDeleteReactiveCapabilityCurvePointsQuery() {
     public static String buildInsertRegulatingPointsQuery() {
         return "insert into " + REGULATING_POINT_TABLE + " (" +
             NETWORK_UUID_COLUMN + " ," + VARIANT_NUM_COLUMN + ", " + REGULATING_EQUIPMENT_ID + ", " + REGULATING_EQUIPMENT_TYPE_COLUMN + ", " +
-            REGULATION_MODE + ", localTerminalConnectableId, localTerminalSide, regulatingterminalconnectableid, regulatingterminalside, " + REGULATED_EQUIPMENT_TYPE_COLUMN + ")" +
-            " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+            REGULATING_EQUIPMENT_SUB_TYPE_COLUMN + ", " + REGULATION_MODE +
+            ", localTerminalConnectableId, localTerminalSide, regulatingterminalconnectableid, regulatingterminalside, " +
+            REGULATED_EQUIPMENT_TYPE_COLUMN + ", " + REGULATING + ")" +
+            " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
     }
 
     public static String buildUpdateRegulatingPointsQuery() {
         return "Update " + REGULATING_POINT_TABLE +
             " set " + REGULATION_MODE + " = ?, " +
             "regulatingterminalconnectableid = ?, " +
             "regulatingterminalside = ?, " +
-            REGULATED_EQUIPMENT_TYPE_COLUMN + " = ? " +
+            REGULATED_EQUIPMENT_TYPE_COLUMN + " = ?, " +
+            REGULATING + " = ? " +
             "where " +
             NETWORK_UUID_COLUMN + " = ? AND " +
             VARIANT_NUM_COLUMN + " = ? AND " +
@@ -515,21 +520,21 @@ public static String buildUpdateRegulatingPointsQuery() {
 
     public static String buildCloneRegulatingPointsQuery() {
         return "insert into " + REGULATING_POINT_TABLE + " (" + NETWORK_UUID_COLUMN + " ," + VARIANT_NUM_COLUMN + ", " +
-             REGULATING_EQUIPMENT_ID + ", " + REGULATING_EQUIPMENT_TYPE_COLUMN + ", " + REGULATION_MODE +
+             REGULATING_EQUIPMENT_ID + ", " + REGULATING_EQUIPMENT_TYPE_COLUMN + ", " + REGULATING_EQUIPMENT_SUB_TYPE_COLUMN + ", " + REGULATION_MODE +
             ", localTerminalConnectableId, localTerminalSide, regulatingTerminalConnectableId, regulatingTerminalSide, " +
-            REGULATED_EQUIPMENT_TYPE_COLUMN + ") select ?, ?" + ", " + REGULATING_EQUIPMENT_ID + ", " +
-            REGULATING_EQUIPMENT_TYPE_COLUMN + ", " + REGULATION_MODE +
+            REGULATED_EQUIPMENT_TYPE_COLUMN + ", " + REGULATING + ") select ?, ?" + ", " + REGULATING_EQUIPMENT_ID + ", " +
+            REGULATING_EQUIPMENT_TYPE_COLUMN + ", " + REGULATING_EQUIPMENT_SUB_TYPE_COLUMN + ", " + REGULATION_MODE +
             ", localTerminalConnectableId, localTerminalSide, regulatingTerminalConnectableId, regulatingTerminalSide, "
-            + REGULATED_EQUIPMENT_TYPE_COLUMN + " from " + REGULATING_POINT_TABLE + " where " + NETWORK_UUID_COLUMN +
+            + REGULATED_EQUIPMENT_TYPE_COLUMN + ", " + REGULATING + " from " + REGULATING_POINT_TABLE + " where " + NETWORK_UUID_COLUMN +
             " = ? and " + VARIANT_NUM_COLUMN + " = ?";
     }
 
     public static String buildRegulatingPointsQuery() {
         return "select " +
             NETWORK_UUID_COLUMN + ", " +
             VARIANT_NUM_COLUMN + ", " +
-            REGULATING_EQUIPMENT_ID + ", " + REGULATION_MODE + ", localterminalconnectableid, localterminalside, " +
-            "regulatingterminalconnectableid, regulatingterminalside, " + REGULATED_EQUIPMENT_TYPE_COLUMN +
+            REGULATING_EQUIPMENT_ID + ", " + REGULATING_EQUIPMENT_SUB_TYPE_COLUMN + ", " + REGULATION_MODE + ", localterminalconnectableid, localterminalside, " +
+            "regulatingterminalconnectableid, regulatingterminalside, " + REGULATING +
             " from " + REGULATING_POINT_TABLE + " where " +
             NETWORK_UUID_COLUMN + " = ? and " +
             VARIANT_NUM_COLUMN + " = ? and " +
@@ -542,8 +547,8 @@ public static String buildRegulatingPointsWithInClauseQuery(String columnNameFor
         }
         return "select " + NETWORK_UUID_COLUMN + ", " +
             VARIANT_NUM_COLUMN + ", " +
-            REGULATING_EQUIPMENT_ID + ", " + REGULATION_MODE + ", localterminalconnectableid, localterminalside, " +
-            "regulatingterminalconnectableid, regulatingterminalside, " + REGULATED_EQUIPMENT_TYPE_COLUMN
+            REGULATING_EQUIPMENT_ID + ", " + REGULATING_EQUIPMENT_SUB_TYPE_COLUMN + ", " + REGULATION_MODE + ", localterminalconnectableid, localterminalside, " +
+            "regulatingterminalconnectableid, regulatingterminalside, " + REGULATING
             + " from " + REGULATING_POINT_TABLE + " where " +
             NETWORK_UUID_COLUMN + " = ? and " +
             VARIANT_NUM_COLUMN + " = ? and " +
@@ -575,21 +580,18 @@ public static String buildDeleteRegulatingPointsVariantEquipmentINQuery(int numb
             "?, ".repeat(numberOfValues - 1) + "?)";
     }
 
+    // regulating equipments
     public static String buildRegulatingEquipmentsQuery() {
         return "select " + NETWORK_UUID_COLUMN + ", " + VARIANT_NUM_COLUMN + ", " + REGULATING_EQUIPMENT_ID + ", "
-            + "regulatingterminalconnectableid," + REGULATING_EQUIPMENT_TYPE_COLUMN + " from " + REGULATING_POINT_TABLE + " where " +
-            NETWORK_UUID_COLUMN + " = ? and " +
-            VARIANT_NUM_COLUMN + " = ? and " +
-            REGULATED_EQUIPMENT_TYPE_COLUMN + " = ?";
+            + "regulatingterminalconnectableid," + REGULATING_EQUIPMENT_TYPE_COLUMN + ", " + REGULATING_EQUIPMENT_SUB_TYPE_COLUMN
+            + " from " + REGULATING_POINT_TABLE + " where " + NETWORK_UUID_COLUMN + " = ? and " +
+            VARIANT_NUM_COLUMN + " = ? and " + REGULATED_EQUIPMENT_TYPE_COLUMN + " = ?";
     }
 
     public static String buildRegulatingEquipmentsForOneEquipmentQuery() {
-        return "select " + REGULATING_EQUIPMENT_ID + ", " + REGULATING_EQUIPMENT_TYPE_COLUMN
-            + " from " + REGULATING_POINT_TABLE + " where " +
-            NETWORK_UUID_COLUMN + " = ? and " +
-            VARIANT_NUM_COLUMN + " = ? and " +
-            REGULATED_EQUIPMENT_TYPE_COLUMN + " = ? and " +
-            "regulatingterminalconnectableid = ?";
+        return "select " + REGULATING_EQUIPMENT_ID + ", " + REGULATING_EQUIPMENT_TYPE_COLUMN + ", " + REGULATING_EQUIPMENT_SUB_TYPE_COLUMN
+            + " from " + REGULATING_POINT_TABLE + " where " + NETWORK_UUID_COLUMN + " = ? and " +
+            VARIANT_NUM_COLUMN + " = ? and " + REGULATED_EQUIPMENT_TYPE_COLUMN + " = ? and " + "regulatingterminalconnectableid = ?";
     }
 
     public static String buildRegulatingEquipmentsWithInClauseQuery(String columnNameForInClause, int numberOfValues) {
@@ -598,7 +600,8 @@ public static String buildRegulatingEquipmentsWithInClauseQuery(String columnNam
         }
 
         return "select " + NETWORK_UUID_COLUMN + ", " + VARIANT_NUM_COLUMN + ", " + REGULATING_EQUIPMENT_ID + ", "
-            + "regulatingterminalconnectableid," + REGULATING_EQUIPMENT_TYPE_COLUMN + " from " + REGULATING_POINT_TABLE + " where " +
+            + "regulatingterminalconnectableid," + REGULATING_EQUIPMENT_TYPE_COLUMN + ", " + REGULATING_EQUIPMENT_SUB_TYPE_COLUMN
+            + " from " + REGULATING_POINT_TABLE + " where " +
             NETWORK_UUID_COLUMN + " = ? and " +
             VARIANT_NUM_COLUMN + " = ? and " +
             REGULATED_EQUIPMENT_TYPE_COLUMN + " = ? and " +

network-store-server/src/main/java/com/powsybl/network/store/server/dto/RegulatingOwnerInfo.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2024, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package com.powsybl.network.store.server.dto;
+
+import com.powsybl.network.store.model.RegulatingTapChangerType;
+import com.powsybl.network.store.model.ResourceType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+/**
+ * @author Etienne Lesot <etienne.lesot at rte-france.com>
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RegulatingOwnerInfo {
+    private String equipmentId;
+
+    private ResourceType equipmentType;
+
+    private RegulatingTapChangerType equipmentSubType;
+
+    private UUID networkUuid;
+
+    private int variantNum;
+}

network-store-server/src/main/resources/db/changelog/changesets/changelog_20241204T110000Z.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                   https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+
+    <changeSet id="2986331049275-6" author="lesoteti">
+        <addColumn tableName="regulatingpoint">
+            <column name="regulating" type="boolean"/>
+        </addColumn>
+        <sqlFile
+                path="move_regulating_to_regulationPoint_20241204T110000Z.sql"
+                relativeToChangelogFile="true"
+                splitStatements="true"
+                stripComments="true"/>
+        <dropColumn tableName="generator" columnName="voltageregulatoron"/>
+        <dropColumn tableName="vscconverterstation" columnName="voltageregulatoron"/>
+        <dropColumn tableName="shuntcompensator" columnName="voltageregulatoron"/>
+    </changeSet>
+</databaseChangeLog>

network-store-server/src/main/resources/db/changelog/changesets/changelog_20241205T110000Z.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                   https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+
+    <changeSet id="2986331049275-7" author="admin">
+        <addColumn tableName="regulatingpoint">
+            <column name="regulatingresourcesubtype" type="VARCHAR" defaultValue="''">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+    </changeSet>
+    <changeSet id="2986331049275-8" author="admin">
+        <dropPrimaryKey tableName="regulatingpoint"/>
+        <addPrimaryKey columnNames="networkuuid, variantnum, regulatingequipmenttype, regulatingresourcesubtype, regulatingequipmentid"
+                       constraintName="regulatingpoint_pkey" tableName="regulatingpoint"/>
+        <sqlFile
+                path="twt_regulationPoint_20241205T110000Z.sql"
+                relativeToChangelogFile="true"
+                splitStatements="true"
+                stripComments="true"/>
+        <!-- twowindingstransformer -->
+        <!-- ratio -->
+        <dropColumn tableName="twowindingstransformer" columnName="ratiotapchangerregulationmode"/>
+        <dropColumn tableName="twowindingstransformer" columnName="ratiotapchangerterminalrefconnectableid"/>
+        <dropColumn tableName="twowindingstransformer" columnName="ratiotapchangerterminalrefside"/>
+        <dropColumn tableName="twowindingstransformer" columnName="ratiotapchangerregulating"/>
+        <!-- phase -->
+        <dropColumn tableName="twowindingstransformer" columnName="phasetapchangerregulationmode"/>
+        <dropColumn tableName="twowindingstransformer" columnName="phasetapchangerterminalrefconnectableid"/>
+        <dropColumn tableName="twowindingstransformer" columnName="phasetapchangerterminalrefside"/>
+        <dropColumn tableName="twowindingstransformer" columnName="phasetapchangerregulating"/>
+
+        <!-- threewindingstransformer -->
+        <!-- side 1 -->
+        <!-- ratio -->
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulationmode1"/>
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefconnectableid1"/>
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefside1"/>
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulating1"/>
+        <!-- phase -->
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulationmode1"/>
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefconnectableid1"/>
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefside1"/>
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulating1"/>
+
+        <!-- side 2 -->
+        <!-- ratio -->
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulationmode2"/>
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefconnectableid2"/>
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefside2"/>
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulating2"/>
+        <!-- phase -->
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulationmode2"/>
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefconnectableid2"/>
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefside2"/>
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulating2"/>
+
+        <!-- side 3 -->
+        <!-- ratio -->
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulationmode3"/>
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefconnectableid3"/>
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerterminalrefside3"/>
+        <dropColumn tableName="threewindingstransformer" columnName="ratiotapchangerregulating3"/>
+        <!-- phase -->
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulationmode3"/>
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefconnectableid3"/>
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerterminalrefside3"/>
+        <dropColumn tableName="threewindingstransformer" columnName="phasetapchangerregulating3"/>
+    </changeSet>
+</databaseChangeLog>

network-store-server/src/main/resources/db/changelog/changesets/move_regulating_to_regulationPoint_20241204T110000Z.sql

@@ -0,0 +1,30 @@
+-- generator
+update regulatingpoint
+set regulating = (select generator.voltageregulatoron from generator
+            where regulatingpoint.regulatingequipmenttype = 'GENERATOR'
+              and regulatingpoint.regulatingequipmentid = generator.id
+              and regulatingpoint.networkuuid = generator.networkuuid
+              and regulatingpoint.variantnum = generator.variantnum)
+where regulatingequipmenttype = 'GENERATOR';
+-- vsc
+
+update regulatingpoint
+set regulating = (select vscconverterstation.voltageregulatoron from vscconverterstation
+            where regulatingpoint.regulatingequipmenttype = 'VSC_CONVERTER_STATION'
+              and regulatingpoint.regulatingequipmentid = vscconverterstation.id
+              and regulatingpoint.networkuuid = vscconverterstation.networkuuid
+              and regulatingpoint.variantnum = vscconverterstation.variantnum)
+where regulatingequipmenttype = 'VSC_CONVERTER_STATION';
+-- shunt
+update regulatingpoint
+set regulating = (select shuntcompensator.voltageregulatoron from shuntcompensator
+            where regulatingpoint.regulatingequipmenttype = 'SHUNT_COMPENSATOR'
+              and regulatingpoint.regulatingequipmentid = shuntcompensator.id
+              and regulatingpoint.networkuuid = shuntcompensator.networkuuid
+              and regulatingpoint.variantnum = shuntcompensator.variantnum)
+where regulatingequipmenttype = 'SHUNT_COMPENSATOR';
+-- svc
+update regulatingpoint
+set regulating = (CASE WHEN regulationmode = 'VOLTAGE'
+                           THEN TRUE ELSE FALSE END)
+where regulatingequipmenttype = 'STATIC_VAR_COMPENSATOR';