Add Number of Reviews

ls1intum · Sep 25, 2024 · 02e00b8 · 02e00b8
1 parent 92c07fb
commit 02e00b8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/server/application-server/openapi.yaml b/server/application-server/openapi.yaml
@@ -468,6 +468,9 @@ components:
         numberOfReviewedPRs:
           type: integer
           format: int32
+        numberOfReviews:
+          type: integer
+          format: int32
         changesRequested:
           type: array
           items:

diff --git a/...lication-server/src/main/java/de/tum/in/www1/hephaestus/leaderboard/LeaderboardEntry.java b/...lication-server/src/main/java/de/tum/in/www1/hephaestus/leaderboard/LeaderboardEntry.java
@@ -22,6 +22,7 @@ public class LeaderboardEntry {
         private int score;
         private int rank;
         private int numberOfReviewedPRs;
+        private int numberOfReviews;
         private PullRequestReviewDTO[] changesRequested;
         private PullRequestReviewDTO[] approvals;
         private PullRequestReviewDTO[] comments;

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
@@ -57,6 +57,7 @@ public List<LeaderboardEntry> createLeaderboard(Optional<LocalDate> after, Optio
             }
             AtomicInteger score = new AtomicInteger(0);
             Set<Integer> reviewedPRs = new HashSet<>();
+            AtomicInteger numberOfReviews = new AtomicInteger(0);
             Set<PullRequestReviewDTO> changesRequestedSet = new HashSet<>();
             Set<PullRequestReviewDTO> approvedSet = new HashSet<>();
             Set<PullRequestReviewDTO> commentSet = new HashSet<>();
@@ -71,6 +72,7 @@ public List<LeaderboardEntry> createLeaderboard(Optional<LocalDate> after, Optio
                                 review.getUpdatedAt(), review.getSubmittedAt(), review.getState());
 
                         reviewedPRs.add(review.getPullRequest().getNumber());
+                        numberOfReviews.incrementAndGet();
                         switch (review.getState()) {
                             case CHANGES_REQUESTED:
                                 changesRequestedSet.add(reviewDTO);
@@ -91,6 +93,7 @@ public List<LeaderboardEntry> createLeaderboard(Optional<LocalDate> after, Optio
                     score.get(),
                     0, // preliminary rank
                     reviewedPRs.size(),
+                    numberOfReviews.get(),
                     changesRequestedSet.toArray(new PullRequestReviewDTO[changesRequestedSet.size()]),
                     approvedSet.toArray(new PullRequestReviewDTO[approvedSet.size()]),
                     commentSet.toArray(new PullRequestReviewDTO[commentSet.size()]));

diff --git a/webapp/src/app/core/modules/openapi/model/leaderboard-entry.ts b/webapp/src/app/core/modules/openapi/model/leaderboard-entry.ts
@@ -20,6 +20,7 @@ export interface LeaderboardEntry {
     score?: number;
     rank?: number;
     numberOfReviewedPRs?: number;
+    numberOfReviews?: number;
     changesRequested?: Array<PullRequestReviewDTO>;
     approvals?: Array<PullRequestReviewDTO>;
     comments?: Array<PullRequestReviewDTO>;

diff --git a/webapp/src/app/home/leaderboard/leaderboard.component.html b/webapp/src/app/home/leaderboard/leaderboard.component.html
@@ -25,7 +25,11 @@
         <td appTableCell class="text-center">{{ entry.score }}</td>
         <td appTableCell class="py-2">
           <div class="flex items-center gap-3">
-            <div class="flex items-center gap-1 text-github-foreground" title="Total reviewed PRs">
+            <div class="flex items-center gap-1 text-github-muted-foreground" title="Total number of reviews">
+              <ng-icon [svg]="octEye" size="16" />
+              {{ entry.numberOfReviews }}
+            </div>
+            <div class="flex items-center gap-1 text-github-muted-foreground" title="Total reviewed PRs">
               <ng-icon [svg]="octGitPullRequest" size="16" />
               {{ entry.numberOfReviewedPRs }}
             </div>

diff --git a/webapp/src/app/home/leaderboard/leaderboard.component.ts b/webapp/src/app/home/leaderboard/leaderboard.component.ts
@@ -1,6 +1,6 @@
 import { Component, input } from '@angular/core';
 import { NgIconComponent } from '@ng-icons/core';
-import { octFileDiff, octCheck, octComment, octGitPullRequest, octChevronRight } from '@ng-icons/octicons';
+import { octFileDiff, octCheck, octComment, octGitPullRequest, octChevronRight, octEye } from '@ng-icons/octicons';
 import { LeaderboardEntry } from 'app/core/modules/openapi';
 import { AvatarFallbackComponent } from 'app/ui/avatar/avatar-fallback.component';
 import { AvatarImageComponent } from 'app/ui/avatar/avatar-image.component';
@@ -39,6 +39,7 @@ export class LeaderboardComponent {
   protected octComment = octComment;
   protected octGitPullRequest = octGitPullRequest;
   protected octChevronRight = octChevronRight;
+  protected octEye = octEye;
 
   leaderboard = input<LeaderboardEntry[]>();
 }