use helper

Author: avivkeller

src/constants.mjs

@@ -34,6 +34,3 @@ export const HACKMD_DEFAULT_PERMISSIONS = {
   writePermission: 'signed_in',
   commentPermission: 'signed_in_users',
 };
-
-export const REPOSITORY_URL_PREFIX_LENGTH = 'https://api.github.com/repos/'
-  .length;

src/github.mjs

@@ -1,6 +1,6 @@
 import { Octokit } from '@octokit/rest';
 
-import { DEFAULT_CONFIG, REPOSITORY_URL_PREFIX_LENGTH } from './constants.mjs';
+import { DEFAULT_CONFIG } from './constants.mjs';
 
 /**
  * Creates a GitHub API client
@@ -42,12 +42,25 @@ export const createGitHubIssue = async (
   return response.data;
 };
 
+/**
+ * Sorts issues by repository
+ * @param {Array<GitHubIssue>} issues The issues to sort
+ * @returns {Promise<{ [key: string]: Array<GitHubIssue> }>} Sorted issues
+ */
+export const sortIssuesByRepo = issues =>
+  issues.reduce((obj, issue) => {
+    (obj[issue.repository_url.split('/').slice(-2).join('/')] ||= []).push(
+      issue
+    );
+    return obj;
+  }, {});
+
 /**
  * Fetches GitHub issues from all repositories in an organization with a specific label
  * @param {import('@octokit/rest').Octokit} githubClient - Authenticated GitHub API client
  * @param {import('./types.d.ts').AppConfig} config - Application configuration
  * @param {import('./types.d.ts').MeetingConfig} meetingConfig - Meeting configuration
- * @returns {Promise<{ [key: string]: Array<GitHubIssue> }>} Formatted markdown string of issues
+ * @returns {Promise<{ [key: string]: Array<GitHubIssue> }>} Meeting agenda
  */
 export const getAgendaIssues = async (
   githubClient,
@@ -59,14 +72,9 @@ export const getAgendaIssues = async (
 
   // Get all issues/PRs in the organization
   const issues = await githubClient.paginate('GET /search/issues', {
-    q: `label:${agendaTag} org:${githubOrg}`,
+    q: `is:open label:${agendaTag} org:${githubOrg}`,
     advanced_search: true,
   });
 
-  return issues.reduce((obj, issue) => {
-    (obj[issue.repository_url.slice(REPOSITORY_URL_PREFIX_LENGTH)] ||= []).push(
-      issue
-    );
-    return obj;
-  }, {});
+  return sortIssuesByRepo(issues);
 };