Merge pull request #27 from ShiboSoftwareDev/main

count approvals and rejections as tiny contribution points
tscircuit · Dec 31, 2024 · 89c9283 · 89c9283
2 parents c00d70e + 42dc435
commit 89c9283
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 2 deletions.
diff --git a/index.ts b/index.ts
@@ -35,6 +35,8 @@ export async function generateOverview(startDate: string) {
           reviewsReceived: 0,
           rejectionsReceived: 0,
           approvalsReceived: 0,
+          approvalsGiven: 0,
+          rejectionsGiven: 0,
           prsOpened: 0,
           prsMerged: 0,
           issuesCreated: 0,
@@ -48,6 +50,31 @@ export async function generateOverview(startDate: string) {
       contributorData[contributor].approvalsReceived += pr.approvalsReceived
       contributorData[contributor].prsOpened += 1
 
+      if (pr.reviewsByUser) {
+        Object.entries(pr.reviewsByUser).forEach(
+          ([reviewer, reviewerStats]) => {
+            if (!contributorData[reviewer]) {
+              contributorData[reviewer] = {
+                reviewsReceived: 0,
+                rejectionsReceived: 0,
+                approvalsReceived: 0,
+                approvalsGiven: 0,
+                rejectionsGiven: 0,
+                prsOpened: 0,
+                prsMerged: 0,
+                issuesCreated: 0,
+                bountiedIssuesCount: 0,
+                bountiedIssuesTotal: 0,
+              }
+            }
+            contributorData[reviewer].approvalsGiven +=
+              reviewerStats.approvalsGiven
+            contributorData[reviewer].rejectionsGiven +=
+              reviewerStats.rejectionsGiven
+          },
+        )
+      }
+
       if (pr.isClosed && pr.merged_at)
         contributorData[contributor].prsMerged += 1
     }

diff --git a/lib/generateMarkdown.ts b/lib/generateMarkdown.ts
@@ -73,7 +73,6 @@ export async function generateMarkdown(
     {} as Record<string, Record<string, number>>,
   )
 
-  // Then add bounty points separately for each contributor
   Object.entries(contributorEffort).forEach(([contributor, effort]) => {
     const bountiedAmount =
       contributorIdToStatsMap[contributor]?.bountiedIssuesTotal || 0
@@ -86,6 +85,12 @@ export async function generateMarkdown(
     )
     // Add to score (minor contributions are worth 2 points each)
     effort.score += minorContributionsFromBounties * 2
+
+    const approvalsGiven =
+      contributorIdToStatsMap[contributor]?.approvalsGiven || 0
+    const rejectionsGiven =
+      contributorIdToStatsMap[contributor]?.rejectionsGiven || 0
+    effort.score += Math.min(approvalsGiven + rejectionsGiven, 20)
   })
 
   const sortedContributors = Object.entries(contributorEffort).sort(
@@ -133,6 +138,8 @@ export async function generateMarkdown(
     "Reviews Received": "reviewsReceived",
     "Approvals Received": "approvalsReceived",
     "Rejections Received": "rejectionsReceived",
+    Approvals: "approvalsGiven",
+    Rejections: "rejectionsGiven",
     "PRs Opened": "prsOpened",
     "PRs Merged": "prsMerged",
     "Issues Created": "issuesCreated",

diff --git a/lib/getAllPRs.ts b/lib/getAllPRs.ts
@@ -1,5 +1,5 @@
 import { octokit } from "lib/sdks"
-import type { PullRequest, PullRequestWithReviews } from "./types"
+import type { PullRequestWithReviews, ReviewerStats } from "./types"
 
 export async function getAllPRs(
   repo: string,
@@ -66,11 +66,28 @@ export async function getAllPRs(
         (review) => review.state === "CHANGES_REQUESTED",
       ).length
 
+      const reviewsByUser = reviews.reduce<Record<string, ReviewerStats>>(
+        (acc, review) => {
+          const reviewer = review.user.login
+          if (!acc[reviewer]) {
+            acc[reviewer] = { approvalsGiven: 0, rejectionsGiven: 0 }
+          }
+          if (review.state === "APPROVED") {
+            acc[reviewer].approvalsGiven++
+          } else if (review.state === "CHANGES_REQUESTED") {
+            acc[reviewer].rejectionsGiven++
+          }
+          return acc
+        },
+        {},
+      )
+
       return {
         ...pr,
         reviewsReceived,
         rejectionsReceived,
         approvalsReceived,
+        reviewsByUser,
         isClosed: pr.state === "closed",
       } as PullRequestWithReviews
     }),

diff --git a/lib/types.ts b/lib/types.ts
@@ -1,3 +1,8 @@
+export interface ReviewerStats {
+  approvalsGiven: number
+  rejectionsGiven: number
+}
+
 export interface ContributorStats {
   reviewsReceived: number
   rejectionsReceived: number
@@ -8,6 +13,8 @@ export interface ContributorStats {
   bountiedIssuesCount?: number
   bountiedIssuesTotal?: number
   score?: number
+  approvalsGiven: number
+  rejectionsGiven: number
 }
 
 export interface PullRequest {
@@ -31,6 +38,7 @@ export interface PullRequestWithReviews extends PullRequest {
   rejectionsReceived: number
   approvalsReceived: number
   isClosed: boolean
+  reviewsByUser?: Record<string, ReviewerStats>
 }
 
 export interface AnalyzedPR {