Enhanced Skills Activity GHA to use Skills Directory

.github/workflows/activity-trigger.yml

@@ -22,7 +22,7 @@ permissions:
 jobs:
   Gather-Activity-Event-Information:
     runs-on: ubuntu-latest
-    if: github.repository == 'hackforla/website'
+    if: github.repository == 'xnealcarson/website'
     steps:
     - uses: actions/checkout@v5
 

github-actions/activity-trigger/post-to-skills-issue.js

@@ -5,6 +5,7 @@
 const checkTeamMembership = require('../utils/check-team-membership');
 const statusFieldIds = require('../utils/_data/status-field-ids');
 const mutateIssueStatus = require('../utils/mutate-issue-status');
+const { lookupSkillsDirectory, updateSkillsDirectory } = require('../utils/skills-directory'); 
 
 // `complexity0` refers `Complexity: Prework` label
 const SKILLS_LABEL = retrieveLabelDirectory("complexity0");
@@ -33,72 +34,149 @@
         console.log(`eventActor is undefined (likely a bot). Cannot post message...`);
         return;
     }
-
-    // Get eventActor's Skills Issue number, nodeId, current statusId (all null if no Skills Issue found)
-    const skillsInfo = await querySkillsIssue(github, context, eventActor, SKILLS_LABEL);
-    const skillsIssueNum = skillsInfo.issueNum;
-    const skillsIssueNodeId = skillsInfo.issueId;
-    const skillsStatusId = skillsInfo.statusId;
-    const isArchived = skillsInfo.isArchived;
 
+    // Step 1: Try local directory lookup first
+    let needsUpdate = false;
+    let skillsInfo = lookupSkillsDirectory(eventActor);
+
+    if (!skillsInfo) {
+        console.log(`No cached Skills Issue found for ${eventActor}, querying GitHub...`);
+
+        // Step 2: Fallback to GitHub API
+        skillsInfo = await querySkillsIssue(github, context, eventActor, SKILLS_LABEL);
+
+        // Step 3: Save result to local directory if found
+        if (skillsInfo && skillsInfo.issueNum) {
+            needsUpdate = true
+        } else {
+          console.log(` ⮡  No Skills Issue found for ${eventActor}. Cannot post message.`);
+          return;   
+        }
+    }
+    // Get eventActor's Skills Issue number, nodeId, current statusId (all null if no Skills Issue found) 
+    //const skillsIssueNum = skillsInfo.issueNum;
+    const skillsIssueNum = 17;
+    const skillsIssueNodeId = skillsInfo.issueId;
+    const skillsStatusId = skillsInfo?.statusId || 'unknown';
+    const isArchived = skillsInfo?.isArchived || false;
+    const commentIdCached = skillsInfo?.commentId || null;   // not used currently
+
+ console.log(`skillsIssueNum: ${skillsIssueNum}, skillsIssueNodeId: ${skillsIssueNodeId}, skillsStatusId: ${skillsStatusId}, isArchived: ${isArchived}`);  // only for debugging 
+
     // Return immediately if Skills Issue not found
     if (!skillsIssueNum) {
         console.log(` ⮡  Did not find Skills Issue for ${eventActor}. Cannot post message.`);
         return;
     }
     console.log(` ⮡  Found Skills Issue for ${eventActor}: #${skillsIssueNum}`);
 
-    // Get all comments from the Skills Issue
-    let commentData;
-    try {
-        // https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#list-issue-comments
-        commentData = await github.request('GET /repos/{owner}/{repo}/issues/{issue_number}/comments', {
-            owner,
-            repo,
-            per_page: 100,
-            issue_number: skillsIssueNum,
-        });
-    } catch (err) {
-        console.error(` ⮡  GET comments failed for issue #${skillsIssueNum}:`, err);
-        return;
-    }
+    let commentIdToUse = commentIdCached;
+    let commentFound = null;
 
-    // Find the comment that includes the MARKER text and append message
-    const commentFound = commentData.data.find(comment => comment.body.includes(MARKER));
+    // Try cached comment ID first
+    if (commentIdCached) {
+        console.log(` ⮡  Found cached comment ID for ${eventActor}: ${commentIdCached}`);
+        try {
+            const { data: cachedComment } = await github.request(
+                'GET /repos/{owner}/{repo}/issues/comments/{comment_id}',
+                {
+                    owner,
+                    repo,
+                    comment_id: commentIdCached,
+                }
+            );
 
-    if (commentFound) {
-        console.log(` ⮡  Found comment with MARKER...`);
-        const comment_id = commentFound.id;
-        const originalBody = commentFound.body;
-        const updatedBody = `${originalBody}\n${message}`;
+            if (cachedComment && cachedComment.body.includes(MARKER)) {
+                const updatedBody = `${cachedComment.body}\n${message}`;
+                await github.request('PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}', {
+                    owner,
+                    repo,
+                    comment_id: commentIdCached,
+                    body: updatedBody,
+                });
+                console.log(` ⮡  Updated cached comment #${commentIdCached}`);
+
+            } else {
+                commentIdToUse = null;
+            }
+        } catch (err) {
+            console.warn(` ⮡  Cached comment invalid or not found. Falling back to search.`, err);
+            commentIdToUse = null; // Force fallback path
+        }
+    }
+
+    // Fallback — search for MARKER or create new comment
+    if (!commentIdToUse) {
+        console.log(` ⮡  Searching for activity comment marker...`);
+        let commentData;
         try {
-            // https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#update-an-issue-comment
-            await github.request('PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}', {
-                owner,
-                repo,
-                comment_id,
-                body: updatedBody
-            });
-            console.log(` ⮡  Entry posted to Skills Issue #${skillsIssueNum}`);
+            commentData = await github.request(
+                'GET /repos/{owner}/{repo}/issues/{issue_number}/comments',
+                {
+                    owner,
+                    repo,
+                    per_page: 100,
+                    issue_number: skillsIssueNum,
+                }
+            );
         } catch (err) {
-            console.error(` ⮡  Something went wrong posting entry to #${skillsIssueNum}:`, err);
+            console.error(` ⮡  GET comments failed for issue #${skillsIssueNum}:`, err);
+            return;
         }
-
-    } else {
-        console.log(` ⮡  MARKER not found, creating new comment entry with MARKER...`);
-        const body = `${MARKER}\n## Activity Log: ${eventActor}\n### Repo: https://github.com/hackforla/website\n\n#####  ⚠ Important note: The bot updates this comment automatically - do not edit\n\n${message}`;
-        const commentPosted = await postComment(skillsIssueNum, body, github, context);
-        if (commentPosted) {
-            console.log(` ⮡  Entry posted to Skills Issue #${skillsIssueNum}`);
+
+        commentFound = commentData.data.find((comment) => comment.body.includes(MARKER));
+
+        if (commentFound) {
+            console.log(` ⮡  Found comment with MARKER...`);
+            const comment_id = commentFound.id;
+            const originalBody = commentFound.body;
+            const updatedBody = `${originalBody}\n${message}`;
+            try {
+                await github.request('PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}', {
+                    owner,
+                    repo,
+                    comment_id,
+                    body: updatedBody,
+                });
+                console.log(` ⮡  Entry posted to Skills Issue #${skillsIssueNum}`);
+                // Cache this comment ID
+                updateSkillsDirectory(eventActor, { commentId: comment_id });
+            } catch (err) {
+                console.error(` ⮡  Something went wrong posting entry to #${skillsIssueNum}:`, err);
+            }
+        } else {
+            console.log(` ⮡  MARKER not found, creating new comment entry with MARKER...`);
+            const body = `${MARKER}\n## Activity Log: ${eventActor}\n### Repo: https://github.com/hackforla/website\n\n##### ⚠ Important note: The bot updates this comment automatically - do not edit\n\n${message}`;
+            try {
+                const { data: newComment } = await github.request(
+                    'POST /repos/{owner}/{repo}/issues/{issue_number}/comments',
+                    {
+                        owner,
+                        repo,
+                        issue_number: skillsIssueNum,
+                        body,
+                    }
+                );
+                console.log(` ⮡  Entry posted to Skills Issue #${skillsIssueNum}`);
+                // Cache new comment ID
+               // updateSkillsDirectory(eventActor, { commentId: newComment.id });
+            } catch (err) {
+                console.error(` ⮡  Failed to create new comment for issue #${skillsIssueNum}:`, err);
+            }
         }
     }
+      if (needsUpdate) {
+         console.log(` ⮡  Updating Skills Directory for ${eventActor}...`);
+         updateSkillsDirectory(eventActor, skillsIssueNum, skillsIssueNodeId, commentIdFound);
+      };
+
 
     // Only proceed if Skills Issue message does not include: 'closed', 'assigned', or isArchived 
     if (!(message.includes('closed') || message.includes('assigned') || isArchived)) {
 
         // If eventActor is team member, open issue and move to "In progress"
-        const isActiveMember = await checkTeamMembership(github, context, eventActor, TEAM);
-
+       //const isActiveMember = await checkTeamMembership(github, context, eventActor, TEAM);
+       const isActiveMember = true;
         if (isActiveMember) {
             try {
                 await github.request('PATCH /repos/{owner}/{repo}/issues/{issue_number}', {
@@ -121,4 +199,4 @@
 
 }
 
-module.exports = postToSkillsIssue;
+module.exports = postToSkillsIssue;