[backend] fix contextual team while duplicating scenario #1303 #1343
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package io.openbas.service; | ||
|
|
||
| import io.openbas.database.model.*; | ||
| import io.openbas.utils.CopyObjectListUtils; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| @Service | ||
| public class TeamService { | ||
|
|
||
| public Team copyContextualTeam(Team teamToCopy) { | ||
| Team newTeam = new Team(); | ||
| newTeam.setName(teamToCopy.getName()); | ||
| newTeam.setDescription(teamToCopy.getDescription()); | ||
| newTeam.setTags(CopyObjectListUtils.copy(teamToCopy.getTags(), Tag.class)); | ||
| newTeam.setOrganization(teamToCopy.getOrganization()); | ||
| newTeam.setUsers(CopyObjectListUtils.copy(teamToCopy.getUsers(), User.class)); | ||
| newTeam.setContextual(teamToCopy.getContextual()); | ||
| return newTeam; | ||
| } | ||
|
|
||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package io.openbas.utils; | ||
|
|
||
| import io.openbas.database.model.Base; | ||
| import jakarta.validation.constraints.NotNull; | ||
| import org.apache.commons.beanutils.BeanUtils; | ||
|
|
||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.util.*; | ||
|
|
||
| public class CopyObjectListUtils { | ||
|
|
||
| public static <T extends Base> List<T> copy(@NotNull final List<T> origins, Class<T> clazz) { | ||
| List<T> destinations = new ArrayList<>(); | ||
| return copyCollection(origins, clazz, destinations); | ||
| } | ||
|
|
||
| public static <T extends Base> Set<T> copy(@NotNull final Set<T> origins, Class<T> clazz) { | ||
| Set<T> destinations = new HashSet<>(); | ||
| return copyCollection(origins, clazz, destinations); | ||
| } | ||
|
|
||
| public static <T extends Base, C extends Collection<T>> C copyCollection(@NotNull final C origins, Class<T> clazz, C destinations) { | ||
| origins.forEach(origin -> { | ||
| try { | ||
| T destination = clazz.getDeclaredConstructor().newInstance(); | ||
| BeanUtils.copyProperties(destination, origin); | ||
| destinations.add(destination); | ||
| } catch (IllegalAccessException | InvocationTargetException | InstantiationException | | ||
| NoSuchMethodException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| }); | ||
| return destinations; | ||
| } | ||
|
|
||
| } | ||
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 |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| package io.openbas.service; | ||
|
|
||
| import io.openbas.database.model.*; | ||
| import io.openbas.database.repository.*; | ||
| import io.openbas.rest.inject.service.InjectDuplicateService; | ||
| import jakarta.transaction.Transactional; | ||
| import jakarta.validation.constraints.NotBlank; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.DisplayName; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.mockito.InjectMocks; | ||
| import org.mockito.Mock; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotEquals; | ||
|
|
||
| @SpringBootTest | ||
| public class ScenarioServiceTest { | ||
|
|
||
| @Autowired | ||
| ScenarioRepository scenarioRepository; | ||
| @Autowired | ||
| private TeamRepository teamRepository; | ||
| @Autowired | ||
| private UserRepository userRepository; | ||
| @Autowired | ||
| private DocumentRepository documentRepository; | ||
| @Autowired | ||
| private ScenarioTeamUserRepository scenarioTeamUserRepository; | ||
| @Autowired | ||
| private ArticleRepository articleRepository; | ||
|
|
||
| @Autowired | ||
| InjectRepository injectRepository; | ||
|
|
||
| @Mock | ||
| GrantService grantService; | ||
| @Mock | ||
| VariableService variableService; | ||
| @Mock | ||
| ChallengeService challengeService; | ||
| @Autowired | ||
| private TeamService teamService; | ||
| @Mock | ||
| FileService fileService; | ||
| @Autowired | ||
| private InjectDuplicateService injectDuplicateService; | ||
|
|
||
|
|
||
| @InjectMocks | ||
| private ScenarioService scenarioService; | ||
|
|
||
| @BeforeEach | ||
| void setUp() { | ||
| scenarioService = new ScenarioService(scenarioRepository, teamRepository, userRepository, documentRepository, | ||
| scenarioTeamUserRepository, articleRepository, grantService, variableService, challengeService, | ||
| teamService, fileService, injectDuplicateService | ||
| ); | ||
| } | ||
|
|
||
| @DisplayName("Should create new contextual teams during scenario duplication") | ||
| @Test | ||
| @Transactional(rollbackOn = Exception.class) | ||
| void createNewContextualTeamsDuringScenarioDuplication(){ | ||
| // -- PREPARE -- | ||
| List<Team> scenarioTeams = new ArrayList<>();; | ||
| Team contextualTeam = createTeam("fakeTeamName1", true); | ||
| scenarioTeams.add(contextualTeam); | ||
| Team noContextualTeam = createTeam("fakeTeamName2",false); | ||
| scenarioTeams.add(noContextualTeam); | ||
|
|
||
| Scenario scenario = createScenario(scenarioTeams); | ||
|
|
||
| // -- EXECUTE -- | ||
| Scenario scenarioDuplicated = scenarioService.getDuplicateScenario(scenario.getId()); | ||
|
|
||
| // -- ASSERT -- | ||
| assertNotEquals(scenario.getId(), scenarioDuplicated.getId()); | ||
| assertEquals(scenario.getFrom(), scenarioDuplicated.getFrom()); | ||
| assertEquals(2, scenarioDuplicated.getTeams().size()); | ||
| scenarioDuplicated.getTeams().forEach(team -> { | ||
| if (team.getContextual()){ | ||
| assertNotEquals(contextualTeam.getId(), team.getId()); | ||
| assertEquals(contextualTeam.getName(), team.getName()); | ||
| } else { | ||
| assertEquals(noContextualTeam.getId(), team.getId()); | ||
| } | ||
| }); | ||
| assertEquals(1, scenarioDuplicated.getInjects().size()); | ||
| assertEquals(2, scenario.getInjects().get(0).getTeams().size()); | ||
| scenarioDuplicated.getInjects().get(0).getTeams().forEach(injectTeam -> { | ||
| if (injectTeam.getContextual()){ | ||
| assertNotEquals(contextualTeam.getId(), injectTeam.getId()); | ||
| assertEquals( | ||
| scenarioDuplicated.getTeams().stream().filter(team -> team.getContextual().equals(true)).findFirst().orElse(new Team()).getId(), | ||
| injectTeam.getId() | ||
| ); | ||
| } else { | ||
| assertEquals(noContextualTeam.getId(), injectTeam.getId()); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private Team createTeam(@NotBlank String name, Boolean isContextualTeam){ | ||
|
There was a problem hiding this comment. You can add this in TeamFixture There was a problem hiding this comment. yes my bad i saw the utils/fixtures folder only this morning i will correct that |
||
| Team team = new Team(); | ||
| team.setName(name); | ||
| team.setContextual(isContextualTeam); | ||
| return this.teamRepository.save(team); | ||
| } | ||
|
|
||
| private Scenario createScenario(List<Team> scenarioTeams){ | ||
| Scenario scenario = new Scenario(); | ||
| scenario.setName("Scenario name"); | ||
| scenario.setFrom("[email protected]"); | ||
| scenario.setTeams(scenarioTeams); | ||
| Inject inject = new Inject(); | ||
| inject.setTeams(scenarioTeams); | ||
| Set<Inject> injects = new HashSet<>(); | ||
| injects.add(this.injectRepository.save(inject)); | ||
| scenario.setInjects(injects); | ||
| return this.scenarioRepository.save(scenario); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice !