feat: WIP modelefiliere add last extraction date

Author: loichenninger

src/main/java/fr/insee/genesis/controller/rest/JsonExtractionController.java

@@ -30,11 +30,11 @@ public class JsonExtractionController {
     @PutMapping(path = "/json")
     @PreAuthorize("hasAnyRole('USER_KRAFTWERK','SCHEDULER')")
     public ResponseEntity<String> saveLastJsonExtractionDate(
-            @RequestParam("questionnaireId") String questionnaireId,
+            @RequestParam("collectionInstrumentId") String collectionInstrumentId,
             @RequestParam(value = "mode", required = false) Mode mode){
         LocalDateTime extractDate = LocalDateTime.now();
         LastJsonExtractionModel extract = LastJsonExtractionModel.builder()
-                .questionnaireModelId(questionnaireId)
+                .collectionInstrumentId(collectionInstrumentId)
                 .mode(mode)
                 .lastExtractionDate(extractDate)
                 .build();
@@ -46,10 +46,10 @@ public ResponseEntity<String> saveLastJsonExtractionDate(
     @GetMapping(path = "/json")
     @PreAuthorize("hasAnyRole('USER_KRAFTWERK','SCHEDULER')")
     public ResponseEntity<LastExtractionResponseDto> getLastJsonExtractionDate(
-            @RequestParam("questionnaireId") String questionnaireId,
+            @RequestParam("collectionInstrumentId") String collectionInstrumentId,
             @RequestParam(value = "mode", required = false) Mode mode){
         try{
-            LastJsonExtractionModel lastJsonExtraction = lastJsonExtractionApiPort.getLastExtractionDate(questionnaireId,mode);
+            LastJsonExtractionModel lastJsonExtraction = lastJsonExtractionApiPort.getLastExtractionDate(collectionInstrumentId,mode);
             return ResponseEntity.ok(new LastExtractionResponseDto(lastJsonExtraction.getLastExtractionDate()));
         } catch (GenesisException e){
             return ResponseEntity.notFound().build();

src/main/java/fr/insee/genesis/domain/model/extraction/json/LastJsonExtractionModel.java

@@ -16,7 +16,7 @@
 public class LastJsonExtractionModel {
         @Id
         private String id; //Used to remove warning
-        String questionnaireModelId;
+        String collectionInstrumentId;
         Mode mode;
         LocalDateTime lastExtractionDate;
 }

src/main/java/fr/insee/genesis/domain/ports/api/LastJsonExtractionApiPort.java

@@ -7,5 +7,5 @@
 public interface LastJsonExtractionApiPort {
     void recordDate(LastJsonExtractionModel extraction);
 
-    LastJsonExtractionModel getLastExtractionDate(String questionnaireModelId, Mode mode) throws GenesisException;
+    LastJsonExtractionModel getLastExtractionDate(String collectionInstrumentId, Mode mode) throws GenesisException;
 }

src/main/java/fr/insee/genesis/domain/ports/spi/LastJsonExtractionPersistencePort.java

@@ -6,5 +6,5 @@
 
 public interface LastJsonExtractionPersistencePort {
     void save(LastJsonExtractionModel extraction);
-    LastJsonExtractionModel getLastExecutionDate(String questionnaireModelId, Mode mode) throws GenesisException;
+    LastJsonExtractionModel getLastExecutionDate(String collectionInstrumentId, Mode mode) throws GenesisException;
 }

src/main/java/fr/insee/genesis/domain/service/extraction/LastJsonExtractionService.java

@@ -25,15 +25,15 @@ public LastJsonExtractionService(LastJsonExtractionPersistencePort extractionPer
     @Override
     public void recordDate(LastJsonExtractionModel extraction) {
         // Create a unique ID based on the questionnaire and the mode.
-        extraction.setId(String.format("%s_%s",extraction.getQuestionnaireModelId(),extraction.getMode()));
+        extraction.setId(String.format("%s_%s",extraction.getCollectionInstrumentId(),extraction.getMode()));
 
         // save() does an insert if the id doesn't exist, otherwise an update
         extractionPersistencePort.save(extraction);
     }
 
     @Override
-    public LastJsonExtractionModel getLastExtractionDate(String questionnaireModelId, Mode mode) throws GenesisException {
-        return extractionPersistencePort.getLastExecutionDate(questionnaireModelId,mode);
+    public LastJsonExtractionModel getLastExtractionDate(String collectionInstrumentId, Mode mode) throws GenesisException {
+        return extractionPersistencePort.getLastExecutionDate(collectionInstrumentId,mode);
     }
 
 

src/main/java/fr/insee/genesis/infrastructure/adapter/LastJsonExtractionMongoAdapter.java

@@ -32,13 +32,13 @@ public void save(LastJsonExtractionModel extraction) {
     }
 
     @Override
-    public LastJsonExtractionModel getLastExecutionDate(String questionnaireModelId, Mode mode) throws GenesisException {
-        String id = String.format("%s_%s",questionnaireModelId, mode);
+    public LastJsonExtractionModel getLastExecutionDate(String collectionInstrumentId, Mode mode) throws GenesisException {
+        String id = String.format("%s_%s",collectionInstrumentId, mode);
         Optional<LastJsonExtractionDocument> extraction = extractionRepository.findById(id);
         if (extraction.isPresent()) {
             return LastJsonExtractionDocumentMapper.INSTANCE.documentToModel(extraction.get());
         } else {
-            String message = String.format("No extraction date found for questionnaire %s and mode %s",questionnaireModelId,mode==null?null:mode.getModeName());
+            String message = String.format("No extraction date found for collection instrument %s and mode %s",collectionInstrumentId,mode==null?null:mode.getModeName());
             throw new GenesisException(404,message);
         }
     }

src/main/java/fr/insee/genesis/infrastructure/document/extraction/json/LastJsonExtractionDocument.java

@@ -14,7 +14,7 @@ public class LastJsonExtractionDocument {
 
     @Id
     private String id;
-    private String questionnaireModelId;
+    private String collectionInstrumentId;
     private Mode mode;
     private LocalDateTime lastExtractionDate;