From 8cd9074a9882d345b541701bc3c0be87d3a466c9 Mon Sep 17 00:00:00 2001
From: Alice Zhao <alice@makenotion.com>
Date: Fri, 5 Apr 2024 16:48:30 -0700
Subject: [PATCH 1/5] fix: add team_reviewers to requestReviewers

---
 src/utils.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/utils.ts b/src/utils.ts
index eb9c22e..9a6a8e9 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -407,9 +407,10 @@ export const tagBackportReviewers = async ({
   user?: string;
 }) => {
   const reviewers = [];
+  const teamReviewers = [];
 
   if (DEFAULT_BACKPORT_REVIEW_TEAM) {
-    reviewers.push(DEFAULT_BACKPORT_REVIEW_TEAM);
+    teamReviewers.push(DEFAULT_BACKPORT_REVIEW_TEAM);
   }
 
   if (user) {
@@ -419,11 +420,12 @@ export const tagBackportReviewers = async ({
     if (hasWrite) reviewers.push(user);
   }
 
-  if (reviewers.length > 0) {
+  if (Math.max(reviewers.length, teamReviewers.length) > 0) {
     await context.octokit.pulls.requestReviewers(
       context.repo({
         pull_number: targetPrNumber,
         reviewers,
+        team_reviewers: teamReviewers,
       }),
     );
   }

From 851acdb18d86f724ceea39ee930b3ee4789e9363 Mon Sep 17 00:00:00 2001
From: Alice Zhao <alice@makenotion.com>
Date: Fri, 5 Apr 2024 17:06:51 -0700
Subject: [PATCH 2/5] chore: move comment

---
 src/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils.ts b/src/utils.ts
index 9a6a8e9..09b4179 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -410,12 +410,12 @@ export const tagBackportReviewers = async ({
   const teamReviewers = [];
 
   if (DEFAULT_BACKPORT_REVIEW_TEAM) {
+    // Optionally request a default review team for backports.
     teamReviewers.push(DEFAULT_BACKPORT_REVIEW_TEAM);
   }
 
   if (user) {
     const hasWrite = await checkUserHasWriteAccess(context, user);
-    // Optionally request a default review team for backports.
     // If the PR author has write access, also request their review.
     if (hasWrite) reviewers.push(user);
   }

From 66e40ea3faaaaab7b3b9fc775d6d155b05edf0a7 Mon Sep 17 00:00:00 2001
From: Alice Zhao <alice@makenotion.com>
Date: Fri, 5 Apr 2024 17:32:12 -0700
Subject: [PATCH 3/5] chore: update team reviewer to just slug

---
 src/utils.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/utils.ts b/src/utils.ts
index 09b4179..ac41dcb 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -411,7 +411,9 @@ export const tagBackportReviewers = async ({
 
   if (DEFAULT_BACKPORT_REVIEW_TEAM) {
     // Optionally request a default review team for backports.
-    teamReviewers.push(DEFAULT_BACKPORT_REVIEW_TEAM);
+    // Use team slug value. i.e electron/wg-releases => wg-releases
+    const slug = DEFAULT_BACKPORT_REVIEW_TEAM.split('/')[1];
+    teamReviewers.push(slug);
   }
 
   if (user) {

From 9cfc30f776c70b8fdd63d19f87b139d512c98261 Mon Sep 17 00:00:00 2001
From: Alice Zhao <alice@makenotion.com>
Date: Fri, 5 Apr 2024 17:45:20 -0700
Subject: [PATCH 4/5] fix: add backup case

---
 src/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils.ts b/src/utils.ts
index ac41dcb..c59a762 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -413,7 +413,7 @@ export const tagBackportReviewers = async ({
     // Optionally request a default review team for backports.
     // Use team slug value. i.e electron/wg-releases => wg-releases
     const slug = DEFAULT_BACKPORT_REVIEW_TEAM.split('/')[1];
-    teamReviewers.push(slug);
+    teamReviewers.push(slug ? slug : DEFAULT_BACKPORT_REVIEW_TEAM);
   }
 
   if (user) {

From 9e4abd76aa375732fdba4e611268b09841bc8d1e Mon Sep 17 00:00:00 2001
From: Alice Zhao <alice@makenotion.com>
Date: Sun, 7 Apr 2024 15:34:19 -0700
Subject: [PATCH 5/5] refactor: update slug for readability

---
 src/utils.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/utils.ts b/src/utils.ts
index c59a762..1645dbd 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -412,8 +412,10 @@ export const tagBackportReviewers = async ({
   if (DEFAULT_BACKPORT_REVIEW_TEAM) {
     // Optionally request a default review team for backports.
     // Use team slug value. i.e electron/wg-releases => wg-releases
-    const slug = DEFAULT_BACKPORT_REVIEW_TEAM.split('/')[1];
-    teamReviewers.push(slug ? slug : DEFAULT_BACKPORT_REVIEW_TEAM);
+    const slug =
+      DEFAULT_BACKPORT_REVIEW_TEAM.split('/')[1] ||
+      DEFAULT_BACKPORT_REVIEW_TEAM;
+    teamReviewers.push(slug);
   }
 
   if (user) {