remove pageinfo returns

mattdholloway · mattdholloway · commit 83c0a7446eae · 2025-07-15T12:24:13.000+01:00
diff --git a/pkg/github/discussions.go b/pkg/github/discussions.go
@@ -124,15 +124,7 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 					discussions = append(discussions, di)
 				}
 
-				// Include pagination info in response
-				response := map[string]interface{}{
-					"discussions": discussions,
-					"pageInfo": map[string]interface{}{
-						"hasNextPage": query.Repository.Discussions.PageInfo.HasNextPage,
-						"endCursor":   query.Repository.Discussions.PageInfo.EndCursor,
-					},
-				}
-				out, err := json.Marshal(response)
+				out, err := json.Marshal(discussions)
 				if err != nil {
 					return nil, fmt.Errorf("failed to marshal discussions: %w", err)
 				}
@@ -184,15 +176,7 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 					discussions = append(discussions, di)
 				}
 
-				// Include pagination info in response
-				response := map[string]interface{}{
-					"discussions": discussions,
-					"pageInfo": map[string]interface{}{
-						"hasNextPage": query.Repository.Discussions.PageInfo.HasNextPage,
-						"endCursor":   query.Repository.Discussions.PageInfo.EndCursor,
-					},
-				}
-				out, err := json.Marshal(response)
+				out, err := json.Marshal(discussions)
 				if err != nil {
 					return nil, fmt.Errorf("failed to marshal discussions: %w", err)
 				}
@@ -346,15 +330,7 @@ func GetDiscussionComments(getGQLClient GetGQLClientFn, t translations.Translati
 				comments = append(comments, &github.IssueComment{Body: github.Ptr(string(c.Body))})
 			}
 
-			result := map[string]interface{}{
-				"comments": comments,
-				"pageInfo": map[string]interface{}{
-					"hasNextPage": bool(q.Repository.Discussion.Comments.PageInfo.HasNextPage),
-					"endCursor":   string(q.Repository.Discussion.Comments.PageInfo.EndCursor),
-				},
-			}
-
-			out, err := json.Marshal(result)
+			out, err := json.Marshal(comments)
 			if err != nil {
 				return nil, fmt.Errorf("failed to marshal comments: %w", err)
 			}
@@ -438,15 +414,7 @@ func ListDiscussionCategories(getGQLClient GetGQLClientFn, t translations.Transl
 				})
 			}
 
-			result := map[string]interface{}{
-				"categories": categories,
-				"pageInfo": map[string]interface{}{
-					"hasNextPage": bool(q.Repository.DiscussionCategories.PageInfo.HasNextPage),
-					"endCursor":   string(q.Repository.DiscussionCategories.PageInfo.EndCursor),
-				},
-			}
-
-			out, err := json.Marshal(result)
+			out, err := json.Marshal(categories)
 			if err != nil {
 				return nil, fmt.Errorf("failed to marshal discussion categories: %w", err)
 			}
diff --git a/pkg/github/discussions_test.go b/pkg/github/discussions_test.go
@@ -163,21 +163,11 @@ func Test_ListDiscussions(t *testing.T) {
 			}
 			require.NoError(t, err)
 
-			// Debug: print the actual response
-			t.Logf("Actual response text: %q", text)
-
 			// Parse the structured response with pagination info
-			var response struct {
-				Discussions []*github.Discussion `json:"discussions"`
-				PageInfo    struct {
-					HasNextPage bool   `json:"hasNextPage"`
-					EndCursor   string `json:"endCursor"`
-				} `json:"pageInfo"`
-			}
-			err = json.Unmarshal([]byte(text), &response)
+			var returnedDiscussions []*github.Discussion
+			err = json.Unmarshal([]byte(text), &returnedDiscussions)
 			require.NoError(t, err)
 
-			returnedDiscussions := response.Discussions
 			assert.Len(t, returnedDiscussions, tc.expectedCount, "Expected %d discussions, got %d", tc.expectedCount, len(returnedDiscussions))
 
 			// Verify that all returned discussions have a category if filtered
@@ -338,18 +328,14 @@ func Test_GetDiscussionComments(t *testing.T) {
 
 	textContent := getTextResult(t, result)
 
-	var response struct {
-		Comments []*github.IssueComment `json:"comments"`
-		PageInfo map[string]interface{} `json:"pageInfo"`
-	}
-	err = json.Unmarshal([]byte(textContent.Text), &response)
+	var comments []*github.IssueComment
+	err = json.Unmarshal([]byte(textContent.Text), &comments)
 	require.NoError(t, err)
-	assert.Len(t, response.Comments, 2)
+	assert.Len(t, comments, 2)
 	expectedBodies := []string{"This is the first comment", "This is the second comment"}
-	for i, comment := range response.Comments {
+	for i, comment := range comments {
 		assert.Equal(t, expectedBodies[i], *comment.Body)
 	}
-	assert.Equal(t, false, response.PageInfo["hasNextPage"])
 }
 
 func Test_ListDiscussionCategories(t *testing.T) {
@@ -394,15 +380,11 @@ func Test_ListDiscussionCategories(t *testing.T) {
 	require.NoError(t, err)
 
 	text := getTextResult(t, result).Text
-	var response struct {
-		Categories []map[string]string    `json:"categories"`
-		PageInfo   map[string]interface{} `json:"pageInfo"`
-	}
-	require.NoError(t, json.Unmarshal([]byte(text), &response))
-	assert.Len(t, response.Categories, 2)
-	assert.Equal(t, "123", response.Categories[0]["id"])
-	assert.Equal(t, "CategoryOne", response.Categories[0]["name"])
-	assert.Equal(t, "456", response.Categories[1]["id"])
-	assert.Equal(t, "CategoryTwo", response.Categories[1]["name"])
-	assert.Equal(t, false, response.PageInfo["hasNextPage"])
+	var categories []map[string]string
+	require.NoError(t, json.Unmarshal([]byte(text), &categories))
+	assert.Len(t, categories, 2)
+	assert.Equal(t, "123", categories[0]["id"])
+	assert.Equal(t, "CategoryOne", categories[0]["name"])
+	assert.Equal(t, "456", categories[1]["id"])
+	assert.Equal(t, "CategoryTwo", categories[1]["name"])
 }
