Merge pull request #26 from kc-bclaudel/master

Fix required-nomenclature endpoint
InseeFr · May 18, 2021 · e3b48b5 · e3b48b5
2 parents 2f26152 + f971133
commit e3b48b5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>fr.insee.queen</groupId>
 	<artifactId>queen</artifactId>
-	<version>3.0.4</version>
+	<version>3.0.5</version>
 	<packaging>war</packaging>
 	<name>Queen-Back-Office</name>
 	<description>Back-office services for Queen</description>
@@ -391,7 +391,7 @@
 						<changeLogFile>src/main/resources/db/master.xml</changeLogFile>
 						<diffChangeLogFile>src/main/resources/db/changelog/new_changelog.xml</diffChangeLogFile>
 						<driver>org.postgresql.Driver</driver>
-						<url>jdbc:postgresql://localhost:5433/queen_api</url>
+						<url>jdbc:postgresql://localhost:5432/queen_api</url>
 						<defaultSchemaName>public</defaultSchemaName>
 						<contexts>test,dev,prod</contexts>
 						<username>user_capi3g</username>

diff --git a/src/main/java/fr/insee/queen/api/controller/NomenclatureController.java b/src/main/java/fr/insee/queen/api/controller/NomenclatureController.java
@@ -1,5 +1,6 @@
 package fr.insee.queen.api.controller;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -85,7 +86,7 @@ public ResponseEntity<Object> getNomenclatureById(@PathVariable(value = "id") St
 	*/
 	@ApiOperation(value = "Get list of required nomenclature by campaign Id ")
 	@GetMapping(path = "/campaign/{id}/required-nomenclatures")
-	public ResponseEntity<Object> getListRequiredNomenclature(@PathVariable(value = "id") String id){
+	public ResponseEntity<List<String>> getListRequiredNomenclature(@PathVariable(value = "id") String id){
 		Optional<Campaign> campaignOptional = campaignService.findById(id);
 		if (!campaignOptional.isPresent()) {
 			LOGGER.info("GET required-nomenclatures for campaign with id {} resulting in 404", id);
@@ -104,7 +105,7 @@ public ResponseEntity<Object> getListRequiredNomenclature(@PathVariable(value =
 	*/
 	@ApiOperation(value = "Get list of required nomenclature by campaign Id ")
 	@GetMapping(path = "/questionnaire/{id}/required-nomenclatures")
-	public ResponseEntity<Object> getListRequiredNomenclatureByQuestionnaireId(@PathVariable(value = "id") String id){
+	public ResponseEntity<List<String>> getListRequiredNomenclatureByQuestionnaireId(@PathVariable(value = "id") String id){
 		Optional<QuestionnaireModel> questionnaireOptional = questionnaireModelService.findById(id);
 		if (!questionnaireOptional.isPresent()) {
 			LOGGER.info("GET required-nomenclatures for questionnaire with id {} resulting in 404", id);

diff --git a/src/main/java/fr/insee/queen/api/service/impl/NomenclatureServiceImpl.java b/src/main/java/fr/insee/queen/api/service/impl/NomenclatureServiceImpl.java
@@ -47,7 +47,7 @@ public Optional<Nomenclature> findById(String id) {
 	public List<String> findRequiredNomenclatureByQuestionnaire(Set<QuestionnaireModel> setQuestionnaireModel) {
 		return setQuestionnaireModel.parallelStream().map(QuestionnaireModel::getNomenclatures).collect(Collectors.toList())
 				.parallelStream().flatMap(Set::parallelStream).collect(Collectors.toList())
-				.parallelStream().distinct().map(Nomenclature::getLabel).collect(Collectors.toList());
+				.parallelStream().distinct().map(Nomenclature::getId).collect(Collectors.toList());
 	}
 
 	public List<String> findRequiredNomenclatureByCampaign(String campaignId) {

diff --git a/src/test/java/fr/insee/queen/api/authKeycloak/mongo/TestAuthKeycloakMongo.java b/src/test/java/fr/insee/queen/api/authKeycloak/mongo/TestAuthKeycloakMongo.java
@@ -34,12 +34,13 @@ public void initialize(ConfigurableApplicationContext configurableApplicationCon
 			.of("spring.data.mongodb.uri=" + mongoDBContainer.getReplicaSetUrl(),
 					"keycloak.auth-server-url=" + keycloak.getAuthServerUrl())
 			.applyTo(configurableApplicationContext.getEnvironment());
+			mongoDBContainer.start();
 		}
 	}
 
 	@AfterAll
 	public static void  cleanUp() {
-		if(mongoDBContainer!=null) {
+		if(mongoDBContainer!=null && mongoDBContainer.isRunning()) {
 			mongoDBContainer.close();
 		}
 		if(keycloak!=null) {

diff --git a/src/test/java/fr/insee/queen/api/basicAuth/mongo/TestBasicAuthMongo.java b/src/test/java/fr/insee/queen/api/basicAuth/mongo/TestBasicAuthMongo.java
@@ -33,12 +33,13 @@ public void initialize(ConfigurableApplicationContext configurableApplicationCon
 			TestPropertyValues
 			.of("spring.data.mongodb.uri=" + mongoDBContainer.getReplicaSetUrl())
 			.applyTo(configurableApplicationContext.getEnvironment());
+			mongoDBContainer.start();
 		}
 	}
 
 	@AfterAll
 	public static void  cleanUp() {
-		if(mongoDBContainer!=null) {
+		if(mongoDBContainer!=null && mongoDBContainer.isRunning()) {
 			mongoDBContainer.close();
 		}
 		if(mockServerClient!=null) {

diff --git a/src/test/java/fr/insee/queen/api/noAuth/mongo/TestNoAuthMongo.java b/src/test/java/fr/insee/queen/api/noAuth/mongo/TestNoAuthMongo.java
@@ -37,13 +37,14 @@ public void initialize(ConfigurableApplicationContext configurableApplicationCon
 			TestPropertyValues
 			.of("spring.data.mongodb.uri=" + mongoDBContainer.getReplicaSetUrl())
 			.applyTo(configurableApplicationContext.getEnvironment());
+			mongoDBContainer.start();
 		}
 	}
 
 	@AfterAll
 	public static void  cleanUp() {
-		if(mongoDBContainer!=null) {
-			mongoDBContainer.stop();
+		if(mongoDBContainer!=null && mongoDBContainer.isRunning()) {
+			mongoDBContainer.close();
 		}
 	}
 }