Skip to content

Always set the 'id' field in CurrentLimitsData dto #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 25, 2025
Merged

Always set the 'id' field in CurrentLimitsData dto #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
144cd8a
Always set the 'id' field in CurrentLimitsData dto with the operation…
FranckLecuyer Sep 24, 2025
abbb5e6
Fix sonar issues
FranckLecuyer Sep 24, 2025
b40b021
Merge branch 'main' into set_limitset_id_in_current_limits_data_dto
TheMaskedTurtle Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/org/gridsuite/network/map/dto/common/CurrentLimitsData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
@EqualsAndHashCode
@ToString
public class CurrentLimitsData {
// may be null in case we just need the selected limit set and don't really need its name/id
@JsonInclude(JsonInclude.Include.NON_NULL)
private String id;

Expand Down
17 changes: 8 additions & 9 deletions src/main/java/org/gridsuite/network/map/dto/mapper/BranchInfosMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,13 @@ public static ElementInfos toData(@NonNull final Identifiable<?> identifiable,
final Terminal terminal1 = branch.getTerminal1();
final Terminal terminal2 = branch.getTerminal2();

branch.getSelectedOperationalLimitsGroup1()
.flatMap(OperationalLimitsGroup::getCurrentLimits)
.map(cl -> builder.selectedOperationalLimitsGroup1(toMapDataCurrentLimits(cl, null, null)));
branch.getSelectedOperationalLimitsGroupId1().map(name -> builder.selectedOperationalLimitsGroup1Name(name));
branch.getSelectedOperationalLimitsGroup2()
.flatMap(OperationalLimitsGroup::getCurrentLimits)
.map(cl -> builder.selectedOperationalLimitsGroup2(toMapDataCurrentLimits(cl, null, null)));
branch.getSelectedOperationalLimitsGroupId2().map(name -> builder.selectedOperationalLimitsGroup2Name(name));
branch.getSelectedOperationalLimitsGroup1().ifPresent(limitGrp ->
limitGrp.getCurrentLimits().ifPresent(cl -> builder.selectedOperationalLimitsGroup1(toMapDataCurrentLimits(cl, limitGrp.getId(), null))));
branch.getSelectedOperationalLimitsGroupId1().ifPresent(builder::selectedOperationalLimitsGroup1Name);

branch.getSelectedOperationalLimitsGroup2().ifPresent(limitGrp ->
limitGrp.getCurrentLimits().ifPresent(cl -> builder.selectedOperationalLimitsGroup2(toMapDataCurrentLimits(cl, limitGrp.getId(), null))));
branch.getSelectedOperationalLimitsGroupId2().ifPresent(builder::selectedOperationalLimitsGroup2Name);

if (loadOperationalLimitGroups) {
final Map<String, CurrentLimitsData> mapOperationalLimitsGroup1 = buildCurrentLimitsMap(branch.getOperationalLimitsGroups1());
Expand Down Expand Up @@ -133,7 +132,7 @@ private static Map<String, CurrentLimitsData> buildCurrentLimitsMap(@NonNull fin
}
Map<String, CurrentLimitsData> res = HashMap.newHashMap(operationalLimitsGroups.size());
operationalLimitsGroups.forEach(operationalLimitsGroup -> operationalLimitsGroup.getCurrentLimits()
.ifPresent(limits -> res.put(operationalLimitsGroup.getId(), toMapDataCurrentLimits(limits, null, null))));
.ifPresent(limits -> res.put(operationalLimitsGroup.getId(), toMapDataCurrentLimits(limits, operationalLimitsGroup.getId(), null))));
return res;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ private static LineTooltipInfos toTooltipInfos(Identifiable<?> identifiable, Dou
.b1(line.getB1())
.b2(line.getB2());

line.getCurrentLimits1().ifPresent(limits1 -> builder.currentLimits1(toMapDataCurrentLimits(limits1, null, null)));
line.getCurrentLimits2().ifPresent(limits2 -> builder.currentLimits2(toMapDataCurrentLimits(limits2, null, null)));
line.getSelectedOperationalLimitsGroup1().ifPresent(limitsGrp -> limitsGrp.getCurrentLimits().ifPresent(limits -> builder.currentLimits1(toMapDataCurrentLimits(limits, limitsGrp.getId(), null))));
line.getSelectedOperationalLimitsGroup2().ifPresent(limitsGrp -> limitsGrp.getCurrentLimits().ifPresent(limits -> builder.currentLimits2(toMapDataCurrentLimits(limits, limitsGrp.getId(), null))));

return builder.build();
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/network/map/dto/mapper/TieLineInfosMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ private static TieLineMapInfos toMapInfos(Identifiable<?> identifiable, Double d
.i2(nullIfNan(computeIntensity(terminal2, dcPowerFactor)))
.operatingStatus(ExtensionUtils.toOperatingStatus(tieLine));

tieLine.getCurrentLimits1().ifPresent(limits1 -> builder.currentLimits1(toMapDataCurrentLimits(limits1, null, null)));
tieLine.getCurrentLimits2().ifPresent(limits2 -> builder.currentLimits2(toMapDataCurrentLimits(limits2, null, null)));
tieLine.getSelectedOperationalLimitsGroup1().ifPresent(limitsGrp -> limitsGrp.getCurrentLimits().ifPresent(limits -> builder.currentLimits1(toMapDataCurrentLimits(limits, limitsGrp.getId(), null))));
tieLine.getSelectedOperationalLimitsGroup2().ifPresent(limitsGrp -> limitsGrp.getCurrentLimits().ifPresent(limits -> builder.currentLimits2(toMapDataCurrentLimits(limits, limitsGrp.getId(), null))));

return builder.build();
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/network/map/dto/mapper/TwoWindingsTransformerInfosMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ private static TwoWindingsTransformerTooltipInfos toTooltipInfos(Identifiable<?>
.x(twoWindingsTransformer.getX())
.b(twoWindingsTransformer.getB());

twoWindingsTransformer.getCurrentLimits1().ifPresent(limits1 -> builder.currentLimits1(toMapDataCurrentLimits(limits1, null, null)));
twoWindingsTransformer.getCurrentLimits2().ifPresent(limits2 -> builder.currentLimits2(toMapDataCurrentLimits(limits2, null, null)));
twoWindingsTransformer.getSelectedOperationalLimitsGroup1().ifPresent(limitsGrp -> limitsGrp.getCurrentLimits().ifPresent(limits -> builder.currentLimits1(toMapDataCurrentLimits(limits, limitsGrp.getId(), null))));
twoWindingsTransformer.getSelectedOperationalLimitsGroup2().ifPresent(limitsGrp -> limitsGrp.getCurrentLimits().ifPresent(limits -> builder.currentLimits2(toMapDataCurrentLimits(limits, limitsGrp.getId(), null))));

return builder.build();
}
Expand Down
22 changes: 18 additions & 4 deletions src/test/resources/2-windings-transformer-tooltip-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,35 @@
"voltageLevelId1": "VLGEN",
"voltageLevelId2": "VLHV1",
"currentLimits1": {
"id": "limit set 1",
"permanentLimit": 750.4,
"temporaryLimits": [
{ "name": "IT5", "value": 300.0, "acceptableDuration": 2087 }
{
"name": "IT5",
"value": 300.0,
"acceptableDuration": 2087
}
],
"applicability": null
},
"currentLimits2": {
"id": "limit set 1",
"permanentLimit": 780.6,
"temporaryLimits": [
{ "name": "IT20", "value": 1200.0, "acceptableDuration": 961 },
{ "name": "N/A", "value": 2.147483647e9, "acceptableDuration": 664 }
{
"name": "IT20",
"value": 1200.0,
"acceptableDuration": 961
},
{
"name": "N/A",
"value": 2.147483647E9,
"acceptableDuration": 664
}
],
"applicability": null
},
"r": 0.26658461538461536,
"x": 11.104492831516762,
"b": 0.0
}
}
4 changes: 4 additions & 0 deletions src/test/resources/2-windings-transformers-tab-data-without-optionals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"r": 0.26658461538461536,
"x": 11.104492831516762,
"selectedOperationalLimitsGroup1": {
"id": "limit set 1",
"permanentLimit": 750.4,
"temporaryLimits": [
{
Expand All @@ -32,6 +33,7 @@
},
"selectedOperationalLimitsGroup1Name": "limit set 1",
"selectedOperationalLimitsGroup2": {
"id": "limit set 1",
"permanentLimit": 780.6,
"temporaryLimits": [
{
Expand Down Expand Up @@ -194,6 +196,7 @@
"r": 47.0,
"x": 23.0,
"selectedOperationalLimitsGroup1": {
"id": "DEFAULT",
"permanentLimit": 300.4,
"temporaryLimits": [
{
Expand All @@ -206,6 +209,7 @@
},
"selectedOperationalLimitsGroup1Name": "DEFAULT",
"selectedOperationalLimitsGroup2": {
"id": "DEFAULT",
"permanentLimit": 280.6,
"temporaryLimits": [
{
Expand Down
8 changes: 8 additions & 0 deletions src/test/resources/2-windings-transformers-tab-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"x": 11.104492831516762,
"operationalLimitsGroup1": {
"limit set 1": {
"id": "limit set 1",
"permanentLimit": 750.4,
"temporaryLimits": [
{
Expand All @@ -36,6 +37,7 @@
"limit set 1"
],
"selectedOperationalLimitsGroup1": {
"id": "limit set 1",
"permanentLimit": 750.4,
"temporaryLimits": [
{
Expand All @@ -49,6 +51,7 @@
"selectedOperationalLimitsGroup1Name": "limit set 1",
"operationalLimitsGroup2": {
"limit set 1": {
"id": "limit set 1",
"permanentLimit": 780.6,
"temporaryLimits": [
{
Expand All @@ -69,6 +72,7 @@
"limit set 1"
],
"selectedOperationalLimitsGroup2": {
"id": "limit set 1",
"permanentLimit": 780.6,
"temporaryLimits": [
{
Expand Down Expand Up @@ -232,6 +236,7 @@
"x": 23.0,
"operationalLimitsGroup1": {
"DEFAULT": {
"id": "DEFAULT",
"permanentLimit": 300.4,
"temporaryLimits": [
{
Expand All @@ -247,6 +252,7 @@
"DEFAULT"
],
"selectedOperationalLimitsGroup1": {
"id": "DEFAULT",
"permanentLimit": 300.4,
"temporaryLimits": [
{
Expand All @@ -260,6 +266,7 @@
"selectedOperationalLimitsGroup1Name": "DEFAULT",
"operationalLimitsGroup2": {
"DEFAULT": {
"id": "DEFAULT",
"permanentLimit": 280.6,
"temporaryLimits": [
{
Expand All @@ -275,6 +282,7 @@
"DEFAULT"
],
"selectedOperationalLimitsGroup2": {
"id": "DEFAULT",
"permanentLimit": 280.6,
"temporaryLimits": [
{
Expand Down
Loading