complete limits in branch creation #572

Mathieu-Deharbe · 2024-12-10T14:43:03Z

needs network-modification lib update in order to compile :
gridsuite/network-modification#9

Temp files that will be removed before merging :
pom.xml
src/main/resources/db/changelog/changesets/différence avec main.xml

I keep these here temporarily for facilitating the dev

ATTENTION migration liquidbase included.

-> may be a good idea to remove the delete of the obsolete data column in order to keep the data just in case of problem during the migration

Signed-off-by: Mathieu DEHARBE <[email protected]>

ghazwarhili · 2024-12-16T16:00:24Z

...java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java

-        ), nullable = true)
-    private CurrentLimitsEntity currentLimits2;
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+    @OrderColumn


@OrderColumn(name = "pos_currentLimits1")

Ok but renamed @OrderColumn(name = "pos_operationalLimitsGroups1") given that I changed the structure.

ghazwarhili · 2024-12-16T16:00:40Z

...java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java

+    private List<CurrentLimitsEntity> currentLimits1;
+
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+    @OrderColumn


@OrderColumn(name = "pos_currentLimits2")

Ok but renamed @OrderColumn(name = "pos_operationalLimitsGroups2") given that I changed the structure.

ghazwarhili · 2024-12-16T16:02:20Z

...java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java

-            name = "current_limits_id2_fk"
-        ), nullable = true)
-    private CurrentLimitsEntity currentLimits2;
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)


you removed the @joincolumn ?

Yes. Now that this is a list instead of a single object, a join column can't reference the whole list of the entry.

ghazwarhili · 2024-12-16T16:04:02Z

pom.xml

@@ -129,7 +129,7 @@
        <dependency>
            <groupId>org.gridsuite</groupId>
            <artifactId>gridsuite-network-modification</artifactId>
-            <version>${network-modification.version}</version>
+            <version>0.3.0-SNAPSHOT</version>


to be removed

Yes but I keep it here to simplify my test for now.

I precised in the PR description that 2 changes have to be removed before the merging. This is one of them.

ghazwarhili · 2024-12-16T16:16:15Z

...java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java

        connectionDirection1 = branchCreationInfos.getConnectionDirection1();
        connectionName1 = branchCreationInfos.getConnectionName1();
        connectionDirection2 = branchCreationInfos.getConnectionDirection2();
        connectionName2 = branchCreationInfos.getConnectionName2();
+        selectedOperationalLimitsGroupId1 = branchCreationInfos.getSelectedOperationalLimitsGroupId1();


getActiveOperationalLimits ?

This could have been a good name but I use the iidm terminology. Cf LineAttributes.java in powsybl network store.

basseche · 2024-12-18T16:31:10Z

...modification/server/entities/equipment/creation/CurrentTemporaryLimitCreationEmbeddable.java

@@ -25,6 +25,8 @@
 @Embeddable
 public class CurrentTemporaryLimitCreationEmbeddable {

+    // TODO : pas besoin d'id ici ??


forgotten todo ?

Indeed. It already worked without it. I was too suspicious because of a bug.

Signed-off-by: Mathieu DEHARBE <[email protected]>

basseche · 2025-01-02T14:57:57Z

pom.xml

@@ -129,7 +129,7 @@
        <dependency>
            <groupId>org.gridsuite</groupId>
            <artifactId>gridsuite-network-modification</artifactId>
-            <version>${network-modification.version}</version>
+            <version>0.4.0-SNAPSHOT</version>


i don't think you should commit this !

rollback here

Yes but I keep it here to simplify my test for now.

I precised in the PR description that 2 changes have to be removed before the merging. This is one of them.

.../java/org/gridsuite/modification/server/entities/equipment/creation/CurrentLimitsEntity.java

basseche · 2025-01-02T15:37:57Z

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

+    </changeSet>
+    <changeSet author="deharbemat (generated)" id="1734603384951-26">
+        <createTable tableName="two_windings_transformer_creation_operational_limits_groups1">
+            <column name="two_windings_transformer_creation_entity_id" type="UUID">


can we reduce column name ? like for example creation_entity_id ?

To fix the name column, it should be done properly in the entity class and not in the changelog

Indeed. It is automatically generated by this :

@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) @OrderColumn(name = "pos_operationalLimitsGroups1") private List<OperationalLimitsGroupEntity> operationalLimitsGroups1;

The problem is that this is part of BranchCreationEntity inherited by transfos and lines. I don't really know how to rename it properly.

ghazwarhili · 2025-01-06T14:51:54Z

...java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java

-        ), nullable = true)
-    private CurrentLimitsEntity currentLimits2;
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+    @OrderColumn(name = "pos_operationalLimitsGroups1")


operationalLimitsGroup1 (whithout s) to be consistent with the code on the library side

Here operationalLimitsGroups1 is a list because there are several groups. So I think the 's' makes sense.

ghazwarhili · 2025-01-06T15:14:18Z

...java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java

        connectionPosition1 = branchCreationInfos.getConnectionPosition1();
        connectionPosition2 = branchCreationInfos.getConnectionPosition2();
        connected1 = branchCreationInfos.isConnected1();
        connected2 = branchCreationInfos.isConnected2();
    }
+
+    /**
+     * the point of this function is to never dereference operationalLimitsGroups if it already exists,


The purpose of this function is to avoid dereferencing operationalLimitsGroups if it already exists

ghazwarhili · 2025-01-06T15:16:25Z

...java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java

+
+    /**
+     * the point of this function is to never dereference operationalLimitsGroups if it already exists,
+     * in order for Hibernate not to lose this reference when doing some cascade cleaning or whatever


in order to prevent Hibernate from losing the reference during cascade cleaning.

ghazwarhili · 2025-01-06T15:26:33Z

.../gridsuite/modification/server/entities/equipment/creation/OperationalLimitsGroupEntity.java

+            referencedColumnName = "id",
+            foreignKey = @ForeignKey(
+                    name = "current_limits_id_fk"
+            ), nullable = true)


remove the nullable parameter (by default is true)

ghazwarhili · 2025-01-06T15:40:08Z

.../gridsuite/modification/server/entities/equipment/creation/OperationalLimitsGroupEntity.java

+    @Column(name = "uuid")
+    private UUID uuid;
+
+    @Schema(description = "Operational limit group id")


@Schema in the entity ?

Corrected into :

@Column(name = "id") private String id;

ghazwarhili · 2025-01-06T15:58:26Z

...java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java

+            updatedLimitsGroups = new ArrayList<>();
+        } else {
+            updatedLimitsGroups.clear();
+        }


List<OperationalLimitsGroupEntity> updatedLimitsGroups = (operationalLimitsGroups == null) ? new ArrayList<>() : new ArrayList<>(operationalLimitsGroups); }

maybe

I will try but I think it won't work because new ArrayList<>(operationalLimitsGroups); may lose the reference to operationalLimitsGroups by creating a new Array.

ghazwarhili · 2025-01-06T15:58:59Z

.../gridsuite/modification/server/entities/equipment/creation/OperationalLimitsGroupEntity.java

+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "operationalLimitsGroup")


@table(operational_limits_group)
@PrimaryKeyJoinColumn(foreignKey = @foreignkey(name = "operational_limits_group_id_fk_constraint"))

I cna't find this. Is it outdated or can you find it ?

ghazwarhili · 2025-01-06T16:11:58Z

.../gridsuite/modification/server/entities/equipment/creation/OperationalLimitsGroupEntity.java

+ * @author Mathieu Deharbe <mathieu.deharbe_externe at rte-france.com>
+ */
+@Getter
+@Setter


you need the @Setter here ?

Apparently not. Removed.

.../gridsuite/modification/server/entities/equipment/creation/OperationalLimitsGroupEntity.java

Signed-off-by: Mathieu DEHARBE <[email protected]>

ghazwarhili · 2025-01-08T17:50:51Z

[ERROR] Tests run: 843, Failures: 2, Errors: 0, Skipped: 0

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe · 2025-01-09T08:48:51Z

[ERROR] Tests run: 843, Failures: 2, Errors: 0, Skipped: 0

Indeed sorry, I corrected it.

This is caused by the change from selectedOperationalLimitsGroupId2 to selectedOperationalLimitsGroup2 that made me change stuff everywhere. And I may have to go back because it has taken me away from the IIDM standard (which uses selectedOperationalLimitsGroupId2).

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe added 2 commits December 10, 2024 15:42

draft complete limits in branch creation (not tested)

6c6e608

Signed-off-by: Mathieu DEHARBE <[email protected]>

draft functional change set

cad336c

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe changed the title ~~draft complete limits in branch creation (not tested)~~ complete limits in branch creation Dec 12, 2024

Mathieu-Deharbe and others added 4 commits December 12, 2024 11:26

back to CurrentLimitsEntity + update application

a1c26a9

Signed-off-by: Mathieu DEHARBE <[email protected]>

back to original table names

2cd3053

Signed-off-by: Mathieu DEHARBE <[email protected]>

Merge branch 'main' into complete-limits-in-branch-creation

01d429a

Merge branch 'main' into complete-limits-in-branch-creation

b2a7ee3

Mathieu-Deharbe requested a review from ghazwarhili December 16, 2024 12:12

Mathieu-Deharbe added 2 commits December 16, 2024 15:14

TUs

8d1ab52

Signed-off-by: Mathieu DEHARBE <[email protected]>

corrects cascade referencing problem

96c7682

Signed-off-by: Mathieu DEHARBE <[email protected]>

ghazwarhili reviewed Dec 16, 2024

View reviewed changes

Merge branch 'main' into complete-limits-in-branch-creation

d385970

basseche reviewed Dec 18, 2024

View reviewed changes

Mathieu-Deharbe added 3 commits December 19, 2024 10:44

OperationalLimitsGroupEntity and everything that uses it

aed3d13

Signed-off-by: Mathieu DEHARBE <[email protected]>

maj changeset de réf

28685d3

Signed-off-by: Mathieu DEHARBE <[email protected]>

new changelog and TU corrections

b4c86d8

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe requested review from basseche and ghazwarhili December 19, 2024 11:30

Merge branch 'main' into complete-limits-in-branch-creation

d5d6f0b

basseche reviewed Jan 2, 2025

View reviewed changes

Merge branch 'main' into complete-limits-in-branch-creation

aaff292

ghazwarhili requested changes Jan 6, 2025

View reviewed changes

ghazwarhili reviewed Jan 6, 2025

View reviewed changes

Mathieu-Deharbe and others added 4 commits January 6, 2025 18:26

post review 1

58dad14

Signed-off-by: Mathieu DEHARBE <[email protected]>

post review 3

e4a7e32

Signed-off-by: Mathieu DEHARBE <[email protected]>

Merge branch 'main' into complete-limits-in-branch-creation

ca851f8

post review 3

d67b51e

Signed-off-by: Mathieu DEHARBE <[email protected]>

TU

e7bde6c

Signed-off-by: Mathieu DEHARBE <[email protected]>

Merge branch 'main' into complete-limits-in-branch-creation

f8854ed

Mathieu-Deharbe requested review from basseche and ghazwarhili January 13, 2025 09:04

Mathieu-Deharbe and others added 4 commits January 15, 2025 11:13

Merge branch 'main' into complete-limits-in-branch-creation

b5e56a2

named foreign keys

e2ee671

Signed-off-by: Mathieu DEHARBE <[email protected]>

migration

d539281

Signed-off-by: Mathieu DEHARBE <[email protected]>

new changeset

d247c47

Signed-off-by: Mathieu DEHARBE <[email protected]>

complete limits in branch creation #572

Are you sure you want to change the base?

complete limits in branch creation #572

Conversation

Mathieu-Deharbe commented Dec 10, 2024 • edited Loading

Choose a reason for hiding this comment

Mathieu-Deharbe Dec 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mathieu-Deharbe Dec 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

basseche Dec 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghazwarhili Jan 6, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghazwarhili commented Jan 8, 2025

Mathieu-Deharbe commented Jan 9, 2025

Mathieu-Deharbe commented Dec 10, 2024 •

edited

Loading

Mathieu-Deharbe Dec 18, 2024 •

edited

Loading

Mathieu-Deharbe Dec 18, 2024 •

edited

Loading

basseche Dec 18, 2024 •

edited

Loading

ghazwarhili Jan 6, 2025 •

edited

Loading