Skip to content

Before node build, dont load excluded, inactive or stashed modifications #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Before node build, dont load excluded, inactive or stashed modifications #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1a2189
before node build, dont load excluded, inactive or stashed modifications
dbraquart Oct 16, 2025
958ee00
Merge remote-tracking branch 'origin/main' into dbraquart/dont-load-m…
dbraquart Oct 21, 2025
42a8cdc
use single group
dbraquart Oct 21, 2025
e3d557a
Merge branch 'main' into dbraquart/dont-load-modifications-we-wont-build
dbraquart Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...in/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,13 @@ private List<ModificationEntity> getModificationsEntitiesNonTransactional(List<U
}

@Transactional(readOnly = true)
public List<ModificationEntity> getModificationsEntities(List<UUID> groupUuids, boolean onlyStashed) {
List<ModificationEntity> modificationsEntities = getModificationsEntitiesNonTransactional(groupUuids, onlyStashed);
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(m -> m.toModificationInfos());
modificationsEntities.forEach(ModificationEntity::toModificationInfos);
return modificationsEntities;
}

Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand Down