Add by formula modification #359
Merged
Conversation
This file contains 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
YenguiSeddik
requested review from
anistouri
and removed request for
SlimaneAmar
anistouri
reviewed
Nov 7, 2023
Comment on lines
63
to
68
| if (filters == null) { | ||
| this.filters = formulaInfos.getFilters().stream().map(FilterInfos::toEntity).collect(Collectors.toList()); | ||
| } else { | ||
| filters.clear(); | ||
| filters.addAll(formulaInfos.getFilters().stream().map(FilterInfos::toEntity).collect(Collectors.toList())); | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (filters == null) { | |
| this.filters = formulaInfos.getFilters().stream().map(FilterInfos::toEntity).collect(Collectors.toList()); | |
| } else { | |
| filters.clear(); | |
| filters.addAll(formulaInfos.getFilters().stream().map(FilterInfos::toEntity).collect(Collectors.toList())); | |
| } | |
| this.filters = formulaInfos.getFilters().stream().map(FilterInfos::toEntity).collect(Collectors.toList()); |
added 3 commits
November 8, 2023 13:15
EstherDarkish
requested changes
Nov 8, 2023
src/main/java/org/gridsuite/modification/server/modifications/ByFormulaModification.java
Outdated
Show resolved
Hide resolved
anistouri
reviewed
Nov 9, 2023
| List<Report> formulaReports, | ||
| FormulaInfos formulaInfos, | ||
| FilterInfos filterInfos) { | ||
| var filterEquipments = exportFilters.get(filterInfos.getId()); |
There was a problem hiding this comment.
To enhance code readability and maintainability, I suggest specifying the explicit return type instead of using var
Suggested change
| var filterEquipments = exportFilters.get(filterInfos.getId()); | |
| FilterEquipments filterEquipments = exportFilters.get(filterInfos.getId()); |
| .build()); | ||
|
|
||
| if (!CollectionUtils.isEmpty(filterEquipments.getNotFoundEquipments())) { | ||
| var equipmentIds = String.join(", ", filterEquipments.getNotFoundEquipments()); |
There was a problem hiding this comment.
Suggested change
| var equipmentIds = String.join(", ", filterEquipments.getNotFoundEquipments()); | |
| String equipmentIds = String.join(", ", filterEquipments.getNotFoundEquipments()); |
anistouri
reviewed
Nov 10, 2023
|
|
||
| public boolean isValidFilter(Reporter subReporter, | ||
| NetworkModificationException.Type errorType, | ||
| Map<UUID, String> filters, |
| Map<UUID, String> filters, | ||
| Map<UUID, FilterEquipments> exportFilters) { | ||
| // collect all filters with wrong equipments ids | ||
| Map<UUID, FilterEquipments> filterWithWrongEquipmentsIds = exportFilters.entrySet() |
There was a problem hiding this comment.
this variable is not used
added 2 commits
November 10, 2023 11:26
…suite/network-modification-server into add_by_formula_modification
| case DIVISION -> { | ||
| if (value2 == 0) { | ||
| throw new NetworkModificationException(NetworkModificationException.Type.BY_FORMULA_MODIFICATION_ERROR, | ||
| "there is a division by 0 in one formula"); |
There was a problem hiding this comment.
replace with "there is a division by zero in a formula"
src/main/java/org/gridsuite/modification/server/service/FilterService.java
Show resolved
Hide resolved
EstherDarkish
approved these changes
Nov 10, 2023
anistouri
approved these changes
Nov 13, 2023
|
Kudos, SonarCloud Quality Gate passed! |
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.
No description provided.