troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-27 21:03:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix migration information update bug when linked github account (#10310)

Browse source 
* Fix bug on upgrade migrated reactions

* Fix migration information update bug when linked github account

Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
Lunny Xiao 2020-02-18 08:42:13 +08:00 committed by GitHub
parent e76a64dda1
commit ce0413ff88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
models/issue.go
View file

@ -1873,9 +1873,8 @@ func UpdateIssuesMigrationsByType(gitServiceType structs.GitServiceType, origina
// UpdateReactionsMigrationsByType updates all migrated repositories' reactions from gitServiceType to replace originalAuthorID to posterID // UpdateReactionsMigrationsByType updates all migrated repositories' reactions from gitServiceType to replace originalAuthorID to posterID
func UpdateReactionsMigrationsByType(gitServiceType structs.GitServiceType, originalAuthorID string, userID int64) error { func UpdateReactionsMigrationsByType(gitServiceType structs.GitServiceType, originalAuthorID string, userID int64) error {
_, err := x.Table("reaction"). _, err := x.Table("reaction").
Join("INNER", "issue", "issue.id = reaction.issue_id"). Where("original_author_id = ?", originalAuthorID).
Where("issue.repo_id IN (SELECT id FROM repository WHERE original_service_type = ?)", gitServiceType). And(migratedIssueCond(gitServiceType)).
And("reaction.original_author_id = ?", originalAuthorID).
Update(map[string]interface{}{ Update(map[string]interface{}{
"user_id": userID, "user_id": userID,
"original_author": "", "original_author": "",

24
models/migrate.go
View file

@ -208,20 +208,24 @@ func InsertReleases(rels ...*Release) error {
return sess.Commit() return sess.Commit()
} }
func migratedIssueCond(tp structs.GitServiceType) builder.Cond {
return 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,
}),
)
}
// UpdateReviewsMigrationsByType updates reviews' migrations information via given git service type and original id and poster id // UpdateReviewsMigrationsByType updates reviews' migrations information via given git service type and original id and poster id
func UpdateReviewsMigrationsByType(tp structs.GitServiceType, originalAuthorID string, posterID int64) error { func UpdateReviewsMigrationsByType(tp structs.GitServiceType, originalAuthorID string, posterID int64) error {
_, err := x.Table("review"). _, err := x.Table("review").
Where(builder.In("issue_id", Where("original_author_id = ?", originalAuthorID).
builder.Select("issue.id"). And(migratedIssueCond(tp)).
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{}{ Update(map[string]interface{}{
"poster_id": posterID, "reviewer_id": posterID,
"original_author": "", "original_author": "",
"original_author_id": 0, "original_author_id": 0,
}) })