add in error handling, minor changes

Author: t-will-gillis

.github/workflows/activity-trigger.yml

@@ -26,9 +26,9 @@ jobs:
       with:
         github-token: ${{ secrets.HACKFORLA_GRAPHQL_TOKEN }}
         script: |
-          const script = require('./github-actions/activity-trigger/activity-trigger.js')
-          const activities = script({g: github, c: context})
-          return activities
+          const script = require('./github-actions/activity-trigger/activity-trigger.js');
+          const activities = script({github, context});
+          return activities;
           
     - if: ${{ steps.gather-event-details.outputs.result  != '[]' }}
       name: Post to Skills Issue
@@ -40,5 +40,5 @@ jobs:
           const activities = JSON.parse(${{ steps.gather-event-details.outputs.result }});
           const script = require('./github-actions/activity-trigger/post-to-skills-issue.js');
           for (const activity of activities) {
-            await script({g: github, c: context}, activity);
+            await script({github, context}, activity);
           }

github-actions/activity-trigger/activity-trigger.js

@@ -1,20 +1,11 @@
-// Global variables
-var github;
-var context;
-
-
-
 /**
  * This function parses the triggered event to determine the trigger eventName and eventAction
  * and from this information decide the eventActor (user who is credited for the event).
  * @param {Object} github    - GitHub object from function calling activity-trigger.js
  * @param {Object} context   - Context of the function calling activity-trigger.js
  * @returns {Object}         - An object containing the eventActor and a message
  */
-async function activityTrigger({g, c}) {
-
-    github = g;
-    context = c;
+async function activityTrigger({github, context}) {
 
     let issueNum = '';
     let assignee = '';
@@ -110,7 +101,7 @@ async function activityTrigger({g, c}) {
     }
 
     // Only if issue is closed, and eventActor != assignee, return assignee and message
-    if (eventAction.includes('Closed-') && (eventActor != assignee)) {
+    if (eventAction.includes('Closed-') && (eventActor !== assignee)) {
         message = `- ${assignee} issue ${action}: ${eventUrl} at ${localTime}`;
         activities.push([assignee, message]);
     }

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

@@ -6,10 +6,6 @@ const checkTeamMembership = require('../utils/check-team-membership');
 const statusFieldIds = require('../utils/_data/status-field-ids');
 const mutateIssueStatus = require('../utils/mutate-issue-status');
 
-// Global variables
-var github;
-var context;
-
 // `complexity0` refers `Complexity: Prework` label
 const SKILLS_LABEL = retrieveLabelDirectory("complexity0");
 
@@ -19,20 +15,16 @@ const SKILLS_LABEL = retrieveLabelDirectory("complexity0");
  * Function to get eventActor's Skills Issue and post message
  * @param {Object} github    - GitHub object 
  * @param {Object} context   - Context object
- * @param {Object} package  - eventActor and message 
+ * @param {Object} activity  - username and message 
  * 
  */
-async function postToSkillsIssue({g, c}, activity) {
-
-    github = g;
-    context = c;
+async function postToSkillsIssue({github, context}, activity) {
 
     const owner = context.repo.owner;
     const repo = context.repo.repo;
     const TEAM = 'website-write';
 
-    const username = activity[0];
-    const message = activity[1];
+    const [username, message] = activity;
     const MARKER = '<!-- Skills Issue Activity Record -->';
     const IN_PROGRESS_ID = statusFieldIds('In_Progress');
 
@@ -44,19 +36,25 @@ async function postToSkillsIssue({g, c}, activity) {
 
     // Return immediately if Skills Issue not found
     if (skillsIssueNum) {
-        console.log(`Found Skills Issue for ${username}: ${skillsIssueNum}`);
+        console.log(`Found Skills Issue for ${username}: #${skillsIssueNum}`);
     } else {
         console.log(`Did not find Skills Issue for ${username}. Cannot post message.`);
         return;
     }
 
     // Get all comments from the Skills Issue
-    // https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#list-issue-comments
-    const commentData = await github.request('GET /repos/{owner}/{repo}/issues/{issueNum}/comments', {
-        owner,
-        repo,
-        issueNum: skillsIssueNum,
-    });
+    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,
+            issue_number: skillsIssueNum,
+        });
+    } catch (err) {
+        console.error(`GET comments failed for issue #${skillsIssueNum}:`, err);
+        return;
+    }
 
     // Find the comment that includes the MARKER text and append message
     const commentFound = commentData.data.find(comment => comment.body.includes(MARKER));
@@ -67,36 +65,45 @@ async function postToSkillsIssue({g, c}, activity) {
         const commentId = commentFoundId;
         const originalBody = commentFound.body;
         const updatedBody = `${originalBody}\n${message}`;
-        // 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/{commentId}', {
-            owner,
-            repo,
-            commentId,
-            body: updatedBody
-        });
+        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/{commentId}', {
+                owner,
+                repo,
+                commentId,
+                body: updatedBody
+            });
+        } catch (err) {
+            console.error(`Something went wrong updating comment:`, err);
+        }
+        
     } else {
         console.log(`MARKER not found in comments, creating new comment with MARKER...`);
         const body = `${MARKER}\n## Activity Log: ${username}\n### Repo: https://github.com/hackforla/website\n\n#####  ⚠ Important note: The bot updates this comment automatically - do not edit\n\n${message}`;
         await postComment(skillsIssueNum, body, github, context);
     }
 
     // If eventActor is team member, open issue and move to "In progress". Else, close issue
-    const isActiveMember = await checkTeamMembership(github, username, TEAM);
+    const isActiveMember = await checkTeamMembership(github, context, username, TEAM);
     let skillsIssueState = "closed";
 
     if (isActiveMember) {
         skillsIssueState = "open";
         // Update item's status to "In progress (actively working)" if not already
-        if (skillsStatusId != IN_PROGRESS_ID) {
+        if (skillsIssueNodeId && skillsStatusId !== IN_PROGRESS_ID) {
             await mutateIssueStatus(github, context, skillsIssueNodeId, IN_PROGRESS_ID);
         }
     }
-    await github.request('PATCH /repos/{owner}/{repo}/issues/{issueNum}', {
-        owner,
-        repo,
-        issueNum: skillsIssueNum,
-        state: skillsIssueState,
-    });
+    try {
+        await github.request('PATCH /repos/{owner}/{repo}/issues/{issue_number}', {
+            owner,
+            repo,
+            issue_number: skillsIssueNum,
+            state: skillsIssueState,
+        });
+    } catch (err) {
+        console.error(`Failed to update issue #${skillsIssueNum} state:`, err)
+    }
 }
 
 module.exports = postToSkillsIssue;

github-actions/utils/check-team-membership.js

@@ -11,10 +11,10 @@ Lack of permission will result in a 403 error.
 docs on printing context information into the log.
 */
 
-async function isMemberOfTeam(github, githubUsername, team) {
+async function isMemberOfTeam(github, context, githubUsername, team) {
     try {
         await github.rest.teams.getMembershipForUserInOrg({
-            org: 'hackforla',
+            org: context.repo.owner,
             team_slug: team,
             username: githubUsername
         });