test: fix test with and without auth

alicela · alicela · commit ae84e254f8c4 · 2025-03-20T11:55:24.000+01:00
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java
@@ -1,33 +1,21 @@
 package fr.insee.genesis.controller.rest.responses;
 
-import fr.insee.bpm.metadata.model.VariablesMap;
 import fr.insee.genesis.controller.dto.rawdata.LunaticJsonRawDataUnprocessedDto;
-import fr.insee.genesis.controller.services.MetadataService;
-import fr.insee.genesis.controller.utils.ControllerUtils;
-import fr.insee.genesis.domain.model.surveyunit.DataState;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
-import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
-import fr.insee.genesis.exceptions.GenesisError;
-import fr.insee.genesis.exceptions.GenesisException;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
+import fr.insee.genesis.domain.service.rawdata.LunaticJsonRawDataService;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -37,20 +25,24 @@
 public class RawResponseController {
 
     private static final String SUCCESS_MESSAGE = "Interrogation %s saved";
-    private final LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort;
-    private final ControllerUtils controllerUtils;
-    private final MetadataService metadataService;
-    private final SurveyUnitService surveyUnitService;
-    private final SurveyUnitQualityService surveyUnitQualityService;
-    private final FileUtils fileUtils;
+    private final LunaticJsonRawDataService lunaticJsonRawDataApiPort;
+//    private final ControllerUtils controllerUtils;
+//    private final MetadataService metadataService;
+//    private final SurveyUnitService surveyUnitService;
+//    private final SurveyUnitQualityService surveyUnitQualityService;
+//    private final FileUtils fileUtils;
     
-    public RawResponseController(LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort, ControllerUtils controllerUtils, MetadataService metadataService, SurveyUnitService surveyUnitService, SurveyUnitQualityService surveyUnitQualityService, FileUtils fileUtils) {
+   /* public RawResponseController(LunaticJsonRawDataService lunaticJsonRawDataApiPort, ControllerUtils controllerUtils, MetadataService metadataService, SurveyUnitService surveyUnitService, SurveyUnitQualityService surveyUnitQualityService, FileUtils fileUtils) {
         this.lunaticJsonRawDataApiPort = lunaticJsonRawDataApiPort;
         this.controllerUtils = controllerUtils;
         this.metadataService = metadataService;
         this.surveyUnitService = surveyUnitService;
         this.surveyUnitQualityService = surveyUnitQualityService;
         this.fileUtils = fileUtils;
+    }*/
+
+    public RawResponseController(LunaticJsonRawDataService lunaticJsonRawDataApiPort) {
+        this.lunaticJsonRawDataApiPort = lunaticJsonRawDataApiPort;
     }
 
     @Operation(summary = "Save lunatic json data from one interrogation in Genesis Database")
@@ -95,7 +87,7 @@ public ResponseEntity<List<LunaticJsonRawDataUnprocessedDto>> getUnproccessedJso
     }
 
     //PROCESS
-    @Operation(summary = "Process raw data of a campaign")
+  /*  @Operation(summary = "Process raw data of a campaign")
     @PostMapping(path = "/lunatic-json/process")
     @PreAuthorize("hasRole('ADMIN')")
     public ResponseEntity<Object> processJsonRawData(
@@ -153,5 +145,5 @@ public ResponseEntity<Object> processJsonRawData(
             return ResponseEntity.status(e.getStatus()).body(e.getMessage());
         }
     }
-
+*/
 }
diff --git a/src/main/resources/application-test-cucumber.properties b/src/main/resources/application-test-cucumber.properties
@@ -0,0 +1,18 @@
+fr.insee.genesis.application.host.url=http://localhost:8080
+fr.insee.genesis.sourcefolder.data = /data/genesis
+fr.insee.genesis.sourcefolder.specifications = /data/genesis
+
+app.role.admin.claims=administrateur_traiter
+app.role.user-kraftwerk.claims=utilisateur_Kraftwerk
+app.role.user-platine.claims=utilisateur_Platine
+app.role.reader.claims=lecteur_traiter
+app.role.collect-platform.claims=protools
+
+logging.file.name = /logs/genesis-api.log
+
+fr.insee.genesis.oidc.auth-server-url=https://organisation.server.auth/auth
+fr.insee.genesis.oidc.realm=test-realm
+springdoc.swagger-ui.oauth.client-id=client-id-test
+
+
+fr.insee.genesis.authentication = NONE
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
@@ -12,4 +12,7 @@ logging.file.name = /logs/genesis-api.log
 
 fr.insee.genesis.oidc.auth-server-url=https://organisation.server.auth/auth
 fr.insee.genesis.oidc.realm=test-realm
-springdoc.swagger-ui.oauth.client-id=client-id-test
+springdoc.swagger-ui.oauth.client-id=client-id-test
+
+
+fr.insee.genesis.authentication = OIDC
diff --git a/src/test/java/cucumber/config/CucumberSpringConfiguration.java b/src/test/java/cucumber/config/CucumberSpringConfiguration.java
@@ -8,7 +8,7 @@
 
 @CucumberContextConfiguration
 @SpringBootTest(classes = GenesisApi.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
+@ActiveProfiles("test-cucumber")
 public class CucumberSpringConfiguration {
 }
 
diff --git a/src/test/java/cucumber/functional_tests/RawDataDefinitions.java b/src/test/java/cucumber/functional_tests/RawDataDefinitions.java
@@ -1,15 +1,12 @@
 package cucumber.functional_tests;
 
+import cucumber.config.CucumberSpringConfiguration;
 import fr.insee.genesis.TestConstants;
 import fr.insee.genesis.configuration.Config;
 import fr.insee.genesis.controller.rest.responses.RawResponseController;
-import fr.insee.genesis.controller.services.MetadataService;
-import fr.insee.genesis.controller.utils.ControllerUtils;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
 import fr.insee.genesis.domain.service.rawdata.LunaticJsonRawDataService;
 import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
 import fr.insee.genesis.stubs.ConfigStub;
 import fr.insee.genesis.stubs.LunaticJsonRawDataPersistanceStub;
@@ -29,12 +26,18 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.ContextConfiguration;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPublicKey;
 
 @Slf4j
+@ContextConfiguration(classes = CucumberSpringConfiguration.class)
 public class RawDataDefinitions {
 
 
@@ -45,19 +48,20 @@ public class RawDataDefinitions {
     @Autowired
     private TestRestTemplate rest;
 
+
     LunaticJsonRawDataPersistanceStub lunaticJsonRawDataPersistanceStub = new LunaticJsonRawDataPersistanceStub();
-    LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort = new LunaticJsonRawDataService(lunaticJsonRawDataPersistanceStub);
+    LunaticJsonRawDataService lunaticJsonRawDataApiPort = new LunaticJsonRawDataService(lunaticJsonRawDataPersistanceStub);
     Config config = new ConfigStub();
     FileUtils fileUtils = new FileUtils(config);
     SurveyUnitPersistencePortStub surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
     SurveyUnitQualityService surveyUnitQualityService = new SurveyUnitQualityService();
     RawResponseController rawResponseController = new RawResponseController(
-            lunaticJsonRawDataApiPort,
-            new ControllerUtils(fileUtils),
-            new MetadataService(),
-            new SurveyUnitService(surveyUnitPersistencePortStub),
-            surveyUnitQualityService,
-            fileUtils
+            lunaticJsonRawDataApiPort
+//           , new ControllerUtils(fileUtils),
+//            new MetadataService(),
+//            new SurveyUnitService(surveyUnitPersistencePortStub),
+//            surveyUnitQualityService,
+//            fileUtils
     );
     Path rawDataFilePath;
     String rawJsonData;
@@ -69,6 +73,16 @@ public void init(){
         this.lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
         log.info("rest autowired : {}", rest.getRootUri());
         BASE_URL = "http://localhost:" + port + "/";
+
+    }
+
+    private RSAPublicKey generateTestKey() {
+        try {
+            KeyPair keyPair = KeyPairGenerator.getInstance("RSA").generateKeyPair();
+            return (RSAPublicKey) keyPair.getPublic();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Given("We have raw data file in {string}")
@@ -81,7 +95,7 @@ public void set_input_file(String rawDataFile) throws IOException {
     public void save_raw_data(String campaignId, String questionnaireId, String interrogationId) throws IOException {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
-
+        headers.set("Authorization", "Bearer fake_token");
         String url = String.format("%sresponses/raw/lunatic-json/save?campaignName=%s&questionnaireId=%s&interrogationId=%s&surveyUnitId=%s&mode=%s",
                 BASE_URL,
                 campaignId,
@@ -112,4 +126,7 @@ public void check_response_status_code(int expectedStatusCode){
         Assertions.assertThat(response.getStatusCode().value()).isEqualTo(expectedStatusCode);
     }
 
+
+
+
 }
diff --git a/src/test/java/fr/insee/genesis/controller/rest/ControllerAccessTest.java b/src/test/java/fr/insee/genesis/controller/rest/ControllerAccessTest.java

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`@CucumberContextConfiguration`
`10`	`10`	`@SpringBootTest(classes = GenesisApi.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)`
`11`		`-@ActiveProfiles("test")`
	`11`	`+@ActiveProfiles("test-cucumber")`
`12`	`12`	`public class CucumberSpringConfiguration {`
`13`	`13`	`}`
`14`	`14`