fix changelogs and database

Author: basseche

pom.xml

@@ -52,7 +52,7 @@
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
         <!-- TODO network-modification.version remove when upgrading gridsuite dependencies -->
-        <network-modification.version>0.41.0</network-modification.version>
+        <network-modification.version>0.42.0-SNAPSHOT</network-modification.version>
         <powsybl-balances-adjustment.version>2.14.1</powsybl-balances-adjustment.version>
     </properties>
 

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

@@ -25,20 +25,20 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-@Table(name = "currentLimits")
+@Table(name = "current_limits")
 public class CurrentLimitsEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private UUID id;
 
-    @Column(name = "permanentLimit")
+    @Column(name = "permanent_limit")
     private Double permanentLimit;
 
     @ElementCollection
     @CollectionTable(
-            name = "currentTemporaryLimits",
+            name = "current_temporary_limits",
             joinColumns = @JoinColumn(name = "id", foreignKey = @ForeignKey(name = "temporaryLimits_fk_constraint"))
     )
     private List<CurrentTemporaryLimitCreationEmbeddable> temporaryLimits;

src/main/java/org/gridsuite/modification/server/entities/equipment/creation/OperationalLimitsGroupEntity.java

@@ -8,10 +8,12 @@
 
 import jakarta.persistence.*;
 import lombok.*;
+import org.gridsuite.modification.dto.LimitsPropertyInfos;
 import org.gridsuite.modification.dto.OperationalLimitsGroupInfos;
 import org.gridsuite.modification.server.entities.equipment.modification.LimitsPropertyEntity;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -42,8 +44,8 @@ public class OperationalLimitsGroupEntity {
     @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
     @JoinTable(
         name = "operational_limits_group_properties",
-        joinColumns = @JoinColumn(name = "op_limits_group_id"), foreignKey = @ForeignKey(name = "operationalLimitsGroups_id_fk"),
-        inverseJoinColumns = @JoinColumn(name = "limits_property_id"), inverseForeignKey = @ForeignKey(name = "limits_property_fk"))
+        joinColumns = @JoinColumn(name = "op_limits_group_id", referencedColumnName = "uuid"), foreignKey = @ForeignKey(name = "operationalLimitsGroups_id_fk"),
+        inverseJoinColumns = @JoinColumn(name = "limits_property_id", referencedColumnName = "id"), inverseForeignKey = @ForeignKey(name = "limits_property_fk"))
     private List<LimitsPropertyEntity> limitsProperties;
 
     @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
@@ -54,6 +56,14 @@ public class OperationalLimitsGroupEntity {
             ))
     private CurrentLimitsEntity currentLimits;
 
+    private static List<LimitsPropertyEntity> toLimitPropertyEntities(List<LimitsPropertyInfos> properties) {
+        List<LimitsPropertyEntity> result = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(properties)) {
+            result = properties.stream().map(LimitsPropertyEntity::fromLimitsPropertyInfos).toList();
+        }
+        return result;
+    }
+
     public static List<OperationalLimitsGroupEntity> toOperationalLimitsGroupsEntities(@NonNull List<OperationalLimitsGroupInfos> limitsGroups) {
         return limitsGroups.stream()
                 .filter(Objects::nonNull)
@@ -62,7 +72,7 @@ public static List<OperationalLimitsGroupEntity> toOperationalLimitsGroupsEntiti
                                 null,
                                 limitsGroup.getId(),
                                 limitsGroup.getApplicability(),
-                                limitsGroup.getLimitsPropertiesInfos().stream().map(LimitsPropertyEntity::fromLimitsPropertyInfos).toList(),
+                                toLimitPropertyEntities(limitsGroup.getLimitsProperties()),
                                 new CurrentLimitsEntity(limitsGroup.getCurrentLimits())
                         )
                 )
@@ -77,7 +87,7 @@ public static List<OperationalLimitsGroupInfos> fromOperationalLimitsGroupsEntit
                                         .id(limitsGroupEntity.getId())
                                         .applicability(limitsGroupEntity.getApplicability())
                                         .currentLimits(limitsGroupEntity.getCurrentLimits().toCurrentLimitsInfos())
-                                        .limitsPropertiesInfos(limitsGroupEntity.getLimitsProperties()
+                                        .limitsProperties(limitsGroupEntity.getLimitsProperties()
                                             .stream().map(LimitsPropertyEntity::toCurrentLimitsInfos).toList())
                                         .build()
                         )

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LimitsPropertyEntity.java

@@ -4,11 +4,13 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.gridsuite.modification.dto.LimitsPropertyInfos;
 
 import java.util.UUID;
 
 @Getter
+@Setter
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity

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

@@ -409,7 +409,7 @@ databaseChangeLog:
       file: changesets/changelog_20250822T115310Z.xml
       relativeToChangelogFile: true
   - include:
-      file: changesets/changelog_20251006T143445Z.xml
+      file: changesets/changelog_20250921T151431Z.xml
       relativeToChangelogFile: true
   - include:
       file: changesets/changelog_20251003T070056Z.xml