Skip to content

Commit 304899c

Browse files
authored
Store the VL ID in BranchStatusModificationInfos (#265)
Add a new variable energizedVoltageLevelId to BranchStatusModificationInfos to store the voltage level ID when it's an energized end Signed-off-by: Florent MILLOT <[email protected]>
1 parent ca90b45 commit 304899c

File tree

6 files changed

+23
-0
lines changed

6 files changed

+23
-0
lines changed

src/main/java/org/gridsuite/modification/server/dto/BranchStatusModificationInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ public class BranchStatusModificationInfos extends EquipmentModificationInfos {
3535
@Schema(description = "Action type")
3636
ActionType action;
3737

38+
@Schema(description = "Energized end one or two voltage level ID")
39+
private String energizedVoltageLevelId;
40+
3841
public enum ActionType {
3942
LOCKOUT,
4043
TRIP,

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ public class BranchStatusModificationEntity extends EquipmentModificationEntity
2828
@Enumerated(EnumType.STRING)
2929
private BranchStatusModificationInfos.ActionType action;
3030

31+
@Column
32+
private String energizedVoltageLevelId;
33+
3134
public BranchStatusModificationEntity(@NonNull BranchStatusModificationInfos branchStatusModificationInfos) {
3235
super(branchStatusModificationInfos);
3336
assignAttributes(branchStatusModificationInfos);
@@ -41,6 +44,7 @@ public void update(@NonNull ModificationInfos modificationInfos) {
4144

4245
private void assignAttributes(BranchStatusModificationInfos branchStatusModificationInfos) {
4346
action = branchStatusModificationInfos.getAction();
47+
energizedVoltageLevelId = branchStatusModificationInfos.getEnergizedVoltageLevelId();
4448
}
4549

4650
@Override
@@ -51,6 +55,7 @@ public BranchStatusModificationInfos toModificationInfos() {
5155
.date(getDate())
5256
.equipmentId(getEquipmentId())
5357
.action(getAction())
58+
.energizedVoltageLevelId(getEnergizedVoltageLevelId())
5459
.build();
5560
}
5661
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
2+
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-4.1.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
3+
<changeSet author="florent (generated)" id="1686580426216-5">
4+
<addColumn tableName="branch_status_modification">
5+
<column name="energized_voltage_level_id" type="varchar(255)"/>
6+
</addColumn>
7+
</changeSet>
8+
</databaseChangeLog>

src/main/resources/db/changelog/db.changelog-master.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ databaseChangeLog:
147147
- include:
148148
file: changesets/changelog_20230529T102224Z.xml
149149
relativeToChangelogFile: true
150+
- include:
151+
file: changesets/changelog_20230612T143325Z.xml
152+
relativeToChangelogFile: true
150153
- include:
151154
file: changesets/changelog_20230619T112802Z.xml
152155
relativeToChangelogFile: true

src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationEnergiseSideOneLineTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ protected Network createNetwork(UUID networkUuid) {
4444
protected ModificationInfos buildModification() {
4545
return BranchStatusModificationInfos.builder()
4646
.equipmentId(TARGET_LINE_ID)
47+
.energizedVoltageLevelId("vl1")
4748
.action(BranchStatusModificationInfos.ActionType.ENERGISE_END_ONE).build();
4849
}
4950

5051
@Override
5152
protected ModificationInfos buildModificationUpdate() {
5253
return BranchStatusModificationInfos.builder()
5354
.equipmentId("line1")
55+
.energizedVoltageLevelId("vl1_bis")
5456
.action(BranchStatusModificationInfos.ActionType.TRIP).build();
5557
}
5658

src/test/java/org/gridsuite/modification/server/modifications/BranchStatusModificationEnergiseSideTwoLineTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ protected Network createNetwork(UUID networkUuid) {
4444
protected ModificationInfos buildModification() {
4545
return BranchStatusModificationInfos.builder()
4646
.equipmentId(TARGET_LINE_ID)
47+
.energizedVoltageLevelId("vl2")
4748
.action(BranchStatusModificationInfos.ActionType.ENERGISE_END_TWO).build();
4849
}
4950

5051
@Override
5152
protected ModificationInfos buildModificationUpdate() {
5253
return BranchStatusModificationInfos.builder()
5354
.equipmentId("line1")
55+
.energizedVoltageLevelId("vl2_bis")
5456
.action(BranchStatusModificationInfos.ActionType.TRIP).build();
5557
}
5658

0 commit comments

Comments
 (0)