use single group

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

Author: dbraquart

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

@@ -422,17 +422,12 @@ 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, Set<UUID> modificationsToExclude) {
-        List<ModificationEntity> modificationsEntities = getActiveModificationsEntities(groupUuids, modificationsToExclude);
+    public List<ModificationEntity> getActiveModificationsEntities(UUID groupUuid, Set<UUID> modificationsToExclude) {
+        List<ModificationEntity> modificationsEntities = getModificationEntityStream(groupUuid)
+                .filter(m -> modificationsToExclude == null || !modificationsToExclude.contains(m.getId()))
+                .filter(m -> !m.getStashed() && m.getActivated())
+                .toList();
         // TODO resolve lazy initialisation exception : replace this line by loadFullModificationsEntities
         modificationsEntities.forEach(ModificationEntity::toModificationInfos);
         return modificationsEntities;

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

@@ -243,7 +243,7 @@ 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), modificationsToExclude)
+                    modifications = networkModificationRepository.getActiveModificationsEntities(groupUuid, modificationsToExclude)
                         .stream()
                         .toList();
                 } catch (NetworkModificationException e) {