fix: approval duplication

AKharytonchyk · Mar 28, 2024 · 70bb58d · 70bb58d
1 parent 0897abf
commit 70bb58d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/components/PullRequestsApprovals.tsx b/src/components/PullRequestsApprovals.tsx
@@ -21,7 +21,7 @@ export const PullRequestsApprovals: React.FC<PullRequestsApprovalsProps> = ({
     if (!octokit) return;
     octokit
       .getPRApprovals(owner, repo, prNumber)
-      .then((response) => setApprovals(response.data as Approvals[]));
+      .then((response) => setApprovals(response as Approvals[]));
 
     return () => {
       setApprovals([]);

diff --git a/src/service/gitService.ts b/src/service/gitService.ts
@@ -47,6 +47,13 @@ export class GitService {
   }
 
   async getPRApprovals(owner: string, repo: string, prNumber: number) {
-    return this.octokit.pulls.listReviews({owner, repo, pull_number: prNumber});
+    const reviews = await this.octokit.pulls.listReviews({owner, repo, pull_number: prNumber});
+
+    return reviews.data.reduce((acc: any, review: any) => {
+      if (!acc[review.user.login] || new Date(acc[review.user.login].submitted_at) < new Date(review.submitted_at)) {
+        acc[review.user.login] = review;
+      }
+      return acc;
+    }, {} as Record<string, any>).values();
   }
 }