Merge pull request #22 from aws-github-ops/khushail/discussionPagination

peterwoodworth · web-flow · commit f70f5bae7120 · 2023-06-30T17:06:25.000-07:00
(fix): pagination failure when too many discussions
diff --git a/dist/GithubDiscussionClient.js b/dist/GithubDiscussionClient.js
diff --git a/dist/generated/graphql.js b/dist/generated/graphql.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/types/GithubDiscussionClient.d.ts b/dist/types/GithubDiscussionClient.d.ts
@@ -13,7 +13,7 @@ export declare class GithubDiscussionClient {
     getTotalDiscussionCount(categoryID: string): Promise<number>;
     getDiscussionCommentCount(discussionNum: number): Promise<number>;
     getCommentsMetaData(discussionNum: number, commentCount: number): Promise<DiscussionCommentConnection>;
-    getDiscussionsMetaData(categoryID: string): Promise<DiscussionConnection>;
+    getDiscussionsMetaData(categoryID: string, pageSize: number, afterCursor: string): Promise<DiscussionConnection>;
     getAnswerableDiscussionCategoryIDs(): Promise<any>;
     closeDiscussionAsResolved(discussionId: string): Promise<void>;
     closeDiscussionAsOutdated(discussionId: string): Promise<void>;
diff --git a/dist/types/generated/graphql.d.ts b/dist/types/generated/graphql.d.ts
@@ -38983,14 +38983,20 @@ export type GetDiscussionDataQueryVariables = Exact<{
     owner: Scalars['String'];
     name: Scalars['String'];
     categoryID: Scalars['ID'];
-    count: Scalars['Int'];
+    after?: InputMaybe<Scalars['String']>;
+    pageSize: Scalars['Int'];
 }>;
 export type GetDiscussionDataQuery = {
     __typename?: 'Query';
     repository?: {
         __typename?: 'Repository';
         discussions: {
             __typename?: 'DiscussionConnection';
+            pageInfo: {
+                __typename?: 'PageInfo';
+                hasNextPage: boolean;
+                endCursor?: string | null;
+            };
             edges?: Array<{
                 __typename?: 'DiscussionEdge';
                 node?: {
diff --git a/src/GithubDiscussionClient.ts b/src/GithubDiscussionClient.ts
@@ -124,15 +124,16 @@ export class GithubDiscussionClient {
     return result.data.repository?.discussion?.comments as DiscussionCommentConnection;
   }
 
-  public async getDiscussionsMetaData(categoryID: string): Promise<DiscussionConnection> {
+  public async getDiscussionsMetaData(categoryID: string, pageSize: number, afterCursor: string): Promise<DiscussionConnection> {
     const discussionsCount = await this.getTotalDiscussionCount(categoryID);
     const result = await this.githubClient.query<GetDiscussionDataQuery, GetDiscussionDataQueryVariables>({
       query: GetDiscussionData,
       variables: {
         owner: this.owner,
         name: this.repo,
         categoryID: categoryID,
-        count: discussionsCount!,
+        pageSize: pageSize,
+        after: afterCursor,
       },
     })
 
diff --git a/src/generated/graphql.ts b/src/generated/graphql.ts
@@ -41486,9 +41486,18 @@ export const GetDiscussionCount = gql`
 }
     `;
 export const GetDiscussionData = gql`
-    query GetDiscussionData($owner: String!, $name: String!, $categoryID: ID!, $count: Int!) {
+    query GetDiscussionData($owner: String!, $name: String!, $categoryID: ID!, $after: String, $pageSize: Int!) {
   repository(owner: $owner, name: $name) {
-    discussions(categoryId: $categoryID, last: $count) {
+    discussions(
+      categoryId: $categoryID
+      after: $after
+      first: $pageSize
+      orderBy: {field: UPDATED_AT, direction: DESC}
+    ) {
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
       edges {
         node {
           locked
@@ -41633,11 +41642,12 @@ export type GetDiscussionDataQueryVariables = Exact<{
   owner: Scalars['String'];
   name: Scalars['String'];
   categoryID: Scalars['ID'];
-  count: Scalars['Int'];
+  after?: InputMaybe<Scalars['String']>;
+  pageSize: Scalars['Int'];
 }>;
 
 
-export type GetDiscussionDataQuery = { __typename?: 'Query', repository?: { __typename?: 'Repository', discussions: { __typename?: 'DiscussionConnection', edges?: Array<{ __typename?: 'DiscussionEdge', node?: { __typename?: 'Discussion', locked: boolean, id: string, bodyText: string, number: number, closed: boolean, author?: { __typename?: 'Bot', login: string } | { __typename?: 'EnterpriseUserAccount', login: string } | { __typename?: 'Mannequin', login: string } | { __typename?: 'Organization', login: string } | { __typename?: 'User', login: string } | null, answer?: { __typename?: 'DiscussionComment', id: string, bodyText: string } | null } | null } | null> | null } } | null };
+export type GetDiscussionDataQuery = { __typename?: 'Query', repository?: { __typename?: 'Repository', discussions: { __typename?: 'DiscussionConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, endCursor?: string | null }, edges?: Array<{ __typename?: 'DiscussionEdge', node?: { __typename?: 'Discussion', locked: boolean, id: string, bodyText: string, number: number, closed: boolean, author?: { __typename?: 'Bot', login: string } | { __typename?: 'EnterpriseUserAccount', login: string } | { __typename?: 'Mannequin', login: string } | { __typename?: 'Organization', login: string } | { __typename?: 'User', login: string } | null, answer?: { __typename?: 'DiscussionComment', id: string, bodyText: string } | null } | null } | null> | null } } | null };
 
 export type IsDiscussionLockedQueryVariables = Exact<{
   owner: Scalars['String'];
diff --git a/src/index.ts b/src/index.ts
@@ -33,33 +33,42 @@ export async function processDiscussions(githubClient: GithubDiscussionClient) {
   const discussionCategoryIDList: string[] = await githubClient.getAnswerableDiscussionCategoryIDs();
 
   for (const discussionCategoryID of discussionCategoryIDList) {
-    const discussions = await githubClient.getDiscussionsMetaData(discussionCategoryID);
-    for (const discussion of discussions.edges!) {
-      var discussionId = discussion?.node?.id ? discussion?.node?.id : "";
-      var discussionNum = discussion?.node?.number ? discussion.node.number : 0;
-      core.debug(`Processing discussionId: ${discussionId} with number: ${discussionNum} and bodyText: ${discussion?.node?.bodyText}`);
-      if (discussionId === "" || discussionNum === 0) {
-        core.warning(`Can not proceed checking discussion, discussionId is null!`);
-        continue;
-      }
-      else if (discussion?.node?.locked && CLOSE_LOCKED_DISCUSSIONS) {
-        core.info(`Discussion ${discussionId} is locked, closing it as resolved`);
-        githubClient.closeDiscussionAsResolved(discussionId);
-        continue;
-      }
-      else if (discussion?.node?.answer != null && CLOSE_ANSWERED_DISCUSSIONS) {
-        core.info(`Discussion ${discussionId} is already answered, so closing it as resolved.`);
-        githubClient.closeDiscussionAsResolved(discussionId);
-        continue;
-      }
-      else if (discussion?.node?.closed) {
-        core.debug(`Discussion ${discussionId} is closed, so no action needed.`);
-        continue;
-      }
-      else {
-        await processComments(discussion!, githubClient);
+    const pageSize = 50;
+    let hasNextPage = true;
+    let afterCursor: string | null = null;
+
+    while (hasNextPage) {
+      const discussions = await githubClient.getDiscussionsMetaData(discussionCategoryID, pageSize, afterCursor!);
+      hasNextPage = discussions.pageInfo.hasNextPage;
+      afterCursor = discussions.pageInfo.endCursor!;
+    
+      for (const discussion of discussions.edges!) {
+        var discussionId = discussion?.node?.id ? discussion?.node?.id : "";
+        var discussionNum = discussion?.node?.number ? discussion.node.number : 0;
+        core.debug(`Processing discussionId: ${discussionId} with number: ${discussionNum} and bodyText: ${discussion?.node?.bodyText}`);
+        if (discussionId === "" || discussionNum === 0) {
+          core.warning(`Can not proceed checking discussion, discussionId is null!`);
+          continue;
+        }
+        else if (discussion?.node?.locked && CLOSE_LOCKED_DISCUSSIONS) {
+          core.info(`Discussion ${discussionId} is locked, closing it as resolved`);
+          githubClient.closeDiscussionAsResolved(discussionId);
+          continue;
+        }
+        else if (discussion?.node?.answer != null && CLOSE_ANSWERED_DISCUSSIONS) {
+          core.info(`Discussion ${discussionId} is already answered, so closing it as resolved.`);
+          githubClient.closeDiscussionAsResolved(discussionId);
+          continue;
+        }
+        else if (discussion?.node?.closed) {
+          core.debug(`Discussion ${discussionId} is closed, so no action needed.`);
+          continue;
+        }
+        else {
+          await processComments(discussion!, githubClient);
+        }
       }
-    };
+    }
   }
 }
 
diff --git a/src/queries/get-discussion-data.graphql b/src/queries/get-discussion-data.graphql
@@ -1,22 +1,31 @@
-query GetDiscussionData($owner: String!, $name: String!,$categoryID: ID!, $count: Int!) {
+query GetDiscussionData($owner: String!, $name: String!,$categoryID: ID!, $after: String, $pageSize: Int! ) {
   repository(owner: $owner, name: $name) {
-    discussions(categoryId: $categoryID last:$count) {
-      edges {
-        node {
-          locked
-          id
-          bodyText
-          number
-          closed
-          author{
-            login
-          }
-          answer{
+    discussions(
+      categoryId: $categoryID,
+      after: $after,
+      first: $pageSize,
+      orderBy: { field: UPDATED_AT, direction: DESC}
+      ) {
+        pageInfo {
+          hasNextPage
+          endCursor
+        }
+        edges {
+          node {
+            locked
             id
             bodyText
+            number
+            closed
+            author{
+              login
+            }
+            answer{
+              id
+              bodyText
+            }
           }
         }
       }
     }
-  }
-}
+  }
