fix: fixing issue reference requirements on pull request when theres …

…multiple issue references@
worknenjoy · Dec 2, 2024 · 97f9002 · 97f9002
1 parent cd0bb30
commit 97f9002
Show file tree

Hide file tree

Showing 2 changed files with 304 additions and 218 deletions.
diff --git a/modules/tasks/taskSolutionFetchData.js b/modules/tasks/taskSolutionFetchData.js
@@ -9,6 +9,12 @@ function extractIssueReferences(text) {
   return matches ? matches.map(match => match.slice(1)) : []; // Remove the '#' prefix
 }
 
+function extractIssueNumberFromURL(url) {
+  const match = url.match(/\/issues\/(\d+)(\/)?$/);
+  return match ? match[1] : null;
+}
+
+
 module.exports = Promise.method(async function fetchTaskSolutionData (solutionParams) {
   return requestPromise({
     uri: `https://api.github.com/repos/${solutionParams.owner}/${solutionParams.repositoryName}/pulls/${solutionParams.pullRequestId}`,
@@ -59,7 +65,10 @@ module.exports = Promise.method(async function fetchTaskSolutionData (solutionPa
       }
     }
     const issueReferences = extractIssueReferences(pullRequestData.body)
-    if(issueReferences.length && task.dataValues.url.includes(issueReferences)) {
+    const issueNumber = extractIssueNumberFromURL(task.dataValues.url)
+    const issueReferencesMatch = issueReferences.some(issueReference => issueNumber === issueReference)
+
+    if(issueReferences.length && issueReferencesMatch) {
       hasIssueReference = true
     }