Fix genesis not getting in default directory

InseeFr · Jul 31, 2024 · 2017cc4 · 2017cc4
1 parent b5cb737
commit 2017cc4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,4 @@ src/test/resources/unit_tests/out/*
 !src/test/resources/unit_tests/out/.gitkeep
 kraftwerk-core/src/test/resources/unit_tests/out/*
 qodana.yaml
+kraftwerk-api/src/main/resources/kraftwerk.properties
diff --git a/kraftwerk-api/src/main/java/fr/insee/kraftwerk/api/client/GenesisClient.java b/kraftwerk-api/src/main/java/fr/insee/kraftwerk/api/client/GenesisClient.java
@@ -7,6 +7,7 @@
 import fr.insee.kraftwerk.core.data.model.Mode;
 import fr.insee.kraftwerk.core.data.model.SurveyUnitId;
 import fr.insee.kraftwerk.core.data.model.SurveyUnitUpdateLatest;
+import lombok.Getter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.HttpEntity;
@@ -24,6 +25,7 @@ public class GenesisClient {
 
 	private final RestTemplate restTemplate;
 
+	@Getter
 	private final ConfigProperties configProperties;
 
 

diff --git a/kraftwerk-api/src/main/java/fr/insee/kraftwerk/api/configuration/ConfigProperties.java b/kraftwerk-api/src/main/java/fr/insee/kraftwerk/api/configuration/ConfigProperties.java
@@ -16,11 +16,11 @@ public class ConfigProperties {
 	private String genesisUrl;
 
 	@Value("${fr.insee.postcollecte.files}")
-	private String specDirectory;
+	private String defaultDirectory;
 
 	@PostConstruct
 	public void setTempDirectory() {
-		System.setProperty("java.io.tmpdir", Paths.get(specDirectory,"temp","currentExecution").toString());
+		System.setProperty("java.io.tmpdir", Paths.get(defaultDirectory,"temp","currentExecution").toString());
 	}
 
 }
diff --git a/kraftwerk-api/src/main/java/fr/insee/kraftwerk/api/process/MainProcessingGenesis.java b/kraftwerk-api/src/main/java/fr/insee/kraftwerk/api/process/MainProcessingGenesis.java
@@ -67,7 +67,7 @@ public MainProcessingGenesis(ConfigProperties config, FileUtilsInterface fileUti
 
 	public void init(String idCampaign) throws KraftwerkException {
 		log.info("Kraftwerk main service started for campaign: " + idCampaign);
-		this.controlInputSequenceGenesis = new ControlInputSequenceGenesis("", fileUtilsInterface);
+		this.controlInputSequenceGenesis = new ControlInputSequenceGenesis(client.getConfigProperties().getDefaultDirectory(), fileUtilsInterface);
 		this.executionDateTime = LocalDateTime.now();
 		inDirectory = controlInputSequenceGenesis.getInDirectory(idCampaign);
 		//First we check the modes present in database for the given questionnaire

diff --git a/kraftwerk-api/src/main/java/fr/insee/kraftwerk/api/services/HealthcheckService.java b/kraftwerk-api/src/main/java/fr/insee/kraftwerk/api/services/HealthcheckService.java
@@ -57,14 +57,14 @@ public ResponseEntity<String> healthcheck() {
 								status,
 								projectVersion,
 								client.pingGenesis().split("\n")[0],
-								configProperties.getSpecDirectory(),
+								configProperties.getDefaultDirectory(),
 								fileStorageStatus
 						));
 	}
 
 	private String fileStorageExists() {
 		try{
-			Files.exists(Paths.get(configProperties.getSpecDirectory()));
+			Files.exists(Paths.get(configProperties.getDefaultDirectory()));
 		}catch (Exception e){
 			return "Disconnected " +e.getMessage();
 		}