Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/main/java/fr/insee/genesis/configuration/MongoConfig.java
Original file line number Diff line number Diff line change
@@ -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);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
15 changes: 15 additions & 0 deletions src/test/java/fr/insee/genesis/TransactionManagerTestConfig.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -35,6 +37,7 @@
"logging.level.=DEBUG"
})
@EnableAutoConfiguration(exclude = {MongoAutoConfiguration.class, DataMongoAutoConfiguration.class})
@Import(TransactionManagerTestConfig.class)
public abstract class IntegrationTestAbstract {
@Autowired
protected MockMvc mockMvc;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
Loading