Prevent mentor self-match and duplicate notifications

Signed-off-by: Mounil <[email protected]>

Author: Mounil2005

.github/scripts/bot-mentor-assignment.js

@@ -36,16 +36,25 @@ function loadMentorRoster() {
   }
 }
 
-function selectMentor(roster) {
+function selectMentor(roster, mentee) {
   if (!Array.isArray(roster) || roster.length === 0) {
     throw new Error('Mentor roster must contain at least one entry.');
   }
 
   const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;
   const dayNumber = Math.floor(Date.now() / MILLISECONDS_PER_DAY); // UTC day index
-  const index = dayNumber % roster.length;
+  const baseIndex = dayNumber % roster.length;
+  const normalizedMentee = typeof mentee === 'string' ? mentee.toLowerCase() : null;
 
-  return roster[index];
+  for (let offset = 0; offset < roster.length; offset += 1) {
+    const candidate = roster[(baseIndex + offset) % roster.length];
+
+    if (!normalizedMentee || candidate.toLowerCase() !== normalizedMentee) {
+      return candidate;
+    }
+  }
+
+  return null;
 }
 
 function hasGoodFirstIssueLabel(issue) {
@@ -55,6 +64,41 @@ function hasGoodFirstIssueLabel(issue) {
   });
 }
 
+async function hasActiveMentorAssignment(github, owner, repo, mentee, currentIssueNumber) {
+  try {
+    const assignedIssues = await github.paginate(
+      github.rest.issues.listForRepo,
+      {
+        owner,
+        repo,
+        assignee: mentee,
+        state: 'open',
+        per_page: 100,
+      },
+      (response) =>
+        (response.data || []).filter((issue) => issue?.number && issue.number !== currentIssueNumber),
+    );
+
+    for (const assignedIssue of assignedIssues) {
+      const comments = await github.paginate(github.rest.issues.listComments, {
+        owner,
+        repo,
+        issue_number: assignedIssue.number,
+        per_page: 100,
+      });
+
+      if (comments.some((comment) => comment.body?.includes(COMMENT_MARKER))) {
+        return true;
+      }
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.log(`Unable to detect existing mentor assignments for ${mentee}: ${message}`);
+  }
+
+  return false;
+}
+
 async function isNewContributor(github, owner, repo, login) {
   const query = `repo:${owner}/${repo} type:pr state:closed is:merged author:${login}`;
 
@@ -132,19 +176,44 @@ module.exports = async ({ github, context }) => {
       return console.log(`${mentee} already has merged contributions. Skipping mentor assignment.`);
     }
 
+    if (await hasActiveMentorAssignment(github, owner, repo, mentee, issue.number)) {
+      return console.log(`${mentee} already has an active mentor assignment comment on another issue. Skipping.`);
+    }
+
     const roster = loadMentorRoster();
-    const mentor = selectMentor(roster);
+    const mentor = selectMentor(roster, mentee);
+
+    if (!mentor) {
+      return console.log(`No eligible mentor (excluding mentee ${mentee}) found. Skipping mentor assignment.`);
+    }
 
     console.log(`Assigning mentor @${mentor} to mentee @${mentee} for issue #${issue.number}.`);
 
     const comment = buildComment({ mentee, mentor, owner, repo });
 
-    await github.rest.issues.createComment({
-      owner,
-      repo,
-      issue_number: issue.number,
-      body: comment,
-    });
+    try {
+      await github.rest.issues.createComment({
+        owner,
+        repo,
+        issue_number: issue.number,
+        body: comment,
+      });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+
+      const freshComments = await github.paginate(github.rest.issues.listComments, {
+        owner,
+        repo,
+        issue_number: issue.number,
+        per_page: 100,
+      });
+
+      if (freshComments.some((existing) => existing.body?.includes(COMMENT_MARKER))) {
+        return console.log(`Mentor assignment comment already exists on issue #${issue.number} after concurrent run. Skipping. (${message})`);
+      }
+
+      throw error;
+    }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.log(`❌ Mentor assignment failed: ${message}`);

.github/workflows/bot-mentor-assignment.yml

@@ -12,6 +12,7 @@ permissions:
 
 jobs:
   assign-mentor:
+    if: contains(github.event.issue.labels.*.name, 'Good First Issue')
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner