Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Fix milestone completness calculation when migrating (#7725) (#7732)

Browse source
This commit is contained in:
Lauris BH 2019-08-04 04:29:17 +03:00 committed by Lunny Xiao
parent 0d10482168
commit 4ee8982e91
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
models/migrate.go
View file

@ -62,38 +62,50 @@ func insertIssue(sess *xorm.Session, issue *Issue) error {
if _, err := sess.Insert(issueLabels); err != nil { if _, err := sess.Insert(issueLabels); err != nil {
return err return err
} }
cols := make([]string, 0)
if !issue.IsPull { if !issue.IsPull {
sess.ID(issue.RepoID).Incr("num_issues") sess.ID(issue.RepoID).Incr("num_issues")
cols = append(cols, "num_issues")
if issue.IsClosed { if issue.IsClosed {
sess.Incr("num_closed_issues") sess.Incr("num_closed_issues")
cols = append(cols, "num_closed_issues")
} }
} else { } else {
sess.ID(issue.RepoID).Incr("num_pulls") sess.ID(issue.RepoID).Incr("num_pulls")
cols = append(cols, "num_pulls")
if issue.IsClosed { if issue.IsClosed {
sess.Incr("num_closed_pulls") sess.Incr("num_closed_pulls")
cols = append(cols, "num_closed_pulls")
} }
} }
if _, err := sess.NoAutoTime().Update(issue.Repo); err != nil { if _, err := sess.NoAutoTime().Cols(cols...).Update(issue.Repo); err != nil {
return err return err
} }
cols = []string{"num_issues"}
sess.Incr("num_issues") sess.Incr("num_issues")
if issue.IsClosed { if issue.IsClosed {
sess.Incr("num_closed_issues") sess.Incr("num_closed_issues")
cols = append(cols, "num_closed_issues")
} }
if _, err := sess.In("id", labelIDs).NoAutoTime().Update(new(Label)); err != nil { if _, err := sess.In("id", labelIDs).NoAutoTime().Cols(cols...).Update(new(Label)); err != nil {
return err return err
} }
if issue.MilestoneID > 0 { if issue.MilestoneID > 0 {
cols = []string{"num_issues"}
sess.Incr("num_issues") sess.Incr("num_issues")
cl := "num_closed_issues"
if issue.IsClosed { if issue.IsClosed {
sess.Incr("num_closed_issues") sess.Incr("num_closed_issues")
cols = append(cols, "num_closed_issues")
cl = "(num_closed_issues + 1)"
} }
if _, err := sess.ID(issue.MilestoneID). if _, err := sess.ID(issue.MilestoneID).
SetExpr("completeness", "num_closed_issues * 100 / num_issues"). SetExpr("completeness", cl+" * 100 / (num_issues + 1)").
NoAutoTime(). NoAutoTime().Cols(cols...).
Update(new(Milestone)); err != nil { Update(new(Milestone)); err != nil {
return err return err
} }