refactor: encryption parameters in schedules

loichenninger · loichenninger · commit 8920f88922c4 · 2026-03-31T15:21:08.000+02:00
diff --git a/src/main/java/fr/insee/genesis/controller/dto/KraftwerkExecutionScheduleInput.java b/src/main/java/fr/insee/genesis/controller/dto/KraftwerkExecutionScheduleInput.java
@@ -26,6 +26,8 @@ public class KraftwerkExecutionScheduleInput {
     private DestinationType destinationType;
     private boolean addStates;
     private String destinationFolder;
+    private boolean useAsymmetricEncryption;
+    private boolean useSymmetricEncryption;
     private TrustParameters trustParameters;
     private Integer batchSize;
 }
diff --git a/src/main/java/fr/insee/genesis/controller/dto/ScheduleRequestDto.java b/src/main/java/fr/insee/genesis/controller/dto/ScheduleRequestDto.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import fr.insee.genesis.controller.utils.ExportType;
+import fr.insee.genesis.controller.validation.schedule.ValidScheduleRequest;
 import fr.insee.genesis.domain.model.context.schedule.DestinationType;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -17,6 +18,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "Request used to schedule a Kraftwerk export workflow")
+@ValidScheduleRequest
 public class ScheduleRequestDto {
 
     @NotBlank
@@ -47,7 +49,10 @@ public class ScheduleRequestDto {
     private DestinationType destinationType = DestinationType.APPLISHARE;
 
     @Schema(defaultValue = "false")
-    private boolean useEncryption = false;
+    private boolean useSymmetricEncryption = false;
+
+    @Schema(defaultValue = "false")
+    private boolean useAsymmetricEncryption = false;
 
     @Schema(description = "Encryption vault path")
     private String encryptionVaultPath = "";
diff --git a/src/main/java/fr/insee/genesis/controller/dto/rawdata/ScheduleResponseDto.java b/src/main/java/fr/insee/genesis/controller/dto/rawdata/ScheduleResponseDto.java
@@ -15,7 +15,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ScheduleV2Dto {
+public class ScheduleResponseDto {
 
     private String scheduleUuid;
     private String collectionInstrumentId;
@@ -32,7 +32,8 @@ public class ScheduleV2Dto {
 
     private Mode mode;
     private DestinationType destinationType;
-    private boolean useEncryption;
+    private boolean useAsymmetricEncryption;
+    private boolean useSymmetricEncryption;
     private String encryptionVaultPath;
     private boolean useSignature;
     private boolean addStates;
diff --git a/src/main/java/fr/insee/genesis/controller/rest/ControllerExceptionHandler.java b/src/main/java/fr/insee/genesis/controller/rest/ControllerExceptionHandler.java
@@ -3,9 +3,13 @@
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestControllerAdvice
 public class ControllerExceptionHandler {
 
@@ -15,4 +19,25 @@ public ResponseEntity<String> handleDuplicate(DuplicateKeyException ex) {
                 .status(HttpStatus.CONFLICT)
                 .body(ex.getMessage());
     }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationExceptions(MethodArgumentNotValidException ex) {
+
+        Map<String, String> errors = new HashMap<>();
+
+        ex.getBindingResult().getFieldErrors().forEach(error -> {
+            errors.put(error.getField(), error.getDefaultMessage());
+        });
+
+        ex.getBindingResult().getGlobalErrors().forEach(error -> {
+            errors.put(error.getObjectName(), error.getDefaultMessage());
+        });
+
+        Map<String, Object> body = new HashMap<>();
+        body.put("status", 400);
+        body.put("message", "Validation failed");
+        body.put("errors", errors);
+
+        return ResponseEntity.badRequest().body(body);
+    }
 }
diff --git a/src/main/java/fr/insee/genesis/controller/rest/DataProcessingContextController.java b/src/main/java/fr/insee/genesis/controller/rest/DataProcessingContextController.java
@@ -4,7 +4,7 @@
 import fr.insee.genesis.controller.dto.KraftwerkExecutionScheduleInput;
 import fr.insee.genesis.controller.dto.ScheduleDto;
 import fr.insee.genesis.controller.dto.ScheduleRequestDto;
-import fr.insee.genesis.controller.dto.rawdata.ScheduleV2Dto;
+import fr.insee.genesis.controller.dto.rawdata.ScheduleResponseDto;
 import fr.insee.genesis.domain.model.context.schedule.ServiceToCall;
 import fr.insee.genesis.domain.model.context.schedule.TrustParameters;
 import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
@@ -109,7 +109,7 @@ public ResponseEntity<Object> createScheduleV2(
     ) {
         try {
             TrustParameters trustParameters = null;
-            if (request.isUseEncryption()) {
+            if (request.isUseAsymmetricEncryption()) {
                 trustParameters = new TrustParameters(
                         fileUtils.getKraftwerkOutFolder(request.getCollectionInstrumentId()),
                         "",
@@ -243,7 +243,7 @@ public ResponseEntity<Object> updateScheduleV2(
     ) {
         try {
             TrustParameters trustParameters = null;
-            if (request.isUseEncryption()) {
+            if (request.isUseAsymmetricEncryption()) {
                 trustParameters = new TrustParameters(
                         fileUtils.getKraftwerkOutFolder(collectionInstrumentId),
                         "",
@@ -263,6 +263,8 @@ public ResponseEntity<Object> updateScheduleV2(
                     .destinationType(request.getDestinationType())
                     .addStates(request.isAddStates())
                     .destinationFolder(request.getDestinationFolder())
+                    .useAsymmetricEncryption(request.isUseAsymmetricEncryption())
+                    .useSymmetricEncryption(request.isUseSymmetricEncryption())
                     .trustParameters(trustParameters)
                     .batchSize(request.getBatchSize())
                     .build();
@@ -308,7 +310,7 @@ public ResponseEntity<Object> getAllSchedulesV2() {
     public ResponseEntity<Object> getAllSchedulesV3() {
         log.debug("Got GET all schedules V2 request");
 
-        List<ScheduleV2Dto> schedules = dataProcessingContextApiPort.getAllSchedulesV2();
+        List<ScheduleResponseDto> schedules = dataProcessingContextApiPort.getAllSchedulesV2();
 
         log.info("Returning {} V2 schedule documents...", schedules.size());
         return ResponseEntity.ok(schedules);
@@ -320,7 +322,7 @@ public ResponseEntity<Object> getAllSchedulesV3() {
     public ResponseEntity<Object> getSchedulesV2ByCollectionInstrumentId(
             @PathVariable("collectionInstrumentId") String collectionInstrumentId
     ) {
-        List<ScheduleV2Dto> schedules =
+        List<ScheduleResponseDto> schedules =
                 dataProcessingContextApiPort.getSchedulesV2ByCollectionInstrumentId(collectionInstrumentId);
 
         return ResponseEntity.ok(schedules);
diff --git a/src/main/java/fr/insee/genesis/controller/validation/schedule/ScheduleRequestValidator.java b/src/main/java/fr/insee/genesis/controller/validation/schedule/ScheduleRequestValidator.java
@@ -0,0 +1,47 @@
+package fr.insee.genesis.controller.validation.schedule;
+
+import fr.insee.genesis.controller.dto.ScheduleRequestDto;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+public class ScheduleRequestValidator implements ConstraintValidator<ValidScheduleRequest, ScheduleRequestDto> {
+
+    @Override
+    public boolean isValid(ScheduleRequestDto value, ConstraintValidatorContext context) {
+
+        if (value == null) {
+            return true;
+        }
+
+        boolean valid = true;
+
+        // Encryption rule
+        if (value.isUseAsymmetricEncryption()) {
+            if (value.getEncryptionVaultPath() == null || value.getEncryptionVaultPath().isBlank()) {
+                addViolation(context, "encryptionVaultPath", "encryptionVaultPath is mandatory if useAsymetricEncryption=true");
+                valid = false;
+            }
+        }
+
+        // Date rule
+        if (value.getScheduleBeginDate() != null &&
+                value.getScheduleEndDate() != null &&
+                value.getScheduleBeginDate().isAfter(value.getScheduleEndDate())) {
+
+            addViolation(context, "scheduleEndDate",
+                    "scheduleEndDate should be after scheduleBeginDate");
+            valid = false;
+        }
+
+        return valid;
+    }
+
+    private void addViolation(ConstraintValidatorContext context, String field, String message) {
+        context.disableDefaultConstraintViolation();
+
+        context.buildConstraintViolationWithTemplate(message)
+                .addPropertyNode(field)
+                .addConstraintViolation();
+    }
+
+}
diff --git a/src/main/java/fr/insee/genesis/controller/validation/schedule/ValidScheduleRequest.java b/src/main/java/fr/insee/genesis/controller/validation/schedule/ValidScheduleRequest.java
@@ -0,0 +1,18 @@
+package fr.insee.genesis.controller.validation.schedule;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = ScheduleRequestValidator.class)
+public @interface ValidScheduleRequest {
+    String message() default "Invalid schedule request";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+}
diff --git a/src/main/java/fr/insee/genesis/domain/model/context/DataProcessingContextModel.java b/src/main/java/fr/insee/genesis/domain/model/context/DataProcessingContextModel.java
@@ -1,7 +1,7 @@
 package fr.insee.genesis.domain.model.context;
 
 import fr.insee.genesis.controller.dto.ScheduleDto;
-import fr.insee.genesis.controller.dto.rawdata.ScheduleV2Dto;
+import fr.insee.genesis.controller.dto.rawdata.ScheduleResponseDto;
 import fr.insee.genesis.domain.model.context.schedule.KraftwerkExecutionSchedule;
 import fr.insee.genesis.domain.model.context.schedule.KraftwerkExecutionScheduleV2;
 import lombok.AllArgsConstructor;
@@ -44,14 +44,14 @@ public ScheduleDto toScheduleDto() {
                 .build();
     }
 
-    public List<ScheduleV2Dto> toScheduleV2Dtos() {
+    public List<ScheduleResponseDto> toScheduleResponseDtos() {
         if (kraftwerkExecutionScheduleV2List == null || kraftwerkExecutionScheduleV2List.isEmpty()) {
             return List.of();
         }
 
         return kraftwerkExecutionScheduleV2List.stream()
                 .filter(schedule -> schedule != null && schedule.getScheduleUuid() != null)
-                .map(schedule -> ScheduleV2Dto.builder()
+                .map(schedule -> ScheduleResponseDto.builder()
                         .scheduleUuid(schedule.getScheduleUuid())
                         .collectionInstrumentId(getResolvedCollectionInstrumentId())
                         .lastExecution(lastExecution)
@@ -60,7 +60,8 @@ public List<ScheduleV2Dto> toScheduleV2Dtos() {
                         .scheduleBeginDate(schedule.getScheduleBeginDate())
                         .scheduleEndDate(schedule.getScheduleEndDate())
                         .mode(schedule.getMode())
-                        .useEncryption(schedule.getTrustParameters() != null)
+                        .useSymmetricEncryption(schedule.isUseSymmetricEncryption())
+                        .useAsymmetricEncryption(schedule.getTrustParameters() != null)
                         .encryptionVaultPath(
                                 schedule.getTrustParameters() != null
                                         ? schedule.getTrustParameters().getVaultPath()
diff --git a/src/main/java/fr/insee/genesis/domain/model/context/schedule/KraftwerkExecutionScheduleV2.java b/src/main/java/fr/insee/genesis/domain/model/context/schedule/KraftwerkExecutionScheduleV2.java
@@ -28,6 +28,7 @@ public class KraftwerkExecutionScheduleV2 {
     private DestinationType destinationType;
     private boolean addStates;
     private String destinationFolder;
+    private boolean useSymmetricEncryption;
     private TrustParameters trustParameters;
     private Integer batchSize;
 }
diff --git a/src/main/java/fr/insee/genesis/domain/ports/api/DataProcessingContextApiPort.java b/src/main/java/fr/insee/genesis/domain/ports/api/DataProcessingContextApiPort.java
@@ -2,7 +2,7 @@
 
 import fr.insee.genesis.controller.dto.KraftwerkExecutionScheduleInput;
 import fr.insee.genesis.controller.dto.ScheduleDto;
-import fr.insee.genesis.controller.dto.rawdata.ScheduleV2Dto;
+import fr.insee.genesis.controller.dto.rawdata.ScheduleResponseDto;
 import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
 import fr.insee.genesis.domain.model.context.schedule.ServiceToCall;
 import fr.insee.genesis.domain.model.context.schedule.TrustParameters;
@@ -45,11 +45,11 @@ void saveKraftwerkExecutionScheduleByCollectionInstrumentId(String collectionIns
 
     void deleteSchedulesV2ByCollectionInstrumentId(String collectionInstrumentId) throws GenesisException;
 
-    List<ScheduleV2Dto> getSchedulesV2ByCollectionInstrumentId(String collectionInstrumentId);
+    List<ScheduleResponseDto> getSchedulesV2ByCollectionInstrumentId(String collectionInstrumentId);
 
     List<ScheduleDto> getAllSchedules();
 
-    List<ScheduleV2Dto> getAllSchedulesV2();
+    List<ScheduleResponseDto> getAllSchedulesV2();
 
     void deleteExpiredSchedules(String logFolder) throws GenesisException;
 
diff --git a/src/main/java/fr/insee/genesis/domain/service/context/DataProcessingContextService.java b/src/main/java/fr/insee/genesis/domain/service/context/DataProcessingContextService.java
@@ -5,7 +5,7 @@
 import fr.insee.genesis.Constants;
 import fr.insee.genesis.controller.dto.KraftwerkExecutionScheduleInput;
 import fr.insee.genesis.controller.dto.ScheduleDto;
-import fr.insee.genesis.controller.dto.rawdata.ScheduleV2Dto;
+import fr.insee.genesis.controller.dto.rawdata.ScheduleResponseDto;
 import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
 import fr.insee.genesis.domain.model.context.schedule.KraftwerkExecutionSchedule;
 import fr.insee.genesis.domain.model.context.schedule.KraftwerkExecutionScheduleV2;
@@ -180,6 +180,7 @@ public String createKraftwerkExecutionSchedule(KraftwerkExecutionScheduleInput s
                 scheduleInput.getDestinationType(),
                 scheduleInput.isAddStates(),
                 scheduleInput.getDestinationFolder(),
+                scheduleInput.isUseSymmetricEncryption(),
                 scheduleInput.getTrustParameters(),
                 scheduleInput.getBatchSize()
         );
@@ -221,6 +222,7 @@ public void updateKraftwerkExecutionSchedule(KraftwerkExecutionScheduleInput sch
                 .filter(schedule ->
                         schedule.getMode()==scheduleInput.getMode() && schedule.getExportType() == scheduleInput.getExportType()
                 )
+                .filter(schedule -> !schedule.getScheduleUuid().equals(scheduleInput.getScheduleUuid()))
                 .findFirst();
 
         if (tripletAlreadyExists.isPresent()){
@@ -239,6 +241,7 @@ public void updateKraftwerkExecutionSchedule(KraftwerkExecutionScheduleInput sch
         scheduleToUpdate.setDestinationType(scheduleInput.getDestinationType());
         scheduleToUpdate.setAddStates(scheduleInput.isAddStates());
         scheduleToUpdate.setDestinationFolder(scheduleInput.getDestinationFolder());
+        scheduleToUpdate.setUseSymmetricEncryption(scheduleInput.isUseSymmetricEncryption());
         scheduleToUpdate.setTrustParameters(scheduleInput.getTrustParameters());
         scheduleToUpdate.setBatchSize(scheduleInput.getBatchSize());
 
@@ -337,12 +340,12 @@ public void deleteSchedulesV2ByCollectionInstrumentId(String collectionInstrumen
     }
 
     @Override
-    public List<ScheduleV2Dto> getSchedulesV2ByCollectionInstrumentId(String collectionInstrumentId) {
+    public List<ScheduleResponseDto> getSchedulesV2ByCollectionInstrumentId(String collectionInstrumentId) {
         List<DataProcessingContextModel> dataProcessingContextModels =
                 dataProcessingContextPersistancePort.findByCollectionInstrumentIds(List.of(collectionInstrumentId));
 
         return dataProcessingContextModels.stream()
-                .flatMap(model -> model.toScheduleV2Dtos().stream())
+                .flatMap(model -> model.toScheduleResponseDtos().stream())
                 .toList();
     }
 
@@ -361,14 +364,14 @@ public List<ScheduleDto> getAllSchedules() {
     }
 
     @Override
-    public List<ScheduleV2Dto> getAllSchedulesV2() {
+    public List<ScheduleResponseDto> getAllSchedulesV2() {
         List<DataProcessingContextModel> dataProcessingContextModels =
                 DataProcessingContextMapper.INSTANCE.listDocumentToListModel(
                         dataProcessingContextPersistancePort.findAll()
                 );
 
         return dataProcessingContextModels.stream()
-                .flatMap(model -> model.toScheduleV2Dtos().stream())
+                .flatMap(model -> model.toScheduleResponseDtos().stream())
                 .toList();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ public class KraftwerkExecutionScheduleInput {`
`26`	`26`	`private DestinationType destinationType;`
`27`	`27`	`private boolean addStates;`
`28`	`28`	`private String destinationFolder;`
	`29`	`+ private boolean useAsymmetricEncryption;`
	`30`	`+ private boolean useSymmetricEncryption;`
`29`	`31`	`private TrustParameters trustParameters;`
`30`	`32`	`private Integer batchSize;`
`31`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public class KraftwerkExecutionScheduleV2 {`
`28`	`28`	`private DestinationType destinationType;`
`29`	`29`	`private boolean addStates;`
`30`	`30`	`private String destinationFolder;`
	`31`	`+ private boolean useSymmetricEncryption;`
`31`	`32`	`private TrustParameters trustParameters;`
`32`	`33`	`private Integer batchSize;`
`33`	`34`	`}`