Skip to content

[Fix] Add sort and filters to csv export #213

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

Merged
carojeandat merged 9 commits into from
Jan 30, 2026
Merged

[Fix] Add sort and filters to csv export #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1cae47e
add sort and filters to csv export
carojeandat Jan 8, 2026
b78326b
Merge remote-tracking branch 'origin' into fix-sorted-csv-export
carojeandat Jan 14, 2026
ee0ce7b
add sort and filters to csv export
carojeandat Jan 14, 2026
0fecd14
Merge remote-tracking branch 'origin' into fix-sorted-csv-export
carojeandat Jan 22, 2026
0e62247
add sort and filters to csv export
carojeandat Jan 27, 2026
cfc8015
add BOM to test csv files
carojeandat Jan 27, 2026
49a9930
Merge branch 'main' into fix-sorted-csv-export
carojeandat Jan 27, 2026
28b16a7
make methods private
carojeandat Jan 27, 2026
9807f7b
Merge remote-tracking branch 'origin/fix-sorted-csv-export' into fix-…
carojeandat Jan 27, 2026
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
78 changes: 54 additions & 24 deletions src/main/java/org/gridsuite/securityanalysis/server/SecurityAnalysisController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,10 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.UUID;

import static org.gridsuite.computation.service.NotificationService.HEADER_USER_ID;
import static org.gridsuite.computation.utils.FilterUtils.fromStringFiltersToDTO;
import static org.gridsuite.computation.utils.FilterUtils.fromStringGlobalFiltersToDTO;
import static org.springframework.http.MediaType.*;

/**
Expand Down Expand Up @@ -126,17 +122,15 @@ public ResponseEntity<UUID> runAndSave(@Parameter(description = "Network UUID")
public ResponseEntity<List<PreContingencyLimitViolationResultDTO>> getNResult(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid,
@Parameter(description = "network Uuid") @RequestParam(name = "networkUuid", required = false) UUID networkUuid,
@Parameter(description = "variant Id") @RequestParam(name = "variantId", required = false) String variantId,
@Parameter(description = "Filters") @RequestParam(name = "filters", required = false) String stringFilters,
@Parameter(description = "Filters") @RequestParam(name = "filters", required = false) String filters,
@Parameter(description = "Global Filters") @RequestParam(name = "globalFilters", required = false) String globalFilters,
@Parameter(description = "Pageable parameters for pagination and sorting") Sort sort) {
String decodedStringFilters = stringFilters != null ? URLDecoder.decode(stringFilters, StandardCharsets.UTF_8) : null;
String decodedStringGlobalFilters = globalFilters != null ? URLDecoder.decode(globalFilters, StandardCharsets.UTF_8) : null;
List<PreContingencyLimitViolationResultDTO> result = securityAnalysisResultService.findNResult(
resultUuid,
networkUuid,
variantId,
fromStringFiltersToDTO(decodedStringFilters, securityAnalysisResultService.getObjectMapper()),
fromStringGlobalFiltersToDTO(decodedStringGlobalFilters, securityAnalysisResultService.getObjectMapper()),
filters,
globalFilters,
sort);

return result != null
Expand All @@ -149,10 +143,23 @@ public ResponseEntity<List<PreContingencyLimitViolationResultDTO>> getNResult(@P
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The security analysis result csv export"),
@ApiResponse(responseCode = "404", description = "Security analysis result has not been found")})
public ResponseEntity<byte[]> getNResultZippedCsv(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid,
@Parameter(description = "Translation properties") @RequestBody CsvTranslationDTO csvTranslations) {
@Parameter(description = "network Uuid") @RequestParam(name = "networkUuid", required = false) UUID networkUuid,
@Parameter(description = "variant Id") @RequestParam(name = "variantId", required = false) String variantId,
@Parameter(description = "Filters") @RequestParam(name = "filters", required = false) String filters,
@Parameter(description = "Global Filters") @RequestParam(name = "globalFilters", required = false) String globalFilters,
@Parameter(description = "Translation properties") @RequestBody CsvTranslationDTO csvTranslations,
@Parameter(description = "Sort parameters") Sort sort) {
return ResponseEntity.ok()
.contentType(APPLICATION_OCTET_STREAM)
.body(securityAnalysisResultService.findNResultZippedCsv(resultUuid, csvTranslations));
.body(securityAnalysisResultService.findNResultZippedCsv(
resultUuid,
networkUuid,
variantId,
filters,
globalFilters,
sort,
csvTranslations
));
}

@GetMapping(value = "/results/{resultUuid}/nmk-contingencies-result/paged", produces = APPLICATION_JSON_VALUE)
Expand All @@ -162,12 +169,10 @@ public ResponseEntity<byte[]> getNResultZippedCsv(@Parameter(description = "Resu
public ResponseEntity<Page<ContingencyResultDTO>> getPagedNmKContingenciesResult(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid,
@Parameter(description = "network Uuid") @RequestParam(name = "networkUuid", required = false) UUID networkUuid,
@Parameter(description = "variant Id") @RequestParam(name = "variantId", required = false) String variantId,
@Parameter(description = "Filters") @RequestParam(name = "filters", required = false) String stringFilters,
@Parameter(description = "Filters") @RequestParam(name = "filters", required = false) String filters,
@Parameter(description = "Global Filters") @RequestParam(name = "globalFilters", required = false) String globalFilters,
@Parameter(description = "Pagination parameters") Pageable pageable) {
String decodedStringFilters = stringFilters != null ? URLDecoder.decode(stringFilters, StandardCharsets.UTF_8) : null;
String decodedStringGlobalFilters = globalFilters != null ? URLDecoder.decode(globalFilters, StandardCharsets.UTF_8) : null;
Page<ContingencyResultDTO> result = securityAnalysisResultService.findNmKContingenciesPaged(resultUuid, networkUuid, variantId, decodedStringFilters, decodedStringGlobalFilters, pageable);
Page<ContingencyResultDTO> result = securityAnalysisResultService.findNmKContingenciesPaged(resultUuid, networkUuid, variantId, filters, globalFilters, pageable);

return result != null
? ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(result)
Expand All @@ -191,10 +196,23 @@ public ResponseEntity<List<ContingencyResultDTO>> getNmKContingenciesResult(@Par
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The security analysis result csv export"),
@ApiResponse(responseCode = "404", description = "Security analysis result has not been found")})
public ResponseEntity<byte[]> getNmKContingenciesResultZippedCsv(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid,
@Parameter(description = "Translation properties") @RequestBody CsvTranslationDTO csvTranslations) {
@Parameter(description = "network Uuid") @RequestParam(name = "networkUuid", required = false) UUID networkUuid,
@Parameter(description = "variant Id") @RequestParam(name = "variantId", required = false) String variantId,
@Parameter(description = "Filters") @RequestParam(name = "filters", required = false) String filters,
@Parameter(description = "Global Filters") @RequestParam(name = "globalFilters", required = false) String globalFilters,
@Parameter(description = "Translation properties") @RequestBody CsvTranslationDTO csvTranslations,
@Parameter(description = "Sort parameters") Sort sort) {
return ResponseEntity.ok()
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.body(securityAnalysisResultService.findNmKContingenciesResultZippedCsv(resultUuid, csvTranslations));
.body(securityAnalysisResultService.findNmKContingenciesResultZippedCsv(
resultUuid,
networkUuid,
variantId,
filters,
globalFilters,
sort,
csvTranslations
));
}

@GetMapping(value = "/results/{resultUuid}/nmk-constraints-result/paged", produces = APPLICATION_JSON_VALUE)
Expand All @@ -204,12 +222,10 @@ public ResponseEntity<byte[]> getNmKContingenciesResultZippedCsv(@Parameter(desc
public ResponseEntity<Page<SubjectLimitViolationResultDTO>> getNmKConstraintsResult(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid,
@Parameter(description = "network Uuid") @RequestParam(name = "networkUuid", required = false) UUID networkUuid,
@Parameter(description = "variant Id") @RequestParam(name = "variantId", required = false) String variantId,
@Parameter(description = "Filters") @RequestParam(name = "filters", required = false) String stringFilters,
@Parameter(description = "Filters") @RequestParam(name = "filters", required = false) String filters,
@Parameter(description = "Global Filters") @RequestParam(name = "globalFilters", required = false) String globalFilters,
@Parameter(description = "Pagination parameters") Pageable pageable) {
String decodedStringFilters = stringFilters != null ? URLDecoder.decode(stringFilters, StandardCharsets.UTF_8) : null;
String decodedStringGlobalFilters = globalFilters != null ? URLDecoder.decode(globalFilters, StandardCharsets.UTF_8) : null;
Page<SubjectLimitViolationResultDTO> result = securityAnalysisResultService.findNmKConstraintsResultPaged(resultUuid, networkUuid, variantId, decodedStringFilters, decodedStringGlobalFilters, pageable);
Page<SubjectLimitViolationResultDTO> result = securityAnalysisResultService.findNmKConstraintsResultPaged(resultUuid, networkUuid, variantId, filters, globalFilters, pageable);
return result != null
? ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(result)
: ResponseEntity.notFound().build();
Expand All @@ -220,10 +236,24 @@ public ResponseEntity<Page<SubjectLimitViolationResultDTO>> getNmKConstraintsRes
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The security analysis result csv export"),
@ApiResponse(responseCode = "404", description = "Security analysis result has not been found")})
public ResponseEntity<byte[]> getNmKContraintsResultZippedCsv(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid,
@Parameter(description = "Translation properties") @RequestBody CsvTranslationDTO csvTranslations) {
@Parameter(description = "network Uuid") @RequestParam(name = "networkUuid", required = false) UUID networkUuid,
@Parameter(description = "variant Id") @RequestParam(name = "variantId", required = false) String variantId,
@Parameter(description = "Filters") @RequestParam(name = "filters", required = false) String filters,
@Parameter(description = "Global Filters") @RequestParam(name = "globalFilters", required = false) String globalFilters,
@Parameter(description = "Translation properties") @RequestBody CsvTranslationDTO csvTranslations,
@Parameter(description = "Sort parameters") Sort sort) {

return ResponseEntity.ok()
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.body(securityAnalysisResultService.findNmKConstraintsResultZippedCsv(resultUuid, csvTranslations));
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.body(securityAnalysisResultService.findNmKConstraintsResultZippedCsv(
resultUuid,
networkUuid,
variantId,
filters,
globalFilters,
sort,
csvTranslations
));
}

@DeleteMapping(value = "/results", produces = APPLICATION_JSON_VALUE)
Expand Down
Loading