Skip to content

Commit 8111d65

Browse files
authored
Revert tabular modification optimization when moving a modification (#718)
Signed-off-by: David BRAQUART <[email protected]>
1 parent a61637b commit 8111d65

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ private List<ModificationEntity> saveModificationsNonTransactional(UUID groupUui
169169
@Transactional
170170
public List<ModificationEntity> moveModifications(UUID destinationGroupUuid, UUID originGroupUuid, List<UUID> modificationsToMoveUUID, UUID referenceModificationUuid) {
171171
List<ModificationEntity> movedModifications = moveModificationsNonTransactional(destinationGroupUuid, originGroupUuid, modificationsToMoveUUID, referenceModificationUuid);
172-
loadFullModificationsEntities(movedModifications);
172+
// TODO resolve lazy initialisation exception : replace this line by loadFullModificationsEntities
173+
movedModifications.forEach(ModificationEntity::toModificationInfos);
173174
return movedModifications;
174175
}
175176

src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ void testMoveModificationInSameGroup() {
511511

512512
SQLStatementCountValidator.reset();
513513
networkModificationRepository.moveModifications(TEST_GROUP_ID, TEST_GROUP_ID, List.of(tabularModificationEntity.getId()), groovyScriptEntity2.getId());
514-
assertRequestsCount(6, 0, 2, 0);
514+
assertRequestsCount(12, 0, 2, 0);
515515

516516
var modification = networkModificationRepository.getModifications(TEST_GROUP_ID, true, true);
517517
// [0:1, 1:6, 2:2, 3:3, 4:4 ,5:5 ]
@@ -522,7 +522,7 @@ void testMoveModificationInSameGroup() {
522522

523523
SQLStatementCountValidator.reset();
524524
networkModificationRepository.moveModifications(TEST_GROUP_ID, TEST_GROUP_ID, List.of(groovyScriptEntity3.getId(), tabularModificationEntity.getId()), null);
525-
assertRequestsCount(6, 0, 2, 0);
525+
assertRequestsCount(12, 0, 2, 0);
526526

527527
// [0:1, 1:2, 2:4, 3:5, 4:6, 5:3 ]
528528
modification = networkModificationRepository.getModifications(TEST_GROUP_ID, true, true);

0 commit comments

Comments
 (0)