core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrations: remove dead code in gitea uploader (#18725) 

When migrating, g.issues is a map with all issues created during the
migration. If an issue is not found in g.issues when inserting a
comment or a review, it cannot exist in the database and trying to get
it via GetIssueByIndex() will always fail and return an error.

Signed-off-by: singuliere <singuliere@autistici.org>
This commit is contained in:
singuliere 2022-02-21 14:00:05 +01:00 committed by GitHub
parent 15a4b1d42b
commit 54dd0fc88b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
services/migrations/gitea_uploader.go
View File

@ -416,12 +416,7 @@ func (g *GiteaLocalUploader) CreateComments(comments ...*base.Comment) error {
var issue *models.Issue var issue *models.Issue
issue, ok := g.issues[comment.IssueIndex] issue, ok := g.issues[comment.IssueIndex]
if !ok { if !ok {
var err error return fmt.Errorf("comment references non existent IssueIndex %d", comment.IssueIndex)
issue, err = models.GetIssueByIndex(g.repo.ID, comment.IssueIndex)
if err != nil {
return err
}
g.issues[comment.IssueIndex] = issue
} }
if comment.Created.IsZero() { if comment.Created.IsZero() {
@ -685,19 +680,14 @@ func convertReviewState(state string) models.ReviewType {
} }
} }
// CreateReviews create pull request reviews // CreateReviews create pull request reviews of currently migrated issues
func (g *GiteaLocalUploader) CreateReviews(reviews ...*base.Review) error { func (g *GiteaLocalUploader) CreateReviews(reviews ...*base.Review) error {
cms := make([]*models.Review, 0, len(reviews)) cms := make([]*models.Review, 0, len(reviews))
for _, review := range reviews { for _, review := range reviews {
var issue *models.Issue var issue *models.Issue
issue, ok := g.issues[review.IssueIndex] issue, ok := g.issues[review.IssueIndex]
if !ok { if !ok {
var err error return fmt.Errorf("review references non existent IssueIndex %d", review.IssueIndex)
issue, err = models.GetIssueByIndex(g.repo.ID, review.IssueIndex)
if err != nil {
return err
}
g.issues[review.IssueIndex] = issue
} }
if review.CreatedAt.IsZero() { if review.CreatedAt.IsZero() {
review.CreatedAt = time.Unix(int64(issue.CreatedUnix), 0) review.CreatedAt = time.Unix(int64(issue.CreatedUnix), 0)