Skip to content

Add result type parameter to short circuit csv export #936

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

Closed
carojeandat wants to merge 1 commit into from
Closed

Add result type parameter to short circuit csv export #936

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
1 change: 1 addition & 0 deletions src/main/java/org/gridsuite/study/server/StudyConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ private StudyConstants() {
public static final String QUERY_PARAM_REPORT_UUID = "reportUuid";
public static final String QUERY_PARAM_REPORTER_ID = "reporterId";
public static final String QUERY_PARAM_REPORT_TYPE = "reportType";
public static final String QUERY_PARAM_RESULT_TYPE = "resultType";
public static final String QUERY_WITH_TAP_CHANGER = "withRatioTapChangers";
public static final String HEADER_RECEIVER = "receiver";
public static final String HEADER_S3_KEY = "s3Key";
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ public byte[] getShortCircuitAnalysisCsvResult(UUID nodeUuid, UUID rootNetworkUu
UUID networkUuid = rootNetworkNodeInfoEntity.getRootNetwork().getNetworkUuid();
UUID resultUuid = getComputationResultUuid(nodeUuid, rootNetworkUuid,
type == ShortcircuitAnalysisType.ALL_BUSES ? SHORT_CIRCUIT : SHORT_CIRCUIT_ONE_BUS);
return shortCircuitService.getShortCircuitAnalysisCsvResult(resultUuid, networkUuid, variantId, filters, globalFilters, sort, headerCsv);
return shortCircuitService.getShortCircuitAnalysisCsvResult(resultUuid, networkUuid, variantId, type, filters, globalFilters, sort, headerCsv);
}

@Transactional(readOnly = true)
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/gridsuite/study/server/service/shortcircuit/ShortCircuitService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,12 @@ public byte[] getShortCircuitAnalysisCsvResultResource(URI resourcePath, String
return restTemplate.exchange(resourcePath, HttpMethod.POST, entity, byte[].class).getBody();
}

public byte[] getShortCircuitAnalysisCsvResult(UUID resultUuid, UUID networkUuid, String variantId, String filters, String globalFilters, Sort sort, String headersCsv) {
public byte[] getShortCircuitAnalysisCsvResult(UUID resultUuid, UUID networkUuid, String variantId, ShortcircuitAnalysisType type, String filters, String globalFilters, Sort sort, String headersCsv) {
String resultPath = getShortCircuitAnalysisCsvResultResourcePath(resultUuid);
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(shortCircuitServerBaseUri + resultPath)
.queryParam(QUERY_PARAM_NETWORK_UUID, networkUuid)
.queryParam(QUERY_PARAM_VARIANT_ID, variantId);
.queryParam(QUERY_PARAM_VARIANT_ID, variantId)
.queryParam(QUERY_PARAM_RESULT_TYPE, type);

addFiltersToQueryParams(builder, filters, globalFilters);
addSortToQueryParams(builder, sort);
Expand Down
Loading