as per review

Signed-off-by: Andrew Thornton <art27@cantab.net>

Author: zeripath

services/migrations/gitea_downloader.go

@@ -670,18 +670,18 @@ func (g *GiteaDownloader) GetReviews(reviewable base.Reviewable) ([]*base.Review
 			}
 
 			review := &base.Review{
-				ID:         pr.ID,
-				IssueIndex: reviewable.GetLocalIndex(),
-				Official:   pr.Official,
-				CommitID:   pr.CommitID,
-				Content:    pr.Body,
-				CreatedAt:  pr.Submitted,
-				State:      string(pr.State),
-				Comments:   reviewComments,
+				ID:           pr.ID,
+				IssueIndex:   reviewable.GetLocalIndex(),
+				ReviewerID:   pr.Reviewer.ID,
+				ReviewerName: pr.Reviewer.UserName,
+				Official:     pr.Official,
+				CommitID:     pr.CommitID,
+				Content:      pr.Body,
+				CreatedAt:    pr.Submitted,
+				State:        string(pr.State),
+				Comments:     reviewComments,
 			}
 
-			review.ReviewerID = pr.Reviewer.ID
-			review.ReviewerName = pr.Reviewer.UserName
 			allReviews = append(allReviews, review)
 		}
 

services/migrations/github.go

@@ -778,6 +778,7 @@ func (g *GithubDownloaderV3) GetReviews(reviewable base.Reviewable) ([]*base.Rev
 	opt := &github.ListOptions{
 		PerPage: g.maxPerPage,
 	}
+	// Get approve/request change reviews
 	for {
 		g.waitAndPickClient()
 		reviews, resp, err := g.getClient().PullRequests.ListReviews(g.ctx, g.repoOwner, g.repoName, int(reviewable.GetForeignIndex()), opt)
@@ -817,6 +818,7 @@ func (g *GithubDownloaderV3) GetReviews(reviewable base.Reviewable) ([]*base.Rev
 		}
 		opt.Page = resp.NextPage
 	}
+	// Get requested reviews
 	for {
 		g.waitAndPickClient()
 		reviewers, resp, err := g.getClient().PullRequests.ListReviewers(g.ctx, g.repoOwner, g.repoName, int(reviewable.GetForeignIndex()), opt)