Skip to content

Razwa/import study computations parameters #207

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
ghazwarhili wants to merge 1 commit into
base: export-import-study
Choose a base branch
from
Open

Razwa/import study computations parameters #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/main/java/org/gridsuite/explore/server/dto/TreeExportInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package org.gridsuite.explore.server.dto;

import java.util.List;
import java.util.Map;
import java.util.UUID;

/**
Expand All @@ -15,6 +16,7 @@
public record TreeExportInfos(
UUID studyUuid,
List<RootNetworkExportInfos> rootNetworks,
NodeTreeExportInfos nodeTree
NodeTreeExportInfos nodeTree,
Map<String, String> computationParameters
) {
}
2 changes: 1 addition & 1 deletion src/main/java/org/gridsuite/explore/server/services/StudyImportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ private TreeExportInfos updateCaseUuidsAndStudyUuidInExportInfos(TreeExportInfos
rootNetwork.caseInfos().caseName(), rootNetwork.caseInfos().caseFormat());
return new RootNetworkExportInfos(rootNetwork.name(), rootNetwork.tag(), rootNetwork.index(), updatedCaseInfo, rootNetwork.importParameters());
}).toList();
return new TreeExportInfos(createdStudyUuid, updatedRootNetworks, original.nodeTree());
return new TreeExportInfos(createdStudyUuid, updatedRootNetworks, original.nodeTree(), original.computationParameters());
}

/**
Expand Down
10 changes: 6 additions & 4 deletions src/test/java/org/gridsuite/explore/server/StudyImportExportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ private byte[] createArchiveWithEmptyRootNetworks() throws IOException {
TreeExportInfos exportInfos = new TreeExportInfos(
STUDY_UUID,
Collections.emptyList(),
createNodeTree()
createNodeTree(),
Collections.emptyMap()
);
addJsonEntry(zos, exportInfos);
}
Expand Down Expand Up @@ -344,7 +345,7 @@ private byte[] createArchiveWithOneMissingCaseFileAmongTwoRoots() throws IOExcep
CaseInfos missingCaseInfo = new CaseInfos(missingCaseUuid, UUID.randomUUID(), "case-missing.xiidm", "XIIDM");
RootNetworkExportInfos missingRootNetwork = new RootNetworkExportInfos("Network 2", "2", 1, missingCaseInfo, Collections.emptyMap());

TreeExportInfos exportInfos = new TreeExportInfos(STUDY_UUID, List.of(validRootNetwork, missingRootNetwork), createNodeTree());
TreeExportInfos exportInfos = new TreeExportInfos(STUDY_UUID, List.of(validRootNetwork, missingRootNetwork), createNodeTree(), Collections.emptyMap());
addJsonEntry(zos, exportInfos);

// only the first root network's case file is present in the archive
Expand Down Expand Up @@ -379,7 +380,8 @@ private TreeExportInfos createStudyExportInfos() {
return new TreeExportInfos(
STUDY_UUID,
Collections.singletonList(rootNetwork),
createNodeTree()
createNodeTree(),
Collections.emptyMap()
);
}

Expand All @@ -397,7 +399,7 @@ private TreeExportInfos createStudyExportInfosWithMultipleRoots() {
);
rootNetworks.add(rootNetwork);
}
return new TreeExportInfos(STUDY_UUID, rootNetworks, createNodeTree());
return new TreeExportInfos(STUDY_UUID, rootNetworks, createNodeTree(), Collections.emptyMap());
}

private NodeTreeExportInfos createNodeTree() {
Expand Down
Loading