refactor queries (#81)

* this was already set * make a generic paginate and use with ProjectItems * use a single Project struct type * generic paginate ProjectFields * fix tests * cleanup * add missing query variables * projectAttribute type constraint * fix tests * do not fetch not needed fields and items * explanation * pass around pointers to avoid copying * add queries_test.go * bug fix * do not request data that will not be shown * begone magic numbers * add type constraint to pager
github · Mar 23, 2023 · 4507ef5 · 4507ef5
1 parent e4e74de
commit 4507ef5
Show file tree

Hide file tree

Showing 30 changed files with 899 additions and 343 deletions.
diff --git a/cmd/close/close.go b/cmd/close/close.go
@@ -104,7 +104,7 @@ func runClose(config closeConfig) error {
 		return err
 	}
 
-	project, err := queries.NewProject(config.client, owner, config.opts.number)
+	project, err := queries.NewProject(config.client, owner, config.opts.number, false)
 	if err != nil {
 		return err
 	}
@@ -131,6 +131,10 @@ func closeArgs(config closeConfig) (*updateProjectMutation, map[string]interface
 			ProjectID: githubv4.ID(config.opts.projectID),
 			Closed:    githubv4.NewBoolean(githubv4.Boolean(closed)),
 		},
+		"firstItems":  githubv4.Int(0),
+		"afterItems":  (*githubv4.String)(nil),
+		"firstFields": githubv4.Int(0),
+		"afterFields": (*githubv4.String)(nil),
 	}
 }
 

diff --git a/cmd/close/close_test.go b/cmd/close/close_test.go
@@ -41,8 +41,12 @@ func TestRunClose_User(t *testing.T) {
 		JSON(map[string]interface{}{
 			"query": "query UserProject.*",
 			"variables": map[string]interface{}{
-				"login":  "monalisa",
-				"number": 1,
+				"login":       "monalisa",
+				"number":      1,
+				"firstItems":  0,
+				"afterItems":  nil,
+				"firstFields": 0,
+				"afterFields": nil,
 			},
 		}).
 		Reply(200).
@@ -59,7 +63,7 @@ func TestRunClose_User(t *testing.T) {
 	// close project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation CloseProjectV2.*"variables":{"input":{"projectId":"an ID","closed":true}}}`).
+		BodyString(`{"query":"mutation CloseProjectV2.*"variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"projectId":"an ID","closed":true}}}`).
 		Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
@@ -126,8 +130,12 @@ func TestRunClose_Org(t *testing.T) {
 		JSON(map[string]interface{}{
 			"query": "query OrgProject.*",
 			"variables": map[string]interface{}{
-				"login":  "github",
-				"number": 1,
+				"login":       "github",
+				"number":      1,
+				"firstItems":  0,
+				"afterItems":  nil,
+				"firstFields": 0,
+				"afterFields": nil,
 			},
 		}).
 		Reply(200).
@@ -144,7 +152,7 @@ func TestRunClose_Org(t *testing.T) {
 	// close project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation CloseProjectV2.*"variables":{"input":{"projectId":"an ID","closed":true}}}`).
+		BodyString(`{"query":"mutation CloseProjectV2.*"variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"projectId":"an ID","closed":true}}}`).
 		Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
@@ -208,7 +216,11 @@ func TestRunClose_Me(t *testing.T) {
 		JSON(map[string]interface{}{
 			"query": "query ViewerProject.*",
 			"variables": map[string]interface{}{
-				"number": 1,
+				"number":      1,
+				"firstItems":  0,
+				"afterItems":  nil,
+				"firstFields": 0,
+				"afterFields": nil,
 			},
 		}).
 		Reply(200).
@@ -225,7 +237,7 @@ func TestRunClose_Me(t *testing.T) {
 	// close project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation CloseProjectV2.*"variables":{"input":{"projectId":"an ID","closed":true}}}`).
+		BodyString(`{"query":"mutation CloseProjectV2.*"variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"projectId":"an ID","closed":true}}}`).
 		Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
@@ -292,8 +304,12 @@ func TestRunClose_Reopen(t *testing.T) {
 		JSON(map[string]interface{}{
 			"query": "query UserProject.*",
 			"variables": map[string]interface{}{
-				"login":  "monalisa",
-				"number": 1,
+				"login":       "monalisa",
+				"number":      1,
+				"firstItems":  0,
+				"afterItems":  nil,
+				"firstFields": 0,
+				"afterFields": nil,
 			},
 		}).
 		Reply(200).
@@ -310,7 +326,7 @@ func TestRunClose_Reopen(t *testing.T) {
 	// close project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation CloseProjectV2.*"variables":{"input":{"projectId":"an ID","closed":false}}}`).
+		BodyString(`{"query":"mutation CloseProjectV2.*"variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"projectId":"an ID","closed":false}}}`).
 		Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{

diff --git a/cmd/copy/copy.go b/cmd/copy/copy.go
@@ -118,7 +118,7 @@ func runCopy(config copyConfig) error {
 		return err
 	}
 
-	project, err := queries.NewProject(config.client, sourceOwner, config.opts.number)
+	project, err := queries.NewProject(config.client, sourceOwner, config.opts.number, false)
 	if err != nil {
 		return err
 	}
@@ -148,6 +148,10 @@ func copyArgs(config copyConfig) (*copyProjectMutation, map[string]interface{})
 			Title:              githubv4.String(config.opts.title),
 			IncludeDraftIssues: githubv4.NewBoolean(githubv4.Boolean(config.opts.includeDraftIssues)),
 		},
+		"firstItems":  githubv4.Int(0),
+		"afterItems":  (*githubv4.String)(nil),
+		"firstFields": githubv4.Int(0),
+		"afterFields": (*githubv4.String)(nil),
 	}
 }
 

diff --git a/cmd/copy/copy_test.go b/cmd/copy/copy_test.go
@@ -22,8 +22,12 @@ func TestRunCopy_User(t *testing.T) {
 		JSON(map[string]interface{}{
 			"query": "query UserProject.*",
 			"variables": map[string]interface{}{
-				"login":  "monalisa",
-				"number": 1,
+				"login":       "monalisa",
+				"number":      1,
+				"firstItems":  0,
+				"afterItems":  nil,
+				"firstFields": 0,
+				"afterFields": nil,
 			},
 		}).
 		Reply(200).
@@ -80,7 +84,7 @@ func TestRunCopy_User(t *testing.T) {
 	// Copy project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation CopyProjectV2.*","variables":{"input":{"projectId":"an ID","ownerId":"an ID","title":"a title","includeDraftIssues":false}}}`).
+		BodyString(`{"query":"mutation CopyProjectV2.*","variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"projectId":"an ID","ownerId":"an ID","title":"a title","includeDraftIssues":false}}}`).
 		Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
@@ -130,8 +134,12 @@ func TestRunCopy_Org(t *testing.T) {
 		JSON(map[string]interface{}{
 			"query": "query OrgProject.*",
 			"variables": map[string]interface{}{
-				"login":  "github",
-				"number": 1,
+				"login":       "github",
+				"number":      1,
+				"firstItems":  0,
+				"afterItems":  nil,
+				"firstFields": 0,
+				"afterFields": nil,
 			},
 		}).
 		Reply(200).
@@ -187,7 +195,7 @@ func TestRunCopy_Org(t *testing.T) {
 	// Copy project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation CopyProjectV2.*","variables":{"input":{"projectId":"an ID","ownerId":"an ID","title":"a title","includeDraftIssues":false}}}`).
+		BodyString(`{"query":"mutation CopyProjectV2.*","variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"projectId":"an ID","ownerId":"an ID","title":"a title","includeDraftIssues":false}}}`).
 		Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
@@ -236,7 +244,11 @@ func TestRunCopy_Me(t *testing.T) {
 		JSON(map[string]interface{}{
 			"query": "query ViewerProject.*",
 			"variables": map[string]interface{}{
-				"number": 1,
+				"number":      1,
+				"firstItems":  0,
+				"afterItems":  nil,
+				"firstFields": 0,
+				"afterFields": nil,
 			},
 		}).
 		Reply(200).
@@ -287,7 +299,7 @@ func TestRunCopy_Me(t *testing.T) {
 	// Copy project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation CopyProjectV2.*","variables":{"input":{"projectId":"an ID","ownerId":"an ID","title":"a title","includeDraftIssues":false}}}`).Reply(200).
+		BodyString(`{"query":"mutation CopyProjectV2.*","variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"projectId":"an ID","ownerId":"an ID","title":"a title","includeDraftIssues":false}}}`).Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
 				"copyProjectV2": map[string]interface{}{

diff --git a/cmd/create/create.go b/cmd/create/create.go
@@ -115,6 +115,10 @@ func createArgs(config createConfig) (*createProjectMutation, map[string]interfa
 			OwnerID: githubv4.ID(config.opts.ownerID),
 			Title:   githubv4.String(config.opts.title),
 		},
+		"firstItems":  githubv4.Int(0),
+		"afterItems":  (*githubv4.String)(nil),
+		"firstFields": githubv4.Int(0),
+		"afterFields": (*githubv4.String)(nil),
 	}
 }
 

diff --git a/cmd/create/create_test.go b/cmd/create/create_test.go
@@ -38,7 +38,7 @@ func TestRunCreate_User(t *testing.T) {
 	// create project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation CreateProjectV2.*"variables":{"input":{"ownerId":"an ID","title":"a title"}}}`).
+		BodyString(`{"query":"mutation CreateProjectV2.*"variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"ownerId":"an ID","title":"a title"}}}`).
 		Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
@@ -101,7 +101,7 @@ func TestRunCreate_Org(t *testing.T) {
 	// create project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation CreateProjectV2.*"variables":{"input":{"ownerId":"an ID","title":"a title"}}}`).Reply(200).
+		BodyString(`{"query":"mutation CreateProjectV2.*"variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"ownerId":"an ID","title":"a title"}}}`).Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
 				"createProjectV2": map[string]interface{}{
@@ -160,7 +160,7 @@ func TestRunCreate_Me(t *testing.T) {
 	// create project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation CreateProjectV2.*"variables":{"input":{"ownerId":"an ID","title":"a title"}}}`).Reply(200).
+		BodyString(`{"query":"mutation CreateProjectV2.*"variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"ownerId":"an ID","title":"a title"}}}`).Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
 				"createProjectV2": map[string]interface{}{

diff --git a/cmd/delete/delete.go b/cmd/delete/delete.go
@@ -102,7 +102,7 @@ func runDelete(config deleteConfig) error {
 		return err
 	}
 
-	project, err := queries.NewProject(config.client, owner, config.opts.number)
+	project, err := queries.NewProject(config.client, owner, config.opts.number, false)
 	if err != nil {
 		return err
 	}
@@ -127,6 +127,10 @@ func deleteItemArgs(config deleteConfig) (*deleteProjectMutation, map[string]int
 		"input": githubv4.DeleteProjectV2Input{
 			ProjectID: githubv4.ID(config.opts.projectID),
 		},
+		"firstItems":  githubv4.Int(0),
+		"afterItems":  (*githubv4.String)(nil),
+		"firstFields": githubv4.Int(0),
+		"afterFields": (*githubv4.String)(nil),
 	}
 }
 

diff --git a/cmd/delete/delete_test.go b/cmd/delete/delete_test.go
@@ -41,8 +41,12 @@ func TestRunDelete_User(t *testing.T) {
 		JSON(map[string]interface{}{
 			"query": "query UserProject.*",
 			"variables": map[string]interface{}{
-				"login":  "monalisa",
-				"number": 1,
+				"login":       "monalisa",
+				"number":      1,
+				"firstItems":  0,
+				"afterItems":  nil,
+				"firstFields": 0,
+				"afterFields": nil,
 			},
 		}).
 		Reply(200).
@@ -59,7 +63,7 @@ func TestRunDelete_User(t *testing.T) {
 	// delete project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation DeleteProject.*","variables":{"input":{"projectId":"an ID"}}}`).
+		BodyString(`{"query":"mutation DeleteProject.*","variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"projectId":"an ID"}}}`).
 		Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
@@ -122,8 +126,12 @@ func TestRunDelete_Org(t *testing.T) {
 		JSON(map[string]interface{}{
 			"query": "query OrgProject.*",
 			"variables": map[string]interface{}{
-				"login":  "github",
-				"number": 1,
+				"login":       "github",
+				"number":      1,
+				"firstItems":  0,
+				"afterItems":  nil,
+				"firstFields": 0,
+				"afterFields": nil,
 			},
 		}).
 		Reply(200).
@@ -140,7 +148,7 @@ func TestRunDelete_Org(t *testing.T) {
 	// delete project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation DeleteProject.*","variables":{"input":{"projectId":"an ID"}}}`).
+		BodyString(`{"query":"mutation DeleteProject.*","variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"projectId":"an ID"}}}`).
 		Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{
@@ -200,7 +208,11 @@ func TestRunDelete_Me(t *testing.T) {
 		JSON(map[string]interface{}{
 			"query": "query ViewerProject.*",
 			"variables": map[string]interface{}{
-				"number": 1,
+				"number":      1,
+				"firstItems":  0,
+				"afterItems":  nil,
+				"firstFields": 0,
+				"afterFields": nil,
 			},
 		}).
 		Reply(200).
@@ -217,7 +229,7 @@ func TestRunDelete_Me(t *testing.T) {
 	// delete project
 	gock.New("https://api.github.com").
 		Post("/graphql").
-		BodyString(`{"query":"mutation DeleteProject.*","variables":{"input":{"projectId":"an ID"}}}`).
+		BodyString(`{"query":"mutation DeleteProject.*","variables":{"afterFields":null,"afterItems":null,"firstFields":0,"firstItems":0,"input":{"projectId":"an ID"}}}`).
 		Reply(200).
 		JSON(map[string]interface{}{
 			"data": map[string]interface{}{

diff --git a/cmd/edit/edit.go b/cmd/edit/edit.go
@@ -121,7 +121,7 @@ func runEdit(config editConfig) error {
 		return err
 	}
 
-	project, err := queries.NewProject(config.client, owner, config.opts.number)
+	project, err := queries.NewProject(config.client, owner, config.opts.number, false)
 	if err != nil {
 		return err
 	}
@@ -160,7 +160,11 @@ func editArgs(config editConfig) (*updateProjectMutation, map[string]interface{}
 	}
 
 	return &updateProjectMutation{}, map[string]interface{}{
-		"input": variables,
+		"input":       variables,
+		"firstItems":  githubv4.Int(0),
+		"afterItems":  (*githubv4.String)(nil),
+		"firstFields": githubv4.Int(0),
+		"afterFields": (*githubv4.String)(nil),
 	}
 }