get username from PR

Author: shortcuts

scripts/release/__tests__/createReleasePR.test.ts

@@ -18,7 +18,7 @@ const buildTestCommit = (
   }> = {}
 ): string => {
   const { type = 'fix', scope, message = 'fix the thing (#123)' } = options;
-  const baseTestCommit = `b2501882|${gitAuthor.name}|${gitAuthor.email}`;
+  const baseTestCommit = `b2501882|${gitAuthor.email}`;
   const typeAndScope = `${type}${scope ? `(${scope})` : ''}`;
 
   return `${baseTestCommit}|${typeAndScope}: ${message}`;
@@ -29,10 +29,12 @@ describe('createReleasePR', () => {
     // Mock `getOctokit` to bypass the API call and credential requirements
     jest.spyOn(common, 'getOctokit').mockImplementation((): any => {
       return {
-        search: {
-          users: (): any => ({
+        pulls: {
+          get: (): any => ({
             data: {
-              total_count: 0,
+              user: {
+                login: gitAuthor.name,
+              },
             },
           }),
         },
@@ -61,10 +63,10 @@ describe('createReleasePR', () => {
         hash: 'b2501882',
         scope: 'javascript',
         message: 'fix(javascript): fix the thing',
-        prNumber: '123',
+        prNumber: 123,
         raw: testCommit,
         type: 'fix',
-        author: `[${gitAuthor.name}](${gitAuthor.email})`,
+        author: `[@${gitAuthor.name}](https://github.com/${gitAuthor.name}/)`,
       });
     });
 
@@ -74,10 +76,10 @@ describe('createReleasePR', () => {
         hash: 'b2501882',
         scope: 'specs',
         message: 'fix(specs): fix the thing',
-        prNumber: '123',
+        prNumber: 123,
         raw: testCommit,
         type: 'fix',
-        author: `[${gitAuthor.name}](${gitAuthor.email})`,
+        author: `[@${gitAuthor.name}](https://github.com/${gitAuthor.name}/)`,
       });
     });
 

scripts/release/createReleasePR.ts

@@ -113,14 +113,15 @@ export function getSkippedCommitsText({
 }
 
 export async function parseCommit(commit: string): Promise<Commit> {
-  const [hash, authorName, authorEmail, message] = commit.split('|');
+  const [hash, authorEmail, message] = commit.split('|');
   const commitScope = message.slice(0, message.indexOf(':'));
   const typeAndScope = commitScope.match(/(.+)\((.+)\)/);
-  const prNumber = message.match(/#(\d+)/);
+  const prNumberMatch = message.match(/#(\d+)/);
+  const prNumber = prNumberMatch ? parseInt(prNumberMatch[1], 10) : 0;
   let commitMessage = message;
 
   if (prNumber) {
-    commitMessage = message.replace(`(#${prNumber[1]})`, '').trim();
+    commitMessage = message.replace(`(#${prNumber})`, '').trim();
   }
 
   // We skip generation commits as they do not appear in changelogs
@@ -146,18 +147,18 @@ export async function parseCommit(commit: string): Promise<Commit> {
   }
 
   // Retrieve the author GitHub username if publicly available
-  if (!fetchedUsers[authorEmail]) {
+  if (!fetchedUsers[authorEmail] && prNumber) {
     const octokit = getOctokit();
-    const { data } = await octokit.search.users({
-      q: authorEmail,
+    const { data } = await octokit.pulls.get({
+      owner: OWNER,
+      repo: REPO,
+      pull_number: prNumber,
     });
 
-    if (data.total_count === 0) {
-      fetchedUsers[authorEmail] = `[${authorName}](${authorEmail})`;
-    } else {
+    if (data.user) {
       fetchedUsers[
         authorEmail
-      ] = `[@${data.items[0].login}](https://github.com/${data.items[0].login}/)`;
+      ] = `[@${data.user.login}](https://github.com/${data.user.login}/)`;
     }
   }
 
@@ -166,7 +167,7 @@ export async function parseCommit(commit: string): Promise<Commit> {
     type: typeAndScope[1], // `fix` | `feat` | `chore` | ...
     scope, // `clients` | `specs` | `javascript` | `php` | `java` | ...
     message: commitMessage,
-    prNumber: prNumber ? prNumber[1] : undefined,
+    prNumber,
     raw: commit,
     author: fetchedUsers[authorEmail],
   };
@@ -298,7 +299,7 @@ async function getCommits(): Promise<{
   // Reading commits since last release
   const latestCommits = (
     await run(
-      `git log --pretty=format:"%h|%an|%ae|%s" ${RELEASED_TAG}..${MAIN_BRANCH}`
+      `git log --pretty=format:"%h|%ae|%s" ${RELEASED_TAG}..${MAIN_BRANCH}`
     )
   )
     .split('\n')

scripts/release/types.ts

@@ -29,7 +29,7 @@ export type PassedCommit = {
   author: string;
   message: string;
   raw: string;
-  prNumber: string | undefined;
+  prNumber: number;
 };
 
 export type Commit =