Add migrate from OneDev

modules/migrations/base/issue.go

@@ -14,18 +14,16 @@ type IssueContext interface {
 }
 
 // BasicIssueContext is a 1:1 mapping between local and foreign ids.
-type BasicIssueContext struct {
-	ID int64
-}
+type BasicIssueContext int64
 
 // LocalID gets the local id.
 func (c BasicIssueContext) LocalID() int64 {
-	return c.ID
+	return int64(c)
 }
 
 // ForeignID gets the foreign id.
 func (c BasicIssueContext) ForeignID() int64 {
-	return c.ID
+	return int64(c)
 }
 
 // Issue is a standard issue information

modules/migrations/gitea_downloader.go

@@ -424,7 +424,7 @@ func (g *GiteaDownloader) GetIssues(page, perPage int) ([]*base.Issue, bool, err
 			Labels:      labels,
 			Assignees:   assignees,
 			IsLocked:    issue.IsLocked,
-			Context:     base.BasicIssueContext{ID: issue.Index},
+			Context:     base.BasicIssueContext(issue.Index),
 		})
 	}
 
@@ -596,7 +596,7 @@ func (g *GiteaDownloader) GetPullRequests(page, perPage int) ([]*base.PullReques
 				RepoName:  g.repoName,
 				OwnerName: g.repoOwner,
 			},
-			Context: base.BasicIssueContext{ID: pr.Index},
+			Context: base.BasicIssueContext(pr.Index),
 		})
 	}
 

modules/migrations/gitea_downloader_test.go

@@ -225,7 +225,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 	}, issues[1])
 
 	comments, _, err := downloader.GetComments(base.GetCommentOptions{
-		Context: base.BasicIssueContext{ID: 4},
+		Context: base.BasicIssueContext(4),
 	})
 	assert.NoError(t, err)
 	assert.Len(t, comments, 2)
@@ -299,7 +299,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 		PatchURL:       "https://gitea.com/gitea/test_repo/pulls/12.patch",
 	}, prs[1])
 
-	reviews, err := downloader.GetReviews(base.BasicIssueContext{ID: 7})
+	reviews, err := downloader.GetReviews(base.BasicIssueContext(7))
 	assert.NoError(t, err)
 	if assert.Len(t, reviews, 3) {
 		assert.EqualValues(t, 689, reviews[0].ReviewerID)

modules/migrations/github.go

@@ -416,8 +416,9 @@ func (g *GithubDownloaderV3) GetIssues(page, perPage int) ([]*base.Issue, bool,
 			Labels:      labels,
 			Reactions:   reactions,
 			Closed:      issue.ClosedAt,
-			IsLocked:    *issue.Locked,
-			Context:     base.BasicIssueContext{ID: int64(*issue.Number)},
+			IsLocked:    issue.GetLocked(),
+			Assignees:   assignees,
+			Context:     base.BasicIssueContext(*issue.Number),
 		})
 	}
 
@@ -486,12 +487,12 @@ func (g *GithubDownloaderV3) getComments(issueContext base.IssueContext) ([]*bas
 
 			allComments = append(allComments, &base.Comment{
 				IssueIndex:  issueContext.LocalID(),
-				PosterID:    *comment.User.ID,
-				PosterName:  *comment.User.Login,
-				PosterEmail: email,
-				Content:     *comment.Body,
-				Created:     *comment.CreatedAt,
-				Updated:     *comment.UpdatedAt,
+				PosterID:    comment.GetUser().GetID(),
+				PosterName:  comment.GetUser().GetLogin(),
+				PosterEmail: comment.GetUser().GetEmail(),
+				Content:     comment.GetBody(),
+				Created:     comment.GetCreatedAt(),
+				Updated:     comment.GetUpdatedAt(),
 				Reactions:   reactions,
 			})
 		}
@@ -651,7 +652,7 @@ func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullReq
 			},
 			PatchURL:  pr.GetPatchURL(),
 			Reactions: reactions,
-			Context:   base.BasicIssueContext{ID: int64(*pr.Number)},
+			Context:   base.BasicIssueContext(*pr.Number),
 		})
 	}
 

modules/migrations/github_test.go

@@ -185,7 +185,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
 				},
 			},
 			Closed:  &closed1,
-			Context: base.BasicIssueContext{ID: 1},
+			Context: base.BasicIssueContext(1),
 		},
 		{
 			Number:     2,
@@ -237,13 +237,13 @@ func TestGitHubDownloadRepo(t *testing.T) {
 				},
 			},
 			Closed:  &closed2,
-			Context: base.BasicIssueContext{ID: 2},
+			Context: base.BasicIssueContext(2),
 		},
 	}, issues)
 
 	// downloader.GetComments()
 	comments, _, err := downloader.GetComments(base.GetCommentOptions{
-		Context: base.BasicIssueContext{ID: 2},
+		Context: base.BasicIssueContext(2),
 	})
 	assert.NoError(t, err)
 	assert.Len(t, comments, 2)
@@ -319,7 +319,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
 			Merged:         true,
 			MergedTime:     &merged1,
 			MergeCommitSHA: "f32b0a9dfd09a60f616f29158f772cedd89942d2",
-			Context:        base.BasicIssueContext{ID: 3},
+			Context:        base.BasicIssueContext(3),
 		},
 		{
 			Number:     4,
@@ -366,11 +366,11 @@ func TestGitHubDownloadRepo(t *testing.T) {
 					Content:  "+1",
 				},
 			},
-			Context: base.BasicIssueContext{ID: 4},
+			Context: base.BasicIssueContext(4),
 		},
 	}, prs)
 
-	reviews, err := downloader.GetReviews(base.BasicIssueContext{ID: 3})
+	reviews, err := downloader.GetReviews(base.BasicIssueContext(3))
 	assert.NoError(t, err)
 	assert.EqualValues(t, []*base.Review{
 		{
@@ -402,7 +402,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
 		},
 	}, reviews)
 
-	reviews, err = downloader.GetReviews(base.BasicIssueContext{ID: 4})
+	reviews, err = downloader.GetReviews(base.BasicIssueContext(4))
 	assert.NoError(t, err)
 	assert.EqualValues(t, []*base.Review{
 		{

modules/migrations/gitlab_test.go

@@ -310,7 +310,7 @@ func TestGitlabDownloadRepo(t *testing.T) {
 		},
 	}, prs)
 
-	rvs, err := downloader.GetReviews(base.BasicIssueContext{ID: 1})
+	rvs, err := downloader.GetReviews(base.BasicIssueContext(1))
 	assert.NoError(t, err)
 	if assert.Len(t, rvs, 2) {
 		for i := range rvs {
@@ -327,7 +327,7 @@ func TestGitlabDownloadRepo(t *testing.T) {
 			}
 		}
 	}
-	rvs, err = downloader.GetReviews(base.BasicIssueContext{ID: 2})
+	rvs, err = downloader.GetReviews(base.BasicIssueContext(2))
 	assert.NoError(t, err)
 	if assert.Len(t, prs, 1) {
 		assert.EqualValues(t, 4575606, rvs[0].ReviewerID)

modules/migrations/gogs.go

@@ -301,7 +301,7 @@ func convertGogsIssue(issue *gogs.Issue) *base.Issue {
 		Created:     issue.Created,
 		Labels:      labels,
 		Closed:      closed,
-		Context:     base.BasicIssueContext{ID: issue.Index},
+		Context:     base.BasicIssueContext(issue.Index),
 	}
 }
 

modules/migrations/gogs_test.go

@@ -104,7 +104,7 @@ func TestGogsDownloadRepo(t *testing.T) {
 
 	// downloader.GetComments()
 	comments, _, err := downloader.GetComments(base.GetCommentOptions{
-		Context: base.BasicIssueContext{ID: 1},
+		Context: base.BasicIssueContext(1),
 	})
 	assert.NoError(t, err)
 	assert.Len(t, comments, 1)

modules/migrations/onedev.go

@@ -13,11 +13,10 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/migrations/base"
 	"code.gitea.io/gitea/modules/structs"
-
-	jsoniter "github.com/json-iterator/go"
 )
 
 var (
@@ -126,7 +125,7 @@ func (d *OneDevDownloader) callAPI(endpoint string, parameter map[string]string,
 		u.RawQuery = query.Encode()
 	}
 
-	req, err := http.NewRequest("GET", u.String(), nil)
+	req, err := http.NewRequestWithContext(d.ctx, "GET", u.String(), nil)
 	if err != nil {
 		return err
 	}
@@ -137,7 +136,7 @@ func (d *OneDevDownloader) callAPI(endpoint string, parameter map[string]string,
 	}
 	defer resp.Body.Close()
 
-	decoder := jsoniter.NewDecoder(resp.Body)
+	decoder := json.NewDecoder(resp.Body)
 	return decoder.Decode(&result)
 }
 
@@ -196,8 +195,6 @@ func (d *OneDevDownloader) GetMilestones() ([]*base.Milestone, error) {
 
 	endpoint := fmt.Sprintf("/api/projects/%d/milestones", d.repoID)
 
-	t := time.Now()
-
 	var milestones = make([]*base.Milestone, 0, 100)
 	offset := 0
 	for {
@@ -219,7 +216,7 @@ func (d *OneDevDownloader) GetMilestones() ([]*base.Milestone, error) {
 
 		for _, milestone := range rawMilestones {
 			d.milestoneMap[milestone.ID] = milestone.Name
-			closed := &t
+			closed := milestone.DueDate
 			if !milestone.Closed {
 				closed = nil
 			}
@@ -228,8 +225,6 @@ func (d *OneDevDownloader) GetMilestones() ([]*base.Milestone, error) {
 				Title:       milestone.Name,
 				Description: milestone.Description,
 				Deadline:    milestone.DueDate,
-				Created:     t,
-				Updated:     &t,
 				Closed:      closed,
 			})
 		}
@@ -239,7 +234,32 @@ func (d *OneDevDownloader) GetMilestones() ([]*base.Milestone, error) {
 
 // GetLabels returns labels
 func (d *OneDevDownloader) GetLabels() ([]*base.Label, error) {
-	return nil, nil
+	return []*base.Label{
+		{
+			Name:  "Bug",
+			Color: "f64e60",
+		},
+		{
+			Name:  "Build Failure",
+			Color: "f64e60",
+		},
+		{
+			Name:  "Discussion",
+			Color: "8950fc",
+		},
+		{
+			Name:  "Improvement",
+			Color: "1bc5bd",
+		},
+		{
+			Name:  "New Feature",
+			Color: "1bc5bd",
+		},
+		{
+			Name:  "Support Request",
+			Color: "8950fc",
+		},
+	}, nil
 }
 
 type onedevIssueContext struct {
@@ -284,6 +304,27 @@ func (d *OneDevDownloader) GetIssues(page, perPage int) ([]*base.Issue, bool, er
 
 	issues := make([]*base.Issue, 0, len(rawIssues))
 	for _, issue := range rawIssues {
+		fields := make([]struct {
+			Name  string `json:"name"`
+			Value string `json:"value"`
+		}, 0, 10)
+		err := d.callAPI(
+			fmt.Sprintf("/api/issues/%d/fields", issue.ID),
+			nil,
+			&fields,
+		)
+		if err != nil {
+			return nil, false, err
+		}
+
+		var label *base.Label
+		for _, field := range fields {
+			if field.Name == "Type" {
+				label = &base.Label{Name: field.Value}
+				break
+			}
+		}
+
 		state := strings.ToLower(issue.State)
 		if state == "released" {
 			state = "closed"
@@ -298,7 +339,7 @@ func (d *OneDevDownloader) GetIssues(page, perPage int) ([]*base.Issue, bool, er
 			Milestone:   d.milestoneMap[issue.MilestoneID],
 			State:       state,
 			Created:     issue.SubmitDate,
-			//Closed:      closed,
+			Labels:      []*base.Label{label},
 			Context: onedevIssueContext{
 				foreignID:     issue.ID,
 				localID:       issue.Number,
@@ -441,6 +482,21 @@ func (d *OneDevDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
 
 	pullRequests := make([]*base.PullRequest, 0, len(rawPullRequests))
 	for _, pr := range rawPullRequests {
+		var mergePreview struct {
+			TargetHeadCommitHash string `json:"targetHeadCommitHash"`
+			HeadCommitHash       string `json:"headCommitHash"`
+			MergeStrategy        string `json:"mergeStrategy"`
+			MergeCommitHash      string `json:"mergeCommitHash"`
+		}
+		err := d.callAPI(
+			fmt.Sprintf("/api/pull-requests/%d/merge-preview", pr.ID),
+			nil,
+			&mergePreview,
+		)
+		if err != nil {
+			return nil, false, err
+		}
+
 		state := "open"
 		merged := false
 		var closeTime *time.Time
@@ -469,12 +525,12 @@ func (d *OneDevDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
 			MergedTime: mergedTime,
 			Head: base.PullRequestBranch{
 				Ref:      pr.SourceBranch,
-				SHA:      pr.BaseCommitHash,
+				SHA:      mergePreview.HeadCommitHash,
 				RepoName: d.repoName,
 			},
 			Base: base.PullRequestBranch{
 				Ref:      pr.TargetBranch,
-				SHA:      "",
+				SHA:      mergePreview.TargetHeadCommitHash,
 				RepoName: d.repoName,
 			},
 			Context: onedevIssueContext{
@@ -528,7 +584,6 @@ func (d *OneDevDownloader) GetReviews(context base.IssueContext) ([]*base.Review
 			IssueIndex:   context.LocalID(),
 			ReviewerID:   poster.ID,
 			ReviewerName: poster.Name,
-			CreatedAt:    time.Now(),
 			Content:      content,
 			State:        state,
 		})