make GetPullRequests and GetIssues similar

6543 · 6543 · commit 81f7723e4ee6 · 2020-08-31T22:31:00.000+02:00
diff --git a/modules/migrations/base/downloader.go b/modules/migrations/base/downloader.go
@@ -29,7 +29,7 @@ type Downloader interface {
 	GetLabels() ([]*Label, error)
 	GetIssues(page, perPage int) ([]*Issue, bool, error)
 	GetComments(issueNumber int64) ([]*Comment, error)
-	GetPullRequests(page, perPage int) ([]*PullRequest, error)
+	GetPullRequests(page, perPage int) ([]*PullRequest, bool, error)
 	GetReviews(pullRequestNumber int64) ([]*Review, error)
 }
 
@@ -178,19 +178,20 @@ func (d *RetryDownloader) GetComments(issueNumber int64) ([]*Comment, error) {
 }
 
 // GetPullRequests returns a repository's pull requests with retry
-func (d *RetryDownloader) GetPullRequests(page, perPage int) ([]*PullRequest, error) {
+func (d *RetryDownloader) GetPullRequests(page, perPage int) ([]*PullRequest, bool, error) {
 	var (
 		times = d.RetryTimes
 		prs   []*PullRequest
 		err   error
+		isEnd bool
 	)
 	for ; times > 0; times-- {
-		if prs, err = d.Downloader.GetPullRequests(page, perPage); err == nil {
-			return prs, nil
+		if prs, isEnd, err = d.Downloader.GetPullRequests(page, perPage); err == nil {
+			return prs, isEnd, nil
 		}
 		time.Sleep(time.Second * time.Duration(d.RetryDelay))
 	}
-	return nil, err
+	return nil, false, err
 }
 
 // GetReviews returns pull requests reviews
diff --git a/modules/migrations/git.go b/modules/migrations/git.go
@@ -81,8 +81,8 @@ func (g *PlainGitDownloader) GetComments(issueNumber int64) ([]*base.Comment, er
 }
 
 // GetPullRequests returns pull requests according page and perPage
-func (g *PlainGitDownloader) GetPullRequests(start, limit int) ([]*base.PullRequest, error) {
-	return nil, ErrNotSupported
+func (g *PlainGitDownloader) GetPullRequests(start, limit int) ([]*base.PullRequest, bool, error) {
+	return nil, false, ErrNotSupported
 }
 
 // GetReviews returns reviews according issue number
diff --git a/modules/migrations/gitea_downloader.go b/modules/migrations/gitea_downloader.go
@@ -473,9 +473,9 @@ func (g *GiteaDownloader) GetComments(index int64) ([]*base.Comment, error) {
 }
 
 // GetPullRequests returns pull requests according page and perPage
-func (g *GiteaDownloader) GetPullRequests(page, perPage int) ([]*base.PullRequest, error) {
+func (g *GiteaDownloader) GetPullRequests(page, perPage int) ([]*base.PullRequest, bool, error) {
 	if g == nil {
-		return nil, errors.New("error: GiteaDownloader is nil")
+		return nil, false, errors.New("error: GiteaDownloader is nil")
 	}
 
 	if perPage > g.maxPerPage {
@@ -491,7 +491,7 @@ func (g *GiteaDownloader) GetPullRequests(page, perPage int) ([]*base.PullReques
 		State: gitea_sdk.StateAll,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("error while listing repos: %v", err)
+		return nil, false, fmt.Errorf("error while listing repos: %v", err)
 	}
 	for _, pr := range prs {
 		var milestone string
@@ -527,7 +527,7 @@ func (g *GiteaDownloader) GetPullRequests(page, perPage int) ([]*base.PullReques
 
 		reactions, err := g.getIssueReactions(pr.Index)
 		if err != nil {
-			return nil, fmt.Errorf("error while loading reactions: %v", err)
+			return nil, false, fmt.Errorf("error while loading reactions: %v", err)
 		}
 
 		var assignees []string
@@ -580,7 +580,7 @@ func (g *GiteaDownloader) GetPullRequests(page, perPage int) ([]*base.PullReques
 		})
 	}
 
-	return allPRs, nil
+	return allPRs, len(prs) < perPage, nil
 }
 
 // GetReviews returns pull requests review
diff --git a/modules/migrations/github.go b/modules/migrations/github.go
@@ -486,7 +486,7 @@ func (g *GithubDownloaderV3) GetComments(issueNumber int64) ([]*base.Comment, er
 }
 
 // GetPullRequests returns pull requests according page and perPage
-func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullRequest, error) {
+func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullRequest, bool, error) {
 	opt := &github.PullRequestListOptions{
 		Sort:      "created",
 		Direction: "asc",
@@ -500,7 +500,7 @@ func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullReq
 	g.sleep()
 	prs, resp, err := g.client.PullRequests.List(g.ctx, g.repoOwner, g.repoName, opt)
 	if err != nil {
-		return nil, fmt.Errorf("error while listing repos: %v", err)
+		return nil, false, fmt.Errorf("error while listing repos: %v", err)
 	}
 	g.rate = &resp.Rate
 	for _, pr := range prs {
@@ -566,7 +566,7 @@ func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullReq
 				PerPage: perPage,
 			})
 			if err != nil {
-				return nil, err
+				return nil, false, err
 			}
 			g.rate = &resp.Rate
 			if len(res) == 0 {
@@ -616,7 +616,7 @@ func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullReq
 		})
 	}
 
-	return allPRs, nil
+	return allPRs, len(prs) < perPage, nil
 }
 
 func convertGithubReview(r *github.PullRequestReview) *base.Review {
diff --git a/modules/migrations/github_test.go b/modules/migrations/github_test.go
@@ -269,7 +269,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
 	}, comments[:2])
 
 	// downloader.GetPullRequests()
-	prs, err := downloader.GetPullRequests(1, 2)
+	prs, _, err := downloader.GetPullRequests(1, 2)
 	assert.NoError(t, err)
 	assert.EqualValues(t, 2, len(prs))
 
diff --git a/modules/migrations/gitlab.go b/modules/migrations/gitlab.go
@@ -441,7 +441,7 @@ func (g *GitlabDownloader) GetComments(issueNumber int64) ([]*base.Comment, erro
 }
 
 // GetPullRequests returns pull requests according page and perPage
-func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullRequest, error) {
+func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullRequest, bool, error) {
 
 	opt := &gitlab.ListProjectMergeRequestsOptions{
 		ListOptions: gitlab.ListOptions{
@@ -457,7 +457,7 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
 
 	prs, _, err := g.client.MergeRequests.ListProjectMergeRequests(g.repoID, opt, nil)
 	if err != nil {
-		return nil, fmt.Errorf("error while listing merge requests: %v", err)
+		return nil, false, fmt.Errorf("error while listing merge requests: %v", err)
 	}
 	for _, pr := range prs {
 
@@ -530,7 +530,7 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
 		})
 	}
 
-	return allPRs, nil
+	return allPRs, len(prs) < perPage, nil
 }
 
 // GetReviews returns pull requests review
diff --git a/modules/migrations/gitlab_test.go b/modules/migrations/gitlab_test.go
@@ -200,7 +200,7 @@ func TestGitlabDownloadRepo(t *testing.T) {
 		},
 	}, comments[:4])
 
-	prs, err := downloader.GetPullRequests(1, 1)
+	prs, _, err := downloader.GetPullRequests(1, 1)
 	assert.NoError(t, err)
 	assert.Len(t, prs, 1)
 
diff --git a/modules/migrations/migrate.go b/modules/migrations/migrate.go
@@ -231,7 +231,7 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts
 		log.Trace("migrating pull requests and comments")
 		var prBatchSize = uploader.MaxBatchInsertSize("pullrequest")
 		for i := 1; ; i++ {
-			prs, err := downloader.GetPullRequests(i, prBatchSize)
+			prs, isEnd, err := downloader.GetPullRequests(i, prBatchSize)
 			if err != nil {
 				return err
 			}
@@ -302,7 +302,7 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts
 				}
 			}
 
-			if len(prs) < prBatchSize {
+			if isEnd {
 				break
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type Downloader interface {`
`29`	`29`	`GetLabels() ([]*Label, error)`
`30`	`30`	`GetIssues(page, perPage int) ([]*Issue, bool, error)`
`31`	`31`	`GetComments(issueNumber int64) ([]*Comment, error)`
`32`		`- GetPullRequests(page, perPage int) ([]*PullRequest, error)`
	`32`	`+ GetPullRequests(page, perPage int) ([]*PullRequest, bool, error)`
`33`	`33`	`GetReviews(pullRequestNumber int64) ([]*Review, error)`
`34`	`34`	`}`
`35`	`35`
`@@ -178,19 +178,20 @@ func (d RetryDownloader) GetComments(issueNumber int64) ([]Comment, error) {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`// GetPullRequests returns a repository's pull requests with retry`
`181`		`-func (d RetryDownloader) GetPullRequests(page, perPage int) ([]PullRequest, error) {`
	`181`	`+func (d RetryDownloader) GetPullRequests(page, perPage int) ([]PullRequest, bool, error) {`
`182`	`182`	`var (`
`183`	`183`	`times = d.RetryTimes`
`184`	`184`	`prs []*PullRequest`
`185`	`185`	`err error`
	`186`	`+ isEnd bool`
`186`	`187`	`)`
`187`	`188`	`for ; times > 0; times-- {`
`188`		`- if prs, err = d.Downloader.GetPullRequests(page, perPage); err == nil {`
`189`		`- return prs, nil`
	`189`	`+ if prs, isEnd, err = d.Downloader.GetPullRequests(page, perPage); err == nil {`
	`190`	`+ return prs, isEnd, nil`
`190`	`191`	`}`
`191`	`192`	`time.Sleep(time.Second * time.Duration(d.RetryDelay))`
`192`	`193`	`}`
`193`		`- return nil, err`
	`194`	`+ return nil, false, err`
`194`	`195`	`}`
`195`	`196`
`196`	`197`	`// GetReviews returns pull requests reviews`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ func (g PlainGitDownloader) GetComments(issueNumber int64) ([]base.Comment, er`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// GetPullRequests returns pull requests according page and perPage`
`84`		`-func (g PlainGitDownloader) GetPullRequests(start, limit int) ([]base.PullRequest, error) {`
`85`		`- return nil, ErrNotSupported`
	`84`	`+func (g PlainGitDownloader) GetPullRequests(start, limit int) ([]base.PullRequest, bool, error) {`
	`85`	`+ return nil, false, ErrNotSupported`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`// GetReviews returns reviews according issue number`
Original file line number	Diff line number	Diff line change
`@@ -473,9 +473,9 @@ func (g GiteaDownloader) GetComments(index int64) ([]base.Comment, error) {`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`// GetPullRequests returns pull requests according page and perPage`
`476`		`-func (g GiteaDownloader) GetPullRequests(page, perPage int) ([]base.PullRequest, error) {`
	`476`	`+func (g GiteaDownloader) GetPullRequests(page, perPage int) ([]base.PullRequest, bool, error) {`
`477`	`477`	`if g == nil {`
`478`		`- return nil, errors.New("error: GiteaDownloader is nil")`
	`478`	`+ return nil, false, errors.New("error: GiteaDownloader is nil")`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`if perPage > g.maxPerPage {`
`@@ -491,7 +491,7 @@ func (g GiteaDownloader) GetPullRequests(page, perPage int) ([]base.PullReques`
`491`	`491`	`State: gitea_sdk.StateAll,`
`492`	`492`	`})`
`493`	`493`	`if err != nil {`
`494`		`- return nil, fmt.Errorf("error while listing repos: %v", err)`
	`494`	`+ return nil, false, fmt.Errorf("error while listing repos: %v", err)`
`495`	`495`	`}`
`496`	`496`	`for _, pr := range prs {`
`497`	`497`	`var milestone string`
`@@ -527,7 +527,7 @@ func (g GiteaDownloader) GetPullRequests(page, perPage int) ([]base.PullReques`
`527`	`527`
`528`	`528`	`reactions, err := g.getIssueReactions(pr.Index)`
`529`	`529`	`if err != nil {`
`530`		`- return nil, fmt.Errorf("error while loading reactions: %v", err)`
	`530`	`+ return nil, false, fmt.Errorf("error while loading reactions: %v", err)`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`var assignees []string`
`@@ -580,7 +580,7 @@ func (g GiteaDownloader) GetPullRequests(page, perPage int) ([]base.PullReques`
`580`	`580`	`})`
`581`	`581`	`}`
`582`	`582`
`583`		`- return allPRs, nil`
	`583`	`+ return allPRs, len(prs) < perPage, nil`
`584`	`584`	`}`
`585`	`585`
`586`	`586`	`// GetReviews returns pull requests review`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ func (g GitlabDownloader) GetComments(issueNumber int64) ([]base.Comment, erro`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`// GetPullRequests returns pull requests according page and perPage`
`444`		`-func (g GitlabDownloader) GetPullRequests(page, perPage int) ([]base.PullRequest, error) {`
	`444`	`+func (g GitlabDownloader) GetPullRequests(page, perPage int) ([]base.PullRequest, bool, error) {`
`445`	`445`
`446`	`446`	`opt := &gitlab.ListProjectMergeRequestsOptions{`
`447`	`447`	`ListOptions: gitlab.ListOptions{`
`@@ -457,7 +457,7 @@ func (g GitlabDownloader) GetPullRequests(page, perPage int) ([]base.PullReque`
`457`	`457`
`458`	`458`	`prs, _, err := g.client.MergeRequests.ListProjectMergeRequests(g.repoID, opt, nil)`
`459`	`459`	`if err != nil {`
`460`		`- return nil, fmt.Errorf("error while listing merge requests: %v", err)`
	`460`	`+ return nil, false, fmt.Errorf("error while listing merge requests: %v", err)`
`461`	`461`	`}`
`462`	`462`	`for _, pr := range prs {`
`463`	`463`
`@@ -530,7 +530,7 @@ func (g GitlabDownloader) GetPullRequests(page, perPage int) ([]base.PullReque`
`530`	`530`	`})`
`531`	`531`	`}`
`532`	`532`
`533`		`- return allPRs, nil`
	`533`	`+ return allPRs, len(prs) < perPage, nil`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`// GetReviews returns pull requests review`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts`
`231`	`231`	`log.Trace("migrating pull requests and comments")`
`232`	`232`	`var prBatchSize = uploader.MaxBatchInsertSize("pullrequest")`
`233`	`233`	`for i := 1; ; i++ {`
`234`		`- prs, err := downloader.GetPullRequests(i, prBatchSize)`
	`234`	`+ prs, isEnd, err := downloader.GetPullRequests(i, prBatchSize)`
`235`	`235`	`if err != nil {`
`236`	`236`	`return err`
`237`	`237`	`}`
`@@ -302,7 +302,7 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`
`305`		`- if len(prs) < prBatchSize {`
	`305`	`+ if isEnd {`
`306`	`306`	`break`
`307`	`307`	`}`
`308`	`308`	`}`