diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/BusModificationInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/BusModificationInfos.java index a5a9b42..42e24ec 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/BusModificationInfos.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/BusModificationInfos.java @@ -18,6 +18,8 @@ @Getter @Setter public class BusModificationInfos { + private String voltageLevelId; + private String busId; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/BusVoltage.java b/src/main/java/org/gridsuite/voltageinit/server/dto/BusVoltage.java index e4555ac..e0fc1ec 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/BusVoltage.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/BusVoltage.java @@ -17,6 +17,8 @@ @AllArgsConstructor @NoArgsConstructor public class BusVoltage { + private String voltageLevelId; + private String busId; private double v; diff --git a/src/main/java/org/gridsuite/voltageinit/server/entities/BusVoltageEmbeddable.java b/src/main/java/org/gridsuite/voltageinit/server/entities/BusVoltageEmbeddable.java index 5582acc..86c7940 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/entities/BusVoltageEmbeddable.java +++ b/src/main/java/org/gridsuite/voltageinit/server/entities/BusVoltageEmbeddable.java @@ -20,6 +20,8 @@ @NoArgsConstructor @Embeddable public class BusVoltageEmbeddable { + @Column + private String voltageLevelId; @Column private String busId; diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java b/src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java index 8a71f20..a08f379 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java +++ b/src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java @@ -186,6 +186,7 @@ public UUID createVoltageInitModificationGroup(Network network, OpenReacResult r Bus bus = network.getBusView().getBus(busId); if (bus != null) { BusModificationInfos.BusModificationInfosBuilder builder = BusModificationInfos.builder() + .voltageLevelId(bus.getVoltageLevel().getId()) .busId(busId) .v(voltage.getFirst() * bus.getVoltageLevel().getNominalV()) .angle(Math.toDegrees(voltage.getSecond())); diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultService.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultService.java index 224f8b0..7482e3f 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultService.java +++ b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultService.java @@ -55,7 +55,7 @@ private static VoltageInitResultEntity toVoltageInitResultEntity(UUID resultUuid .map(vp -> { Bus b = networkBuses.get(vp.getKey()); if (b != null) { - return new BusVoltageEmbeddable(vp.getKey(), + return new BusVoltageEmbeddable(b.getVoltageLevel().getId(), vp.getKey(), vp.getValue().getFirst() * b.getVoltageLevel().getNominalV(), Math.toDegrees(vp.getValue().getSecond())); } else { diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitService.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitService.java index 0e6dc1b..6259d28 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitService.java +++ b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitService.java @@ -75,7 +75,7 @@ private static VoltageInitResult fromEntity(VoltageInitResultEntity resultEntity .map(slack -> new ReactiveSlack(slack.getBusId(), slack.getSlack())) .toList(); List busVoltages = resultEntity.getBusVoltages().stream() - .map(bv -> new BusVoltage(bv.getBusId(), bv.getV(), bv.getAngle())) + .map(bv -> new BusVoltage(bv.getVoltageLevelId(), bv.getBusId(), bv.getV(), bv.getAngle())) .toList(); return new VoltageInitResult(resultEntity.getResultUuid(), resultEntity.getWriteTimeStamp(), sortedIndicators, reactiveSlacks, busVoltages, resultEntity.getModificationsGroupUuid(), resultEntity.isReactiveSlacksOverThreshold(), diff --git a/src/main/resources/db/changelog/changesets/changelog_20240709T084348Z.xml b/src/main/resources/db/changelog/changesets/changelog_20240709T084348Z.xml new file mode 100644 index 0000000..260f403 --- /dev/null +++ b/src/main/resources/db/changelog/changesets/changelog_20240709T084348Z.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml index 3a21943..98cf5b6 100644 --- a/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -30,3 +30,6 @@ databaseChangeLog: - include: file: changesets/changelog_20240529T153656Z.xml relativeToChangelogFile: true + - include: + file: changesets/changelog_20240709T084348Z.xml + relativeToChangelogFile: true