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
11 changes: 11 additions & 0 deletions src/main/java/io/pakland/mdas/githubstats/domain/model/Team.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ public class Team {
@Column(name = "member_url")
private String memberUrl;

@Column
private String name;

@ManyToOne(fetch = FetchType.LAZY)
private Organization organization;

Expand All @@ -50,6 +53,14 @@ public class Team {
)
private List<HistoricQueries> queries = new ArrayList<>();

public void setName(String name) {
this.name = name;
}

public String getName() {
return this.name;
}

public void addUser(User user) {
users.add(user);
user.setTeam(this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import java.util.Optional;

/**
* Add jdoc about the rep
*/

@Repository
public interface TeamRepository extends JpaRepository<Team,Long> {
Optional<Team> findTeamByName(String name);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package io.pakland.mdas.githubstats.domain.service;

import io.pakland.mdas.githubstats.domain.model.Organization;
import io.pakland.mdas.githubstats.domain.model.Team;
import io.pakland.mdas.githubstats.domain.ports.TeamRepository;
import org.springframework.stereotype.Service;

import java.util.Optional;

@Service
public class GetOrganizationFromTeamName {
Comment thread
mikededo marked this conversation as resolved.
private final TeamRepository teamRepository;

public GetOrganizationFromTeamName(TeamRepository teamRepo) {
this.teamRepository = teamRepo;
}

public Organization execute(String teamName) {
Optional<Team> maybeTeam = teamRepository.findTeamByName(teamName);
if (maybeTeam.isEmpty()) {
// TODO: Add exception
return null;
}

return maybeTeam.get().getOrganization();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,21 @@
public class GetOrganizationFromIdTest {
@Test
public void givenValidId_shouldReturnTrue() {
OrganizationRepository orgMock = Mockito.mock(OrganizationRepository.class);
Mockito.when(orgMock.findById(Mockito.anyLong())).thenReturn(Optional.of(new Organization()));
OrganizationRepository organizationMock = Mockito.mock(OrganizationRepository.class);
Mockito.when(organizationMock.findById(Mockito.anyLong())).thenReturn(Optional.of(new Organization()));

GetOrganizationFromId useCase = new GetOrganizationFromId(orgMock);
boolean res = useCase.execute(1L);
GetOrganizationFromId useCase = new GetOrganizationFromId(organizationMock);

assertTrue(res);
assertTrue(useCase.execute(1L));
}

@Test
public void givenInvalidId_shouldReturnFalse() {
OrganizationRepository orgMock = Mockito.mock(OrganizationRepository.class);
Mockito.when(orgMock.findById(Mockito.anyLong())).thenReturn(Optional.empty());
OrganizationRepository organizationMock = Mockito.mock(OrganizationRepository.class);
Mockito.when(organizationMock.findById(Mockito.anyLong())).thenReturn(Optional.empty());

GetOrganizationFromId useCase = new GetOrganizationFromId(orgMock);
boolean res = useCase.execute(1L);
GetOrganizationFromId useCase = new GetOrganizationFromId(organizationMock);

assertFalse(res);
assertFalse(useCase.execute(1L));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package io.pakland.mdas.githubstats.domain.service;

import io.pakland.mdas.githubstats.domain.model.Organization;
import io.pakland.mdas.githubstats.domain.model.Team;
import io.pakland.mdas.githubstats.domain.ports.TeamRepository;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import java.util.Optional;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;

public class GetOrganizationFromTeamNameTest {
@Test
public void givenTeamName_shouldReturnOrganizationFound() {
Organization organization = new Organization();
organization.setId(1L);
Team team = new Team();
team.setOrganization(organization);

TeamRepository teamRepoMock = Mockito.mock(TeamRepository.class);
Mockito.when(teamRepoMock.findTeamByName(Mockito.anyString())).thenReturn(Optional.of(team));

GetOrganizationFromTeamName useCase = new GetOrganizationFromTeamName(teamRepoMock);
Organization result = useCase.execute("some team");

Mockito.verify(teamRepoMock, Mockito.times(1)).findTeamByName("some team");
assertEquals(result.getId(), organization.getId());
}

// Change for expecting an exception
@Test
public void givenTeamName_shouldReturnNull_ifTeamNotFound() {
TeamRepository teamRepoMock = Mockito.mock(TeamRepository.class);
Mockito.when(teamRepoMock.findTeamByName(Mockito.anyString())).thenReturn(Optional.empty());

GetOrganizationFromTeamName useCase = new GetOrganizationFromTeamName(teamRepoMock);
Organization result = useCase.execute("some team");

Mockito.verify(teamRepoMock, Mockito.times(1)).findTeamByName("some team");
assertNull(result);
}
}