Skip to content

Commit f0bc16e

Browse files
committed
use single group
Signed-off-by: David BRAQUART <[email protected]>
1 parent 958ee00 commit f0bc16e

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -422,17 +422,16 @@ private List<ModificationEntity> getModificationsEntitiesNonTransactional(List<U
422422
}
423423
}
424424

425-
private List<ModificationEntity> getActiveModificationsEntities(List<UUID> groupUuids, Set<UUID> modificationsToExclude) {
426-
Stream<ModificationEntity> entityStream = groupUuids.stream().flatMap(this::getModificationEntityStream);
427-
return entityStream
425+
private List<ModificationEntity> getActiveModificationsEntities(UUID groupUuid, Set<UUID> modificationsToExclude) {
426+
return getModificationEntityStream(groupUuid)
428427
.filter(m -> modificationsToExclude == null || !modificationsToExclude.contains(m.getId()))
429428
.filter(m -> !m.getStashed() && m.getActivated())
430429
.toList();
431430
}
432431

433432
@Transactional(readOnly = true)
434-
public List<ModificationEntity> getModificationsEntities(List<UUID> groupUuids, Set<UUID> modificationsToExclude) {
435-
List<ModificationEntity> modificationsEntities = getActiveModificationsEntities(groupUuids, modificationsToExclude);
433+
public List<ModificationEntity> getModificationsEntities(UUID groupUuid, Set<UUID> modificationsToExclude) {
434+
List<ModificationEntity> modificationsEntities = getActiveModificationsEntities(groupUuid, modificationsToExclude);
436435
// TODO resolve lazy initialisation exception : replace this line by loadFullModificationsEntities
437436
modificationsEntities.forEach(ModificationEntity::toModificationInfos);
438437
return modificationsEntities;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public NetworkModificationResult buildVariant(@NonNull UUID networkUuid, @NonNul
243243
List<ModificationEntity> modifications = List.of();
244244
try {
245245
// FullDto needed for toModificationInfos() after the modifications have been applied
246-
modifications = networkModificationRepository.getModificationsEntities(List.of(groupUuid), modificationsToExclude)
246+
modifications = networkModificationRepository.getModificationsEntities(groupUuid, modificationsToExclude)
247247
.stream()
248248
.toList();
249249
} catch (NetworkModificationException e) {

0 commit comments

Comments
 (0)