diff --git a/src/main/java/org/gridsuite/study/server/StudyConstants.java b/src/main/java/org/gridsuite/study/server/StudyConstants.java index d0789a28d..fffd6e4ac 100644 --- a/src/main/java/org/gridsuite/study/server/StudyConstants.java +++ b/src/main/java/org/gridsuite/study/server/StudyConstants.java @@ -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"; diff --git a/src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java b/src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java index ab4397dd3..2afd33d88 100644 --- a/src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java +++ b/src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java @@ -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) diff --git a/src/main/java/org/gridsuite/study/server/service/shortcircuit/ShortCircuitService.java b/src/main/java/org/gridsuite/study/server/service/shortcircuit/ShortCircuitService.java index eed14a8c3..29cd84fea 100644 --- a/src/main/java/org/gridsuite/study/server/service/shortcircuit/ShortCircuitService.java +++ b/src/main/java/org/gridsuite/study/server/service/shortcircuit/ShortCircuitService.java @@ -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);