optimize temporary and permanent limits db writings and db reading

network-store-server/pom.xml

@@ -107,7 +107,6 @@
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

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

@@ -30,7 +30,7 @@
 @Schema(description = "limits attributes")
 public class LimitsInfos {
 
-    @Schema(description = "List of permeant limits")
+    @Schema(description = "List of permanent limits")
     private List<PermanentLimitAttributes> permanentLimits = new ArrayList<>();
 
     @Schema(description = "List of temporary limits")

network-store-server/src/main/java/com/powsybl/network/store/server/json/PermanentLimitSqlData.java

@@ -0,0 +1,51 @@
+/**
+ * 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.json;
+
+import com.powsybl.iidm.network.LimitType;
+import com.powsybl.network.store.server.dto.PermanentLimitAttributes;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * @author Etienne Lesot <etienne.lesot at rte-france.com>
+ */
+@ToString
+@Builder
+@AllArgsConstructor
+@Getter
+public class PermanentLimitSqlData {
+
+    private String operationalLimitsGroupId;
+    private double value;
+    private Integer side;
+    private LimitType limitType;
+
+    public PermanentLimitSqlData() {
+        // empty constructor for Jackson
+    }
+
+    public static PermanentLimitSqlData of(PermanentLimitAttributes permanentLimitAttributes) {
+        return PermanentLimitSqlData.builder()
+            .operationalLimitsGroupId(permanentLimitAttributes.getOperationalLimitsGroupId())
+            .value(permanentLimitAttributes.getValue())
+            .side(permanentLimitAttributes.getSide())
+            .limitType(permanentLimitAttributes.getLimitType())
+            .build();
+    }
+
+    public PermanentLimitAttributes toPermanentLimitAttributes() {
+        return PermanentLimitAttributes.builder()
+            .operationalLimitsGroupId(operationalLimitsGroupId)
+            .value(value)
+            .side(side)
+            .limitType(limitType)
+            .build();
+    }
+}

network-store-server/src/main/java/com/powsybl/network/store/server/json/TemporaryLimitSqlData.java

@@ -0,0 +1,59 @@
+/**
+ * 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.json;
+
+import com.powsybl.iidm.network.LimitType;
+import com.powsybl.network.store.model.TemporaryLimitAttributes;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * @author Etienne Lesot <etienne.lesot at rte-france.com>
+ */
+@ToString
+@Builder
+@AllArgsConstructor
+@Getter
+public class TemporaryLimitSqlData {
+    private String operationalLimitsGroupId;
+    private Integer side;
+    private LimitType limitType;
+    private String name;
+    private double value;
+    private Integer acceptableDuration;
+    private boolean fictitious;
+
+    public TemporaryLimitSqlData() {
+        // empty constructor for Jackson
+    }
+
+    public static TemporaryLimitSqlData of(TemporaryLimitAttributes temporaryLimit) {
+        return TemporaryLimitSqlData.builder()
+            .operationalLimitsGroupId(temporaryLimit.getOperationalLimitsGroupId())
+            .side(temporaryLimit.getSide())
+            .limitType(temporaryLimit.getLimitType())
+            .name(temporaryLimit.getName())
+            .value(temporaryLimit.getValue())
+            .acceptableDuration(temporaryLimit.getAcceptableDuration())
+            .fictitious(temporaryLimit.isFictitious())
+            .build();
+    }
+
+    public TemporaryLimitAttributes toTemporaryLimitAttributes() {
+        return TemporaryLimitAttributes.builder()
+            .operationalLimitsGroupId(operationalLimitsGroupId)
+            .side(side)
+            .limitType(limitType)
+            .name(name)
+            .value(value)
+            .acceptableDuration(acceptableDuration)
+            .fictitious(fictitious)
+            .build();
+    }
+}

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

@@ -0,0 +1,48 @@
+<?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-5" author="lesoteti">
+        <createTable tableName="newtemporarylimits">
+            <column name="networkuuid" type="VARCHAR(255)">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="newtemporarylimits_pkey"/>
+            </column>
+            <column name="variantnum" type="INTEGER">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="newtemporarylimits_pkey"/>
+            </column>
+            <column name="equipmentid" type="VARCHAR(255)">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="newtemporarylimits_pkey"/>
+            </column>
+            <column name="equipmenttype" type="VARCHAR(255)">
+            </column>
+                <column name="temporarylimits" type="TEXT"/>
+        </createTable>
+        <createTable tableName="newpermanentlimits">
+            <column name="networkuuid" type="VARCHAR(255)">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="newpermanentlimits_pkey"/>
+            </column>
+            <column name="variantnum" type="INTEGER">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="newpermanentlimits_pkey"/>
+            </column>
+            <column name="equipmentid" type="VARCHAR(255)">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="newpermanentlimits_pkey"/>
+            </column>
+            <column name="equipmenttype" type="VARCHAR(255)">
+            </column>
+            <column name="permanentlimits" type="TEXT"/>
+        </createTable>
+        <createIndex indexName="permanentlimits_networkuuid_variantnum_equipmenttype_idx" tableName="newpermanentlimits">
+            <column name="networkuuid"/>
+            <column name="variantnum"/>
+            <column name="equipmenttype"/>
+        </createIndex>
+        <createIndex indexName="temporarylimits_networkuuid_variantnum_equipmenttype_idx" tableName="newtemporarylimits">
+            <column name="networkuuid"/>
+            <column name="variantnum"/>
+            <column name="equipmenttype"/>
+        </createIndex>
+    </changeSet>
+
+</databaseChangeLog>

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

@@ -0,0 +1,22 @@
+-- will be used in next deployment
+INSERT INTO newtemporarylimits (equipmentid, equipmenttype, networkuuid, variantnum, temporarylimits)
+SELECT equipmentid, equipmenttype, networkuuid, variantnum,
+       json_agg(json_build_object(
+               'operationalLimitsGroupId', operationalLimitsGroupId,
+               'side', side,
+               'limitType', limitType,
+               'name', name,
+               'value', value_,
+               'acceptableDuration', acceptableduration,
+               'fictitious', fictitious
+                )) as temporarylimits FROM temporarylimit
+GROUP  BY equipmentid, equipmenttype, networkuuid, variantnum;
+INSERT INTO newpermanentlimits (equipmentid, equipmenttype, networkuuid, variantnum, permanentlimits)
+SELECT equipmentid, equipmenttype, networkuuid, variantnum,
+       json_agg(json_build_object(
+               'operationalLimitsGroupId', operationalLimitsGroupId,
+               'value', value_,
+               'side', side,
+               'limitType', limitType
+                )) as permanentlimits FROM permanentlimit
+GROUP  BY equipmentid, equipmenttype, networkuuid, variantnum;

network-store-server/src/main/resources/db/changelog/db.changelog-master.yaml

@@ -87,3 +87,7 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20241031T110000Z.xml
       relativeToChangelogFile: true
+
+  - include:
+      file: changesets/changelog_20241121T110000Z.xml
+      relativeToChangelogFile: true

pom.xml

@@ -50,7 +50,6 @@
     <properties>
         <sirocco.version>1.0</sirocco.version>
         <powsybl-ws-dependencies.version>2.16.0</powsybl-ws-dependencies.version>
-
         <!-- FIXME : to remove when sonar version is updated on github actions -->
         <!-- https://community.sonarsource.com/t/stackoverflowerror-at-defaultinputcomponent-equals/20324 -->
         <!-- The versions are very different from this post. But the fix works again. Maybe a similar problem in sonar code -->