refactor(discussion): add Cursor field and ExportData to DiscussionLi…

…stResult Track the input pagination cursor on DiscussionListResult and add an ExportData method that conditionally includes cursor/next fields. Use ExportData in the list command instead of manually building the JSON envelope. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
babakks · Jun 10, 2026 · Jun 1, 2026 · Jun 1, 2026 · Jun 1, 2026 · Jun 1, 2026
commit fbd733e3a255e8a22ed42f9c9405ccf311594940
diff --git a/pkg/cmd/discussion/client/client_impl.go b/pkg/cmd/discussion/client/client_impl.go
@@ -209,7 +209,9 @@ func (c *discussionClient) List(repo ghrepo.Interface, filters ListFilters, afte
 		variables["answered"] = githubv4.Boolean(*filters.Answered)
 	}
 
-	var result DiscussionListResult
+	result := DiscussionListResult{
+		Cursor: after,
+	}
 	remaining := limit
 
 	for {
@@ -326,7 +328,9 @@ func (c *discussionClient) Search(repo ghrepo.Interface, filters SearchFilters,
 		variables["after"] = githubv4.String(after)
 	}
 
-	var result DiscussionListResult
+	result := DiscussionListResult{
+		Cursor: after,
+	}
 	remaining := limit
 
 	for {

diff --git a/pkg/cmd/discussion/client/client_impl_test.go b/pkg/cmd/discussion/client/client_impl_test.go
@@ -67,7 +67,7 @@ func minimalNodes(count int) string {
 }
 
 // listResp builds a mock repository.discussions JSON response.
-func listResp(hasNext bool, cursor string, total int, nodes string) string {
+func listResp(hasNext bool, endCursor string, total int, nodes string) string {
 	return heredoc.Docf(`
 		{
 			"data": {
@@ -84,11 +84,11 @@ func listResp(hasNext bool, cursor string, total int, nodes string) string {
 				}
 			}
 		}
-	`, total, hasNext, cursor, nodes)
+	`, total, hasNext, endCursor, nodes)
 }
 
 // searchResp builds a mock search JSON response.
-func searchResp(hasNext bool, cursor string, count int, nodes string) string {
+func searchResp(hasNext bool, endCursor string, count int, nodes string) string {
 	return heredoc.Docf(`
 		{
 			"data": {
@@ -102,7 +102,7 @@ func searchResp(hasNext bool, cursor string, count int, nodes string) string {
 				}
 			}
 		}
-	`, count, hasNext, cursor, nodes)
+	`, count, hasNext, endCursor, nodes)
 }
 
 func TestList(t *testing.T) {
@@ -180,6 +180,7 @@ func TestList(t *testing.T) {
 		wantErr        string
 		wantTotal      int
 		wantLen        int
+		wantNextCursor string
 		wantCursor     string
 		wantTitles     []string
 		wantSingleDisc *Discussion
@@ -291,6 +292,7 @@ func TestList(t *testing.T) {
 					}),
 				)
 			},
+			wantCursor: "someCursor",
 		},
 		{
 			name:    "open state filter",
@@ -478,9 +480,9 @@ func TestList(t *testing.T) {
 					httpmock.StringResponse(listResp(true, "cursor42", 5, minimalNode("D1", "Discussion 1"))),
 				)
 			},
-			wantLen:    1,
-			wantTotal:  5,
-			wantCursor: "cursor42",
+			wantLen:        1,
+			wantTotal:      5,
+			wantNextCursor: "cursor42",
 		},
 		{
 			// Two pages are fetched when limit exceeds the first page's results.
@@ -537,7 +539,8 @@ func TestList(t *testing.T) {
 			require.NotNil(t, result)
 			assert.Equal(t, tt.wantTotal, result.TotalCount)
 			assert.Len(t, result.Discussions, tt.wantLen)
-			assert.Equal(t, tt.wantCursor, result.NextCursor)
+			assert.Equal(t, tt.wantCursor, result.Cursor)
+			assert.Equal(t, tt.wantNextCursor, result.NextCursor)
 
 			for i, title := range tt.wantTitles {
 				assert.Equal(t, title, result.Discussions[i].Title)
@@ -609,6 +612,7 @@ func TestSearch(t *testing.T) {
 		wantTotal      int
 		wantLen        int
 		wantCursor     string
+		wantNextCursor string
 		wantTitles     []string
 		wantSingleDisc *Discussion
 	}{
@@ -695,6 +699,7 @@ func TestSearch(t *testing.T) {
 					}),
 				)
 			},
+			wantCursor: "someCursor",
 		},
 		{
 			name:    "open state filter",
@@ -860,9 +865,9 @@ func TestSearch(t *testing.T) {
 					httpmock.StringResponse(searchResp(true, "searchCursor42", 5, minimalNode("D1", "Discussion 1"))),
 				)
 			},
-			wantLen:    1,
-			wantTotal:  5,
-			wantCursor: "searchCursor42",
+			wantLen:        1,
+			wantTotal:      5,
+			wantNextCursor: "searchCursor42",
 		},
 		{
 			// Two pages are fetched when limit exceeds the first page's results.
@@ -919,7 +924,8 @@ func TestSearch(t *testing.T) {
 			require.NotNil(t, result)
 			assert.Equal(t, tt.wantTotal, result.TotalCount)
 			assert.Len(t, result.Discussions, tt.wantLen)
-			assert.Equal(t, tt.wantCursor, result.NextCursor)
+			assert.Equal(t, tt.wantCursor, result.Cursor)
+			assert.Equal(t, tt.wantNextCursor, result.NextCursor)
 
 			for i, title := range tt.wantTitles {
 				assert.Equal(t, title, result.Discussions[i].Title)

@@ -289,9 +289,30 @@ const (
 type DiscussionListResult struct {
 	Discussions []Discussion
 	TotalCount  int
+	Cursor      string
 	NextCursor  string
 }
 
+// ExportData returns a map suitable for JSON output, including pagination
+// fields only when they are non-empty.
+func (r DiscussionListResult) ExportData(fields []string) map[string]interface{} {
+	discussions := make([]interface{}, len(r.Discussions))
+	for i, d := range r.Discussions {
+		discussions[i] = d.ExportData(fields)
+	}
+	m := map[string]interface{}{
+		"totalCount":  r.TotalCount,
+		"discussions": discussions,
+	}
+	if r.NextCursor != "" {
+		m["next"] = r.NextCursor
+	}
+	if r.Cursor != "" {
+		m["cursor"] = r.Cursor
+	}
+	return m
+}
+
 // ListFilters holds parameters for the repository.discussions query.
 // CategoryID must be resolved by the caller before passing to List.
 // A nil State indicates no state filtering (all states).

@@ -247,12 +247,7 @@ func listRun(opts *ListOptions) error {
 	}
 
 	if opts.Exporter != nil {
-		envelope := map[string]interface{}{
-			"totalCount":  result.TotalCount,
-			"discussions": result.Discussions,
-			"next":        result.NextCursor,
-		}
-		return opts.Exporter.Write(opts.IO, envelope)
+		return opts.Exporter.Write(opts.IO, result)
 	}
 
 	if len(result.Discussions) == 0 {