Fix: Ignore own Issue Comments for Score Calculation (#207)

ls1intum · Dec 7, 2024 · 88bd599 · 88bd599
1 parent 566ae85
commit 88bd599
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...cation-server/src/main/java/de/tum/in/www1/hephaestus/leaderboard/LeaderboardService.java b/...cation-server/src/main/java/de/tum/in/www1/hephaestus/leaderboard/LeaderboardService.java
@@ -90,7 +90,7 @@ public List<LeaderboardEntryDTO> createLeaderboard(
                 Collectors.toMap(Map.Entry::getKey, entry ->
                     calculateTotalScore(
                         entry.getValue(),
-                        issueCommentsByUserId.getOrDefault(entry.getKey(), List.of()).size()
+                        issueCommentsByUserId.getOrDefault(entry.getKey(), List.of())
                     )
                 )
             );
@@ -117,6 +117,7 @@ public List<LeaderboardEntryDTO> createLeaderboard(
                 List<PullRequestInfoDTO> reviewedPullRequests = userReviews
                     .stream()
                     .map(review -> review.getPullRequest())
+                    .filter(pullRequest -> pullRequest.getAuthor().getId() != userId)
                     // First collect to a map keyed by PR ID to ensure uniqueness
                     .collect(
                         Collectors.groupingBy(
@@ -179,7 +180,8 @@ public List<LeaderboardEntryDTO> createLeaderboard(
         return leaderboard;
     }
 
-    private int calculateTotalScore(List<PullRequestReview> reviews, int numberOfIssueComments) {
+    private int calculateTotalScore(List<PullRequestReview> reviews, List<IssueComment> issueComments) {
+        int numberOfIssueComments = issueComments.stream().filter(issueComment -> issueComment.getIssue().getAuthor().getId() != issueComment.getAuthor().getId()).collect(Collectors.toList()).size();
         // Could contain multiple reviews for the same pull request
         Map<Long, List<PullRequestReview>> reviewsByPullRequestId = reviews
             .stream()

diff --git a/...pplication-server/src/main/java/de/tum/in/www1/hephaestus/leaderboard/ScoringService.java b/...pplication-server/src/main/java/de/tum/in/www1/hephaestus/leaderboard/ScoringService.java
@@ -71,6 +71,9 @@ public double calculateReviewScore(IssueComment issueComment) {
             }
             pullRequest = optionalPR.get();
         }
+        if (pullRequest.getAuthor().getId() == issueComment.getAuthor().getId()) {
+            return 0;
+        }
 
         int complexityScore = calculateComplexityScore(pullRequest);