add controles to imprt sts trajectory

Author: melazaar

src/main/java/com/rte_france/antares/datamanager_back/controller/StStorageController.java

@@ -30,7 +30,10 @@ public class StStorageController {
     @Operation(summary = "import sts trajectory to database ")
     @PostMapping("/st-storage")
     public ResponseEntity<TrajectoryDTO> uploadThermalCapacityTrajectory(@RequestParam("area") String area, // FR, // GB, DE, IT, ES, PT, BE, NL, LU, CH //OTHER
-                                                                         @RequestParam(value = "technology") String technology, @RequestParam("trajectoryToUse") @Size(max = 40, message = "Trajectory name cannot exceed 40 characters") String trajectoryToUse, @RequestParam("horizon") @Pattern(regexp = "^\\d{4}-\\d{4}$") @Parameter(description = "example of horizon : 2020-2021") String horizon, @RequestParam("studyId") Integer studyId, @RequestParam("isCivilYear") boolean isCivilYear) throws IOException {
+                                                                         @RequestParam(value = "technology") String technology,
+                                                                         @RequestParam("trajectoryToUse") @Size(max = 40, message = "Trajectory name cannot exceed 40 characters") String trajectoryToUse,
+                                                                         @RequestParam("horizon") @Pattern(regexp = "^\\d{4}-\\d{4}$") @Parameter(description = "example of horizon : 2020-2021") String horizon,
+                                                                         @RequestParam("studyId") Integer studyId, @RequestParam("isCivilYear") boolean isCivilYear) throws IOException {
 
         return new ResponseEntity<>(toTrajectoryDTO
                 (stStorageFileProcessorService.processStStorageFile(trajectoryToUse, horizon, studyId, isCivilYear, area, technology)),

src/main/java/com/rte_france/antares/datamanager_back/repository/model/WarningCode.java

@@ -12,7 +12,9 @@ public enum WarningCode {
     DUPLICATION_MISSING_TRAJECTORIES("duplication.missing_trajectories"),
     THERMAL_INSTALLED_POWER_MISSING_AREAS("thermal.installed_power_missing_areas"),
     THERMAL_SPECIFIC_PARAM_MISSING_AREAS("thermal.specific_param_missing_areas"),
-    THERMAL_SPECIFIC_PARAM_ANY_CM_MR_REQUIRED("thermal.specific_param_any_cm_mr_required");
+    THERMAL_SPECIFIC_PARAM_ANY_CM_MR_REQUIRED("thermal.specific_param_any_cm_mr_required"),
+    STS_MISSING_AREAS("sts_missing_areas");
+
     private final String value;
 
     public String value() {

src/main/java/com/rte_france/antares/datamanager_back/service/StStorage/StStorageFileProcessorServiceImpl.java

@@ -141,7 +141,7 @@ public static TrajectoryEntity buildTrajectory(Path path, int versionTrajectory,
                 .version(versionTrajectory == 0 ? 1 : versionTrajectory + 1)
                 .checksum(checksum)
                 .lastModificationContentDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(Files.getLastModifiedTime(path).toMillis()), ZoneId.systemDefault()))
-                .horizon(horizon)
+                .horizon(civilToChevalHorizon(horizon))
                 .area(area)
                 .technology(technology)
                 .type(trajectoryType.name())
@@ -389,7 +389,7 @@ public static String computeChecksumByType(Path path, TrajectoryType type, Strin
             case LOAD, THERMAL_CAPACITY -> getFileChecksum(path.toString());
             case LINK -> computeLinkChecksum(path.toString(), horizon);
             case THERMAL_TECHNICAL_MODULATION_PARAMETER, THERMAL_ECONOMIC_COST_PARAMETER, THERMAL_ECONOMIC_PARAMETER -> "NA";
-            case  STS ->  computeSheetChecksum(path.toString(), horizon.split("-")[1]);
+            case  STS ->  computeSheetChecksum(path.toString(), horizon.matches("^\\d{4}-\\d{4}$") ? horizon.split("-")[1] : horizon);
             default -> computeSheetChecksum(path.toString(), horizon);
         };
     }
@@ -636,4 +636,15 @@ public static Path findChildDirectoryIgnoreCase(Path parent, String childName) t
             }
         }
     }
+
+    public static String civilToChevalHorizon(String horizon) {
+        if (horizon == null) return null;
+        String s = horizon.trim();
+        if (s.length() == 4 && s.chars().allMatch(Character::isDigit)) {
+            int year = Integer.parseInt(s);
+            return String.format("%04d-%s", year - 1, s);
+        }
+        return s;
+    }
+
 }

src/main/java/com/rte_france/antares/datamanager_back/util/Utils.java

@@ -6,7 +6,7 @@
 #spring.datasource.url=jdbc:postgresql://pegase_db:5434/pegase_local_db?currentSchema=pegase_local_db_schema
 spring.datasource.url=jdbc:postgresql://localhost:5434/pegase_local_db?currentSchema=pegase_local_db_schema
 spring.datasource.username=postgres
-spring.datasource.password=
+spring.datasource.password=postgres
 
 spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.maximum-pool-size=4
@@ -31,7 +31,7 @@ spring.liquibase.change-log=classpath:db/changelog/db.changelog-master.yaml
 spring.liquibase.default-schema=pegase_local_db_schema
 spring.liquibase.liquibase-schema=pegase_local_db_schema
 spring.liquibase.user=postgres
-spring.liquibase.password=
+spring.liquibase.password=postgres
 
 # ===============================
 # = FILES
@@ -42,9 +42,9 @@ antares.datamanager.area.directory=area
 antares.datamanager.link.directory=link
 antares.datamanager.thermal.cost.directory=thermal/economic parameters/costs
 antares.datamanager.thermal.economic.directory=thermal/economic parameters/economic
-antares.datamanager.thermal.capacity.directory=thermal_capacity
-antares.datamanager.thermal.parameter.directory=thermal_parameter
-antares.datamanager.thermal.parameter.modulation.directory=thermal_parameter/param_modulation
+antares.datamanager.thermal.capacity.directory=thermal/installed power
+antares.datamanager.thermal.parameter.directory=thermal/technical parameters
+antares.datamanager.thermal.parameter.modulation.directory=thermal/technical parameters/param_modulation
 antares.datamanager.load.directory=load
 antares.datamanager.sts.directory=STS
 antares.datamanager.load.output.directory=output/load_arrows
@@ -56,7 +56,7 @@ spring.security.oauth2.resourceserver.opaquetoken.introspection-uri=http://local
 spring.security.oauth2.resourceserver.opaquetoken.client-id=pegase-client
 spring.security.oauth2.resourceserver.opaquetoken.client-secret=
 
-pegase.nas.directory=tmp/mnt/nas
+pegase.nas.directory=/home/elazaarmou/Bureau
 pegase.enable.authentification=false
 peagse.genarator.host.url=http://localhost:8094