fix: exclude the assignedIssue from recommended issues pool

Signed-off-by: Parv Ninama <ninamaparv@gmail.com>

Author: parvninama

.github/scripts/bot-next-issue-recommendation.js

@@ -55,28 +55,28 @@ module.exports = async ({ github, context, core }) => {
     return;
   }
 
-  const issueNumber = extractLinkedIssueNumber(prBody);
-  if (!issueNumber) {
+  const linkedIssueNumber = extractLinkedIssueNumber(prBody);
+  if (!linkedIssueNumber) {
     core.info('No linked issue found in PR body, skipping');
     return;
   }
 
-  core.info(`Linked issue: #${issueNumber}`);
+  core.info(`Linked issue: #${linkedIssueNumber}`);
 
   let issue;
   try {
     const { data } = await github.rest.issues.get({
-      owner, repo, issue_number: issueNumber,
+      owner, repo, issue_number: linkedIssueNumber,
     });
     issue = data;
   } catch (error) {
-    core.warning(`Could not fetch issue #${issueNumber}: ${error.message}`);
+    core.warning(`Could not fetch issue #${linkedIssueNumber}: ${error.message}`);
     return;
   }
 
   const completedLevelKey = getHighestSkillLevelKey(issue, homeRepo);
   if (!completedLevelKey) {
-    core.info(`Issue #${issueNumber} has no recognised skill level label, skipping`);
+    core.info(`Issue #${linkedIssueNumber} has no recognised skill level label, skipping`);
     return;
   }
 
@@ -86,7 +86,7 @@ module.exports = async ({ github, context, core }) => {
 
   let result;
   try {
-    result = await getRecommendedIssues(github, homeRepo, username, completedLevelKey, core);
+    result = await getRecommendedIssues(github, homeRepo, username, completedLevelKey, linkedIssueNumber, core);
   } catch (error) {
     core.error(`Error generating recommendations: ${error.message}`);
     return;

.github/scripts/shared/core/recommendation.js

@@ -89,7 +89,7 @@ async function prefetchIssues(github, core) {
  * @param {object} core            - @actions/core logger.
  * @returns {Promise<{ issues: Array, fromRepo: string|null, unlockedLevelKey: string|null }>}
  */
-async function getRecommendedIssues(github, homeRepo, username, completedLevelKey, core) {
+async function getRecommendedIssues(github, homeRepo, username, completedLevelKey, linkedIssueNumber, core) {
   const [eligibleLevelKey, unlockedLevelKey] = await Promise.all([
     resolveEligibleLevel(github, homeRepo, username),
     detectUnlockedLevel(github, homeRepo, username, completedLevelKey),
@@ -108,7 +108,7 @@ async function getRecommendedIssues(github, homeRepo, username, completedLevelKe
     // Skip if the fetch failed (null) or the repo is missing from the cache (undefined).
     if (issues == null) continue;
 
-    const picked = filterIssuesByLevel(issues, levelKey, repoConfig);
+    const picked = filterIssuesByLevel(issues, levelKey, repoConfig, linkedIssueNumber);
     if (picked.length > 0) {
       core.info(`Recommending ${levelKey} issues from ${repoKey}`);
       return { issues: picked, fromRepo: repoKey, unlockedLevelKey };

.github/scripts/shared/helpers/utils.js

@@ -25,12 +25,16 @@ function hasLabel(issue, labelName) {
 /**
  * Filters issues by a specific skill level and caps the result size.
  */
-function filterIssuesByLevel(issues, levelKey, repoConfig) {
+function filterIssuesByLevel(issues, levelKey, repoConfig, excludeIssueNumber = null) {
   const labelString = repoLabelFor(repoConfig, levelKey);
   if (!labelString) return [];
 
   return issues
-    .filter(issue => hasLabel(issue, labelString))
+    .filter(issue =>
+      hasLabel(issue, labelString) &&
+      issue.pull_request == null &&
+      issue.number !== excludeIssueNumber
+    )
     .slice(0, CONFIG.maxRecommendations);
 }