Creating modifications should now impact ES index #365
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
added 8 commits
November 10, 2023 10:54
…h - still buggy with voltageLevels/subsations updating across linked equipments Signed-off-by: LE SAULNIER Kevin <[email protected]>
Signed-off-by: LE SAULNIER Kevin <[email protected]>
Signed-off-by: LE SAULNIER Kevin <[email protected]>
Signed-off-by: LE SAULNIER Kevin <[email protected]>
Signed-off-by: LE SAULNIER Kevin <[email protected]>
Signed-off-by: LE SAULNIER Kevin <[email protected]>
Signed-off-by: LE SAULNIER Kevin <[email protected]>
flomillot
reviewed
Nov 29, 2023
| @@ -21,6 +21,8 @@ public interface EquipmentInfosRepository extends ElasticsearchRepository<Equipm | |||
|
|
|||
| List<EquipmentInfos> findByIdInAndNetworkUuidAndVariantId(@NonNull List<String> equipmentIds, @NonNull UUID networkUuid, @NonNull String variantId); | |||
|
|
|||
| EquipmentInfos findByIdAndNetworkUuid/*AndVariantId*/(@NonNull String equipmentId, @NonNull UUID networkUuid/*, @NonNull String variantId*/); | |||
| // update substation linked to voltageLevel | ||
| Optional<Substation> linkedSubstation = updatedVoltageLevel.getSubstation(); | ||
| if (linkedSubstation.isPresent()) { | ||
| createdEquipments.add(EquipmentInfos.toInfosWithUpdatedVoltageLevelName(linkedSubstation.get(), updatedVoltageLevel, networkUuid, network.getVariantManager().getWorkingVariantId())); |
There was a problem hiding this comment.
If I understood well, maybe rename createdEquipments into createdOrUpdatedEquipments ? Or use a new list updatedEquipments ?
It's consufing to me, it took some time to understand why do you do add on a list named createdEquipments (I don't know this class and no Javadoc so not easy to get in)
There was a problem hiding this comment.
Yes use modifedEquipments list ?
| linkedVoltageLevels.forEach(vl -> createdEquipments.add(EquipmentInfos.toInfosWithUpdatedSubstationName(vl, updatedSubstation, networkUuid, network.getVariantManager().getWorkingVariantId()))); | ||
| // update all equipments linked to each of the voltageLevels | ||
| linkedVoltageLevels.forEach(vl -> | ||
| Iterables.concat( |
There was a problem hiding this comment.
Maybe you can extract this part into a method like you did for updateEquipmentsLinkedToVoltageLevel ?
SlimaneAmar
reviewed
Nov 30, 2023
| @@ -88,4 +89,18 @@ public void deleteAll() { | |||
| equipmentInfosRepository.deleteAll(); | |||
| tombstonedEquipmentInfosRepository.deleteAll(); | |||
| } | |||
|
|
|||
| public void updateEquipment(Identifiable<?> identifiable, UUID networkUuid, String variantId) { | |||
| @@ -130,9 +119,68 @@ public void onElementReplaced(Identifiable identifiable, String attribute, Objec | |||
| addSimpleModificationImpact(identifiable); | |||
| } | |||
|
|
|||
| @Override | |||
| public void onUpdate(Identifiable identifiable, String attribute, Object oldValue, Object newValue) { | |||
| networkImpacts.add( | |||
There was a problem hiding this comment.
addSimpleModificationImpact ?
There was a problem hiding this comment.
this is not my code, but fixed anyway
| // update substation linked to voltageLevel | ||
| Optional<Substation> linkedSubstation = updatedVoltageLevel.getSubstation(); | ||
| if (linkedSubstation.isPresent()) { | ||
| createdEquipments.add(EquipmentInfos.toInfosWithUpdatedVoltageLevelName(linkedSubstation.get(), updatedVoltageLevel, networkUuid, network.getVariantManager().getWorkingVariantId())); |
There was a problem hiding this comment.
Yes use modifedEquipments list ?
added 2 commits
November 30, 2023 15:03
Signed-off-by: LE SAULNIER Kevin <[email protected]>
Signed-off-by: LE SAULNIER Kevin <[email protected]>
SlimaneAmar
approved these changes
Dec 1, 2023
| @AutoConfigureMockMvc | ||
| @SpringBootTest | ||
| @Tag("IntegrationTest") | ||
| public class ModificationElasticsearchTest { |
| @@ -102,4 +103,15 @@ public static Set<SubstationInfos> getSubstationsInfos(@NonNull Identifiable<?> | |||
| .collect(Collectors.toSet()); | |||
| } | |||
|
|
|||
| public static EquipmentInfos toInfos(Identifiable<?> identifiable, UUID networkUuid, String variantId) { | |||
There was a problem hiding this comment.
Move it to the listener class
added 2 commits
December 1, 2023 16:51
Signed-off-by: LE SAULNIER Kevin <[email protected]>
Signed-off-by: LE SAULNIER Kevin <[email protected]>
|
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.