diff --git a/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java index 9884cb5e6..a74df78d7 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java @@ -62,7 +62,7 @@ public class ModificationEntity { @Column(name = "message_values") private String messageValues; - @Column(name = "activated") + @Column(name = "activated", columnDefinition = "boolean default true") private Boolean activated = true; public ModificationEntity(UUID id, String type, Instant date, Boolean stashed, Boolean activated, String messageType, String messageValues) { diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java index 05270177e..6cb273e22 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java @@ -26,7 +26,7 @@ @NoArgsConstructor @Getter @Entity -@Table(name = "batteryCreation") +@Table(name = "battery_creation") @PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "batteryCreation_id_fk_constraint")) public class BatteryCreationEntity extends InjectionCreationEntity { diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java index e00111492..2534c161e 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java @@ -67,9 +67,7 @@ public class VoltageLevelCreationEntity extends EquipmentCreationEntity { @JoinColumn( name = "substation_creation_id", referencedColumnName = "id", - foreignKey = @ForeignKey( - name = "voltageLevel_substationCreation_fk" - )) + foreignKey = @ForeignKey(name = "voltageLevel_substationCreation_fk")) private SubstationCreationEntity substationCreation; public VoltageLevelCreationEntity(VoltageLevelCreationInfos voltageLevelCreationInfos) { diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java index e2caddaee..279092c69 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java @@ -25,7 +25,10 @@ @NoArgsConstructor @Getter @Entity -@Table(name = "vscCreation") +@Table(name = "vsc_creation", uniqueConstraints = { + @UniqueConstraint(name = "vsc_creation_converter_station_1_id_uc", columnNames = "converter_station_1_id"), + @UniqueConstraint(name = "vsc_creation_converter_station_2_id_uc", columnNames = "converter_station_2_id") +}) public class VscCreationEntity extends EquipmentCreationEntity { private Double nominalV; diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BalancesAdjustmentEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BalancesAdjustmentEntity.java index 7db0c7c6a..b356bb2e4 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BalancesAdjustmentEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BalancesAdjustmentEntity.java @@ -46,16 +46,16 @@ public class BalancesAdjustmentEntity extends ModificationEntity { @Enumerated(EnumType.STRING) private LoadFlowParameters.BalanceType balanceType = DEFAULT_BALANCE_TYPE; - @Column(name = "with_load_flow") + @Column(name = "with_load_flow", nullable = false, columnDefinition = "boolean default " + DEFAULT_WITH_LOAD_FLOW) private boolean withLoadFlow = DEFAULT_WITH_LOAD_FLOW; @Column(name = "load_flow_parameters_id") private UUID loadFlowParametersId; - @Column(name = "with_ratio_tap_changers") + @Column(name = "with_ratio_tap_changers", columnDefinition = "boolean default " + DEFAULT_WITH_RATIO_TAP_CHANGERS) private boolean withRatioTapChangers = DEFAULT_WITH_RATIO_TAP_CHANGERS; - @Column(name = "subtract_load_flow_balancing") + @Column(name = "subtract_load_flow_balancing", columnDefinition = "boolean default " + DEFAULT_SUBTRACT_LOAD_FLOW_BALANCING) private boolean subtractLoadFlowBalancing = DEFAULT_SUBTRACT_LOAD_FLOW_BALANCING; @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ConverterStationModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ConverterStationModificationEntity.java index 64d42180b..2bec76eb8 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ConverterStationModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ConverterStationModificationEntity.java @@ -32,7 +32,8 @@ @NoArgsConstructor @Getter @Entity -@Table(name = "converterStationModification") +@Table(name = "converter_station_modification") +@PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "converter_station_modification_id_fk_constraint")) public class ConverterStationModificationEntity extends InjectionModificationEntity { @Embedded diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/EquipmentModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/EquipmentModificationEntity.java index 050d0be72..b88728f62 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/EquipmentModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/EquipmentModificationEntity.java @@ -26,7 +26,11 @@ public class EquipmentModificationEntity extends ModificationEntity { private String equipmentId; @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "equipment_modification_id") + @JoinColumn(name = "equipment_modification_id", + referencedColumnName = "id", + foreignKey = @ForeignKey( + name = "equipment_modification_id_fk") + ) @OrderColumn(name = "insert_position") private List properties; diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GenerationDispatchEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GenerationDispatchEntity.java index 357d2adc8..d315f21f6 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GenerationDispatchEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GenerationDispatchEntity.java @@ -56,11 +56,11 @@ public class GenerationDispatchEntity extends ModificationEntity { private List generatorsWithFixedSupply; @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) - @OrderColumn(name = "pos_generators_frequency") + @OrderColumn(name = "pos_generators_frequency", nullable = false, columnDefinition = "integer default 0") private List generatorsFrequencyReserve; @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) - @OrderColumn(name = "pos_generators_ordering") + @OrderColumn(name = "pos_generators_ordering", nullable = false, columnDefinition = "integer default 0") private List generatorsOrdering; public GenerationDispatchEntity(@NotNull GenerationDispatchInfos generationDispatchInfos) { diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorsFrequencyReserveEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorsFrequencyReserveEntity.java index c5a53a7bc..fb4556f44 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorsFrequencyReserveEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorsFrequencyReserveEntity.java @@ -6,18 +6,11 @@ */ package org.gridsuite.modification.server.entities.equipment.modification; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import jakarta.persistence.CollectionTable; -import jakarta.persistence.Column; -import jakarta.persistence.ElementCollection; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; import java.util.List; import java.util.UUID; diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VscModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VscModificationEntity.java index 87c5e4e4f..cd946f089 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VscModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VscModificationEntity.java @@ -27,26 +27,26 @@ @NoArgsConstructor @Getter @Entity -@Table(name = "vscModification") +@Table(name = "vsc_modification") public class VscModificationEntity extends BasicEquipmentModificationEntity { @Embedded @AttributeOverrides(value = { @AttributeOverride(name = "value", column = @Column(name = "nominalv")), - @AttributeOverride(name = "opType", column = @Column(name = "nominalvOp")) + @AttributeOverride(name = "opType", column = @Column(name = "nominalv_Op")) }) private DoubleModificationEmbedded nominalV; @Embedded @AttributeOverrides(value = { @AttributeOverride(name = "value", column = @Column(name = "r")), - @AttributeOverride(name = "opType", column = @Column(name = "rOp")) + @AttributeOverride(name = "opType", column = @Column(name = "r_Op")) }) private DoubleModificationEmbedded r; @Embedded @AttributeOverrides(value = { @AttributeOverride(name = "value", column = @Column(name = "maxp")), - @AttributeOverride(name = "opType", column = @Column(name = "maxpOp")) + @AttributeOverride(name = "opType", column = @Column(name = "maxp_Op")) }) private DoubleModificationEmbedded maxP; diff --git a/src/main/java/org/gridsuite/modification/server/entities/tabular/TabularBaseEntity.java b/src/main/java/org/gridsuite/modification/server/entities/tabular/TabularBaseEntity.java index 9f350afdf..3c64f64d6 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/tabular/TabularBaseEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/tabular/TabularBaseEntity.java @@ -6,12 +6,7 @@ */ package org.gridsuite.modification.server.entities.tabular; -import jakarta.persistence.CascadeType; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.MappedSuperclass; -import jakarta.persistence.OneToMany; -import jakarta.persistence.OrderColumn; +import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import org.gridsuite.modification.dto.ModificationInfos; @@ -29,7 +24,10 @@ public class TabularBaseEntity extends ModificationEntity { @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "tabular_modification_id") + @JoinColumn(name = "tabular_modification_id", + referencedColumnName = "id", + foreignKey = @ForeignKey(name = "tabular_modification_id_fk_constraint") + ) @OrderColumn(name = "insert_position") private List properties; diff --git a/src/main/resources/db/changelog/changesets/changelog_20220425T102224Z.xml b/src/main/resources/db/changelog/changesets/changelog_20220425T102224Z.xml index 5aa8e7e31..257087573 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20220425T102224Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20220425T102224Z.xml @@ -22,7 +22,10 @@ - + + + + diff --git a/src/main/resources/db/changelog/changesets/changelog_20220516T120149Z.xml b/src/main/resources/db/changelog/changesets/changelog_20220516T120149Z.xml index 578daf0be..2ed8d740b 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20220516T120149Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20220516T120149Z.xml @@ -25,7 +25,13 @@ + + + + + + diff --git a/src/main/resources/db/changelog/changesets/changelog_20230613T103000Z.xml b/src/main/resources/db/changelog/changesets/changelog_20230613T103000Z.xml index ea59060b2..1c684d1b5 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20230613T103000Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20230613T103000Z.xml @@ -36,4 +36,7 @@ + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/changesets/changelog_20230810T134233Z.xml b/src/main/resources/db/changelog/changesets/changelog_20230810T134233Z.xml index 7afe5a43a..70fa08601 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20230810T134233Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20230810T134233Z.xml @@ -8,7 +8,7 @@ - + diff --git a/src/main/resources/db/changelog/changesets/changelog_20230917T220327Z.xml b/src/main/resources/db/changelog/changesets/changelog_20230917T220327Z.xml index fb641d107..a5a4772dd 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20230917T220327Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20230917T220327Z.xml @@ -67,4 +67,10 @@ + + + + + + diff --git a/src/main/resources/db/changelog/changesets/changelog_20231011T120303Z.xml b/src/main/resources/db/changelog/changesets/changelog_20231011T120303Z.xml index 98ebde10a..5bab2b7e9 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20231011T120303Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20231011T120303Z.xml @@ -43,4 +43,7 @@ + + + diff --git a/src/main/resources/db/changelog/changesets/changelog_20241204T222759Z.xml b/src/main/resources/db/changelog/changesets/changelog_20241204T222759Z.xml index c245df334..42216cefd 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20241204T222759Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20241204T222759Z.xml @@ -8,4 +8,7 @@ + + + diff --git a/src/main/resources/db/changelog/changesets/changelog_20250723T155748Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250723T155748Z.xml index 13d72a1ef..af9e95d7c 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20250723T155748Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20250723T155748Z.xml @@ -97,4 +97,7 @@ + + + diff --git a/src/main/resources/db/changelog/changesets/changelog_20250729T072247Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250729T072247Z.xml index 430437b3c..ed1072662 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20250729T072247Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20250729T072247Z.xml @@ -8,13 +8,13 @@ - + - - - + + +