update csv columns for export

Signed-off-by: David BRAQUART <[email protected]>

Author: dbraquart

src/main/java/org/gridsuite/securityanalysis/server/dto/LimitViolationDTO.java

@@ -60,13 +60,17 @@ private static String convertDoubleToLocale(Double value, String language) {
 
     public List<String> toCsvRow(Map<String, String> translations, String language) {
         List<String> csvRow = new ArrayList<>();
-        csvRow.add(this.getLocationId());
         csvRow.add(this.getLimitType() != null ? CsvExportUtils.translate(this.getLimitType().name(), translations) : "");
+        csvRow.add(this.getLocationId());  // busId
         csvRow.add(CsvExportUtils.replaceNullWithEmptyString(CsvExportUtils.translate(this.getLimitName(), translations)));
-        csvRow.add(convertDoubleToLocale(this.getLimit(), language));
-        csvRow.add(convertDoubleToLocale(this.getValue(), language));
         csvRow.add(this.getLoading() == null ? "" : convertDoubleToLocale(this.getLoading(), language));
+        csvRow.add(this.getPatlLoading() == null ? "" : convertDoubleToLocale(this.getPatlLoading(), language));
         csvRow.add(this.getAcceptableDuration() == Integer.MAX_VALUE ? null : Integer.toString(this.getAcceptableDuration()));
+        csvRow.add(this.getUpcomingAcceptableDuration() == null || this.getUpcomingAcceptableDuration() == Integer.MAX_VALUE ? null : Integer.toString(this.getUpcomingAcceptableDuration()));
+        csvRow.add(CsvExportUtils.replaceNullWithEmptyString(CsvExportUtils.translate(this.getNextLimitName(), translations)));
+        csvRow.add(convertDoubleToLocale(this.getLimit(), language));
+        csvRow.add(this.getPatlLimit() == null ? "" : convertDoubleToLocale(this.getPatlLimit(), language));
+        csvRow.add(convertDoubleToLocale(this.getValue(), language));
         csvRow.add(this.getSide() != null ? CsvExportUtils.translate(this.getSide().name(), translations) : "");
         return csvRow;
     }

src/main/java/org/gridsuite/securityanalysis/server/dto/PreContingencyLimitViolationResultDTO.java

@@ -14,9 +14,9 @@
 import lombok.experimental.FieldNameConstants;
 import org.gridsuite.securityanalysis.server.entities.PreContingencyLimitViolationEntity;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
 @Getter
 @AllArgsConstructor
@@ -41,12 +41,12 @@ public static PreContingencyLimitViolationResultDTO toDto(PreContingencyLimitVio
     }
 
     public List<String> toCsvRow(Map<String, String> translations, String language) {
-        List<String> csvRow = List.of();
-
-        if (this.getLimitViolation() != null) {
-            return Stream.concat(csvRow.stream(), this.getLimitViolation().toCsvRow(translations, language).stream()).toList();
+        if (this.getLimitViolation() == null) {
+            return List.of();
         }
-
+        List<String> csvRow = new ArrayList<>();
+        csvRow.add(this.getSubjectId());
+        csvRow.addAll(this.getLimitViolation().toCsvRow(translations, language));
         return csvRow;
     }
 }