before node build, dont load excluded, inactive or stashed modifications

Signed-off-by: David BRAQUART <[email protected]>

Author: dbraquart

src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java

@@ -458,9 +458,17 @@ private List<ModificationEntity> getModificationsEntitiesNonTransactional(List<U
         }
     }
 
+    private List<ModificationEntity> getActiveModificationsEntities(List<UUID> groupUuids, Set<UUID> modificationsToExclude) {
+        Stream<ModificationEntity> entityStream = groupUuids.stream().flatMap(this::getModificationEntityStream);
+        return entityStream
+            .filter(m -> modificationsToExclude == null || !modificationsToExclude.contains(m.getId()))
+            .filter(m -> !m.getStashed() && m.getActivated())
+            .toList();
+    }
+
     @Transactional(readOnly = true)
-    public List<ModificationEntity> getModificationsEntities(List<UUID> groupUuids, boolean onlyStashed) {
-        List<ModificationEntity> modificationsEntities = getModificationsEntitiesNonTransactional(groupUuids, onlyStashed);
+    public List<ModificationEntity> getModificationsEntities(List<UUID> groupUuids, Set<UUID> modificationsToExclude) {
+        List<ModificationEntity> modificationsEntities = getActiveModificationsEntities(groupUuids, modificationsToExclude);
         loadFullModificationsEntities(modificationsEntities);
         return modificationsEntities;
     }

src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java

@@ -243,10 +243,8 @@ public NetworkModificationResult buildVariant(@NonNull UUID networkUuid, @NonNul
                 List<ModificationEntity> modifications = List.of();
                 try {
                     // FullDto needed for toModificationInfos() after the modifications have been applied
-                    modifications = networkModificationRepository.getModificationsEntities(List.of(groupUuid), false)
+                    modifications = networkModificationRepository.getModificationsEntities(List.of(groupUuid), modificationsToExclude)
                         .stream()
-                        .filter(m -> modificationsToExclude == null || !modificationsToExclude.contains(m.getId()))
-                        .filter(m -> !m.getStashed())
                         .toList();
                 } catch (NetworkModificationException e) {
                     if (e.getType() != MODIFICATION_GROUP_NOT_FOUND) { // May not exist