diff --git a/internal/database/milestone.go b/internal/database/milestone.go index a7d1492e5..8f1088139 100644 --- a/internal/database/milestone.go +++ b/internal/database/milestone.go @@ -4,11 +4,10 @@ import ( "fmt" "time" - log "unknwon.dev/clog/v2" - "xorm.io/xorm" - "github.com/cockroachdb/errors" api "github.com/gogs/go-gogs-client" + "gorm.io/gorm" + log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/errutil" @@ -17,29 +16,30 @@ import ( // Milestone represents a milestone of repository. type Milestone struct { ID int64 - RepoID int64 `xorm:"INDEX"` + RepoID int64 `gorm:"index"` Name string - Content string `xorm:"TEXT"` - RenderedContent string `xorm:"-" json:"-" gorm:"-"` + Content string `gorm:"type:text"` + RenderedContent string `gorm:"-" json:"-"` IsClosed bool NumIssues int NumClosedIssues int - NumOpenIssues int `xorm:"-" json:"-" gorm:"-"` + NumOpenIssues int `gorm:"-" json:"-"` Completeness int // Percentage(1-100). - IsOverDue bool `xorm:"-" json:"-" gorm:"-"` + IsOverDue bool `gorm:"-" json:"-"` - DeadlineString string `xorm:"-" json:"-" gorm:"-"` - Deadline time.Time `xorm:"-" json:"-" gorm:"-"` + DeadlineString string `gorm:"-" json:"-"` + Deadline time.Time `gorm:"-" json:"-"` DeadlineUnix int64 - ClosedDate time.Time `xorm:"-" json:"-" gorm:"-"` + ClosedDate time.Time `gorm:"-" json:"-"` ClosedDateUnix int64 } -func (m *Milestone) BeforeInsert() { +func (m *Milestone) BeforeCreate(tx *gorm.DB) error { m.DeadlineUnix = m.Deadline.Unix() + return nil } -func (m *Milestone) BeforeUpdate() { +func (m *Milestone) BeforeUpdate(tx *gorm.DB) error { if m.NumIssues > 0 { m.Completeness = m.NumClosedIssues * 100 / m.NumIssues } else { @@ -48,27 +48,22 @@ func (m *Milestone) BeforeUpdate() { m.DeadlineUnix = m.Deadline.Unix() m.ClosedDateUnix = m.ClosedDate.Unix() + return nil } -func (m *Milestone) AfterSet(colName string, _ xorm.Cell) { - switch colName { - case "num_closed_issues": - m.NumOpenIssues = m.NumIssues - m.NumClosedIssues - - case "deadline_unix": - m.Deadline = time.Unix(m.DeadlineUnix, 0).Local() - if m.Deadline.Year() == 9999 { - return - } +func (m *Milestone) AfterFind(tx *gorm.DB) error { + m.NumOpenIssues = m.NumIssues - m.NumClosedIssues + m.Deadline = time.Unix(m.DeadlineUnix, 0).Local() + if m.Deadline.Year() != 9999 { m.DeadlineString = m.Deadline.Format("2006-01-02") if time.Now().Local().After(m.Deadline) { m.IsOverDue = true } - - case "closed_date_unix": - m.ClosedDate = time.Unix(m.ClosedDateUnix, 0).Local() } + + m.ClosedDate = time.Unix(m.ClosedDateUnix, 0).Local() + return nil } // State returns string representation of milestone status. @@ -102,30 +97,24 @@ func (m *Milestone) APIFormat() *api.Milestone { } func (m *Milestone) CountIssues(isClosed, includePulls bool) int64 { - sess := x.Where("milestone_id = ?", m.ID).And("is_closed = ?", isClosed) + query := db.Model(new(Issue)).Where("milestone_id = ? AND is_closed = ?", m.ID, isClosed) if !includePulls { - sess.And("is_pull = ?", false) + query = query.Where("is_pull = ?", false) } - count, _ := sess.Count(new(Issue)) + var count int64 + query.Count(&count) return count } // NewMilestone creates new milestone of repository. func NewMilestone(m *Milestone) (err error) { - sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err - } + return db.Transaction(func(tx *gorm.DB) error { + if err := tx.Create(m).Error; err != nil { + return err + } - if _, err = sess.Insert(m); err != nil { - return err - } - - if _, err = sess.Exec("UPDATE `repository` SET num_milestones = num_milestones + 1 WHERE id = ?", m.RepoID); err != nil { - return err - } - return sess.Commit() + return tx.Exec("UPDATE `repository` SET num_milestones = num_milestones + 1 WHERE id = ?", m.RepoID).Error + }) } var _ errutil.NotFound = (*ErrMilestoneNotExist)(nil) @@ -147,74 +136,73 @@ func (ErrMilestoneNotExist) NotFound() bool { return true } -func getMilestoneByRepoID(e Engine, repoID, id int64) (*Milestone, error) { - m := &Milestone{ - ID: id, - RepoID: repoID, - } - has, err := e.Get(m) +func getMilestoneByRepoID(e *gorm.DB, repoID, id int64) (*Milestone, error) { + m := &Milestone{} + err := e.Where("id = ? AND repo_id = ?", id, repoID).First(m).Error if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil, ErrMilestoneNotExist{args: map[string]any{"repoID": repoID, "milestoneID": id}} + } return nil, err - } else if !has { - return nil, ErrMilestoneNotExist{args: map[string]any{"repoID": repoID, "milestoneID": id}} } return m, nil } // GetWebhookByRepoID returns the milestone in a repository. func GetMilestoneByRepoID(repoID, id int64) (*Milestone, error) { - return getMilestoneByRepoID(x, repoID, id) + return getMilestoneByRepoID(db, repoID, id) } // GetMilestonesByRepoID returns all milestones of a repository. func GetMilestonesByRepoID(repoID int64) ([]*Milestone, error) { miles := make([]*Milestone, 0, 10) - return miles, x.Where("repo_id = ?", repoID).Find(&miles) + return miles, db.Where("repo_id = ?", repoID).Find(&miles).Error } // GetMilestones returns a list of milestones of given repository and status. func GetMilestones(repoID int64, page int, isClosed bool) ([]*Milestone, error) { miles := make([]*Milestone, 0, conf.UI.IssuePagingNum) - sess := x.Where("repo_id = ? AND is_closed = ?", repoID, isClosed) + query := db.Where("repo_id = ? AND is_closed = ?", repoID, isClosed) if page > 0 { - sess = sess.Limit(conf.UI.IssuePagingNum, (page-1)*conf.UI.IssuePagingNum) + query = query.Limit(conf.UI.IssuePagingNum).Offset((page - 1) * conf.UI.IssuePagingNum) } - return miles, sess.Find(&miles) + return miles, query.Find(&miles).Error } -func updateMilestone(e Engine, m *Milestone) error { - _, err := e.ID(m.ID).AllCols().Update(m) - return err +func updateMilestone(e *gorm.DB, m *Milestone) error { + return e.Model(m).Where("id = ?", m.ID).Updates(m).Error } // UpdateMilestone updates information of given milestone. func UpdateMilestone(m *Milestone) error { - return updateMilestone(x, m) + return updateMilestone(db, m) } -func countRepoMilestones(e Engine, repoID int64) int64 { - count, _ := e.Where("repo_id=?", repoID).Count(new(Milestone)) +func countRepoMilestones(e *gorm.DB, repoID int64) int64 { + var count int64 + e.Model(new(Milestone)).Where("repo_id = ?", repoID).Count(&count) return count } // CountRepoMilestones returns number of milestones in given repository. func CountRepoMilestones(repoID int64) int64 { - return countRepoMilestones(x, repoID) + return countRepoMilestones(db, repoID) } -func countRepoClosedMilestones(e Engine, repoID int64) int64 { - closed, _ := e.Where("repo_id=? AND is_closed=?", repoID, true).Count(new(Milestone)) - return closed +func countRepoClosedMilestones(e *gorm.DB, repoID int64) int64 { + var count int64 + e.Model(new(Milestone)).Where("repo_id = ? AND is_closed = ?", repoID, true).Count(&count) + return count } // CountRepoClosedMilestones returns number of closed milestones in given repository. func CountRepoClosedMilestones(repoID int64) int64 { - return countRepoClosedMilestones(x, repoID) + return countRepoClosedMilestones(db, repoID) } // MilestoneStats returns number of open and closed milestones of given repository. func MilestoneStats(repoID int64) (open, closed int64) { - open, _ = x.Where("repo_id=? AND is_closed=?", repoID, false).Count(new(Milestone)) + db.Model(new(Milestone)).Where("repo_id = ? AND is_closed = ?", repoID, false).Count(&open) return open, CountRepoClosedMilestones(repoID) } @@ -227,26 +215,19 @@ func ChangeMilestoneStatus(m *Milestone, isClosed bool) (err error) { return err } - sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err - } + return db.Transaction(func(tx *gorm.DB) error { + m.IsClosed = isClosed + if err := updateMilestone(tx, m); err != nil { + return err + } - m.IsClosed = isClosed - if err = updateMilestone(sess, m); err != nil { - return err - } - - repo.NumMilestones = int(countRepoMilestones(sess, repo.ID)) - repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.ID)) - if _, err = sess.ID(repo.ID).AllCols().Update(repo); err != nil { - return err - } - return sess.Commit() + repo.NumMilestones = int(countRepoMilestones(tx, repo.ID)) + repo.NumClosedMilestones = int(countRepoClosedMilestones(tx, repo.ID)) + return tx.Model(repo).Where("id = ?", repo.ID).Updates(repo).Error + }) } -func changeMilestoneIssueStats(e *xorm.Session, issue *Issue) error { +func changeMilestoneIssueStats(e *gorm.DB, issue *Issue) error { if issue.MilestoneID == 0 { return nil } @@ -270,20 +251,12 @@ func changeMilestoneIssueStats(e *xorm.Session, issue *Issue) error { // ChangeMilestoneIssueStats updates the open/closed issues counter and progress // for the milestone associated with the given issue. func ChangeMilestoneIssueStats(issue *Issue) (err error) { - sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err - } - - if err = changeMilestoneIssueStats(sess, issue); err != nil { - return err - } - - return sess.Commit() + return db.Transaction(func(tx *gorm.DB) error { + return changeMilestoneIssueStats(tx, issue) + }) } -func changeMilestoneAssign(e *xorm.Session, issue *Issue, oldMilestoneID int64) error { +func changeMilestoneAssign(e *gorm.DB, issue *Issue, oldMilestoneID int64) error { if oldMilestoneID > 0 { m, err := getMilestoneByRepoID(e, issue.RepoID, oldMilestoneID) if err != nil { @@ -297,7 +270,9 @@ func changeMilestoneAssign(e *xorm.Session, issue *Issue, oldMilestoneID int64) if err = updateMilestone(e, m); err != nil { return err - } else if _, err = e.Exec("UPDATE `issue_user` SET milestone_id = 0 WHERE issue_id = ?", issue.ID); err != nil { + } + + if err = e.Exec("UPDATE `issue_user` SET milestone_id = 0 WHERE issue_id = ?", issue.ID).Error; err != nil { return err } @@ -317,7 +292,9 @@ func changeMilestoneAssign(e *xorm.Session, issue *Issue, oldMilestoneID int64) if err = updateMilestone(e, m); err != nil { return err - } else if _, err = e.Exec("UPDATE `issue_user` SET milestone_id = ? WHERE issue_id = ?", m.ID, issue.ID); err != nil { + } + + if err = e.Exec("UPDATE `issue_user` SET milestone_id = ? WHERE issue_id = ?", m.ID, issue.ID).Error; err != nil { return err } @@ -329,18 +306,11 @@ func changeMilestoneAssign(e *xorm.Session, issue *Issue, oldMilestoneID int64) // ChangeMilestoneAssign changes assignment of milestone for issue. func ChangeMilestoneAssign(doer *User, issue *Issue, oldMilestoneID int64) (err error) { - sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err - } - - if err = changeMilestoneAssign(sess, issue, oldMilestoneID); err != nil { - return err - } - - if err = sess.Commit(); err != nil { - return errors.Newf("commit: %v", err) + err = db.Transaction(func(tx *gorm.DB) error { + return changeMilestoneAssign(tx, issue, oldMilestoneID) + }) + if err != nil { + return errors.Newf("transaction: %v", err) } var hookAction api.HookIssueAction @@ -394,26 +364,21 @@ func DeleteMilestoneOfRepoByID(repoID, id int64) error { return err } - sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err - } + return db.Transaction(func(tx *gorm.DB) error { + if err := tx.Where("id = ?", m.ID).Delete(new(Milestone)).Error; err != nil { + return err + } - if _, err = sess.ID(m.ID).Delete(new(Milestone)); err != nil { - return err - } + repo.NumMilestones = int(countRepoMilestones(tx, repo.ID)) + repo.NumClosedMilestones = int(countRepoClosedMilestones(tx, repo.ID)) + if err := tx.Model(repo).Where("id = ?", repo.ID).Updates(repo).Error; err != nil { + return err + } - repo.NumMilestones = int(countRepoMilestones(sess, repo.ID)) - repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.ID)) - if _, err = sess.ID(repo.ID).AllCols().Update(repo); err != nil { - return err - } - - if _, err = sess.Exec("UPDATE `issue` SET milestone_id = 0 WHERE milestone_id = ?", m.ID); err != nil { - return err - } else if _, err = sess.Exec("UPDATE `issue_user` SET milestone_id = 0 WHERE milestone_id = ?", m.ID); err != nil { - return err - } - return sess.Commit() + if err := tx.Exec("UPDATE `issue` SET milestone_id = 0 WHERE milestone_id = ?", m.ID).Error; err != nil { + return err + } + + return tx.Exec("UPDATE `issue_user` SET milestone_id = 0 WHERE milestone_id = ?", m.ID).Error + }) }