diff --git a/src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java b/src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java index 038497488..24947cf2d 100644 --- a/src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java +++ b/src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java @@ -423,10 +423,13 @@ private List getModificationsEntitiesNonTransactional(List getModificationsEntities(List groupUuids, boolean onlyStashed) { - List modificationsEntities = getModificationsEntitiesNonTransactional(groupUuids, onlyStashed); + public List getActiveModificationsEntities(UUID groupUuid, Set modificationsToExclude) { + List 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(m -> m.toModificationInfos()); + modificationsEntities.forEach(ModificationEntity::toModificationInfos); return modificationsEntities; } diff --git a/src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java b/src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java index 0fdf5c86e..14b7f2260 100644 --- a/src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java +++ b/src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java @@ -243,10 +243,8 @@ public NetworkModificationResult buildVariant(@NonNull UUID networkUuid, @NonNul List modifications = List.of(); try { // FullDto needed for toModificationInfos() after the modifications have been applied - modifications = networkModificationRepository.getModificationsEntities(List.of(groupUuid), false) + modifications = networkModificationRepository.getActiveModificationsEntities(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