add detail attachment point for line attached to vl modification #128
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Etienne LESOT <[email protected]>
Signed-off-by: Etienne LESOT <[email protected]>
Signed-off-by: Etienne LESOT <[email protected]>
Mathieu-Deharbe
approved these changes
Dec 1, 2025
Contributor
Mathieu-Deharbe
left a comment
Mathieu-Deharbe
left a comment
There was a problem hiding this comment.
Code OK, test OK.
Only optional small remarks.
Comment on lines
100
to
128
| // override voltage level | ||
| VoltageLevel voltageLevel = network.getVoltageLevel(modificationInfos.getAttachmentPointId()); | ||
| if (modificationInfos.getAttachmentPointDetailInformation().getHighVoltageLimit() != null) { | ||
| voltageLevel.setHighVoltageLimit(modificationInfos.getAttachmentPointDetailInformation().getHighVoltageLimit()); | ||
| } | ||
| if (modificationInfos.getAttachmentPointDetailInformation().getLowVoltageLimit() != null) { | ||
| voltageLevel.setLowVoltageLimit(modificationInfos.getAttachmentPointDetailInformation().getLowVoltageLimit()); | ||
| } | ||
| if (modificationInfos.getAttachmentPointDetailInformation().getIpMax() != null || modificationInfos.getAttachmentPointDetailInformation().getIpMin() != null) { | ||
| IdentifiableShortCircuitAdder<VoltageLevel> adder = voltageLevel.newExtension(IdentifiableShortCircuitAdder.class); | ||
| if (modificationInfos.getAttachmentPointDetailInformation().getIpMax() != null) { | ||
| adder.withIpMax(modificationInfos.getAttachmentPointDetailInformation().getIpMax()); | ||
| } | ||
| if (modificationInfos.getAttachmentPointDetailInformation().getIpMin() != null) { | ||
| adder.withIpMin(modificationInfos.getAttachmentPointDetailInformation().getIpMin()); | ||
| } | ||
| adder.add(); | ||
| } | ||
| PropertiesUtils.applyProperties(voltageLevel, modificationInfos.getAttachmentPointDetailInformation().getProperties()); | ||
| // override substation | ||
| SubstationCreationInfos substationCreationInfos = modificationInfos.getAttachmentPointDetailInformation().getSubstationCreation(); | ||
| final Substation substation = network.getSubstation(substationCreationInfos.getEquipmentId()); | ||
| if (substationCreationInfos.getEquipmentName() != null) { | ||
| substation.setName(substationCreationInfos.getEquipmentName()); | ||
| } | ||
| if (substationCreationInfos.getCountry() != null) { | ||
| substation.setCountry(substationCreationInfos.getCountry()); | ||
| } | ||
| PropertiesUtils.applyProperties(substation, substationCreationInfos.getProperties()); |
Contributor
There was a problem hiding this comment.
All that part could be extracted to a function taking modificationInfos.getAttachmentPointDetailInformation() as a VoltageLevelCreationInfos parameter.
(I say this to please please sonar but technically this is a separate modification so it kind of make sense)
A bit like this :
private void updateAttachmentVoltageLevel(Network network, @NotNull VoltageLevelCreationInfos attachmentPointDetailInformation) {
VoltageLevel voltageLevel = network.getVoltageLevel(modificationInfos.getAttachmentPointId());
if (attachmentPointDetailInformation.getHighVoltageLimit() != null) {
voltageLevel.setHighVoltageLimit(attachmentPointDetailInformation.getHighVoltageLimit());
}
if (attachmentPointDetailInformation.getLowVoltageLimit() != null) {
voltageLevel.setLowVoltageLimit(attachmentPointDetailInformation.getLowVoltageLimit());
}
if (attachmentPointDetailInformation.getIpMax() != null || attachmentPointDetailInformation.getIpMin() != null) {
IdentifiableShortCircuitAdder<VoltageLevel> adder = voltageLevel.newExtension(IdentifiableShortCircuitAdder.class);
if (attachmentPointDetailInformation.getIpMax() != null) {
adder.withIpMax(attachmentPointDetailInformation.getIpMax());
}
if (attachmentPointDetailInformation.getIpMin() != null) {
adder.withIpMin(attachmentPointDetailInformation.getIpMin());
}
adder.add();
}
PropertiesUtils.applyProperties(voltageLevel, attachmentPointDetailInformation.getProperties());
// override substation
SubstationCreationInfos substationCreationInfos = attachmentPointDetailInformation.getSubstationCreation();
final Substation substation = network.getSubstation(substationCreationInfos.getEquipmentId());
if (substationCreationInfos.getEquipmentName() != null) {
substation.setName(substationCreationInfos.getEquipmentName());
}
if (substationCreationInfos.getCountry() != null) {
substation.setCountry(substationCreationInfos.getCountry());
}
PropertiesUtils.applyProperties(substation, substationCreationInfos.getProperties());
}
You can even separate voltage level and substation creation in two functions.
Comment on lines
38
to
40
| .substationCreation(SubstationCreationInfos.builder().stashed(false) | ||
| .equipmentId("attachmentPointSubstation") | ||
| .country(Country.FR) |
Contributor
There was a problem hiding this comment.
This is the only data that you don't test :
Suggested change
| .substationCreation(SubstationCreationInfos.builder().stashed(false) | |
| .equipmentId("attachmentPointSubstation") | |
| .country(Country.FR) | |
| .substationCreation(SubstationCreationInfos.builder().stashed(false) | |
| .equipmentId("attachmentPointSubstation") | |
| .equipmentName("attachmentPointSubstationName") | |
| .country(Country.FR) |
Signed-off-by: Etienne LESOT <[email protected]>
Signed-off-by: Etienne LESOT <[email protected]>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Summary
add voltage level info in line attached to voltage level to override fictious information of the voltage level created