feat: add additions, deletions and date to PullRequest entity

Author: Adrià Manero

src/main/java/io/pakland/mdas/githubstats/application/dto/PullRequestDTO.java

@@ -2,8 +2,18 @@
 
 import io.pakland.mdas.githubstats.domain.enums.PullRequestState;
 
+import java.time.Instant;
+
 public interface PullRequestDTO {
     Integer getId();
+
     Integer getNumber();
+
     PullRequestState getState();
+
+    Instant getClosedAt();
+
+    Integer getAdditions();
+
+    Integer getDeletions();
 }

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

@@ -1,9 +1,9 @@
 package io.pakland.mdas.githubstats.domain.entity;
 
+import io.pakland.mdas.githubstats.domain.enums.PullRequestState;
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
-
-import io.pakland.mdas.githubstats.domain.enums.PullRequestState;
 import lombok.*;
 
 @Data
@@ -18,6 +18,12 @@ public class PullRequest {
 
     private PullRequestState state;
 
+    private Instant closedAt;
+
+    private Integer additions;
+
+    private Integer deletions;
+
     @ToString.Exclude
     private Repository repository;
 
@@ -37,26 +43,4 @@ public void addCommits(Collection<Commit> commits) {
             this.commits.add(commit);
         });
     }
-    public List<Commit> getCommitsByUser(User user) {
-        return commits
-            .stream()
-            .filter(commit -> commit.getUser().equals(user))
-            .collect(Collectors.toList());
-    }
-
-    public boolean isClosed() {
-        return state.equals(PullRequestState.CLOSED);
-    }
-
-    public boolean isCreatedByUser(User user) {
-        return this.user.equals(user);
-    }
-
-    public List<UserReview> getReviewsFromUser(User user) {
-        return userReviews
-            .stream()
-            .filter(x -> x.getUser().equals(user))
-            .collect(Collectors.toList());
-    }
-
 }

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

@@ -1,11 +1,10 @@
 package io.pakland.mdas.githubstats.domain.entity;
 
-import javax.persistence.*;
-
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,24 +21,12 @@ public class UserReview {
 
   private List<Comment> comments = new ArrayList<>();
 
-  public int sumCommentLength() {
-    return comments.stream().mapToInt(Comment::getLength).sum();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (!(o instanceof UserReview )) return false;
-    return id != null && id.equals(((UserReview) o).getId());
-  }
-
-  @Override
-  public int hashCode() {
-    return getClass().hashCode();
-  }
-
-  public boolean isReviewFromTeam(Team team) {
-    return pullRequest.getRepository().getTeam().equals(team);
-  }
+    public int sumCommentLength() {
+        return comments.stream().mapToInt(Comment::getLength).sum();
+    }
+
+    public boolean isReviewFromTeam(Team team) {
+        return pullRequest.getRepository().getTeam().equals(team);
+    }
 
 }

src/main/java/io/pakland/mdas/githubstats/infrastructure/github/model/GitHubPullRequestDTO.java

@@ -5,6 +5,8 @@
 import io.pakland.mdas.githubstats.application.dto.PullRequestStateDTO;
 import io.pakland.mdas.githubstats.domain.enums.PullRequestState;
 
+import java.time.Instant;
+
 public class GitHubPullRequestDTO implements PullRequestDTO {
 
     @JsonProperty("id")
@@ -16,6 +18,15 @@ public class GitHubPullRequestDTO implements PullRequestDTO {
     @JsonProperty("state")
     private PullRequestStateDTO state;
 
+    @JsonProperty("closed_at")
+    private Instant closedAt;
+
+    @JsonProperty("additions")
+    private Integer additions;
+
+    @JsonProperty("deletions")
+    private Integer deletions;
+
     @Override
     public Integer getId() {
         return this.id;
@@ -31,4 +42,18 @@ public PullRequestState getState() {
         return this.state.getValue();
     }
 
+    @Override
+    public Instant getClosedAt() {
+        return this.closedAt;
+    }
+
+    @Override
+    public Integer getAdditions() {
+        return this.additions;
+    }
+
+    @Override
+    public Integer getDeletions() {
+        return this.deletions;
+    }
 }

src/test/java/io/pakland/mdas/githubstats/application/external/FetchCommitsFromPullRequestTest.java

@@ -30,19 +30,19 @@ public void init() {
     @Test
     public void whenValidRepository_shouldReturnTheListOfCommits()
         throws HttpException {
-        Commit commit = new Commit();
-        commit.setSha("a0b3ed9d5f1356575f2b16ab8ef5d93c5ce77575");
-        commit.setDate(new Date());
-        Commit commit1 = new Commit();
-        commit1.setSha("f16b593d35d6e66dc7e1c8727d4eaa829d3973ed");
-        commit1.setDate(new Date());
+        Commit commitOne = Commit.builder().sha(
+            "a0b3ed9d5f1356575f2b16ab8ef5d93c5ce77575"
+        ).date(new Date()).additions(250).deletions(125).build();
+        Commit commitTwo = Commit.builder().sha(
+            "f16b593d35d6e66dc7e1c8727d4eaa829d3973ed"
+        ).date(new Date()).additions(250).deletions(125).build();
 
         CommitExternalRepository repository = Mockito.mock(
             CommitExternalRepository.class);
 
         Mockito.when(repository.fetchCommitsFromPullRequest(Mockito.any(
                 FetchCommitsFromPullRequestRequest.class)))
-            .thenReturn(new ArrayList<>(Arrays.asList(commit, commit1)))
+            .thenReturn(new ArrayList<>(Arrays.asList(commitOne, commitTwo)))
             .thenReturn(new ArrayList<>());
 
         List<Commit> response = new FetchCommitsFromPullRequest(repository).execute(
@@ -56,8 +56,8 @@ public void whenValidRepository_shouldReturnTheListOfCommits()
         assertEquals(2, captor.getValue().getPage());
         assertEquals(100, captor.getValue().getPerPage());
         assertEquals(2, response.size());
-        assertEquals(commit.getSha(), response.get(0).getSha());
-        assertEquals(commit1.getSha(), response.get(1).getSha());
+        assertEquals(commitOne.getSha(), response.get(0).getSha());
+        assertEquals(commitTwo.getSha(), response.get(1).getSha());
     }
 
     @Test