Feature: Configure approvals number

action.yml

@@ -54,6 +54,10 @@ inputs:
     description: "Percentile value for timeline"
     required: false
     default: "75"
+  REQUIRED_APPROVALS:
+    description: "Amount of approvals required for PR to be approved"
+    required: true
+    default: "1"
   TOP_LIST_AMOUNT:
     description: "Amount of items in lists"
     required: false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pull-request-analytics-action",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "Generates detailed PR analytics reports within GitHub, focusing on review efficiency and team performance.",
   "main": "build/index.js",
   "scripts": {

src/analytics/sendActionRun.ts

@@ -29,8 +29,11 @@ export const sendActionRun = () => {
       AGGREGATE_VALUE_METHODS: getMultipleValuesInput(
         "AGGREGATE_VALUE_METHODS"
       ),
+      INCLUDE_USERS: getMultipleValuesInput("INCLUDE_USERS").length,
+      EXCLUDE_USERS: getMultipleValuesInput("EXCLUDE_USERS").length,
       HIDE_USERS: getMultipleValuesInput("HIDE_USERS").length,
       SHOW_USERS: getMultipleValuesInput("SHOW_USERS").length,
+      REQUIRED_APPROVALS: getValueAsIs("REQUIRED_APPROVALS"),
       INCLUDE_LABELS: getMultipleValuesInput("INCLUDE_LABELS").length,
       EXCLUDE_LABELS: getMultipleValuesInput("EXCLUDE_LABELS").length,
       EXECUTION_OUTCOME: getMultipleValuesInput("EXECUTION_OUTCOME"),

src/converters/utils/calculations/getApproveTime.spec.ts

@@ -11,6 +11,24 @@ const approvedReview = [
   },
 ];
 
+const approvedTwiceReviewWithRequiredApprovals = [
+  {
+    state: "approved",
+    submitted_at: "2024-01-11T07:00:00Z",
+    user: { login: "dev1" },
+  },
+  {
+    state: "changes_requested",
+    submitted_at: "2024-01-11T09:00:00Z",
+    user: { login: "dev2" },
+  },
+  {
+    state: "approved",
+    submitted_at: "2024-01-11T11:00:00Z",
+    user: { login: "dev2" },
+  },
+]
+
 const approvedTwiceReview = [
   {
     state: "approved",
@@ -132,44 +150,55 @@ const dismissedBySecondReviewer = [
 
 describe("check getApproveTime", () => {
   it("Check PR without reviews and return null", () => {
-    expect(getApproveTime(notReviewed)).toBe(null);
+    expect(getApproveTime(notReviewed, 1)).toBe(null);
   });
   it("Check PR with only 1 approval", () => {
-    expect(getApproveTime(approvedReview)).toBe("2024-01-11T07:00:00Z");
+    expect(getApproveTime(approvedReview, 1)).toBe("2024-01-11T07:00:00Z");
   });
   it("Check PR with 2 approval and return the earliest one", () => {
-    expect(getApproveTime(approvedTwiceReview)).toBe("2024-01-11T07:00:00Z");
+    expect(getApproveTime(approvedTwiceReview, 1)).toBe("2024-01-11T07:00:00Z");
   });
   // changes requested included
   it("Check PR with approval after changes requested and return time of approval", () => {
-    expect(getApproveTime(approvedAfterChangesRequestedReview)).toBe(
+    expect(getApproveTime(approvedAfterChangesRequestedReview, 1)).toBe(
       "2024-01-11T09:00:00Z"
     );
   });
   it("Check PR with changes requested by second developer and approval after it. Should return the last time of approval", () => {
-    expect(getApproveTime(oneApprovedOneChangesRequestedReview)).toBe(
+    expect(getApproveTime(oneApprovedOneChangesRequestedReview, 1)).toBe(
       "2024-01-12T05:00:00Z"
     );
   });
   it("Check PR with approval -> changes requested -> approval and return time of the last approve", () => {
-    expect(getApproveTime(approvedRequestedChangesApprovedReview)).toBe(
+    expect(getApproveTime(approvedRequestedChangesApprovedReview, 1)).toBe(
       "2024-01-12T09:00:00Z"
     );
   });
   it("Check PR with dismissed changes requested and return time of the approval", () => {
-    expect(getApproveTime(dismissedChangesRequestedReview)).toBe(
+    expect(getApproveTime(dismissedChangesRequestedReview, 1)).toBe(
       "2024-01-11T09:00:00Z"
     );
   });
   it("Check PR with changes requested and return null", () => {
-    expect(getApproveTime(changesRequestedReview)).toBe(null);
+    expect(getApproveTime(changesRequestedReview, 1)).toBe(null);
   });
   it("Check commented PR and return time of the approval", () => {
-    expect(getApproveTime(commentedReview)).toBe("2024-01-12T05:00:00Z");
+    expect(getApproveTime(commentedReview, 1)).toBe("2024-01-12T05:00:00Z");
   });
   it("Check PR with dismissed changes requested status from second reviewer and return time of the approval", () => {
-    expect(getApproveTime(dismissedBySecondReviewer)).toBe(
+    expect(getApproveTime(dismissedBySecondReviewer, 1)).toBe(
       "2024-01-11T13:00:00Z"
     );
   });
+  it("Check PR with 2 approvals and return time of the second approval", () => {
+    expect(getApproveTime(approvedTwiceReview, 2)).toBe("2024-01-11T09:00:00Z");
+  });
+  it("Check PR with 3 approvals and return time of the third approval", () => {
+    expect(getApproveTime(approvedTwiceReview, 3)).toBe(null);
+  });
+  it("Check PR with 2 approvals and return time of the second approval", () => {
+    expect(getApproveTime(approvedTwiceReviewWithRequiredApprovals, 2)).toBe(
+      "2024-01-11T11:00:00Z"
+    );
+  });
 });

src/converters/utils/calculations/getApproveTime.ts

@@ -4,7 +4,8 @@ import { invalidUserLogin } from "../../constants";
 import { checkUserInclusive } from "./checkUserInclusive";
 
 export const getApproveTime = (
-  reviews: Awaited<ReturnType<typeof makeComplexRequest>>["events"][number]
+  reviews: Awaited<ReturnType<typeof makeComplexRequest>>["events"][number],
+  requiredApprovals: number
 ) => {
   const statuses = Object.values(
     reviews?.reduce(
@@ -13,12 +14,13 @@ export const getApproveTime = (
         review: any
       ) => {
         const user = review.user?.login || invalidUserLogin;
-        if(!checkUserInclusive(user)){
+        if (!checkUserInclusive(user)) {
           return acc;
         }
         const statusesEntries = Object.keys(acc) as string[];
         const isApproved =
-          statusesEntries.some((user) => acc[user].state === "approved") &&
+          statusesEntries.filter((user) => acc[user].state === "approved")
+            .length >= requiredApprovals &&
           !statusesEntries.some(
             (user) => acc[user].state === "changes_requested"
           ) &&
@@ -41,8 +43,10 @@ export const getApproveTime = (
     ) || {}
   );
 
+
   const isApproved =
-    statuses.some((status) => status.state === "approved") &&
+    statuses.filter((status) => status.state === "approved").length >=
+      requiredApprovals &&
     !statuses.some((status) => status.state === "changes_requested");
 
   return isApproved

src/converters/utils/preparePullRequestTimeline.ts

@@ -28,7 +28,10 @@ export const preparePullRequestTimeline = (
       review.user?.login !== pullRequestInfo?.user?.login &&
       checkUserInclusive(review.user?.login || invalidUserLogin)
   );
-  const approveTime = getApproveTime(pullRequestReviews);
+  const approveTime = getApproveTime(
+    pullRequestReviews,
+    parseInt(getValueAsIs("REQUIRED_APPROVALS"))
+  );
 
   const timeToReviewRequest = calcDifferenceInMinutes(
     pullRequestInfo?.created_at,

src/view/utils/createConfigParamsCode.ts

@@ -19,6 +19,7 @@ ${[
   "AGGREGATE_VALUE_METHODS",
   "SHOW_CORRELATION_GRAPHS",
   "SHOW_ACTIVITY_TIME_GRAPHS",
+  "REQUIRED_APPROVALS",
   "PERCENTILE",
   "HIDE_USERS",
   "SHOW_USERS",