Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[backend/frontend] Fix removing a team from the context doesn't work
- Loading branch information
1 parent
c771b61
commit 4ae7d03
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,81 +1,138 @@ | ||
| package io.openbas.service; | ||
|
|
||
| import io.openbas.database.model.*; | ||
| import io.openbas.database.repository.*; | ||
| import io.openbas.rest.exercise.ExerciseService; | ||
| import io.openbas.rest.inject.service.InjectDuplicateService; | ||
| import io.openbas.utils.fixtures.ExerciseFixture; | ||
| import org.junit.jupiter.api.*; | ||
| import org.mockito.InjectMocks; | ||
| import org.mockito.Mock; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import static io.openbas.database.specification.TeamSpecification.fromExercise; | ||
| import static io.openbas.injectors.email.EmailContract.EMAIL_DEFAULT; | ||
| import static io.openbas.utils.fixtures.ExerciseFixture.getExercise; | ||
| import static io.openbas.utils.fixtures.InjectFixture.getInjectForEmailContract; | ||
| import static io.openbas.utils.fixtures.TeamFixture.getTeam; | ||
| import static io.openbas.utils.fixtures.UserFixture.getUser; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotEquals; | ||
|
|
||
| @SpringBootTest | ||
| @TestInstance(TestInstance.Lifecycle.PER_CLASS) | ||
| class ExerciseServiceTest { | ||
|
|
||
| @Mock | ||
| GrantService grantService; | ||
| @Mock | ||
| InjectService injectService; | ||
| @Mock | ||
| InjectDuplicateService injectDuplicateService; | ||
| @Autowired | ||
| private TeamService teamService; | ||
| @Mock | ||
| VariableService variableService; | ||
|
|
||
| @Autowired | ||
| private ArticleRepository articleRepository; | ||
| @Autowired | ||
| private ExerciseRepository exerciseRepository; | ||
| @Autowired | ||
| private TeamRepository teamRepository; | ||
|
|
||
| @Autowired | ||
| private UserRepository userRepository; | ||
| @Autowired | ||
| private InjectRepository injectRepository; | ||
| @Autowired | ||
| private ExerciseTeamUserRepository exerciseTeamUserRepository; | ||
| @Autowired | ||
| private InjectorContractRepository injectorContractRepository; | ||
|
|
||
| private static String USER_ID; | ||
| private static String TEAM_ID; | ||
| private static String INJECT_ID; | ||
|
|
||
| @InjectMocks | ||
| private ExerciseService exerciseService; | ||
|
|
||
| @BeforeEach | ||
| void setUp() { | ||
| exerciseService = new ExerciseService(grantService, injectService, injectDuplicateService, | ||
| teamService, variableService, articleRepository, exerciseRepository, teamRepository, | ||
| exerciseTeamUserRepository, injectRepository); | ||
| } | ||
|
|
||
| @AfterAll | ||
| public void teardown() { | ||
| this.userRepository.deleteById(USER_ID); | ||
| this.teamRepository.deleteById(TEAM_ID); | ||
| this.injectRepository.deleteById(INJECT_ID); | ||
| } | ||
|
|
||
| @DisplayName("Should create new contextual teams while exercise duplication") | ||
| @Test | ||
| @Transactional(rollbackFor = Exception.class) | ||
| void createNewContextualTeamsWhileExerciseDuplication() { | ||
| // -- PREPARE -- | ||
| List<Team> exerciseTeams = new ArrayList<>(); | ||
| Team contextualTeam = this.teamRepository.save(getTeam(null, "fakeTeamName1", true)); | ||
| exerciseTeams.add(contextualTeam); | ||
| Team noContextualTeam = this.teamRepository.save(getTeam(null, "fakeTeamName2", false)); | ||
| exerciseTeams.add(noContextualTeam); | ||
| Exercise exercise = this.exerciseRepository.save(getExercise(exerciseTeams)); | ||
|
|
||
| // -- EXECUTE -- | ||
| Exercise exerciseDuplicated = exerciseService.getDuplicateExercise(exercise.getId()); | ||
|
|
||
| // -- ASSERT -- | ||
| assertNotEquals(exercise.getId(), exerciseDuplicated.getId()); | ||
| assertEquals(2, exerciseDuplicated.getTeams().size()); | ||
| exerciseDuplicated.getTeams().forEach(team -> { | ||
| if (team.getContextual()) { | ||
| assertNotEquals(contextualTeam.getId(), team.getId()); | ||
| assertEquals(contextualTeam.getName(), team.getName()); | ||
| } else { | ||
| assertEquals(noContextualTeam.getId(), team.getId()); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @DisplayName("Should remove team from exercise") | ||
| @Test | ||
| void testRemoveTeams() { | ||
| // -- PREPARE -- | ||
| User user = getUser(); | ||
| User userSaved = this.userRepository.saveAndFlush(user); | ||
| USER_ID = userSaved.getId(); | ||
| Team team = getTeam(user); | ||
| Team teamSaved = this.teamRepository.saveAndFlush(team); | ||
| TEAM_ID = teamSaved.getId(); | ||
| Exercise exercise = ExerciseFixture.getExercise(); | ||
| exercise.setTeams(List.of(teamSaved)); | ||
| exercise.setFrom(user.getEmail()); | ||
| Exercise exerciseSaved = this.exerciseRepository.saveAndFlush(exercise); | ||
|
|
||
| InjectorContract injectorContract = this.injectorContractRepository.findById(EMAIL_DEFAULT).orElseThrow(); | ||
| Inject injectDefaultEmail = getInjectForEmailContract(injectorContract); | ||
| injectDefaultEmail.setExercise(exerciseSaved); | ||
| injectDefaultEmail.setTeams(List.of(teamSaved)); | ||
| Inject injectDefaultEmailSaved = this.injectRepository.saveAndFlush(injectDefaultEmail); | ||
| INJECT_ID = injectDefaultEmailSaved.getId(); | ||
|
|
||
| // -- EXECUTE -- | ||
| this.exerciseService.removeTeams(exerciseSaved.getId(), List.of(teamSaved.getId())); | ||
|
|
||
| // -- ASSERT -- | ||
| List<Team> teams = this.teamRepository.findAll(fromExercise(exerciseSaved.getId())); | ||
| assertEquals(0, teams.size()); | ||
| Inject injectAssert = this.injectRepository.findById(INJECT_ID).orElseThrow(); | ||
| assertEquals(0, injectAssert.getTeams().size()); | ||
| } | ||
| } |
Oops, something went wrong.