Small object Ids refactor and extract external repository use cases

src/main/java/io/pakland/mdas/githubstats/FetchUsersFromTeam.java

@@ -0,0 +1,20 @@
+package io.pakland.mdas.githubstats;
+
+import io.pakland.mdas.githubstats.application.dto.UserDTO;
+import io.pakland.mdas.githubstats.application.exceptions.HttpException;
+import io.pakland.mdas.githubstats.domain.repository.UserExternalRepository;
+
+import java.util.List;
+
+public class FetchUsersFromTeam {
+    private UserExternalRepository userExternalRepository;
+
+
+    public FetchUsersFromTeam(UserExternalRepository userExternalRepository) {
+        this.userExternalRepository = userExternalRepository;
+    }
+
+     public List<UserDTO> execute(Integer organizationId, Integer teamId) throws HttpException {
+        return this.userExternalRepository.fetchUsersFromTeam(organizationId, teamId);
+     }
+}

src/main/java/io/pakland/mdas/githubstats/application/FetchAvailableOrganizations.java

@@ -8,13 +8,13 @@
 
 public class FetchAvailableOrganizations {
 
-    private OrganizationExternalRepository organizationRESTRepository;
+    private final OrganizationExternalRepository organizationRESTRepository;
 
     public FetchAvailableOrganizations(OrganizationExternalRepository organizationRESTRepository) {
         this.organizationRESTRepository = organizationRESTRepository;
     }
 
-    public List<OrganizationDTO> fetch() throws HttpException {
+    public List<OrganizationDTO> execute() throws HttpException {
         return organizationRESTRepository.fetchAvailableOrganizations();
     }
 }

src/main/java/io/pakland/mdas/githubstats/application/FetchRepositoriesFromTeam.java

@@ -0,0 +1,20 @@
+package io.pakland.mdas.githubstats.application;
+
+import io.pakland.mdas.githubstats.application.dto.RepositoryDTO;
+import io.pakland.mdas.githubstats.application.exceptions.HttpException;
+import io.pakland.mdas.githubstats.domain.repository.RepositoryExternalRepository;
+
+import java.util.List;
+
+public class FetchRepositoriesFromTeam {
+
+    private final RepositoryExternalRepository repositoryExternalRepository;
+
+    public FetchRepositoriesFromTeam(RepositoryExternalRepository repositoryExternalRepository) {
+        this.repositoryExternalRepository = repositoryExternalRepository;
+    }
+
+    public List<RepositoryDTO> execute(Integer organizationId, Integer teamId) throws HttpException {
+        return this.repositoryExternalRepository.fetchTeamRepositories(organizationId, teamId);
+    }
+}

src/main/java/io/pakland/mdas/githubstats/application/FetchTeamsFromOrganization.java

@@ -7,13 +7,13 @@
 import java.util.List;
 
 public class FetchTeamsFromOrganization {
-    private TeamExternalRepository teamRESTRepository;
+    private final TeamExternalRepository teamRESTRepository;
 
     public FetchTeamsFromOrganization(TeamExternalRepository teamRESTRepository) {
         this.teamRESTRepository = teamRESTRepository;
     }
 
-    public List<TeamDTO> execute(String organizationName) throws HttpException {
-        return teamRESTRepository.fetchTeamsFromOrganization(organizationName);
+    public List<TeamDTO> execute(Integer organizationId) throws HttpException {
+        return teamRESTRepository.fetchTeamsFromOrganization(organizationId);
     }
 }

src/main/java/io/pakland/mdas/githubstats/application/GetOrganizationFromId.java

@@ -20,7 +20,7 @@ public GetOrganizationFromId(OrganizationRepository organizationRepository) {
 
     // For tests sake, we return boolean to know if the code works properly
     @Transactional(readOnly = true)
-    public boolean execute(Long id) throws OrganizationNotFound {
+    public boolean execute(Integer id) throws OrganizationNotFound {
         Optional<Organization> org = organizationRepository.findById(id);
         if (org.isPresent()) {
             return true;

src/main/java/io/pakland/mdas/githubstats/application/GetOrganizationFromTeamName.java

@@ -17,7 +17,7 @@ public GetOrganizationFromTeamName(TeamRepository teamRepo) {
     }
 
     public Organization execute(String teamName) throws TeamNotFound {
-        Optional<Team> maybeTeam = teamRepository.findTeamByName(teamName);
+        Optional<Team> maybeTeam = teamRepository.findTeamBySlug(teamName);
         if (maybeTeam.isEmpty()) {
             throw new TeamNotFound(teamName);
         }

src/main/java/io/pakland/mdas/githubstats/application/exceptions/OrganizationNotFound.java

@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.application.exceptions;
 
 public class OrganizationNotFound extends Exception {
-    public OrganizationNotFound(Long id) {
+    public OrganizationNotFound(Integer id) {
         super("Organization with id: " + id + " not found");
     }
 }

src/main/java/io/pakland/mdas/githubstats/application/mappers/RepositoryMapper.java

@@ -5,6 +5,6 @@
 
 public class RepositoryMapper {
   public static Repository dtoToEntity(RepositoryDTO dto) {
-    return Repository.builder().id(dto.getId().longValue()).name(dto.getName()).build();
+    return Repository.builder().id(dto.getId()).name(dto.getName()).build();
   }
 }

src/main/java/io/pakland/mdas/githubstats/application/mappers/TeamMapper.java

@@ -5,6 +5,6 @@
 
 public final class TeamMapper {
     public static Team dtoToEntity(TeamDTO teamDTO) {
-        return Team.builder().id(teamDTO.getId().longValue()).name(teamDTO.getName()).slug(teamDTO.getSlug()).build();
+        return Team.builder().id(teamDTO.getId()).slug(teamDTO.getSlug()).build();
     }
 }

src/main/java/io/pakland/mdas/githubstats/application/mappers/UserMapper.java

@@ -5,6 +5,6 @@
 
 public class UserMapper {
     public static User dtoToEntity(UserDTO dto) {
-        return User.builder().id(dto.getId().longValue()).login(dto.getLogin()).build();
+        return User.builder().id(dto.getId()).login(dto.getLogin()).build();
     }
 }

src/main/java/io/pakland/mdas/githubstats/domain/Comment.java

@@ -16,7 +16,7 @@ public class Comment {
   @Id
   @Column(updatable = false, nullable = false)
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
+  private Integer id;
 
   @ManyToOne(fetch = FetchType.LAZY)
   private UserReview userReview;

src/main/java/io/pakland/mdas/githubstats/domain/Commit.java

@@ -17,7 +17,7 @@ public class Commit {
     @Id
     @Column(updatable = false, nullable = false)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Integer id;
 
     @ManyToOne(fetch = FetchType.LAZY)
     private User user;

src/main/java/io/pakland/mdas/githubstats/domain/HistoricQueries.java

@@ -14,7 +14,7 @@ public class HistoricQueries {
     @Id
     @Column(updatable = false, nullable = false)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Integer id;
 
     @ManyToOne(fetch = FetchType.LAZY)
     private Team team;

src/main/java/io/pakland/mdas/githubstats/domain/Organization.java

@@ -19,7 +19,7 @@ public class Organization {
   @Id
   @Column(updatable = false, nullable = false)
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
+  private Integer id;
 
   private String name;
 

src/main/java/io/pakland/mdas/githubstats/domain/PullRequest.java

@@ -19,7 +19,7 @@ public class PullRequest {
   @Id
   @Column(updatable = false, nullable = false)
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
+  private Integer id;
 
   @OneToMany(
     mappedBy = "pullRequest",

src/main/java/io/pakland/mdas/githubstats/domain/Repository.java

@@ -23,7 +23,7 @@ public class Repository {
   @Id
   @Column(updatable = false, nullable = false)
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
+  private Integer id;
 
   private String name;
 

src/main/java/io/pakland/mdas/githubstats/domain/Team.java

@@ -20,16 +20,13 @@ public class Team {
   @Id
   @Column(updatable = false, nullable = false)
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
+  private Integer id;
 
   private String slug;
 
   @Column(name = "member_url")
   private String memberUrl;
 
-  @Column
-  private String name;
-
   @ManyToOne(fetch = FetchType.LAZY)
   private Organization organization;
 
@@ -54,12 +51,12 @@ public class Team {
   )
   private List<HistoricQueries> queries = new ArrayList<>();
 
-  public void setName(String name) {
-    this.name = name;
+  public void setSlug(String slug) {
+    this.slug = slug;
   }
 
-  public String getName() {
-    return this.name;
+  public String getSlug() {
+    return this.slug;
   }
 
   public void addUser(User user) {

src/main/java/io/pakland/mdas/githubstats/domain/User.java

@@ -23,7 +23,7 @@ public class User {
   @Id
   @Column(updatable = false, nullable = false)
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
+  private Integer id;
 
   private String login;
 

src/main/java/io/pakland/mdas/githubstats/domain/UserReview.java

@@ -19,7 +19,7 @@ public class UserReview {
   @Id
   @Column(updatable = false, nullable = false)
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
+  private Integer id;
 
   @ManyToOne(fetch = FetchType.LAZY)
   private User user;

src/main/java/io/pakland/mdas/githubstats/domain/repository/CommentRepository.java

@@ -9,5 +9,5 @@
  */
 
 @Repository
-public interface CommentRepository extends JpaRepository<Comment,Long> {
+public interface CommentRepository extends JpaRepository<Comment,Integer> {
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/CommitRepository.java

@@ -9,5 +9,5 @@
  */
 
 @Repository
-public interface CommitRepository extends JpaRepository<Commit,Long> {
+public interface CommitRepository extends JpaRepository<Commit,Integer> {
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/HistoricQueriesRepository.java

@@ -3,5 +3,5 @@
 import io.pakland.mdas.githubstats.domain.HistoricQueries;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface HistoricQueriesRepository extends JpaRepository<HistoricQueries, Long> {
+public interface HistoricQueriesRepository extends JpaRepository<HistoricQueries, Integer> {
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/OrganizationRepository.java

@@ -9,5 +9,5 @@
  */
 
 @Repository
-public interface OrganizationRepository extends JpaRepository<Organization,Long> {
+public interface OrganizationRepository extends JpaRepository<Organization,Integer> {
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/PullRequestsRepository.java

@@ -10,5 +10,5 @@
 
 
 @Repository
-public interface PullRequestsRepository extends JpaRepository<PullRequest,Long> {
+public interface PullRequestsRepository extends JpaRepository<PullRequest,Integer> {
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/RepositoryExternalRepository.java

@@ -6,5 +6,5 @@
 import java.util.List;
 
 public interface RepositoryExternalRepository {
-    List<RepositoryDTO> fetchTeamRepositories(Integer orgId, Integer teamId) throws HttpException;
+    List<RepositoryDTO> fetchTeamRepositories(Integer organizationId, Integer teamId) throws HttpException;
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/RepositoryRepository.java

@@ -3,10 +3,6 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-/**
- * Add jdoc about the rep
- */
-
 @Repository
-public interface RepositoryRepository extends JpaRepository<io.pakland.mdas.githubstats.domain.Repository,Long> {
+public interface RepositoryRepository extends JpaRepository<io.pakland.mdas.githubstats.domain.Repository, Integer> {
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/TeamExternalRepository.java

@@ -7,6 +7,5 @@
 import java.util.List;
 
 public interface TeamExternalRepository {
-    List<TeamDTO> fetchTeamsFromOrganization(String organizationName) throws HttpException;
-    List<UserDTO> fetchMembersOfTeam(String orgName, String teamSlug) throws HttpException;
+    List<TeamDTO> fetchTeamsFromOrganization(Integer organizationId) throws HttpException;
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/TeamRepository.java

@@ -11,6 +11,6 @@
  */
 
 @Repository
-public interface TeamRepository extends JpaRepository<Team,Long> {
-    Optional<Team> findTeamByName(String name);
+public interface TeamRepository extends JpaRepository<Team,Integer> {
+    Optional<Team> findTeamBySlug(String name);
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/UserExternalRepository.java

@@ -6,5 +6,5 @@
 import java.util.List;
 
 public interface UserExternalRepository {
-    List<UserDTO> fetchUsersFromTeam(String organizationName, String teamSlug) throws HttpException;
+    List<UserDTO> fetchUsersFromTeam(Integer organizationId, Integer teamId) throws HttpException;
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/UserRepository.java

@@ -9,6 +9,6 @@
  */
 
 @Repository
-public interface UserRepository extends JpaRepository<User,Long> {
+public interface UserRepository extends JpaRepository<User,Integer> {
 
 }

src/main/java/io/pakland/mdas/githubstats/domain/repository/UserReviewRepository.java

@@ -9,5 +9,5 @@
  */
 
 @Repository
-public interface UserReviewRepository extends JpaRepository<UserReview,Long> {
+public interface UserReviewRepository extends JpaRepository<UserReview,Integer> {
 }

src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/TeamGitHubRepository.java

@@ -20,10 +20,10 @@ public TeamGitHubRepository(WebClientConfiguration webClientConfiguration) {
     }
 
     @Override
-    public List<TeamDTO> fetchTeamsFromOrganization(String organizationName) throws HttpException {
+    public List<TeamDTO> fetchTeamsFromOrganization(Integer organizationId) throws HttpException {
         try {
             return this.webClientConfiguration.getWebClient().get()
-                    .uri(String.format("/orgs/%s/teams", organizationName))
+                    .uri(String.format("/orgs/%s/teams", organizationId))
                     .retrieve()
                     .bodyToFlux(TeamDTO.class)
                     .collectList()
@@ -33,19 +33,4 @@ public List<TeamDTO> fetchTeamsFromOrganization(String organizationName) throws
             throw new HttpException(ex.getRawStatusCode(), ex.getMessage());
         }
     }
-
-    @Override
-    public List<UserDTO> fetchMembersOfTeam(String orgName, String teamSlug) throws HttpException {
-        try {
-            return this.webClientConfiguration.getWebClient().get()
-                .uri(String.format("/orgs/%s/teams/%s/members", orgName, teamSlug))
-                .retrieve()
-                .bodyToFlux(UserDTO.class)
-                .collectList()
-                .block();
-        }  catch (WebClientResponseException ex) {
-            logger.error(ex.toString());
-            throw new HttpException(ex.getRawStatusCode(), ex.getMessage());
-        }
-    }
 }

src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/UserGitHubRepository.java

@@ -21,10 +21,10 @@ public UserGitHubRepository(WebClientConfiguration webClientConfiguration) {
     }
 
     @Override
-    public List<UserDTO> fetchUsersFromTeam(String organizationName, String teamSlug) throws HttpException {
+    public List<UserDTO> fetchUsersFromTeam(Integer organizationId, Integer teamId) throws HttpException {
         try {
             return this.webClientConfiguration.getWebClient().get()
-                    .uri(String.format("/orgs/%s/teams/%s/members", organizationName, teamSlug))
+                    .uri(String.format("/orgs/%s/teams/%s/members", organizationId, teamId))
                     .retrieve()
                     .bodyToFlux(UserDTO.class)
                     .collectList()