refactor: extract branch name ops to getBranchNameFromRef function (#246)

## Description
Replaced all occurences of the get branch from a ref branch logic with a
new function getBranchFromRef


## Related Issue
Resolves [#24](#24)

Co-authored-by: Olabode Lawal-Shittabey <[email protected]>

Author: FabianEilts

src/lib/actions/do-contribution-stats.js

@@ -1,7 +1,7 @@
+import { LABELS, PROJECT_REPO_DETAILS } from "../../../constants.js";
 import app from "../octokit/app.js";
 import { decrypt } from "../utils/crypto.js";
-import { buildStatsUrl } from "../utils/index.js";
-import { PROJECT_REPO_DETAILS, LABELS } from "../../../constants.js";
+import { buildStatsUrl, getBranchNameFromRef } from "../utils/index.js";
 
 /**
  * Get some jargons contribution stats for current user on the Jargons Editor
@@ -21,7 +21,7 @@ export default async function doContributionStats(astroGlobal) {
   const viewerLogin = me?.login;
 
   const branchInfo = repoMainBranchRef
-    ? repoMainBranchRef.split("/").slice(2).join("/")
+    ? getBranchNameFromRef(repoMainBranchRef)
     : "";
 
   const baseQuery = `repo:${repoFullname} is:pull-request type:pr author:${viewerLogin} base:${branchInfo}`;

src/lib/submit-word.js

@@ -1,7 +1,7 @@
 import { LABELS } from "../../constants.js";
-import { getRepoParts } from "./utils/index.js";
-import newWordPRTemp from "./templates/new-word-pr.md.js";
 import editWordPRTemp from "./templates/edit-word-pr.md.js";
+import newWordPRTemp from "./templates/new-word-pr.md.js";
+import { getBranchNameFromRef, getRepoParts } from "./utils/index.js";
 
 /**
  * Submit word - create a Pull Request to add word to project repository
@@ -27,11 +27,10 @@ export async function submitWord(
   const { repoOwner: forkedRepoOwner } = getRepoParts(
     forkedRepoDetails.repoFullname,
   );
-  const baseBranch = repoMainBranchRef.split("/").slice(2).join("/");
-  const headBranch = forkedRepoDetails.repoChangeBranchRef
-    .split("/")
-    .slice(2)
-    .join("/");
+  const baseBranch = getBranchNameFromRef(repoMainBranchRef);
+  const headBranch = getBranchNameFromRef(
+    forkedRepoDetails.repoChangeBranchRef,
+  );
 
   const title =
     action === "new"

src/lib/utils/index.js

@@ -99,3 +99,12 @@ export function buildWordPathname(slug) {
 export function buildWordSlug(id) {
   return id.split(".")[0];
 }
+
+/**
+ * Get branch name from branch ref
+ * @param {string} branchRef
+ * @returns {string}
+ */
+export function getBranchNameFromRef(branchRef) {
+  return branchRef.split("/").slice(2).join("/");
+}

src/lib/word-editor.js

@@ -1,5 +1,9 @@
 import wordFileTemplate from "./templates/word.md.js";
-import { getRepoParts, normalizeAsUrl } from "./utils/index.js";
+import {
+  getBranchNameFromRef,
+  getRepoParts,
+  normalizeAsUrl,
+} from "./utils/index.js";
 
 /**
  * Write and add a new word to user's forked dictionary
@@ -14,7 +18,7 @@ export async function writeNewWord(
 ) {
   const { repoFullname, repoChangeBranchRef } = forkedRepoDetails;
   const { repoOwner, repoName } = getRepoParts(repoFullname);
-  const branch = repoChangeBranchRef.split("/").slice(2).join("/");
+  const branch = getBranchNameFromRef(repoChangeBranchRef);
   const wordFileContent = writeWordFileContent(title, content);
 
   try {
@@ -52,7 +56,7 @@ export async function updateExistingWord(
 ) {
   const { repoFullname, repoChangeBranchRef } = forkedRepoDetails;
   const { repoOwner, repoName } = getRepoParts(repoFullname);
-  const branch = repoChangeBranchRef.split("/").slice(2).join("/");
+  const branch = getBranchNameFromRef(repoChangeBranchRef);
   const wordFileContent = writeWordFileContent(title, content);
 
   try {