From 3de4b0ec72c1caadfa308f8e0715a1c23a525b11 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 10 Oct 2019 22:52:05 +0800 Subject: [PATCH 1/3] move change issue title from models to issue service package --- integrations/api_pull_test.go | 3 +- models/issue.go | 86 ++--------------------------------- models/issue_comment.go | 9 ++-- models/issue_lock.go | 2 +- models/issue_test.go | 2 +- models/issue_xref.go | 21 ++++++--- routers/repo/issue.go | 4 +- services/issue/issue.go | 74 ++++++++++++++++++++++++++++++ services/mailer/mail.go | 2 +- services/mailer/mail_issue.go | 2 +- 10 files changed, 106 insertions(+), 99 deletions(-) diff --git a/integrations/api_pull_test.go b/integrations/api_pull_test.go index 8d24cdc188766..ed5a55a9db043 100644 --- a/integrations/api_pull_test.go +++ b/integrations/api_pull_test.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" + issue_service "code.gitea.io/gitea/services/issue" "github.com/stretchr/testify/assert" ) @@ -40,7 +41,7 @@ func TestAPIMergePullWIP(t *testing.T) { owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User) pr := models.AssertExistsAndLoadBean(t, &models.PullRequest{Status: models.PullRequestStatusMergeable}, models.Cond("has_merged = ?", false)).(*models.PullRequest) pr.LoadIssue() - pr.Issue.ChangeTitle(owner, setting.Repository.PullRequest.WorkInProgressPrefixes[0]+" "+pr.Issue.Title) + issue_service.ChangeTitle(pr.Issue, owner, setting.Repository.PullRequest.WorkInProgressPrefixes[0]+" "+pr.Issue.Title) // force reload pr.LoadAttributes() diff --git a/models/issue.go b/models/issue.go index f8fa1377a8fb2..2345e6f672de5 100644 --- a/models/issue.go +++ b/models/issue.go @@ -95,8 +95,8 @@ func (issue *Issue) IsOverdue() bool { } // LoadRepo loads issue's repository -func (issue *Issue) LoadRepo() error { - return issue.loadRepo(x) +func (issue *Issue) LoadRepo(ctx DBContext) error { + return issue.loadRepo(ctx.e) } func (issue *Issue) loadRepo(e Engine) (err error) { @@ -715,8 +715,8 @@ func updateIssueCols(e Engine, issue *Issue, cols ...string) error { } // UpdateIssueCols only updates values of specific columns for given issue. -func UpdateIssueCols(issue *Issue, cols ...string) error { - return updateIssueCols(x, issue, cols...) +func UpdateIssueCols(ctx DBContext, issue *Issue, cols ...string) error { + return updateIssueCols(ctx.e, issue, cols...) } func (issue *Issue) changeStatus(e *xorm.Session, doer *User, isClosed bool) (err error) { @@ -843,84 +843,6 @@ func (issue *Issue) ChangeStatus(doer *User, isClosed bool) (err error) { return nil } -// ChangeTitle changes the title of this issue, as the given user. -func (issue *Issue) ChangeTitle(doer *User, title string) (err error) { - oldTitle := issue.Title - issue.Title = title - sess := x.NewSession() - defer sess.Close() - - if err = sess.Begin(); err != nil { - return err - } - - if err = updateIssueCols(sess, issue, "name"); err != nil { - return fmt.Errorf("updateIssueCols: %v", err) - } - - if err = issue.loadRepo(sess); err != nil { - return fmt.Errorf("loadRepo: %v", err) - } - - if _, err = createChangeTitleComment(sess, doer, issue.Repo, issue, oldTitle, title); err != nil { - return fmt.Errorf("createChangeTitleComment: %v", err) - } - - if err = issue.neuterCrossReferences(sess); err != nil { - return err - } - - if err = issue.addCrossReferences(sess, doer); err != nil { - return err - } - - if err = sess.Commit(); err != nil { - return err - } - sess.Close() - - mode, _ := AccessLevel(issue.Poster, issue.Repo) - if issue.IsPull { - if err = issue.loadPullRequest(sess); err != nil { - return fmt.Errorf("loadPullRequest: %v", err) - } - issue.PullRequest.Issue = issue - err = PrepareWebhooks(issue.Repo, HookEventPullRequest, &api.PullRequestPayload{ - Action: api.HookIssueEdited, - Index: issue.Index, - Changes: &api.ChangesPayload{ - Title: &api.ChangesFromPayload{ - From: oldTitle, - }, - }, - PullRequest: issue.PullRequest.APIFormat(), - Repository: issue.Repo.APIFormat(mode), - Sender: doer.APIFormat(), - }) - } else { - err = PrepareWebhooks(issue.Repo, HookEventIssues, &api.IssuePayload{ - Action: api.HookIssueEdited, - Index: issue.Index, - Changes: &api.ChangesPayload{ - Title: &api.ChangesFromPayload{ - From: oldTitle, - }, - }, - Issue: issue.APIFormat(), - Repository: issue.Repo.APIFormat(mode), - Sender: issue.Poster.APIFormat(), - }) - } - - if err != nil { - log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err) - } else { - go HookQueue.Add(issue.RepoID) - } - - return nil -} - // AddDeletePRBranchComment adds delete branch comment for pull request issue func AddDeletePRBranchComment(doer *User, repo *Repository, issueID int64, branchName string) error { issue, err := getIssueByID(x, issueID) diff --git a/models/issue_comment.go b/models/issue_comment.go index e8043c1ec7f3a..8e2fa43f86c10 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -468,7 +468,7 @@ func (c *Comment) CodeCommentURL() string { return fmt.Sprintf("%s/files#%s", c.Issue.HTMLURL(), c.HashTag()) } -func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err error) { +func createComment(e Engine, opts *CreateCommentOptions) (_ *Comment, err error) { var LabelID int64 if opts.Label != nil { LabelID = opts.Label.ID @@ -519,7 +519,7 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err return comment, nil } -func sendCreateCommentAction(e *xorm.Session, opts *CreateCommentOptions, comment *Comment) (err error) { +func sendCreateCommentAction(e Engine, opts *CreateCommentOptions, comment *Comment) (err error) { // Compose comment action, could be plain comment, close or reopen issue/pull request. // This object will be used to notify watchers in the end of function. act := &Action{ @@ -690,8 +690,9 @@ func createDeadlineComment(e *xorm.Session, doer *User, issue *Issue, newDeadlin }) } -func createChangeTitleComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, oldTitle, newTitle string) (*Comment, error) { - return createComment(e, &CreateCommentOptions{ +// CreateChangeTitleComment created a change title comment for issue +func CreateChangeTitleComment(ctx DBContext, doer *User, repo *Repository, issue *Issue, oldTitle, newTitle string) (*Comment, error) { + return createComment(ctx.e, &CreateCommentOptions{ Type: CommentTypeChangeTitle, Doer: doer, Repo: repo, diff --git a/models/issue_lock.go b/models/issue_lock.go index 5a2d996b640d6..b927bab093c16 100644 --- a/models/issue_lock.go +++ b/models/issue_lock.go @@ -36,7 +36,7 @@ func updateIssueLock(opts *IssueLockOptions, lock bool) error { commentType = CommentTypeUnlock } - if err := UpdateIssueCols(opts.Issue, "is_locked"); err != nil { + if err := UpdateIssueCols(DefaultDBContext(), opts.Issue, "is_locked"); err != nil { return err } diff --git a/models/issue_test.go b/models/issue_test.go index 5b039bc1d5fff..fe5af5c190a89 100644 --- a/models/issue_test.go +++ b/models/issue_test.go @@ -160,7 +160,7 @@ func TestUpdateIssueCols(t *testing.T) { issue.Content = "This should have no effect" now := time.Now().Unix() - assert.NoError(t, UpdateIssueCols(issue, "name")) + assert.NoError(t, UpdateIssueCols(DefaultDBContext(), issue, "name")) then := time.Now().Unix() updatedIssue := AssertExistsAndLoadBean(t, &Issue{ID: issue.ID}).(*Issue) diff --git a/models/issue_xref.go b/models/issue_xref.go index 1cc0bcfe6a11e..3f02741bef3d9 100644 --- a/models/issue_xref.go +++ b/models/issue_xref.go @@ -10,7 +10,6 @@ import ( "code.gitea.io/gitea/modules/log" - "github.com/go-xorm/xorm" "github.com/unknwon/com" ) @@ -51,7 +50,7 @@ type crossReferencesContext struct { OrigComment *Comment } -func newCrossReference(e *xorm.Session, ctx *crossReferencesContext, xref *crossReference) error { +func newCrossReference(e Engine, ctx *crossReferencesContext, xref *crossReference) error { var refCommentID int64 if ctx.OrigComment != nil { refCommentID = ctx.OrigComment.ID @@ -98,7 +97,12 @@ func neuterCrossReferences(e Engine, issueID int64, commentID int64) error { // \/ \/ \/ // -func (issue *Issue) addCrossReferences(e *xorm.Session, doer *User) error { +// AddCrossReferences adds issues cross references +func (issue *Issue) AddCrossReferences(ctx DBContext, doer *User) error { + return issue.addCrossReferences(ctx.e, doer) +} + +func (issue *Issue) addCrossReferences(e Engine, doer *User) error { var commentType CommentType if issue.IsPull { commentType = CommentTypePullRef @@ -113,7 +117,7 @@ func (issue *Issue) addCrossReferences(e *xorm.Session, doer *User) error { return issue.createCrossReferences(e, ctx, issue.Title+"\n"+issue.Content) } -func (issue *Issue) createCrossReferences(e *xorm.Session, ctx *crossReferencesContext, content string) error { +func (issue *Issue) createCrossReferences(e Engine, ctx *crossReferencesContext, content string) error { xreflist, err := ctx.OrigIssue.getCrossReferences(e, ctx, content) if err != nil { return err @@ -126,7 +130,7 @@ func (issue *Issue) createCrossReferences(e *xorm.Session, ctx *crossReferencesC return nil } -func (issue *Issue) getCrossReferences(e *xorm.Session, ctx *crossReferencesContext, content string) ([]*crossReference, error) { +func (issue *Issue) getCrossReferences(e Engine, ctx *crossReferencesContext, content string) ([]*crossReference, error) { xreflist := make([]*crossReference, 0, 5) var xref *crossReference @@ -212,6 +216,11 @@ func (issue *Issue) isValidCommentReference(e Engine, ctx *crossReferencesContex }, nil } +// NeuterCrossReferences updated issues' cross references +func (issue *Issue) NeuterCrossReferences(ctx DBContext) error { + return issue.neuterCrossReferences(ctx.e) +} + func (issue *Issue) neuterCrossReferences(e Engine) error { return neuterCrossReferences(e, issue.ID, 0) } @@ -224,7 +233,7 @@ func (issue *Issue) neuterCrossReferences(e Engine) error { // \/ \/ \/ \/ \/ // -func (comment *Comment) addCrossReferences(e *xorm.Session, doer *User) error { +func (comment *Comment) addCrossReferences(e Engine, doer *User) error { if comment.Type != CommentTypeCode && comment.Type != CommentTypeComment { return nil } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index e4ef3b1dbb033..bb11bb4719ea6 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -757,7 +757,7 @@ func ViewIssue(ctx *context.Context) { ctx.ServerError("GetIssueByID", err) return } - if err = otherIssue.LoadRepo(); err != nil { + if err = otherIssue.LoadRepo(models.DefaultDBContext()); err != nil { ctx.ServerError("LoadRepo", err) return } @@ -1044,7 +1044,7 @@ func UpdateIssueTitle(ctx *context.Context) { } oldTitle := issue.Title - if err := issue.ChangeTitle(ctx.User, title); err != nil { + if err := issue_service.ChangeTitle(issue, ctx.User, title); err != nil { ctx.ServerError("ChangeTitle", err) return } diff --git a/services/issue/issue.go b/services/issue/issue.go index 5afdfc9901b7a..6efe616c3e2b1 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -45,3 +45,77 @@ func NewIssue(repo *models.Repository, issue *models.Issue, labelIDs []int64, as return nil } + +// ChangeTitle changes the title of this issue, as the given user. +func ChangeTitle(issue *models.Issue, doer *models.User, title string) (err error) { + oldTitle := issue.Title + issue.Title = title + + err = models.WithTx(func(ctx models.DBContext) error { + if err = models.UpdateIssueCols(ctx, issue, "name"); err != nil { + return fmt.Errorf("updateIssueCols: %v", err) + } + + if err = issue.LoadRepo(ctx); err != nil { + return fmt.Errorf("loadRepo: %v", err) + } + + if _, err = models.CreateChangeTitleComment(ctx, doer, issue.Repo, issue, oldTitle, title); err != nil { + return fmt.Errorf("CreateChangeTitleComment: %v", err) + } + + if err = issue.NeuterCrossReferences(ctx); err != nil { + return err + } + + if err = issue.AddCrossReferences(ctx, doer); err != nil { + return err + } + return nil + }) + + if err != nil { + return + } + + mode, _ := models.AccessLevel(issue.Poster, issue.Repo) + if issue.IsPull { + if err = issue.LoadPullRequest(); err != nil { + return fmt.Errorf("loadPullRequest: %v", err) + } + issue.PullRequest.Issue = issue + err = models.PrepareWebhooks(issue.Repo, models.HookEventPullRequest, &api.PullRequestPayload{ + Action: api.HookIssueEdited, + Index: issue.Index, + Changes: &api.ChangesPayload{ + Title: &api.ChangesFromPayload{ + From: oldTitle, + }, + }, + PullRequest: issue.PullRequest.APIFormat(), + Repository: issue.Repo.APIFormat(mode), + Sender: doer.APIFormat(), + }) + } else { + err = models.PrepareWebhooks(issue.Repo, models.HookEventIssues, &api.IssuePayload{ + Action: api.HookIssueEdited, + Index: issue.Index, + Changes: &api.ChangesPayload{ + Title: &api.ChangesFromPayload{ + From: oldTitle, + }, + }, + Issue: issue.APIFormat(), + Repository: issue.Repo.APIFormat(mode), + Sender: issue.Poster.APIFormat(), + }) + } + + if err != nil { + log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err) + } else { + go models.HookQueue.Add(issue.RepoID) + } + + return nil +} diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 3f0a789dc4cd4..cdb95e9c47fa3 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -170,7 +170,7 @@ func composeIssueCommentMessage(issue *models.Issue, doer *models.User, content } else { subject = mailSubject(issue) } - err := issue.LoadRepo() + err := issue.LoadRepo(models.DefaultDBContext()) if err != nil { log.Error("LoadRepo: %v", err) } diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index da0249d595dab..bdbbddc12b0aa 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -88,7 +88,7 @@ func mailIssueCommentToParticipants(issue *models.Issue, doer *models.User, cont names = append(names, participants[i].Name) } - if err := issue.LoadRepo(); err != nil { + if err := issue.LoadRepo(models.DefaultDBContext()); err != nil { return err } From b65034d8acbeb8faf27037c718ab9871401e5dc4 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 11 Oct 2019 09:09:46 +0800 Subject: [PATCH 2/3] make the change less --- models/issue.go | 41 +++++++++++++++++++++++++++++------ models/issue_comment.go | 9 ++++---- models/issue_lock.go | 17 +++++++++++---- models/issue_test.go | 2 +- models/issue_xref.go | 21 +++++------------- routers/repo/issue.go | 2 +- services/issue/issue.go | 25 +-------------------- services/mailer/mail.go | 2 +- services/mailer/mail_issue.go | 2 +- 9 files changed, 62 insertions(+), 59 deletions(-) diff --git a/models/issue.go b/models/issue.go index 2345e6f672de5..3fcdab6164c6e 100644 --- a/models/issue.go +++ b/models/issue.go @@ -95,8 +95,8 @@ func (issue *Issue) IsOverdue() bool { } // LoadRepo loads issue's repository -func (issue *Issue) LoadRepo(ctx DBContext) error { - return issue.loadRepo(ctx.e) +func (issue *Issue) LoadRepo() error { + return issue.loadRepo(x) } func (issue *Issue) loadRepo(e Engine) (err error) { @@ -714,11 +714,6 @@ func updateIssueCols(e Engine, issue *Issue, cols ...string) error { return nil } -// UpdateIssueCols only updates values of specific columns for given issue. -func UpdateIssueCols(ctx DBContext, issue *Issue, cols ...string) error { - return updateIssueCols(ctx.e, issue, cols...) -} - func (issue *Issue) changeStatus(e *xorm.Session, doer *User, isClosed bool) (err error) { // Reload the issue currentIssue, err := getIssueByID(e, issue.ID) @@ -843,6 +838,38 @@ func (issue *Issue) ChangeStatus(doer *User, isClosed bool) (err error) { return nil } +// ChangeTitle changes the title of this issue, as the given user. +func (issue *Issue) ChangeTitle(doer *User, oldTitle string) (err error) { + sess := x.NewSession() + defer sess.Close() + + if err = sess.Begin(); err != nil { + return err + } + + if err = updateIssueCols(sess, issue, "name"); err != nil { + return fmt.Errorf("updateIssueCols: %v", err) + } + + if err = issue.loadRepo(sess); err != nil { + return fmt.Errorf("loadRepo: %v", err) + } + + if _, err = createChangeTitleComment(sess, doer, issue.Repo, issue, oldTitle, issue.Title); err != nil { + return fmt.Errorf("CreateChangeTitleComment: %v", err) + } + + if err = issue.neuterCrossReferences(sess); err != nil { + return err + } + + if err = issue.addCrossReferences(sess, doer); err != nil { + return err + } + + return sess.Commit() +} + // AddDeletePRBranchComment adds delete branch comment for pull request issue func AddDeletePRBranchComment(doer *User, repo *Repository, issueID int64, branchName string) error { issue, err := getIssueByID(x, issueID) diff --git a/models/issue_comment.go b/models/issue_comment.go index 8e2fa43f86c10..e8043c1ec7f3a 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -468,7 +468,7 @@ func (c *Comment) CodeCommentURL() string { return fmt.Sprintf("%s/files#%s", c.Issue.HTMLURL(), c.HashTag()) } -func createComment(e Engine, opts *CreateCommentOptions) (_ *Comment, err error) { +func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err error) { var LabelID int64 if opts.Label != nil { LabelID = opts.Label.ID @@ -519,7 +519,7 @@ func createComment(e Engine, opts *CreateCommentOptions) (_ *Comment, err error) return comment, nil } -func sendCreateCommentAction(e Engine, opts *CreateCommentOptions, comment *Comment) (err error) { +func sendCreateCommentAction(e *xorm.Session, opts *CreateCommentOptions, comment *Comment) (err error) { // Compose comment action, could be plain comment, close or reopen issue/pull request. // This object will be used to notify watchers in the end of function. act := &Action{ @@ -690,9 +690,8 @@ func createDeadlineComment(e *xorm.Session, doer *User, issue *Issue, newDeadlin }) } -// CreateChangeTitleComment created a change title comment for issue -func CreateChangeTitleComment(ctx DBContext, doer *User, repo *Repository, issue *Issue, oldTitle, newTitle string) (*Comment, error) { - return createComment(ctx.e, &CreateCommentOptions{ +func createChangeTitleComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, oldTitle, newTitle string) (*Comment, error) { + return createComment(e, &CreateCommentOptions{ Type: CommentTypeChangeTitle, Doer: doer, Repo: repo, diff --git a/models/issue_lock.go b/models/issue_lock.go index b927bab093c16..dc6655ad3b51d 100644 --- a/models/issue_lock.go +++ b/models/issue_lock.go @@ -28,7 +28,6 @@ func updateIssueLock(opts *IssueLockOptions, lock bool) error { } opts.Issue.IsLocked = lock - var commentType CommentType if opts.Issue.IsLocked { commentType = CommentTypeLock @@ -36,16 +35,26 @@ func updateIssueLock(opts *IssueLockOptions, lock bool) error { commentType = CommentTypeUnlock } - if err := UpdateIssueCols(DefaultDBContext(), opts.Issue, "is_locked"); err != nil { + sess := x.NewSession() + defer sess.Close() + if err := sess.Begin(); err != nil { + return err + } + + if err := updateIssueCols(sess, opts.Issue, "is_locked"); err != nil { return err } - _, err := CreateComment(&CreateCommentOptions{ + _, err := createComment(sess, &CreateCommentOptions{ Doer: opts.Doer, Issue: opts.Issue, Repo: opts.Issue.Repo, Type: commentType, Content: opts.Reason, }) - return err + if err != nil { + return err + } + + return sess.Commit() } diff --git a/models/issue_test.go b/models/issue_test.go index fe5af5c190a89..0be3f68808254 100644 --- a/models/issue_test.go +++ b/models/issue_test.go @@ -160,7 +160,7 @@ func TestUpdateIssueCols(t *testing.T) { issue.Content = "This should have no effect" now := time.Now().Unix() - assert.NoError(t, UpdateIssueCols(DefaultDBContext(), issue, "name")) + assert.NoError(t, updateIssueCols(x, issue, "name")) then := time.Now().Unix() updatedIssue := AssertExistsAndLoadBean(t, &Issue{ID: issue.ID}).(*Issue) diff --git a/models/issue_xref.go b/models/issue_xref.go index 3f02741bef3d9..1cc0bcfe6a11e 100644 --- a/models/issue_xref.go +++ b/models/issue_xref.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/modules/log" + "github.com/go-xorm/xorm" "github.com/unknwon/com" ) @@ -50,7 +51,7 @@ type crossReferencesContext struct { OrigComment *Comment } -func newCrossReference(e Engine, ctx *crossReferencesContext, xref *crossReference) error { +func newCrossReference(e *xorm.Session, ctx *crossReferencesContext, xref *crossReference) error { var refCommentID int64 if ctx.OrigComment != nil { refCommentID = ctx.OrigComment.ID @@ -97,12 +98,7 @@ func neuterCrossReferences(e Engine, issueID int64, commentID int64) error { // \/ \/ \/ // -// AddCrossReferences adds issues cross references -func (issue *Issue) AddCrossReferences(ctx DBContext, doer *User) error { - return issue.addCrossReferences(ctx.e, doer) -} - -func (issue *Issue) addCrossReferences(e Engine, doer *User) error { +func (issue *Issue) addCrossReferences(e *xorm.Session, doer *User) error { var commentType CommentType if issue.IsPull { commentType = CommentTypePullRef @@ -117,7 +113,7 @@ func (issue *Issue) addCrossReferences(e Engine, doer *User) error { return issue.createCrossReferences(e, ctx, issue.Title+"\n"+issue.Content) } -func (issue *Issue) createCrossReferences(e Engine, ctx *crossReferencesContext, content string) error { +func (issue *Issue) createCrossReferences(e *xorm.Session, ctx *crossReferencesContext, content string) error { xreflist, err := ctx.OrigIssue.getCrossReferences(e, ctx, content) if err != nil { return err @@ -130,7 +126,7 @@ func (issue *Issue) createCrossReferences(e Engine, ctx *crossReferencesContext, return nil } -func (issue *Issue) getCrossReferences(e Engine, ctx *crossReferencesContext, content string) ([]*crossReference, error) { +func (issue *Issue) getCrossReferences(e *xorm.Session, ctx *crossReferencesContext, content string) ([]*crossReference, error) { xreflist := make([]*crossReference, 0, 5) var xref *crossReference @@ -216,11 +212,6 @@ func (issue *Issue) isValidCommentReference(e Engine, ctx *crossReferencesContex }, nil } -// NeuterCrossReferences updated issues' cross references -func (issue *Issue) NeuterCrossReferences(ctx DBContext) error { - return issue.neuterCrossReferences(ctx.e) -} - func (issue *Issue) neuterCrossReferences(e Engine) error { return neuterCrossReferences(e, issue.ID, 0) } @@ -233,7 +224,7 @@ func (issue *Issue) neuterCrossReferences(e Engine) error { // \/ \/ \/ \/ \/ // -func (comment *Comment) addCrossReferences(e Engine, doer *User) error { +func (comment *Comment) addCrossReferences(e *xorm.Session, doer *User) error { if comment.Type != CommentTypeCode && comment.Type != CommentTypeComment { return nil } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index bb11bb4719ea6..16a049c7aa6df 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -757,7 +757,7 @@ func ViewIssue(ctx *context.Context) { ctx.ServerError("GetIssueByID", err) return } - if err = otherIssue.LoadRepo(models.DefaultDBContext()); err != nil { + if err = otherIssue.LoadRepo(); err != nil { ctx.ServerError("LoadRepo", err) return } diff --git a/services/issue/issue.go b/services/issue/issue.go index 6efe616c3e2b1..a28916a7f9b5e 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -51,30 +51,7 @@ func ChangeTitle(issue *models.Issue, doer *models.User, title string) (err erro oldTitle := issue.Title issue.Title = title - err = models.WithTx(func(ctx models.DBContext) error { - if err = models.UpdateIssueCols(ctx, issue, "name"); err != nil { - return fmt.Errorf("updateIssueCols: %v", err) - } - - if err = issue.LoadRepo(ctx); err != nil { - return fmt.Errorf("loadRepo: %v", err) - } - - if _, err = models.CreateChangeTitleComment(ctx, doer, issue.Repo, issue, oldTitle, title); err != nil { - return fmt.Errorf("CreateChangeTitleComment: %v", err) - } - - if err = issue.NeuterCrossReferences(ctx); err != nil { - return err - } - - if err = issue.AddCrossReferences(ctx, doer); err != nil { - return err - } - return nil - }) - - if err != nil { + if err = issue.ChangeTitle(doer, oldTitle); err != nil { return } diff --git a/services/mailer/mail.go b/services/mailer/mail.go index cdb95e9c47fa3..3f0a789dc4cd4 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -170,7 +170,7 @@ func composeIssueCommentMessage(issue *models.Issue, doer *models.User, content } else { subject = mailSubject(issue) } - err := issue.LoadRepo(models.DefaultDBContext()) + err := issue.LoadRepo() if err != nil { log.Error("LoadRepo: %v", err) } diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index bdbbddc12b0aa..da0249d595dab 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -88,7 +88,7 @@ func mailIssueCommentToParticipants(issue *models.Issue, doer *models.User, cont names = append(names, participants[i].Name) } - if err := issue.LoadRepo(models.DefaultDBContext()); err != nil { + if err := issue.LoadRepo(); err != nil { return err } From 077b00e523899c4ab444ad584c884503a9876887 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 11 Oct 2019 09:13:51 +0800 Subject: [PATCH 3/3] fix typo --- models/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issue.go b/models/issue.go index 3fcdab6164c6e..8ce7d496ab465 100644 --- a/models/issue.go +++ b/models/issue.go @@ -856,7 +856,7 @@ func (issue *Issue) ChangeTitle(doer *User, oldTitle string) (err error) { } if _, err = createChangeTitleComment(sess, doer, issue.Repo, issue, oldTitle, issue.Title); err != nil { - return fmt.Errorf("CreateChangeTitleComment: %v", err) + return fmt.Errorf("createChangeTitleComment: %v", err) } if err = issue.neuterCrossReferences(sess); err != nil {