Merge pull request #511 from InseeFr/bug/mongo-transactional-new

 Bug: Implement Transactional on save all responses

Author: loichenninger

src/main/java/fr/insee/genesis/configuration/MongoConfig.java

@@ -0,0 +1,19 @@
+package fr.insee.genesis.configuration;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.MongoTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+
+@Configuration
+public class MongoConfig {
+
+    @Bean
+    @ConditionalOnMissingBean(PlatformTransactionManager.class)
+    MongoTransactionManager transactionManager(MongoDatabaseFactory dbFactory) {
+        return new MongoTransactionManager(dbFactory);
+    }
+
+}

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

@@ -19,6 +19,7 @@
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 import tools.jackson.databind.json.JsonMapper;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -45,6 +46,7 @@ public SurveyUnitMongoAdapter(SurveyUnitMongoDBRepository mongoRepository, Mongo
 	}
 
 	@Override
+	@Transactional
 	public void saveAll(List<SurveyUnitModel> surveyUnitModels) {
 		List<SurveyUnitDocument> suList = SurveyUnitDocumentMapper.INSTANCE.listModelToListDocument(surveyUnitModels);
 		mongoRepository.insert(suList);

src/test/java/fr/insee/genesis/TransactionManagerTestConfig.java

@@ -0,0 +1,15 @@
+package fr.insee.genesis;
+
+import org.mockito.Mockito;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.transaction.PlatformTransactionManager;
+
+@TestConfiguration
+public class TransactionManagerTestConfig {
+
+    @Bean
+    PlatformTransactionManager transactionManager() {
+        return Mockito.mock(PlatformTransactionManager.class);
+    }
+}

src/test/java/fr/insee/genesis/controller/IntegrationTestAbstract.java

@@ -1,5 +1,6 @@
 package fr.insee.genesis.controller;
 
+import fr.insee.genesis.TransactionManagerTestConfig;
 import fr.insee.genesis.controller.utils.ControllerUtils;
 import fr.insee.genesis.domain.ports.spi.SurveyUnitQualityToolPort;
 import fr.insee.genesis.infrastructure.repository.ContextualExternalVariableMongoDBRepository;
@@ -18,6 +19,7 @@
 import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
@@ -35,6 +37,7 @@
         "logging.level.=DEBUG"
 })
 @EnableAutoConfiguration(exclude = {MongoAutoConfiguration.class, DataMongoAutoConfiguration.class})
+@Import(TransactionManagerTestConfig.class)
 public abstract class IntegrationTestAbstract {
     @Autowired
     protected MockMvc mockMvc;

src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerTest.java

@@ -1,5 +1,6 @@
 package fr.insee.genesis.controller.rest.responses;
 
+import fr.insee.genesis.TransactionManagerTestConfig;
 import fr.insee.genesis.configuration.auth.security.DefaultSecurityConfig;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.DataProcessResult;
@@ -59,7 +60,7 @@
 @TestPropertySource(properties = {
         "fr.insee.genesis.authentication=NONE"
 })
-@Import({DefaultSecurityConfig.class})
+@Import({DefaultSecurityConfig.class, TransactionManagerTestConfig.class})
 @ActiveProfiles("test")
 @AutoConfigureMockMvc
 @EnableAutoConfiguration(exclude = {MongoAutoConfiguration.class, DataMongoAutoConfiguration.class})

src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java

@@ -2,6 +2,7 @@
 
 import fr.insee.bpm.metadata.model.MetadataModel;
 import fr.insee.bpm.metadata.model.VariablesMap;
+import fr.insee.genesis.TransactionManagerTestConfig;
 import fr.insee.genesis.configuration.auth.security.DefaultSecurityConfig;
 import fr.insee.genesis.controller.dto.SurveyUnitDto;
 import fr.insee.genesis.controller.dto.SurveyUnitSimplifiedDto;
@@ -62,7 +63,7 @@
 @TestPropertySource(properties = {
         "fr.insee.genesis.authentication=NONE"
 })
-@Import({DefaultSecurityConfig.class})
+@Import({DefaultSecurityConfig.class, TransactionManagerTestConfig.class})
 @ActiveProfiles("test")
 @AutoConfigureMockMvc
 @EnableAutoConfiguration(exclude = {MongoAutoConfiguration.class, DataMongoAutoConfiguration.class})

src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitMongoAdapterTest.java

@@ -18,7 +18,9 @@
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.lang.reflect.Method;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -90,6 +92,15 @@ void saveAll_shouldMapAllModels() {
 			verify(mongoRepository).insert(captor.capture());
 			assertThat(captor.getValue()).hasSize(3);
 		}
+
+		@Test
+		@DisplayName("saveAll() should be annotated with @Transactional")
+		void saveAll_shouldBeTransactional() throws NoSuchMethodException {
+			Method method = SurveyUnitMongoAdapter.class.getMethod("saveAll", List.class);
+			assertThat(method.isAnnotationPresent(Transactional.class)).isTrue();
+		}
+
+
 	}
 
 	@Nested