Added test and migration when external user login

Author: lunny

models/external_login_user.go

@@ -181,5 +181,8 @@ func UpdateMigrationsByType(tp structs.GitServiceType, externalUserID string, us
 		return err
 	}
 
-	return UpdateReactionsMigrationsByType(tp, externalUserID, userID)
+	if err := UpdateReactionsMigrationsByType(tp, externalUserID, userID); err != nil {
+		return err
+	}
+	return UpdateReviewsMigrationsByType(tp, externalUserID, userID)
 }

models/migrate.go

@@ -4,7 +4,12 @@
 
 package models
 
-import "xorm.io/xorm"
+import (
+	"code.gitea.io/gitea/modules/structs"
+
+	"xorm.io/builder"
+	"xorm.io/xorm"
+)
 
 // InsertMilestones creates milestones of repository.
 func InsertMilestones(ms ...*Milestone) (err error) {
@@ -202,3 +207,23 @@ func InsertReleases(rels ...*Release) error {
 
 	return sess.Commit()
 }
+
+// UpdateReviewsMigrationsByType updates reivews' migrations information via given git service type and original id and poster id
+func UpdateReviewsMigrationsByType(tp structs.GitServiceType, originalAuthorID string, posterID int64) error {
+	_, err := x.Table("review").
+		Where(builder.In("issue_id",
+			builder.Select("issue.id").
+				From("issue").
+				InnerJoin("repository", "issue.repo_id = repository.id").
+				Where(builder.Eq{
+					"repository.original_service_type": tp,
+				}),
+		)).
+		And("review.original_author_id = ?", originalAuthorID).
+		Update(map[string]interface{}{
+			"poster_id":          posterID,
+			"original_author":    "",
+			"original_author_id": 0,
+		})
+	return err
+}

modules/migrations/base/review.go

@@ -6,6 +6,14 @@ package base
 
 import "time"
 
+// enumerate all review states
+const (
+	ReviewStatePending        = "PENDING"
+	ReviewStateApproved       = "APPROVED"
+	ReviewStateRequestChanges = "REQUEST_CHANGES"
+	ReviewStateComment        = "COMMENT"
+)
+
 // Review is a standard review information
 type Review struct {
 	ID           int64
@@ -16,7 +24,7 @@ type Review struct {
 	CommitID     string
 	Content      string
 	CreatedAt    time.Time
-	State        string // PENDING, APPROVE, REQUEST_CHANGES, or COMMENT
+	State        string // PENDING, APPROVED, REQUEST_CHANGES, or COMMENT
 	Comments     []*ReviewComment
 }
 

modules/migrations/gitea.go

@@ -50,6 +50,7 @@ type GiteaLocalUploader struct {
 	gitRepo        *git.Repository
 	prHeadCache    map[string]struct{}
 	userMap        map[int64]int64 // external user id mapping to user id
+	prCache        map[int64]*models.PullRequest
 	gitServiceType structs.GitServiceType
 }
 
@@ -62,6 +63,7 @@ func NewGiteaLocalUploader(ctx context.Context, doer *models.User, repoOwner, re
 		repoName:    repoName,
 		prHeadCache: make(map[string]struct{}),
 		userMap:     make(map[int64]int64),
+		prCache:     make(map[int64]*models.PullRequest),
 	}
 }
 
@@ -710,13 +712,13 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
 
 func convertReviewState(state string) models.ReviewType {
 	switch state {
-	case "PENDING":
+	case base.ReviewStatePending:
 		return models.ReviewTypePending
-	case "APPROVE":
+	case base.ReviewStateApproved:
 		return models.ReviewTypeApprove
-	case "REQUEST_CHANGES":
+	case base.ReviewStateRequestChanges:
 		return models.ReviewTypeReject
-	case "COMMENT":
+	case base.ReviewStateComment:
 		return models.ReviewTypeComment
 	default:
 		return models.ReviewTypePending
@@ -769,10 +771,14 @@ func (g *GiteaLocalUploader) CreateReviews(reviews ...*base.Review) error {
 			cm.OriginalAuthorID = review.ReviewerID
 		}
 
-		// TODO: cache pr
-		pr, err := models.GetPullRequestByID(issueID)
-		if err != nil {
-			return err
+		// get pr
+		pr, ok := g.prCache[issueID]
+		if !ok {
+			pr, err := models.GetPullRequestByID(issueID)
+			if err != nil {
+				return err
+			}
+			g.prCache[issueID] = pr
 		}
 
 		for _, comment := range review.Comments {

modules/migrations/github_test.go

@@ -361,4 +361,73 @@ func TestGitHubDownloadRepo(t *testing.T) {
 			},
 		},
 	}, prs)
+
+	reviews, err := downloader.GetReviews(3)
+	assert.NoError(t, err)
+	assert.EqualValues(t, []*base.Review{
+		{
+			ID:           315859956,
+			IssueIndex:   3,
+			ReviewerID:   42128690,
+			ReviewerName: "jolheiser",
+			CommitID:     "076160cf0b039f13e5eff19619932d181269414b",
+			CreatedAt:    time.Date(2019, 11, 12, 21, 35, 24, 0, time.UTC),
+			State:        base.ReviewStateApproved,
+		},
+		{
+			ID:           315860062,
+			IssueIndex:   3,
+			ReviewerID:   1824502,
+			ReviewerName: "zeripath",
+			CommitID:     "076160cf0b039f13e5eff19619932d181269414b",
+			CreatedAt:    time.Date(2019, 11, 12, 21, 35, 36, 0, time.UTC),
+			State:        base.ReviewStateApproved,
+		},
+		{
+			ID:           315861440,
+			IssueIndex:   3,
+			ReviewerID:   165205,
+			ReviewerName: "lafriks",
+			CommitID:     "076160cf0b039f13e5eff19619932d181269414b",
+			CreatedAt:    time.Date(2019, 11, 12, 21, 38, 00, 0, time.UTC),
+			State:        base.ReviewStateApproved,
+		},
+	}, reviews)
+
+	reviews, err = downloader.GetReviews(4)
+	assert.NoError(t, err)
+	assert.EqualValues(t, []*base.Review{
+		{
+			ID:           338338740,
+			IssueIndex:   4,
+			ReviewerID:   81045,
+			ReviewerName: "lunny",
+			CommitID:     "2be9101c543658591222acbee3eb799edfc3853d",
+			CreatedAt:    time.Date(2020, 01, 04, 05, 33, 18, 0, time.UTC),
+			State:        base.ReviewStateApproved,
+			Comments: []*base.ReviewComment{
+				{
+					ID:        363017488,
+					Content:   "This is a good pull request.",
+					TreePath:  "README.md",
+					Position:  3,
+					CommitID:  "2be9101c543658591222acbee3eb799edfc3853d",
+					PosterID:  81045,
+					Reactions: &base.Reactions{},
+					CreatedAt: time.Date(2020, 01, 04, 05, 33, 06, 0, time.UTC),
+					UpdatedAt: time.Date(2020, 01, 04, 05, 33, 18, 0, time.UTC),
+				},
+			},
+		},
+		{
+			ID:           338338740,
+			IssueIndex:   4,
+			ReviewerID:   81045,
+			ReviewerName: "lunny",
+			CommitID:     "2be9101c543658591222acbee3eb799edfc3853d",
+			CreatedAt:    time.Date(2020, 01, 04, 05, 33, 18, 0, time.UTC),
+			State:        base.ReviewStateRequestChanges,
+			Content:      "Don't add more reviews",
+		},
+	}, reviews)
 }