Skip to content

removes currentLimits1 and currentLimits2 #271

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 36 commits into from
Sep 10, 2025
Merged

removes currentLimits1 and currentLimits2 #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
35c6e05
Add new attribute for lineFormInfos dto
basseche Jul 3, 2025
2ea1911
Fix selected Limits Group name
basseche Jul 4, 2025
501b375
Merge branch 'main' into Add_Attribute_DTO_LimitSets
basseche Jul 8, 2025
4ddf837
Improve function
basseche Jul 9, 2025
5c50a38
fix merge function
basseche Jul 10, 2025
1a3c417
Change current limit group name if selected one is changed
basseche Jul 10, 2025
00386fc
Fix Tests
basseche Jul 10, 2025
0caa838
Update src/main/java/org/gridsuite/network/map/dto/common/CurrentLimi…
basseche Jul 18, 2025
79bf9ad
Update src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils…
basseche Jul 18, 2025
24aff7b
Update src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils…
basseche Jul 18, 2025
4511d86
Merge branch 'main' into Add_Attribute_DTO_LimitSets
Mathieu-Deharbe Jul 18, 2025
42d5f09
--Change Specs : No id change for CurrentLimitsData when limits are …
basseche Jul 18, 2025
a0c0876
Merge branch 'main' into Add_Attribute_DTO_LimitSets
Mathieu-Deharbe Jul 23, 2025
b237412
corrects TU and imports
Mathieu-Deharbe Jul 23, 2025
11a96f9
removes currentLimits1 and currentLimits2
Mathieu-Deharbe Jul 28, 2025
dc09d65
removes currentLimits1 and currentLimits2 for transfos + TU
Mathieu-Deharbe Jul 28, 2025
b444cf0
review
basseche Jul 29, 2025
a593820
Update src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils…
basseche Jul 29, 2025
bc63337
checkstyle
basseche Jul 30, 2025
bde5bf8
Merge branch 'main' into Add_Attribute_DTO_LimitSets
basseche Jul 30, 2025
ebd2e5f
change limit compare function
basseche Jul 30, 2025
f3ae778
revert changes on buildCurrentsLimits
basseche Jul 30, 2025
b8624ee
increase test coverage
basseche Jul 31, 2025
29e6879
increase tests coverage
basseche Jul 31, 2025
0fab314
Merge branch 'Add_Attribute_DTO_LimitSets' into send-all-limit-sets-t…
Mathieu-Deharbe Aug 1, 2025
5f64e3b
corrects TU
Mathieu-Deharbe Aug 1, 2025
ac0a261
Merge branch 'main' into send-all-limit-sets-to-branch-forms
Mathieu-Deharbe Aug 7, 2025
24ae58e
Merge branch 'main' into send-all-limit-sets-to-branch-forms
Mathieu-Deharbe Aug 7, 2025
b40535f
corrections post conflicts
Mathieu-Deharbe Aug 7, 2025
0c330d9
Merge branch 'main' into send-all-limit-sets-to-branch-forms
Mathieu-Deharbe Aug 19, 2025
ec069a2
solve conflicts
Mathieu-Deharbe Aug 26, 2025
8493b5d
Merge branch 'main' into send-all-limit-sets-to-branch-forms
Mathieu-Deharbe Aug 27, 2025
a7d52e9
Merge branch 'main' into send-all-limit-sets-to-branch-forms
ipirog Aug 29, 2025
0514378
Merge branch 'main' into send-all-limit-sets-to-branch-forms
ipirog Sep 2, 2025
d552f64
Merge branch 'main' into send-all-limit-sets-to-branch-forms
ipirog Sep 3, 2025
431a658
Merge branch 'main' into send-all-limit-sets-to-branch-forms
Mathieu-Deharbe Sep 10, 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
8 changes: 0 additions & 8 deletions src/main/java/org/gridsuite/network/map/dto/definition/branch/line/LineFormInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@ public class LineFormInfos extends ElementInfosWithProperties {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<CurrentLimitsData> currentLimits;

//TODO : remove when modification is done
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<CurrentLimitsData> currentLimits1;

//TODO : remove when modification is done
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<CurrentLimitsData> currentLimits2;

@JsonInclude(JsonInclude.Include.NON_NULL)
private String selectedOperationalLimitsGroup1;

Expand Down
7 changes: 0 additions & 7 deletions ...ork/map/dto/definition/branch/twowindingstransformer/TwoWindingsTransformerFormInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,6 @@ public class TwoWindingsTransformerFormInfos extends ElementInfosWithProperties
@JsonInclude(JsonInclude.Include.NON_NULL)
private Double i2;

// TODO : remove currentLimits1 and 2 to leave only currentLimits when modification is done
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<CurrentLimitsData> currentLimits1;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<CurrentLimitsData> currentLimits2;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<CurrentLimitsData> currentLimits;

Expand Down
3 changes: 0 additions & 3 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 @@ -76,9 +76,6 @@ private static LineFormInfos toFormInfos(Identifiable<?> identifiable) {
.selectedOperationalLimitsGroup1(line.getSelectedOperationalLimitsGroupId1().orElse(null))
.selectedOperationalLimitsGroup2(line.getSelectedOperationalLimitsGroupId2().orElse(null));

buildCurrentLimits(line.getOperationalLimitsGroups1(), builder::currentLimits1);
buildCurrentLimits(line.getOperationalLimitsGroups2(), builder::currentLimits2);

builder.busOrBusbarSectionId1(getBusOrBusbarSection(terminal1))
.busOrBusbarSectionId2(getBusOrBusbarSection(terminal2));

Expand Down
3 changes: 0 additions & 3 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 @@ -91,9 +91,6 @@ private static TwoWindingsTransformerFormInfos toFormInfos(Identifiable<?> ident
builder.selectedOperationalLimitsGroup1(twoWT.getSelectedOperationalLimitsGroupId1().orElse(null));
builder.selectedOperationalLimitsGroup2(twoWT.getSelectedOperationalLimitsGroupId2().orElse(null));

buildCurrentLimits(twoWT.getOperationalLimitsGroups1(), builder::currentLimits1);
buildCurrentLimits(twoWT.getOperationalLimitsGroups2(), builder::currentLimits2);

builder.operatingStatus(ExtensionUtils.toOperatingStatus(twoWT));
builder.connectablePosition1(ExtensionUtils.toMapConnectablePosition(twoWT, 1))
.connectablePosition2(ExtensionUtils.toMapConnectablePosition(twoWT, 2));
Expand Down
16 changes: 0 additions & 16 deletions src/test/resources/2-windings-transformer-map-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,6 @@
"q1": 12.2,
"p2": 13.33,
"q2": 14.44,
"currentLimits1": [
{
"id" : "limit set 1",
"permanentLimit":750.4,
"temporaryLimits":[{"name":"IT5","acceptableDuration":2087,"value":300}],
"applicability": null
}
],
"currentLimits2": [
{
"id" : "limit set 1",
"permanentLimit":780.6,
"temporaryLimits":[{"name":"N/A","acceptableDuration":664,"value":2147483647},{"name":"IT20","acceptableDuration":961,"value":1200}],
"applicability": null
}
],
"currentLimits": [
{
"id" : "limit set 1",
Expand Down
16 changes: 0 additions & 16 deletions src/test/resources/line-form-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,6 @@
"q1": 2.2,
"p2": 3.33,
"q2": 4.44,
"currentLimits1": [
{
"id" : "limit set 1",
"permanentLimit":700.4,
"temporaryLimits":[{"name":"IT5","acceptableDuration":300,"value":250.0}],
"applicability": null
}
],
"currentLimits2": [
{
"id" : "limit set 1",
"permanentLimit":800.8,
"temporaryLimits":[{"name":"IT20","acceptableDuration":1200,"value":300.0},{"name":"IT10","acceptableDuration":600,"value":200.0}],
"applicability": null
}
],
"currentLimits": [
{
"id" : "limit set 1",
Expand Down
129 changes: 0 additions & 129 deletions src/test/resources/lines-form-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,6 @@
"q1": 2.2,
"p2": 3.33,
"q2": 4.44,
"currentLimits1": [
{
"id": "limit set 1",
"permanentLimit": 700.4,
"temporaryLimits": [
{
"name": "IT5",
"value": 250.0,
"acceptableDuration": 300
}
],
"applicability": null
}
],
"currentLimits2": [
{
"id": "limit set 1",
"permanentLimit": 800.8,
"temporaryLimits": [
{
"name": "IT20",
"value": 300.0,
"acceptableDuration": 1200
},
{
"name": "IT10",
"value": 200.0,
"acceptableDuration": 600
}
],
"applicability": null
}
],
"currentLimits": [
{
"id": "limit set 1",
Expand Down Expand Up @@ -100,63 +67,6 @@
"voltageLevelId2": "VLHV2",
"terminal1Connected": true,
"terminal2Connected": true,
"currentLimits1": [
{
"id": "group2",
"permanentLimit": 250.0,
"temporaryLimits": [
{
"name": "temporary1",
"value": 90.0,
"acceptableDuration": 200
}
],
"applicability": null
},
{
"id": "group1",
"permanentLimit": 220.0,
"temporaryLimits": [
{
"name": "temporary2",
"value": 70.0,
"acceptableDuration": 150
},
{
"name": "temporary1",
"value": 50.0,
"acceptableDuration": 100
}
],
"applicability": null
}
],
"currentLimits2": [
{
"id": "group4",
"permanentLimit": 320.0,
"temporaryLimits": [
{
"name": "temporary1",
"value": 130.0,
"acceptableDuration": 200
}
],
"applicability": null
},
{
"id": "group3",
"permanentLimit": 300.0,
"temporaryLimits": [
{
"name": "temporary1",
"value": 110.0,
"acceptableDuration": 150
}
],
"applicability": null
}
],
"currentLimits": [
{
"id": "group2",
Expand Down Expand Up @@ -212,7 +122,6 @@
"applicability": "SIDE2"
}
],

"selectedOperationalLimitsGroup1": "group1",
"selectedOperationalLimitsGroup2": "group4",
"r": 3.0,
Expand All @@ -237,25 +146,6 @@
"voltageLevelId2": "VLGEN3",
"terminal1Connected": true,
"terminal2Connected": true,
"currentLimits1": [
{
"id": "group1",
"permanentLimit": 220.0,
"temporaryLimits": [
{
"name": "temporary2",
"value": 70.0,
"acceptableDuration": 150
},
{
"name": "temporary1",
"value": 50.0,
"acceptableDuration": 100
}
],
"applicability": null
}
],
"currentLimits": [
{
"id": "group1",
Expand Down Expand Up @@ -316,25 +206,6 @@
"voltageLevelId2": "VLGEN3",
"terminal1Connected": true,
"terminal2Connected": true,
"currentLimits2": [
{
"id": "group1",
"permanentLimit": 220.0,
"temporaryLimits": [
{
"name": "temporary2",
"value": 70.0,
"acceptableDuration": 150
},
{
"name": "temporary1",
"value": 50.0,
"acceptableDuration": 100
}
],
"applicability": null
}
],
"currentLimits": [
{
"id": "group1",
Expand Down
38 changes: 0 additions & 38 deletions src/test/resources/partial-lines-form-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,6 @@
"voltageLevelId2": "VLGEN3",
"terminal1Connected": true,
"terminal2Connected": true,
"currentLimits2": [
{
"id": "group1",
"permanentLimit": 220.0,
"temporaryLimits": [
{
"name": "temporary2",
"value": 70.0,
"acceptableDuration": 150
},
{
"name": "temporary1",
"value": 50.0,
"acceptableDuration": 100
}
],
"applicability": null
}
],
"currentLimits": [
{
"id": "group1",
Expand Down Expand Up @@ -66,25 +47,6 @@
"voltageLevelId2": "VLGEN3",
"terminal1Connected": true,
"terminal2Connected": true,
"currentLimits1": [
{
"id": "group1",
"permanentLimit": 220.0,
"temporaryLimits": [
{
"name": "temporary2",
"value": 70.0,
"acceptableDuration": 150
},
{
"name": "temporary1",
"value": 50.0,
"acceptableDuration": 100
}
],
"applicability": null
}
],
"currentLimits": [
{
"id": "group1",
Expand Down