refactor

ExpediaGroup · Oct 10, 2024 · d61246f · d61246f
1 parent e5ce6ac
commit d61246f
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 15 deletions.
diff --git a/dist/284.index.js b/dist/284.index.js
diff --git a/dist/284.index.js.map b/dist/284.index.js.map
diff --git a/dist/946.index.js b/dist/946.index.js
diff --git a/dist/946.index.js.map b/dist/946.index.js.map
diff --git a/src/helpers/manage-merge-queue.ts b/src/helpers/manage-merge-queue.ts
@@ -33,6 +33,7 @@ import { approvalsSatisfied } from './approvals-satisfied';
 import { createPrComment } from './create-pr-comment';
 import { isUserInTeam } from './is-user-in-team';
 import { join } from 'path';
+import { getEmailOnUserProfile } from '../utils/get-email-on-user-profile';
 
 export class ManageMergeQueue extends HelperInputs {
   max_queue_size?: string;
@@ -63,13 +64,12 @@ export const manageMergeQueue = async ({
     return removePrFromQueue(pullRequest);
   }
   if (slack_webhook_url && login) {
-    const {
-      data: { email }
-    } = await octokit.users.getByUsername({ username: login });
+    const email = await getEmailOnUserProfile(login);
     if (!email) {
       return removePrFromQueue(pullRequest);
     }
   }
+
   const queuedPrs = await getQueuedPullRequests();
   const queuePosition = queuedPrs.length + 1;
 

diff --git a/src/utils/get-email-on-user-profile.ts b/src/utils/get-email-on-user-profile.ts
@@ -0,0 +1,9 @@
+import { octokit } from '../octokit';
+
+export async function getEmailOnUserProfile(login: string) {
+  const {
+    data: { email }
+  } = await octokit.users.getByUsername({ username: login });
+
+  return email;
+}
diff --git a/src/utils/notify-user.ts b/src/utils/notify-user.ts
@@ -16,6 +16,7 @@ import axios from 'axios';
 import { context } from '@actions/github';
 import { octokit } from '../octokit';
 import { createPrComment } from '../helpers/create-pr-comment';
+import { getEmailOnUserProfile } from './get-email-on-user-profile';
 
 interface NotifyUser {
   login: string;
@@ -26,9 +27,7 @@ interface NotifyUser {
 
 export const notifyUser = async ({ login, pull_number, slack_webhook_url, comment_body }: NotifyUser) => {
   core.info(`Notifying user ${login}...`);
-  const {
-    data: { email }
-  } = await octokit.users.getByUsername({ username: login });
+  const email = await getEmailOnUserProfile(login);
   if (!email && comment_body) {
     return await createPrComment({
       body: comment_body