From 4ffe44fa35a8fdae1c31f758b920641d788c16c3 Mon Sep 17 00:00:00 2001 From: Joris Mancini Date: Mon, 5 Feb 2024 18:10:40 +0100 Subject: [PATCH] fix: tests Signed-off-by: Joris Mancini --- .../NetworkModificationRepository.java | 28 ++++++++++--------- .../TabularGeneratorModificationsTest.java | 4 +-- 2 files changed, 17 insertions(+), 15 deletions(-) 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 3afe8998f..802724423 100644 --- a/src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java +++ b/src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java @@ -145,7 +145,7 @@ public List getModificationsMetadata(UUID groupUuid, boolean .findAllBaseByGroupId(getModificationGroup(groupUuid).getId()) .stream(); if (onlyStashed) { - return modificationEntitySteam.filter(m -> m.getStashed()) + return modificationEntitySteam.filter(ModificationEntity::getStashed) .map(ModificationEntity::toModificationInfos) .collect(Collectors.toList()); } else { @@ -156,29 +156,31 @@ public List getModificationsMetadata(UUID groupUuid, boolean } public List getModificationsInfos(List groupUuids, boolean onlyStashed) { - Stream modificationEntity = groupUuids.stream().flatMap(this::getModificationEntityStream); + Stream modificationEntities = groupUuids.stream().flatMap(this::getModificationEntityStream); if (onlyStashed) { - return modificationEntity.filter(m -> m.getStashed() == onlyStashed) - .map(ModificationEntity::toModificationInfos) - .toList(); + return modificationEntities.filter(m -> m.getStashed() == onlyStashed) + .map(this::getModificationInfos) + .collect(Collectors.toList()); } else { - return modificationEntity.map(ModificationEntity::toModificationInfos).toList(); + return modificationEntities.map(this::getModificationInfos).collect(Collectors.toList()); } } @Transactional(readOnly = true) public ModificationInfos getModificationInfo(UUID modificationUuid) { return modificationRepository.findById(modificationUuid) - .map(modificationEntity -> { - if (modificationEntity instanceof TabularModificationEntity tabularModificationEntity) { - tabularModificationRepository.fillSubEntities(tabularModificationEntity); - return tabularModificationEntity.toModificationInfos(); - } - return modificationEntity.toModificationInfos(); - }) + .map(this::getModificationInfos) .orElseThrow(() -> new NetworkModificationException(MODIFICATION_NOT_FOUND, modificationUuid.toString())); } + private ModificationInfos getModificationInfos(ModificationEntity modificationEntity) { + if (modificationEntity instanceof TabularModificationEntity tabularModificationEntity) { + tabularModificationRepository.fillSubEntities(tabularModificationEntity); + return tabularModificationEntity.toModificationInfos(); + } + return modificationEntity.toModificationInfos(); + } + @Transactional // To have the 2 delete in the same transaction (atomic) public void deleteModificationGroup(UUID groupUuid, boolean errorOnGroupNotFound) { try { diff --git a/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularGeneratorModificationsTest.java b/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularGeneratorModificationsTest.java index 926beb7a2..c115d2488 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularGeneratorModificationsTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularGeneratorModificationsTest.java @@ -101,7 +101,7 @@ public void testCheckSqlRequestsCount() throws Exception { mockMvc.perform(get("/v1/network-modifications/{uuid}", modificationUuid)).andExpectAll( status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); - assertSelectCount(4); + assertSelectCount(3); modifications = List.of( GeneratorModificationInfos.builder().equipmentId("idGenerator").maxActivePower(new AttributeModification<>(300., OperationType.SET)).build(), @@ -119,7 +119,7 @@ public void testCheckSqlRequestsCount() throws Exception { status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); // We check that the request count is not dependent on the number of sub modifications of the tabular modification (the JPA N+1 problem is correctly solved) - assertSelectCount(4); + assertSelectCount(3); reset(); // We get the modifications of the group (so the 2 tabular modifications)