initialise nad layout at study duplication (#845)

Signed-off-by: Abdelsalem <[email protected]>

Author: AbdelHedhili

src/main/java/org/gridsuite/study/server/service/ConsumerService.java

@@ -291,7 +291,7 @@ private void handleConsumeCaseImportSucceeded(CaseImportReceiver receiver, UUID
 
     private void insertStudy(UUID studyUuid, String userId, NetworkInfos networkInfos, CaseInfos caseInfos,
                              Map<String, String> importParameters, UUID importReportUuid) {
-        UserProfileInfos userProfileInfos = getUserProfile(userId);
+        UserProfileInfos userProfileInfos = studyService.getUserProfile(userId);
 
         DynamicSimulationParametersInfos dynamicSimulationParameters = DynamicSimulationService.getDefaultDynamicSimulationParameters();
         UUID loadFlowParametersUuid = createDefaultLoadFlowParameters(userId, userProfileInfos);
@@ -303,7 +303,7 @@ private void insertStudy(UUID studyUuid, String userId, NetworkInfos networkInfo
         UUID dynamicSecurityAnalysisParametersUuid = createDefaultDynamicSecurityAnalysisParameters(userId, userProfileInfos);
         UUID stateEstimationParametersUuid = createDefaultStateEstimationParameters();
         UUID spreadsheetConfigCollectionUuid = createDefaultSpreadsheetConfigCollection(userId, userProfileInfos);
-        UUID diagramGridLayoutUuid = createGridLayoutFromNadDiagram(userId, userProfileInfos);
+        UUID diagramGridLayoutUuid = studyService.createGridLayoutFromNadDiagram(userId, userProfileInfos);
 
         studyService.insertStudy(studyUuid, userId, networkInfos, caseInfos, loadFlowParametersUuid,
             shortCircuitParametersUuid, DynamicSimulationService.toEntity(dynamicSimulationParameters, objectMapper),
@@ -312,30 +312,6 @@ private void insertStudy(UUID studyUuid, String userId, NetworkInfos networkInfo
             importParameters, importReportUuid);
     }
 
-    private UUID createGridLayoutFromNadDiagram(String userId, UserProfileInfos userProfileInfos) {
-        if (userProfileInfos != null && userProfileInfos.getDiagramConfigId() != null) {
-            UUID sourceNadConfig = userProfileInfos.getDiagramConfigId();
-            try {
-                UUID clonedNadConfig = singleLineDiagramService.duplicateNadConfig(sourceNadConfig);
-                String nadConfigName = directoryService.getElementName(sourceNadConfig);
-                return studyConfigService.createGridLayoutFromNadDiagram(sourceNadConfig, clonedNadConfig, nadConfigName);
-            } catch (Exception e) {
-                LOGGER.error(String.format("Could not create a diagram grid layout cloning NAD elment id '%s' from user/profile '%s/%s'. No layout created",
-                    sourceNadConfig, userId, userProfileInfos.getName()), e);
-            }
-        }
-        return null;
-    }
-
-    private UserProfileInfos getUserProfile(String userId) {
-        try {
-            return userAdminService.getUserProfile(userId).orElse(null);
-        } catch (Exception e) {
-            LOGGER.error(String.format("Could not access to profile for user '%s'", userId), e);
-        }
-        return null;
-    }
-
     private UUID createDefaultLoadFlowParameters(String userId, UserProfileInfos userProfileInfos) {
         if (userProfileInfos != null && userProfileInfos.getLoadFlowParameterId() != null) {
             // try to access/duplicate the user profile LF parameters

src/main/java/org/gridsuite/study/server/service/StudyService.java

@@ -140,6 +140,7 @@ public class StudyService {
     private final StateEstimationService stateEstimationService;
     private final RootNetworkService rootNetworkService;
     private final RootNetworkNodeInfoService rootNetworkNodeInfoService;
+    private final DirectoryService directoryService;
 
     private final ObjectMapper objectMapper;
 
@@ -202,7 +203,8 @@ public StudyService(
         StateEstimationService stateEstimationService,
         @Lazy StudyService studyService,
         RootNetworkService rootNetworkService,
-        RootNetworkNodeInfoService rootNetworkNodeInfoService) {
+        RootNetworkNodeInfoService rootNetworkNodeInfoService,
+        DirectoryService directoryService) {
         this.defaultNonEvacuatedEnergyProvider = defaultNonEvacuatedEnergyProvider;
         this.defaultDynamicSimulationProvider = defaultDynamicSimulationProvider;
         this.studyRepository = studyRepository;
@@ -239,6 +241,7 @@ public StudyService(
         this.self = studyService;
         this.rootNetworkService = rootNetworkService;
         this.rootNetworkNodeInfoService = rootNetworkNodeInfoService;
+        this.directoryService = directoryService;
     }
 
     private CreatedStudyBasicInfos toStudyInfos(UUID studyUuid) {
@@ -656,6 +659,30 @@ public CreatedStudyBasicInfos updateNetwork(UUID studyUuid, UUID rootNetworkUuid
         return createdStudyBasicInfos;
     }
 
+    public UUID createGridLayoutFromNadDiagram(String userId, UserProfileInfos userProfileInfos) {
+        if (userProfileInfos != null && userProfileInfos.getDiagramConfigId() != null) {
+            UUID sourceNadConfig = userProfileInfos.getDiagramConfigId();
+            try {
+                UUID clonedNadConfig = singleLineDiagramService.duplicateNadConfig(sourceNadConfig);
+                String nadConfigName = directoryService.getElementName(sourceNadConfig);
+                return studyConfigService.createGridLayoutFromNadDiagram(sourceNadConfig, clonedNadConfig, nadConfigName);
+            } catch (Exception e) {
+                LOGGER.error(String.format("Could not create a diagram grid layout cloning NAD elment id '%s' from user/profile '%s/%s'. No layout created",
+                        sourceNadConfig, userId, userProfileInfos.getName()), e);
+            }
+        }
+        return null;
+    }
+
+    public UserProfileInfos getUserProfile(String userId) {
+        try {
+            return userAdminService.getUserProfile(userId).orElse(null);
+        } catch (Exception e) {
+            LOGGER.error(String.format("Could not access to profile for user '%s'", userId), e);
+        }
+        return null;
+    }
+
     private void duplicateStudyNodeAliases(StudyEntity newStudyEntity, StudyEntity sourceStudyEntity) {
         if (!CollectionUtils.isEmpty(sourceStudyEntity.getNodeAliases())) {
             Map<UUID, AbstractNode> newStudyNodes = networkModificationTreeService.getAllStudyNodesByUuid(newStudyEntity.getId());
@@ -683,7 +710,7 @@ private StudyEntity duplicateStudy(BasicStudyInfos studyInfos, UUID sourceStudyU
 
         StudyEntity sourceStudy = studyRepository.findById(sourceStudyUuid).orElseThrow(() -> new StudyException(STUDY_NOT_FOUND));
 
-        StudyEntity newStudyEntity = duplicateStudyEntity(sourceStudy, studyInfos.getId());
+        StudyEntity newStudyEntity = duplicateStudyEntity(sourceStudy, studyInfos.getId(), userId);
         rootNetworkService.duplicateStudyRootNetworks(newStudyEntity, sourceStudy);
         networkModificationTreeService.duplicateStudyNodes(newStudyEntity, sourceStudy);
         duplicateStudyNodeAliases(newStudyEntity, sourceStudy);
@@ -695,7 +722,7 @@ private StudyEntity duplicateStudy(BasicStudyInfos studyInfos, UUID sourceStudyU
         return newStudyEntity;
     }
 
-    private StudyEntity duplicateStudyEntity(StudyEntity sourceStudyEntity, UUID newStudyId) {
+    private StudyEntity duplicateStudyEntity(StudyEntity sourceStudyEntity, UUID newStudyId, String userId) {
         UUID copiedLoadFlowParametersUuid = null;
         if (sourceStudyEntity.getLoadFlowParametersUuid() != null) {
             copiedLoadFlowParametersUuid = loadflowService.duplicateLoadFlowParameters(sourceStudyEntity.getLoadFlowParametersUuid());
@@ -742,6 +769,9 @@ private StudyEntity duplicateStudyEntity(StudyEntity sourceStudyEntity, UUID new
             copiedStateEstimationParametersUuid = stateEstimationService.duplicateStateEstimationParameters(sourceStudyEntity.getStateEstimationParametersUuid());
         }
 
+        UserProfileInfos userProfile = getUserProfile(userId);
+        UUID diagramGridLayoutId = createGridLayoutFromNadDiagram(userId, userProfile);
+
         return studyRepository.save(StudyEntity.builder()
             .id(newStudyId)
             .loadFlowParametersUuid(copiedLoadFlowParametersUuid)
@@ -756,6 +786,7 @@ private StudyEntity duplicateStudyEntity(StudyEntity sourceStudyEntity, UUID new
             .spreadsheetConfigCollectionUuid(copiedSpreadsheetConfigCollectionUuid)
             .nonEvacuatedEnergyParameters(NonEvacuatedEnergyService.toEntity(nonEvacuatedEnergyParametersInfos))
             .stateEstimationParametersUuid(copiedStateEstimationParametersUuid)
+            .diagramGridLayoutUuid(diagramGridLayoutId)
             .build());
     }