From 9dbf3ca4ef120261775e21b534ea9685704db05b Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 14 Jun 2019 09:30:24 +0800 Subject: [PATCH 01/18] move all mail related codes from models to modules/mailer --- models/issue_comment.go | 35 ------------ models/models.go | 20 +++++++ {models => modules/mailer}/mail.go | 55 ++++++++++--------- modules/mailer/mail_comment.go | 49 +++++++++++++++++ .../mailer/mail_issue.go | 52 +++++++++--------- modules/notification/mail/mail.go | 11 ++-- routers/admin/admin.go | 3 +- routers/admin/users.go | 5 +- routers/api/v1/admin/user.go | 6 +- routers/repo/setting.go | 3 +- routers/routes/routes.go | 3 +- routers/user/auth.go | 12 ++-- routers/user/auth_openid.go | 4 +- routers/user/setting/account.go | 3 +- 14 files changed, 156 insertions(+), 105 deletions(-) rename {models => modules/mailer}/mail.go (73%) create mode 100644 modules/mailer/mail_comment.go rename models/issue_mail.go => modules/mailer/mail_issue.go (65%) diff --git a/models/issue_comment.go b/models/issue_comment.go index 0bb313c30bbf9..6786032f41c91 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -12,7 +12,6 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" @@ -395,40 +394,6 @@ func (c *Comment) LoadDepIssueDetails() (err error) { return err } -// MailParticipants sends new comment emails to repository watchers -// and mentioned people. -func (c *Comment) MailParticipants(opType ActionType, issue *Issue) (err error) { - return c.mailParticipants(x, opType, issue) -} - -func (c *Comment) mailParticipants(e Engine, opType ActionType, issue *Issue) (err error) { - mentions := markup.FindAllMentions(c.Content) - if err = UpdateIssueMentions(e, c.IssueID, mentions); err != nil { - return fmt.Errorf("UpdateIssueMentions [%d]: %v", c.IssueID, err) - } - - if len(c.Content) > 0 { - if err = mailIssueCommentToParticipants(e, issue, c.Poster, c.Content, c, mentions); err != nil { - log.Error("mailIssueCommentToParticipants: %v", err) - } - } - - switch opType { - case ActionCloseIssue: - ct := fmt.Sprintf("Closed #%d.", issue.Index) - if err = mailIssueCommentToParticipants(e, issue, c.Poster, ct, c, mentions); err != nil { - log.Error("mailIssueCommentToParticipants: %v", err) - } - case ActionReopenIssue: - ct := fmt.Sprintf("Reopened #%d.", issue.Index) - if err = mailIssueCommentToParticipants(e, issue, c.Poster, ct, c, mentions); err != nil { - log.Error("mailIssueCommentToParticipants: %v", err) - } - } - - return nil -} - func (c *Comment) loadReactions(e Engine) (err error) { if c.Reactions != nil { return nil diff --git a/models/models.go b/models/models.go index e802a35a77709..64961886e3b56 100644 --- a/models/models.go +++ b/models/models.go @@ -120,6 +120,26 @@ func init() { } } +// WithEngine represents executing database operations +func WithEngine(f func(e Engine) error) error { + return f(x) +} + +// WithTransaction represents executing database operations on a trasaction +func WithTransaction(f func(e Engine) error) error { + sess := x.NewSession() + defer sess.Close() + if err := sess.Begin(); err != nil { + return err + } + + if err := f(sess); err != nil { + return err + } + + return sess.Commit() +} + func getEngine() (*xorm.Engine, error) { connStr, err := setting.DBConnStr() if err != nil { diff --git a/models/mail.go b/modules/mailer/mail.go similarity index 73% rename from models/mail.go rename to modules/mailer/mail.go index 2c72818cec3c3..429c67aabe73f 100644 --- a/models/mail.go +++ b/modules/mailer/mail.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package models +package mailer import ( "bytes" @@ -10,9 +10,9 @@ import ( "html/template" "path" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" @@ -42,11 +42,11 @@ func InitMailRender(tmpls *template.Template) { // SendTestMail sends a test mail func SendTestMail(email string) error { - return gomail.Send(mailer.Sender, mailer.NewMessage([]string{email}, "Gitea Test Email!", "Gitea Test Email!").Message) + return gomail.Send(Sender, NewMessage([]string{email}, "Gitea Test Email!", "Gitea Test Email!").Message) } // SendUserMail sends a mail to the user -func SendUserMail(language string, u *User, tpl base.TplName, code, subject, info string) { +func SendUserMail(language string, u *models.User, tpl base.TplName, code, subject, info string) { data := map[string]interface{}{ "DisplayName": u.DisplayName(), "ActiveCodeLives": timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, language), @@ -61,10 +61,10 @@ func SendUserMail(language string, u *User, tpl base.TplName, code, subject, inf return } - msg := mailer.NewMessage([]string{u.Email}, subject, content.String()) + msg := NewMessage([]string{u.Email}, subject, content.String()) msg.Info = fmt.Sprintf("UID: %d, %s", u.ID, info) - mailer.SendAsync(msg) + SendAsync(msg) } // Locale represents an interface to translation @@ -74,17 +74,17 @@ type Locale interface { } // SendActivateAccountMail sends an activation mail to the user (new user registration) -func SendActivateAccountMail(locale Locale, u *User) { +func SendActivateAccountMail(locale Locale, u *models.User) { SendUserMail(locale.Language(), u, mailAuthActivate, u.GenerateActivateCode(), locale.Tr("mail.activate_account"), "activate account") } // SendResetPasswordMail sends a password reset mail to the user -func SendResetPasswordMail(locale Locale, u *User) { +func SendResetPasswordMail(locale Locale, u *models.User) { SendUserMail(locale.Language(), u, mailAuthResetPassword, u.GenerateActivateCode(), locale.Tr("mail.reset_password"), "recover account") } // SendActivateEmailMail sends confirmation email to confirm new email address -func SendActivateEmailMail(locale Locale, u *User, email *EmailAddress) { +func SendActivateEmailMail(locale Locale, u *models.User, email *models.EmailAddress) { data := map[string]interface{}{ "DisplayName": u.DisplayName(), "ActiveCodeLives": timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, locale.Language()), @@ -99,14 +99,18 @@ func SendActivateEmailMail(locale Locale, u *User, email *EmailAddress) { return } - msg := mailer.NewMessage([]string{email.Email}, locale.Tr("mail.activate_email"), content.String()) + msg := NewMessage([]string{email.Email}, locale.Tr("mail.activate_email"), content.String()) msg.Info = fmt.Sprintf("UID: %d, activate email", u.ID) - mailer.SendAsync(msg) + SendAsync(msg) } // SendRegisterNotifyMail triggers a notify e-mail by admin created a account. -func SendRegisterNotifyMail(locale Locale, u *User) { +func SendRegisterNotifyMail(locale Locale, u *models.User) { + if setting.MailService == nil { + return + } + data := map[string]interface{}{ "DisplayName": u.DisplayName(), "Username": u.Name, @@ -119,14 +123,14 @@ func SendRegisterNotifyMail(locale Locale, u *User) { return } - msg := mailer.NewMessage([]string{u.Email}, locale.Tr("mail.register_notify"), content.String()) + msg := NewMessage([]string{u.Email}, locale.Tr("mail.register_notify"), content.String()) msg.Info = fmt.Sprintf("UID: %d, registration notify", u.ID) - mailer.SendAsync(msg) + SendAsync(msg) } // SendCollaboratorMail sends mail notification to new collaborator. -func SendCollaboratorMail(u, doer *User, repo *Repository) { +func SendCollaboratorMail(u, doer *models.User, repo *models.Repository) { repoName := path.Join(repo.Owner.Name, repo.Name) subject := fmt.Sprintf("%s added you to %s", doer.DisplayName(), repoName) @@ -143,10 +147,10 @@ func SendCollaboratorMail(u, doer *User, repo *Repository) { return } - msg := mailer.NewMessage([]string{u.Email}, subject, content.String()) + msg := NewMessage([]string{u.Email}, subject, content.String()) msg.Info = fmt.Sprintf("UID: %d, add collaborator", u.ID) - mailer.SendAsync(msg) + SendAsync(msg) } func composeTplData(subject, body, link string) map[string]interface{} { @@ -157,14 +161,13 @@ func composeTplData(subject, body, link string) map[string]interface{} { return data } -func composeIssueCommentMessage(issue *Issue, doer *User, content string, comment *Comment, tplName base.TplName, tos []string, info string) *mailer.Message { +func composeIssueCommentMessage(issue *models.Issue, doer *models.User, content string, comment *models.Comment, tplName base.TplName, tos []string, info string) *Message { var subject string if comment != nil { - subject = "Re: " + issue.mailSubject() + subject = "Re: " + mailSubject(issue) } else { - subject = issue.mailSubject() + subject = mailSubject(issue) } - err := issue.LoadRepo() if err != nil { log.Error("LoadRepo: %v", err) @@ -185,7 +188,7 @@ func composeIssueCommentMessage(issue *Issue, doer *User, content string, commen log.Error("Template: %v", err) } - msg := mailer.NewMessageFrom(tos, doer.DisplayName(), setting.MailService.FromEmail, subject, mailBody.String()) + msg := NewMessageFrom(tos, doer.DisplayName(), setting.MailService.FromEmail, subject, mailBody.String()) msg.Info = fmt.Sprintf("Subject: %s, %s", subject, info) // Set Message-ID on first message so replies know what to reference @@ -200,18 +203,18 @@ func composeIssueCommentMessage(issue *Issue, doer *User, content string, commen } // SendIssueCommentMail composes and sends issue comment emails to target receivers. -func SendIssueCommentMail(issue *Issue, doer *User, content string, comment *Comment, tos []string) { +func SendIssueCommentMail(issue *models.Issue, doer *models.User, content string, comment *models.Comment, tos []string) { if len(tos) == 0 { return } - mailer.SendAsync(composeIssueCommentMessage(issue, doer, content, comment, mailIssueComment, tos, "issue comment")) + SendAsync(composeIssueCommentMessage(issue, doer, content, comment, mailIssueComment, tos, "issue comment")) } // SendIssueMentionMail composes and sends issue mention emails to target receivers. -func SendIssueMentionMail(issue *Issue, doer *User, content string, comment *Comment, tos []string) { +func SendIssueMentionMail(issue *models.Issue, doer *models.User, content string, comment *models.Comment, tos []string) { if len(tos) == 0 { return } - mailer.SendAsync(composeIssueCommentMessage(issue, doer, content, comment, mailIssueMention, tos, "issue mention")) + SendAsync(composeIssueCommentMessage(issue, doer, content, comment, mailIssueMention, tos, "issue mention")) } diff --git a/modules/mailer/mail_comment.go b/modules/mailer/mail_comment.go new file mode 100644 index 0000000000000..5295d7a39a749 --- /dev/null +++ b/modules/mailer/mail_comment.go @@ -0,0 +1,49 @@ +// Copyright 2019 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package mailer + +import ( + "fmt" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markup" +) + +// MailParticipants sends new comment emails to repository watchers +// and mentioned people. +func MailParticipantsComment(c *models.Comment, opType models.ActionType, issue *models.Issue) (err error) { + return models.WithEngine(func(e models.Engine) error { + return mailParticipantsComment(c, e, opType, issue) + }) +} + +func mailParticipantsComment(c *models.Comment, e models.Engine, opType models.ActionType, issue *models.Issue) (err error) { + mentions := markup.FindAllMentions(c.Content) + if err = models.UpdateIssueMentions(e, c.IssueID, mentions); err != nil { + return fmt.Errorf("UpdateIssueMentions [%d]: %v", c.IssueID, err) + } + + if len(c.Content) > 0 { + if err = mailIssueCommentToParticipants(issue, c.Poster, c.Content, c, mentions); err != nil { + log.Error("mailIssueCommentToParticipants: %v", err) + } + } + + switch opType { + case models.ActionCloseIssue: + ct := fmt.Sprintf("Closed #%d.", issue.Index) + if err = mailIssueCommentToParticipants(issue, c.Poster, ct, c, mentions); err != nil { + log.Error("mailIssueCommentToParticipants: %v", err) + } + case models.ActionReopenIssue: + ct := fmt.Sprintf("Reopened #%d.", issue.Index) + if err = mailIssueCommentToParticipants(issue, c.Poster, ct, c, mentions); err != nil { + log.Error("mailIssueCommentToParticipants: %v", err) + } + } + + return nil +} diff --git a/models/issue_mail.go b/modules/mailer/mail_issue.go similarity index 65% rename from models/issue_mail.go rename to modules/mailer/mail_issue.go index 87d991e500918..4feed9e8ce7f7 100644 --- a/models/issue_mail.go +++ b/modules/mailer/mail_issue.go @@ -1,13 +1,13 @@ -// Copyright 2016 The Gogs Authors. All rights reserved. -// Copyright 2018 The Gitea Authors. All rights reserved. +// Copyright 2019 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package models +package mailer import ( "fmt" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/setting" @@ -15,7 +15,7 @@ import ( "github.com/unknwon/com" ) -func (issue *Issue) mailSubject() string { +func mailSubject(issue *models.Issue) string { return fmt.Sprintf("[%s] %s (#%d)", issue.Repo.FullName(), issue.Title, issue.Index) } @@ -23,23 +23,23 @@ func (issue *Issue) mailSubject() string { // This function sends two list of emails: // 1. Repository watchers and users who are participated in comments. // 2. Users who are not in 1. but get mentioned in current issue/comment. -func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content string, comment *Comment, mentions []string) error { +func mailIssueCommentToParticipants(issue *models.Issue, doer *models.User, content string, comment *models.Comment, mentions []string) error { if !setting.Service.EnableNotifyMail { return nil } - watchers, err := getWatchers(e, issue.RepoID) + watchers, err := models.GetWatchers(issue.RepoID) if err != nil { return fmt.Errorf("getWatchers [repo_id: %d]: %v", issue.RepoID, err) } - participants, err := getParticipantsByIssueID(e, issue.ID) + participants, err := models.GetParticipantsByIssueID(issue.ID) if err != nil { return fmt.Errorf("getParticipantsByIssueID [issue_id: %d]: %v", issue.ID, err) } // In case the issue poster is not watching the repository and is active, // even if we have duplicated in watchers, can be safely filtered out. - err = issue.loadPoster(e) + err = issue.LoadPoster() if err != nil { return fmt.Errorf("GetUserByID [%d]: %v", issue.PosterID, err) } @@ -48,7 +48,7 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content } // Assignees must receive any communications - assignees, err := getAssigneesByIssue(e, issue) + assignees, err := models.GetAssigneesByIssue(issue) if err != nil { return err } @@ -66,11 +66,11 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content continue } - to, err := getUserByID(e, watchers[i].UserID) + to, err := models.GetUserByID(watchers[i].UserID) if err != nil { return fmt.Errorf("GetUserByID [%d]: %v", watchers[i].UserID, err) } - if to.IsOrganization() || to.EmailNotifications() != EmailNotificationsEnabled { + if to.IsOrganization() || to.EmailNotifications() != models.EmailNotificationsEnabled { continue } @@ -80,7 +80,7 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content for i := range participants { if participants[i].ID == doer.ID || com.IsSliceContainsStr(names, participants[i].Name) || - participants[i].EmailNotifications() != EmailNotificationsEnabled { + participants[i].EmailNotifications() != models.EmailNotificationsEnabled { continue } @@ -88,7 +88,7 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content names = append(names, participants[i].Name) } - if err := issue.loadRepo(e); err != nil { + if err := issue.LoadRepo(); err != nil { return err } @@ -107,7 +107,7 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content tos = append(tos, mentions[i]) } - emails := getUserEmailsByNames(e, tos) + emails := models.GetUserEmailsByNames(tos) for _, to := range emails { SendIssueMentionMail(issue, doer, content, comment, []string{to}) @@ -118,39 +118,41 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content // MailParticipants sends new issue thread created emails to repository watchers // and mentioned people. -func (issue *Issue) MailParticipants(doer *User, opType ActionType) (err error) { - return issue.mailParticipants(x, doer, opType) +func MailParticipants(issue *models.Issue, doer *models.User, opType models.ActionType) (err error) { + return models.WithEngine(func(e models.Engine) error { + return mailParticipants(issue, e, doer, opType) + }) } -func (issue *Issue) mailParticipants(e Engine, doer *User, opType ActionType) (err error) { +func mailParticipants(issue *models.Issue, e models.Engine, doer *models.User, opType models.ActionType) (err error) { mentions := markup.FindAllMentions(issue.Content) - if err = UpdateIssueMentions(e, issue.ID, mentions); err != nil { + if err = models.UpdateIssueMentions(e, issue.ID, mentions); err != nil { return fmt.Errorf("UpdateIssueMentions [%d]: %v", issue.ID, err) } if len(issue.Content) > 0 { - if err = mailIssueCommentToParticipants(e, issue, doer, issue.Content, nil, mentions); err != nil { + if err = mailIssueCommentToParticipants(issue, doer, issue.Content, nil, mentions); err != nil { log.Error("mailIssueCommentToParticipants: %v", err) } } switch opType { - case ActionCreateIssue, ActionCreatePullRequest: + case models.ActionCreateIssue, models.ActionCreatePullRequest: if len(issue.Content) == 0 { ct := fmt.Sprintf("Created #%d.", issue.Index) - if err = mailIssueCommentToParticipants(e, issue, doer, ct, nil, mentions); err != nil { + if err = mailIssueCommentToParticipants(issue, doer, ct, nil, mentions); err != nil { log.Error("mailIssueCommentToParticipants: %v", err) } } - case ActionCloseIssue, ActionClosePullRequest: + case models.ActionCloseIssue, models.ActionClosePullRequest: ct := fmt.Sprintf("Closed #%d.", issue.Index) - if err = mailIssueCommentToParticipants(e, issue, doer, ct, nil, mentions); err != nil { + if err = mailIssueCommentToParticipants(issue, doer, ct, nil, mentions); err != nil { log.Error("mailIssueCommentToParticipants: %v", err) } - case ActionReopenIssue, ActionReopenPullRequest: + case models.ActionReopenIssue, models.ActionReopenPullRequest: ct := fmt.Sprintf("Reopened #%d.", issue.Index) - if err = mailIssueCommentToParticipants(e, issue, doer, ct, nil, mentions); err != nil { + if err = mailIssueCommentToParticipants(issue, doer, ct, nil, mentions); err != nil { log.Error("mailIssueCommentToParticipants: %v", err) } } diff --git a/modules/notification/mail/mail.go b/modules/notification/mail/mail.go index 9d0db4f415197..82b377157e0bc 100644 --- a/modules/notification/mail/mail.go +++ b/modules/notification/mail/mail.go @@ -7,6 +7,7 @@ package mail import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" "code.gitea.io/gitea/modules/notification/base" ) @@ -36,13 +37,13 @@ func (m *mailNotifier) NotifyCreateIssueComment(doer *models.User, repo *models. act = models.ActionCommentIssue } - if err := comment.MailParticipants(act, issue); err != nil { + if err := mailer.MailParticipantsComment(comment, act, issue); err != nil { log.Error("MailParticipants: %v", err) } } func (m *mailNotifier) NotifyNewIssue(issue *models.Issue) { - if err := issue.MailParticipants(issue.Poster, models.ActionCreateIssue); err != nil { + if err := mailer.MailParticipants(issue, issue.Poster, models.ActionCreateIssue); err != nil { log.Error("MailParticipants: %v", err) } } @@ -63,13 +64,13 @@ func (m *mailNotifier) NotifyIssueChangeStatus(doer *models.User, issue *models. } } - if err := issue.MailParticipants(doer, actionType); err != nil { + if err := mailer.MailParticipants(issue, doer, actionType); err != nil { log.Error("MailParticipants: %v", err) } } func (m *mailNotifier) NotifyNewPullRequest(pr *models.PullRequest) { - if err := pr.Issue.MailParticipants(pr.Issue.Poster, models.ActionCreatePullRequest); err != nil { + if err := mailer.MailParticipants(pr.Issue, pr.Issue.Poster, models.ActionCreatePullRequest); err != nil { log.Error("MailParticipants: %v", err) } } @@ -83,7 +84,7 @@ func (m *mailNotifier) NotifyPullRequestReview(pr *models.PullRequest, r *models } else if comment.Type == models.CommentTypeComment { act = models.ActionCommentIssue } - if err := comment.MailParticipants(act, pr.Issue); err != nil { + if err := mailer.MailParticipantsComment(comment, act, pr.Issue); err != nil { log.Error("MailParticipants: %v", err) } } diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 496aca375f508..2691245ddb084 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -19,6 +19,7 @@ import ( "code.gitea.io/gitea/modules/cron" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" @@ -197,7 +198,7 @@ func Dashboard(ctx *context.Context) { func SendTestMail(ctx *context.Context) { email := ctx.Query("email") // Send a test email to the user's email address and redirect back to Config - if err := models.SendTestMail(email); err != nil { + if err := mailer.SendTestMail(email); err != nil { ctx.Flash.Error(ctx.Tr("admin.config.test_mail_failed", email, err)) } else { ctx.Flash.Info(ctx.Tr("admin.config.test_mail_sent", email)) diff --git a/routers/admin/users.go b/routers/admin/users.go index aa595edad9472..0b3a73c5d72bf 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers" @@ -116,8 +117,8 @@ func NewUserPost(ctx *context.Context, form auth.AdminCreateUserForm) { log.Trace("Account created by admin (%s): %s", ctx.User.Name, u.Name) // Send email notification. - if form.SendNotify && setting.MailService != nil { - models.SendRegisterNotifyMail(ctx.Context, u) + if form.SendNotify { + mailer.SendRegisterNotifyMail(ctx.Context, u) } ctx.Flash.Success(ctx.Tr("admin.users.new_success", u.Name)) diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index f4b694aa22879..838b53fd7368c 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -9,7 +9,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/mailer" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/routers/api/v1/convert" "code.gitea.io/gitea/routers/api/v1/user" @@ -88,8 +88,8 @@ func CreateUser(ctx *context.APIContext, form api.CreateUserOption) { log.Trace("Account created by admin (%s): %s", ctx.User.Name, u.Name) // Send email notification. - if form.SendNotify && setting.MailService != nil { - models.SendRegisterNotifyMail(ctx.Context.Context, u) + if form.SendNotify { + mailer.SendRegisterNotifyMail(ctx.Context.Context, u) } ctx.JSON(201, convert.ToUser(u, ctx.IsSigned, ctx.User.IsAdmin)) } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 91db519d62cfc..44995feb766a4 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -20,6 +20,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/validation" @@ -549,7 +550,7 @@ func CollaborationPost(ctx *context.Context) { } if setting.Service.EnableNotifyMail { - models.SendCollaboratorMail(u, ctx.User, ctx.Repo.Repository) + mailer.SendCollaboratorMail(u, ctx.User, ctx.Repo.Repository) } ctx.Flash.Success(ctx.Tr("repo.settings.add_collaborator_success")) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 93ce220b00d67..980713d7ad546 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -19,6 +19,7 @@ import ( "code.gitea.io/gitea/modules/gzip" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" "code.gitea.io/gitea/modules/metrics" "code.gitea.io/gitea/modules/options" "code.gitea.io/gitea/modules/public" @@ -166,7 +167,7 @@ func NewMacaron() *macaron.Macaron { )) m.Use(templates.HTMLRenderer()) - models.InitMailRender(templates.Mailer()) + mailer.InitMailRender(templates.Mailer()) localeNames, err := options.Dir("locale") diff --git a/routers/user/auth.go b/routers/user/auth.go index dedb9c7b0d560..756ed8c40fb39 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -17,6 +17,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" "code.gitea.io/gitea/modules/recaptcha" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" @@ -948,7 +949,8 @@ func LinkAccountPostRegister(ctx *context.Context, cpt *captcha.Captcha, form au // Send confirmation email if setting.Service.RegisterEmailConfirm && u.ID > 1 { - models.SendActivateAccountMail(ctx.Context, u) + mailer.SendActivateAccountMail(ctx.Context, u) + ctx.Data["IsSendRegisterMail"] = true ctx.Data["Email"] = u.Email ctx.Data["ActiveCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, ctx.Locale.Language()) @@ -1094,7 +1096,8 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo // Send confirmation email, no need for social account. if setting.Service.RegisterEmailConfirm && u.ID > 1 { - models.SendActivateAccountMail(ctx.Context, u) + mailer.SendActivateAccountMail(ctx.Context, u) + ctx.Data["IsSendRegisterMail"] = true ctx.Data["Email"] = u.Email ctx.Data["ActiveCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, ctx.Locale.Language()) @@ -1125,7 +1128,7 @@ func Activate(ctx *context.Context) { ctx.Data["ResendLimited"] = true } else { ctx.Data["ActiveCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, ctx.Locale.Language()) - models.SendActivateAccountMail(ctx.Context, ctx.User) + mailer.SendActivateAccountMail(ctx.Context, ctx.User) if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { log.Error("Set cache(MailResendLimit) fail: %v", err) @@ -1247,7 +1250,8 @@ func ForgotPasswdPost(ctx *context.Context) { return } - models.SendResetPasswordMail(ctx.Context, u) + mailer.SendResetPasswordMail(ctx.Context, u) + if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { log.Error("Set cache(MailResendLimit) fail: %v", err) } diff --git a/routers/user/auth_openid.go b/routers/user/auth_openid.go index 832766b16c4ab..96c2a3aca3849 100644 --- a/routers/user/auth_openid.go +++ b/routers/user/auth_openid.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/generate" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" "code.gitea.io/gitea/modules/recaptcha" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" @@ -444,7 +445,8 @@ func RegisterOpenIDPost(ctx *context.Context, cpt *captcha.Captcha, form auth.Si // Send confirmation email, no need for social account. if setting.Service.RegisterEmailConfirm && u.ID > 1 { - models.SendActivateAccountMail(ctx.Context, u) + mailer.SendActivateAccountMail(ctx.Context, u) + ctx.Data["IsSendRegisterMail"] = true ctx.Data["Email"] = u.Email ctx.Data["ActiveCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, ctx.Locale.Language()) diff --git a/routers/user/setting/account.go b/routers/user/setting/account.go index 674606cce827a..f1e7b5d9bab35 100644 --- a/routers/user/setting/account.go +++ b/routers/user/setting/account.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" ) @@ -130,7 +131,7 @@ func EmailPost(ctx *context.Context, form auth.AddEmailForm) { // Send confirmation email if setting.Service.RegisterEmailConfirm { - models.SendActivateEmailMail(ctx.Context, ctx.User, email) + mailer.SendActivateEmailMail(ctx.Context, ctx.User, email) if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { log.Error("Set cache(MailResendLimit) fail: %v", err) From 7931e26d65e8c37f1901c30bd785e77dad1259e8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 14 Jun 2019 10:27:13 +0800 Subject: [PATCH 02/18] fix lint --- modules/mailer/mail_comment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mailer/mail_comment.go b/modules/mailer/mail_comment.go index 5295d7a39a749..ec6637765e6dd 100644 --- a/modules/mailer/mail_comment.go +++ b/modules/mailer/mail_comment.go @@ -12,7 +12,7 @@ import ( "code.gitea.io/gitea/modules/markup" ) -// MailParticipants sends new comment emails to repository watchers +// MailParticipantsComment sends new comment emails to repository watchers // and mentioned people. func MailParticipantsComment(c *models.Comment, opType models.ActionType, issue *models.Issue) (err error) { return models.WithEngine(func(e models.Engine) error { From eba99fd59d4292683d54273206f2ce4e7dec0a7c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 14 Jun 2019 22:45:15 +0800 Subject: [PATCH 03/18] use DBContext instead Engine --- models/issue.go | 8 ++++---- models/models.go | 13 +++++++++---- modules/mailer/mail_comment.go | 8 ++++---- modules/mailer/mail_issue.go | 8 ++++---- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/models/issue.go b/models/issue.go index bb2db9440716c..a6ea6da7e9b40 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1503,7 +1503,7 @@ func getParticipantsByIssueID(e Engine, issueID int64) ([]*User, error) { // UpdateIssueMentions extracts mentioned people from content and // updates issue-user relations for them. -func UpdateIssueMentions(e Engine, issueID int64, mentions []string) error { +func UpdateIssueMentions(ctx DBContext, issueID int64, mentions []string) error { if len(mentions) == 0 { return nil } @@ -1513,7 +1513,7 @@ func UpdateIssueMentions(e Engine, issueID int64, mentions []string) error { } users := make([]*User, 0, len(mentions)) - if err := e.In("lower_name", mentions).Asc("lower_name").Find(&users); err != nil { + if err := ctx.e.In("lower_name", mentions).Asc("lower_name").Find(&users); err != nil { return fmt.Errorf("find mentioned users: %v", err) } @@ -1525,7 +1525,7 @@ func UpdateIssueMentions(e Engine, issueID int64, mentions []string) error { } memberIDs := make([]int64, 0, user.NumMembers) - orgUsers, err := getOrgUsersByOrgID(e, user.ID) + orgUsers, err := getOrgUsersByOrgID(ctx.e, user.ID) if err != nil { return fmt.Errorf("GetOrgUsersByOrgID [%d]: %v", user.ID, err) } @@ -1537,7 +1537,7 @@ func UpdateIssueMentions(e Engine, issueID int64, mentions []string) error { ids = append(ids, memberIDs...) } - if err := UpdateIssueUsersByMentions(e, issueID, ids); err != nil { + if err := UpdateIssueUsersByMentions(ctx.e, issueID, ids); err != nil { return fmt.Errorf("UpdateIssueUsersByMentions: %v", err) } diff --git a/models/models.go b/models/models.go index 64961886e3b56..4724b69986f11 100644 --- a/models/models.go +++ b/models/models.go @@ -120,20 +120,25 @@ func init() { } } +// DBContext represents a db context +type DBContext struct { + e Engine +} + // WithEngine represents executing database operations -func WithEngine(f func(e Engine) error) error { - return f(x) +func WithEngine(f func(ctx DBContext) error) error { + return f(DBContext{x}) } // WithTransaction represents executing database operations on a trasaction -func WithTransaction(f func(e Engine) error) error { +func WithTransaction(f func(ctx DBContext) error) error { sess := x.NewSession() defer sess.Close() if err := sess.Begin(); err != nil { return err } - if err := f(sess); err != nil { + if err := f(DBContext{sess}); err != nil { return err } diff --git a/modules/mailer/mail_comment.go b/modules/mailer/mail_comment.go index ec6637765e6dd..cf834ca341464 100644 --- a/modules/mailer/mail_comment.go +++ b/modules/mailer/mail_comment.go @@ -15,14 +15,14 @@ import ( // MailParticipantsComment sends new comment emails to repository watchers // and mentioned people. func MailParticipantsComment(c *models.Comment, opType models.ActionType, issue *models.Issue) (err error) { - return models.WithEngine(func(e models.Engine) error { - return mailParticipantsComment(c, e, opType, issue) + return models.WithEngine(func(ctx models.DBContext) error { + return mailParticipantsComment(ctx, c, opType, issue) }) } -func mailParticipantsComment(c *models.Comment, e models.Engine, opType models.ActionType, issue *models.Issue) (err error) { +func mailParticipantsComment(ctx models.DBContext, c *models.Comment, opType models.ActionType, issue *models.Issue) (err error) { mentions := markup.FindAllMentions(c.Content) - if err = models.UpdateIssueMentions(e, c.IssueID, mentions); err != nil { + if err = models.UpdateIssueMentions(ctx, c.IssueID, mentions); err != nil { return fmt.Errorf("UpdateIssueMentions [%d]: %v", c.IssueID, err) } diff --git a/modules/mailer/mail_issue.go b/modules/mailer/mail_issue.go index 4feed9e8ce7f7..d85fff37722ac 100644 --- a/modules/mailer/mail_issue.go +++ b/modules/mailer/mail_issue.go @@ -119,15 +119,15 @@ func mailIssueCommentToParticipants(issue *models.Issue, doer *models.User, cont // MailParticipants sends new issue thread created emails to repository watchers // and mentioned people. func MailParticipants(issue *models.Issue, doer *models.User, opType models.ActionType) (err error) { - return models.WithEngine(func(e models.Engine) error { - return mailParticipants(issue, e, doer, opType) + return models.WithEngine(func(ctx models.DBContext) error { + return mailParticipants(ctx, issue, doer, opType) }) } -func mailParticipants(issue *models.Issue, e models.Engine, doer *models.User, opType models.ActionType) (err error) { +func mailParticipants(ctx models.DBContext, issue *models.Issue, doer *models.User, opType models.ActionType) (err error) { mentions := markup.FindAllMentions(issue.Content) - if err = models.UpdateIssueMentions(e, issue.ID, mentions); err != nil { + if err = models.UpdateIssueMentions(ctx, issue.ID, mentions); err != nil { return fmt.Errorf("UpdateIssueMentions [%d]: %v", issue.ID, err) } From 1c2d74318ab5c740e64381198c2e53a1b977c3be Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 14 Jun 2019 22:47:57 +0800 Subject: [PATCH 04/18] use WithContext not WithEngine --- models/models.go | 4 ++-- modules/mailer/mail_comment.go | 2 +- modules/mailer/mail_issue.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/models.go b/models/models.go index 4724b69986f11..d02cf7fdf43a8 100644 --- a/models/models.go +++ b/models/models.go @@ -125,8 +125,8 @@ type DBContext struct { e Engine } -// WithEngine represents executing database operations -func WithEngine(f func(ctx DBContext) error) error { +// WithContext represents executing database operations +func WithContext(f func(ctx DBContext) error) error { return f(DBContext{x}) } diff --git a/modules/mailer/mail_comment.go b/modules/mailer/mail_comment.go index cf834ca341464..c0998f9361583 100644 --- a/modules/mailer/mail_comment.go +++ b/modules/mailer/mail_comment.go @@ -15,7 +15,7 @@ import ( // MailParticipantsComment sends new comment emails to repository watchers // and mentioned people. func MailParticipantsComment(c *models.Comment, opType models.ActionType, issue *models.Issue) (err error) { - return models.WithEngine(func(ctx models.DBContext) error { + return models.WithContext(func(ctx models.DBContext) error { return mailParticipantsComment(ctx, c, opType, issue) }) } diff --git a/modules/mailer/mail_issue.go b/modules/mailer/mail_issue.go index d85fff37722ac..f5c849efce9d2 100644 --- a/modules/mailer/mail_issue.go +++ b/modules/mailer/mail_issue.go @@ -119,7 +119,7 @@ func mailIssueCommentToParticipants(issue *models.Issue, doer *models.User, cont // MailParticipants sends new issue thread created emails to repository watchers // and mentioned people. func MailParticipants(issue *models.Issue, doer *models.User, opType models.ActionType) (err error) { - return models.WithEngine(func(ctx models.DBContext) error { + return models.WithContext(func(ctx models.DBContext) error { return mailParticipants(ctx, issue, doer, opType) }) } From 76dac9fd784ba286c4fbb51bb42f886f32543e58 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 16 Jun 2019 10:54:04 +0800 Subject: [PATCH 05/18] Use DBContext instead of Engine --- models/issue.go | 2 +- models/issue_user.go | 8 ++++---- models/issue_user_test.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/models/issue.go b/models/issue.go index a6ea6da7e9b40..c4b15e9ddfd31 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1537,7 +1537,7 @@ func UpdateIssueMentions(ctx DBContext, issueID int64, mentions []string) error ids = append(ids, memberIDs...) } - if err := UpdateIssueUsersByMentions(ctx.e, issueID, ids); err != nil { + if err := UpdateIssueUsersByMentions(ctx, issueID, ids); err != nil { return fmt.Errorf("UpdateIssueUsersByMentions: %v", err) } diff --git a/models/issue_user.go b/models/issue_user.go index 58eb5117f81c3..d55a0dc2fb85d 100644 --- a/models/issue_user.go +++ b/models/issue_user.go @@ -94,22 +94,22 @@ func UpdateIssueUserByRead(uid, issueID int64) error { } // UpdateIssueUsersByMentions updates issue-user pairs by mentioning. -func UpdateIssueUsersByMentions(e Engine, issueID int64, uids []int64) error { +func UpdateIssueUsersByMentions(ctx DBContext, issueID int64, uids []int64) error { for _, uid := range uids { iu := &IssueUser{ UID: uid, IssueID: issueID, } - has, err := e.Get(iu) + has, err := ctx.e.Get(iu) if err != nil { return err } iu.IsMentioned = true if has { - _, err = e.ID(iu.ID).Cols("is_mentioned").Update(iu) + _, err = ctx.e.ID(iu.ID).Cols("is_mentioned").Update(iu) } else { - _, err = e.Insert(iu) + _, err = ctx.e.Insert(iu) } if err != nil { return err diff --git a/models/issue_user_test.go b/models/issue_user_test.go index a333bc861996a..a1071c820fd9c 100644 --- a/models/issue_user_test.go +++ b/models/issue_user_test.go @@ -50,7 +50,7 @@ func TestUpdateIssueUsersByMentions(t *testing.T) { issue := AssertExistsAndLoadBean(t, &Issue{ID: 1}).(*Issue) uids := []int64{2, 5} - assert.NoError(t, UpdateIssueUsersByMentions(x, issue.ID, uids)) + assert.NoError(t, UpdateIssueUsersByMentions(DBContext{x}, issue.ID, uids)) for _, uid := range uids { AssertExistsAndLoadBean(t, &IssueUser{IssueID: issue.ID, UID: uid}, "is_mentioned=1") } From 7ddef4c26a69dc68a20f843127e7931dd93da595 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 16 Jun 2019 13:04:15 +0800 Subject: [PATCH 06/18] don't use defer when sess.Close() --- models/models.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/models/models.go b/models/models.go index d02cf7fdf43a8..09f569a0882d8 100644 --- a/models/models.go +++ b/models/models.go @@ -133,16 +133,19 @@ func WithContext(f func(ctx DBContext) error) error { // WithTransaction represents executing database operations on a trasaction func WithTransaction(f func(ctx DBContext) error) error { sess := x.NewSession() - defer sess.Close() if err := sess.Begin(); err != nil { + sess.Close() return err } if err := f(DBContext{sess}); err != nil { + sess.Close() return err } - return sess.Commit() + err := sess.Commit() + sess.Close() + return err } func getEngine() (*xorm.Engine, error) { From 085e6dc7b9d52af381628c171c3d6899a4c717b5 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 27 Jun 2019 11:44:37 +0800 Subject: [PATCH 07/18] move DBContext to context.go and add some methods --- models/context.go | 73 +++++++++++++++++++++++++++++++++++++++++++++++ models/error.go | 15 ++++++++++ models/models.go | 28 ------------------ 3 files changed, 88 insertions(+), 28 deletions(-) create mode 100644 models/context.go diff --git a/models/context.go b/models/context.go new file mode 100644 index 0000000000000..2d81793cfb66d --- /dev/null +++ b/models/context.go @@ -0,0 +1,73 @@ +// Copyright 2019 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import "xorm.io/builder" + +// DBContext represents a db context +type DBContext struct { + e Engine +} + +// Insert inserts a object to database +func (ctx *DBContext) Insert(obj interface{}) error { + _, err := ctx.e.Insert(obj) + return err +} + +// LoadByID loads record from database according id, if it's not exist return ErrNotExist +func (ctx *DBContext) LoadByID(id int64, obj interface{}) error { + has, err := ctx.e.ID(id).Get(obj) + if err != nil { + return err + } else if !has { + return ErrNotExist{ID: id} + } + return nil +} + +// FindByConditions loads records by conditions +func (ctx *DBContext) FindByConditions(conds builder.Cond, objs interface{}) error { + return ctx.e.Where(conds).Find(objs) +} + +// DeleteByID deletes a object by id +func (ctx *DBContext) DeleteByID(id int64, obj interface{}) error { + _, err := ctx.e.ID(id).NoAutoCondition().Delete(obj) + return err +} + +// UpdateByID updates a record +func (ctx *DBContext) UpdateByID(id int64, obj interface{}, cols ...string) error { + sess := ctx.e.ID(id) + if len(cols) > 0 { + sess.Cols(cols...) + } + _, err := sess.Update(obj) + return err +} + +// WithContext represents executing database operations +func WithContext(f func(ctx DBContext) error) error { + return f(DBContext{x}) +} + +// WithTransaction represents executing database operations on a trasaction +func WithTransaction(f func(ctx DBContext) error) error { + sess := x.NewSession() + if err := sess.Begin(); err != nil { + sess.Close() + return err + } + + if err := f(DBContext{sess}); err != nil { + sess.Close() + return err + } + + err := sess.Commit() + sess.Close() + return err +} diff --git a/models/error.go b/models/error.go index c025437c500ed..eba29709d5a07 100644 --- a/models/error.go +++ b/models/error.go @@ -11,6 +11,21 @@ import ( "code.gitea.io/gitea/modules/git" ) +// ErrNotExist represents a non-exist error. +type ErrNotExist struct { + ID int64 +} + +// IsErrNotExist checks if an error is an ErrNotExist +func IsErrNotExist(err error) bool { + _, ok := err.(ErrNotExist) + return ok +} + +func (err ErrNotExist) Error() string { + return fmt.Sprintf("record is not exist [id: %d]", err.ID) +} + // ErrNameReserved represents a "reserved name" error. type ErrNameReserved struct { Name string diff --git a/models/models.go b/models/models.go index 09f569a0882d8..e802a35a77709 100644 --- a/models/models.go +++ b/models/models.go @@ -120,34 +120,6 @@ func init() { } } -// DBContext represents a db context -type DBContext struct { - e Engine -} - -// WithContext represents executing database operations -func WithContext(f func(ctx DBContext) error) error { - return f(DBContext{x}) -} - -// WithTransaction represents executing database operations on a trasaction -func WithTransaction(f func(ctx DBContext) error) error { - sess := x.NewSession() - if err := sess.Begin(); err != nil { - sess.Close() - return err - } - - if err := f(DBContext{sess}); err != nil { - sess.Close() - return err - } - - err := sess.Commit() - sess.Close() - return err -} - func getEngine() (*xorm.Engine, error) { connStr, err := setting.DBConnStr() if err != nil { From 9042cf667def4b6f9e507b90c889a5d94e75dd21 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 1 Jul 2019 22:53:06 +0800 Subject: [PATCH 08/18] move mailer from modules/ to services --- modules/notification/mail/mail.go | 2 +- routers/admin/admin.go | 2 +- routers/admin/users.go | 2 +- routers/api/v1/admin/user.go | 2 +- routers/init.go | 2 +- routers/repo/setting.go | 2 +- routers/routes/routes.go | 2 +- routers/user/auth.go | 2 +- routers/user/auth_openid.go | 2 +- routers/user/setting/account.go | 2 +- {modules => services}/mailer/mail.go | 0 {modules => services}/mailer/mail_comment.go | 0 {modules => services}/mailer/mail_issue.go | 0 {modules => services}/mailer/mailer.go | 0 14 files changed, 10 insertions(+), 10 deletions(-) rename {modules => services}/mailer/mail.go (100%) rename {modules => services}/mailer/mail_comment.go (100%) rename {modules => services}/mailer/mail_issue.go (100%) rename {modules => services}/mailer/mailer.go (100%) diff --git a/modules/notification/mail/mail.go b/modules/notification/mail/mail.go index 82b377157e0bc..84cf6045152f4 100644 --- a/modules/notification/mail/mail.go +++ b/modules/notification/mail/mail.go @@ -7,7 +7,7 @@ package mail import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/notification/base" ) diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 2691245ddb084..d6bed7d4cf7b3 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -19,7 +19,7 @@ import ( "code.gitea.io/gitea/modules/cron" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/routers/admin/users.go b/routers/admin/users.go index 0b3a73c5d72bf..86400952d6668 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -12,7 +12,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers" diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 838b53fd7368c..bd0c80a150655 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -9,7 +9,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/services/mailer" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/routers/api/v1/convert" "code.gitea.io/gitea/routers/api/v1/user" diff --git a/routers/init.go b/routers/init.go index fdf90904ce759..e6945f19a876d 100644 --- a/routers/init.go +++ b/routers/init.go @@ -16,7 +16,7 @@ import ( "code.gitea.io/gitea/modules/highlight" issue_indexer "code.gitea.io/gitea/modules/indexer/issues" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/external" "code.gitea.io/gitea/modules/setting" diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 44995feb766a4..1491a3f711417 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -20,7 +20,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/validation" diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 980713d7ad546..1ab02f778f103 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -19,7 +19,7 @@ import ( "code.gitea.io/gitea/modules/gzip" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/metrics" "code.gitea.io/gitea/modules/options" "code.gitea.io/gitea/modules/public" diff --git a/routers/user/auth.go b/routers/user/auth.go index 756ed8c40fb39..a0644cb9f56d9 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -17,7 +17,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/recaptcha" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/routers/user/auth_openid.go b/routers/user/auth_openid.go index 96c2a3aca3849..a9dd0313b9bf0 100644 --- a/routers/user/auth_openid.go +++ b/routers/user/auth_openid.go @@ -15,7 +15,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/generate" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/recaptcha" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/routers/user/setting/account.go b/routers/user/setting/account.go index f1e7b5d9bab35..e5a8b1819b6f8 100644 --- a/routers/user/setting/account.go +++ b/routers/user/setting/account.go @@ -13,7 +13,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/modules/mailer/mail.go b/services/mailer/mail.go similarity index 100% rename from modules/mailer/mail.go rename to services/mailer/mail.go diff --git a/modules/mailer/mail_comment.go b/services/mailer/mail_comment.go similarity index 100% rename from modules/mailer/mail_comment.go rename to services/mailer/mail_comment.go diff --git a/modules/mailer/mail_issue.go b/services/mailer/mail_issue.go similarity index 100% rename from modules/mailer/mail_issue.go rename to services/mailer/mail_issue.go diff --git a/modules/mailer/mailer.go b/services/mailer/mailer.go similarity index 100% rename from modules/mailer/mailer.go rename to services/mailer/mailer.go From 5723ac8e604705a86f2df9f796b46e2dc1b11930 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 9 Jul 2019 14:37:38 +0800 Subject: [PATCH 09/18] fix lint --- modules/notification/mail/mail.go | 2 +- routers/admin/admin.go | 2 +- routers/admin/users.go | 2 +- routers/api/v1/admin/user.go | 2 +- routers/init.go | 2 +- routers/repo/setting.go | 2 +- routers/routes/routes.go | 2 +- routers/user/auth.go | 2 +- routers/user/auth_openid.go | 2 +- routers/user/setting/account.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/notification/mail/mail.go b/modules/notification/mail/mail.go index 84cf6045152f4..e1ae391f783c4 100644 --- a/modules/notification/mail/mail.go +++ b/modules/notification/mail/mail.go @@ -7,8 +7,8 @@ package mail import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/notification/base" + "code.gitea.io/gitea/services/mailer" ) type mailNotifier struct { diff --git a/routers/admin/admin.go b/routers/admin/admin.go index d6bed7d4cf7b3..538d01f9a4e2e 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -19,10 +19,10 @@ import ( "code.gitea.io/gitea/modules/cron" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/services/mailer" "gitea.com/macaron/macaron" "github.com/unknwon/com" diff --git a/routers/admin/users.go b/routers/admin/users.go index 86400952d6668..cef21a18d9393 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -12,9 +12,9 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers" + "code.gitea.io/gitea/services/mailer" "github.com/unknwon/com" ) diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index bd0c80a150655..09e6b7d9746e8 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -9,10 +9,10 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/mailer" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/routers/api/v1/convert" "code.gitea.io/gitea/routers/api/v1/user" + "code.gitea.io/gitea/services/mailer" ) func parseLoginSource(ctx *context.APIContext, u *models.User, sourceID int64, loginName string) { diff --git a/routers/init.go b/routers/init.go index e6945f19a876d..5c8741f244f61 100644 --- a/routers/init.go +++ b/routers/init.go @@ -16,11 +16,11 @@ import ( "code.gitea.io/gitea/modules/highlight" issue_indexer "code.gitea.io/gitea/modules/indexer/issues" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/external" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/ssh" + "code.gitea.io/gitea/services/mailer" "gitea.com/macaron/macaron" ) diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 1491a3f711417..b0af396e7d87d 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -20,11 +20,11 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/routers/utils" + "code.gitea.io/gitea/services/mailer" "github.com/unknwon/com" "mvdan.cc/xurls/v2" diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 1ab02f778f103..e18ac0923ecc0 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -19,7 +19,6 @@ import ( "code.gitea.io/gitea/modules/gzip" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/metrics" "code.gitea.io/gitea/modules/options" "code.gitea.io/gitea/modules/public" @@ -35,6 +34,7 @@ import ( "code.gitea.io/gitea/routers/repo" "code.gitea.io/gitea/routers/user" userSetting "code.gitea.io/gitea/routers/user/setting" + "code.gitea.io/gitea/services/mailer" // to registers all internal adapters _ "code.gitea.io/gitea/modules/session" diff --git a/routers/user/auth.go b/routers/user/auth.go index a0644cb9f56d9..be0bffd3611bf 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -17,11 +17,11 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/recaptcha" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/services/mailer" "gitea.com/macaron/captcha" "github.com/markbates/goth" diff --git a/routers/user/auth_openid.go b/routers/user/auth_openid.go index a9dd0313b9bf0..243d8c1a544d4 100644 --- a/routers/user/auth_openid.go +++ b/routers/user/auth_openid.go @@ -15,10 +15,10 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/generate" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/recaptcha" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/services/mailer" "gitea.com/macaron/captcha" ) diff --git a/routers/user/setting/account.go b/routers/user/setting/account.go index e5a8b1819b6f8..c7f0e87bba505 100644 --- a/routers/user/setting/account.go +++ b/routers/user/setting/account.go @@ -13,9 +13,9 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/mailer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/services/mailer" ) const ( From 6976a7ca852ab609939d2da05f1b4e1b415460d0 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 15 Aug 2019 10:54:45 +0800 Subject: [PATCH 10/18] fix tests --- {models => services/mailer}/mail_test.go | 25 ++++++++++++------------ services/mailer/main_test.go | 16 +++++++++++++++ 2 files changed, 29 insertions(+), 12 deletions(-) rename {models => services/mailer}/mail_test.go (65%) create mode 100644 services/mailer/main_test.go diff --git a/models/mail_test.go b/services/mailer/mail_test.go similarity index 65% rename from models/mail_test.go rename to services/mailer/mail_test.go index 51c52427f027e..d3d291fcc9675 100644 --- a/models/mail_test.go +++ b/services/mailer/mail_test.go @@ -2,12 +2,13 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package models +package mailer import ( "html/template" "testing" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" @@ -33,16 +34,16 @@ const tmpl = ` ` func TestComposeIssueCommentMessage(t *testing.T) { - assert.NoError(t, PrepareTestDatabase()) + assert.NoError(t, models.PrepareTestDatabase()) var MailService setting.Mailer MailService.From = "test@gitea.com" setting.MailService = &MailService - doer := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) - repo := AssertExistsAndLoadBean(t, &Repository{ID: 1, Owner: doer}).(*Repository) - issue := AssertExistsAndLoadBean(t, &Issue{ID: 1, Repo: repo, Poster: doer}).(*Issue) - comment := AssertExistsAndLoadBean(t, &Comment{ID: 2, Issue: issue}).(*Comment) + doer := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User) + repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1, Owner: doer}).(*models.Repository) + issue := models.AssertExistsAndLoadBean(t, &models.Issue{ID: 1, Repo: repo, Poster: doer}).(*models.Issue) + comment := models.AssertExistsAndLoadBean(t, &models.Comment{ID: 2, Issue: issue}).(*models.Comment) email := template.Must(template.New("issue/comment").Parse(tmpl)) InitMailRender(email) @@ -54,22 +55,22 @@ func TestComposeIssueCommentMessage(t *testing.T) { inreplyTo := msg.GetHeader("In-Reply-To") references := msg.GetHeader("References") - assert.Equal(t, subject[0], "Re: "+issue.mailSubject(), "Comment reply subject should contain Re:") + assert.Equal(t, subject[0], "Re: "+mailSubject(issue), "Comment reply subject should contain Re:") assert.Equal(t, inreplyTo[0], "", "In-Reply-To header doesn't match") assert.Equal(t, references[0], "", "References header doesn't match") } func TestComposeIssueMessage(t *testing.T) { - assert.NoError(t, PrepareTestDatabase()) + assert.NoError(t, models.PrepareTestDatabase()) var MailService setting.Mailer MailService.From = "test@gitea.com" setting.MailService = &MailService - doer := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) - repo := AssertExistsAndLoadBean(t, &Repository{ID: 1, Owner: doer}).(*Repository) - issue := AssertExistsAndLoadBean(t, &Issue{ID: 1, Repo: repo, Poster: doer}).(*Issue) + doer := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User) + repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1, Owner: doer}).(*models.Repository) + issue := models.AssertExistsAndLoadBean(t, &models.Issue{ID: 1, Repo: repo, Poster: doer}).(*models.Issue) email := template.Must(template.New("issue/comment").Parse(tmpl)) InitMailRender(email) @@ -80,7 +81,7 @@ func TestComposeIssueMessage(t *testing.T) { subject := msg.GetHeader("Subject") messageID := msg.GetHeader("Message-ID") - assert.Equal(t, subject[0], issue.mailSubject(), "Subject not equal to issue.mailSubject()") + assert.Equal(t, subject[0], mailSubject(issue), "Subject not equal to issue.mailSubject()") assert.Nil(t, msg.GetHeader("In-Reply-To")) assert.Nil(t, msg.GetHeader("References")) assert.Equal(t, messageID[0], "", "Message-ID header doesn't match") diff --git a/services/mailer/main_test.go b/services/mailer/main_test.go new file mode 100644 index 0000000000000..0514f243904a4 --- /dev/null +++ b/services/mailer/main_test.go @@ -0,0 +1,16 @@ +// Copyright 2019 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package mailer + +import ( + "path/filepath" + "testing" + + "code.gitea.io/gitea/models" +) + +func TestMain(m *testing.M) { + models.MainTest(m, filepath.Join("..", "..")) +} \ No newline at end of file From 875ea99dd6c536c928d3bc59eab9ec39b052fe61 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 15 Aug 2019 20:52:24 +0800 Subject: [PATCH 11/18] fix fmt --- services/mailer/main_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/mailer/main_test.go b/services/mailer/main_test.go index 0514f243904a4..bbd121024e3e7 100644 --- a/services/mailer/main_test.go +++ b/services/mailer/main_test.go @@ -13,4 +13,4 @@ import ( func TestMain(m *testing.M) { models.MainTest(m, filepath.Join("..", "..")) -} \ No newline at end of file +} From 0cd0db20f070b7d21151e8c2888672463dc61457 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 15 Aug 2019 23:59:23 +0800 Subject: [PATCH 12/18] add gitea copyright --- services/mailer/mail.go | 1 + 1 file changed, 1 insertion(+) diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 429c67aabe73f..542ebf7d5ad5a 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -1,4 +1,5 @@ // Copyright 2016 The Gogs Authors. All rights reserved. +// Copyright 2019 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. From 1dcd33c8118c5cf806412679967fdd0ad34d26ab Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 22 Aug 2019 13:28:24 +0800 Subject: [PATCH 13/18] fix tests --- services/mailer/mail_test.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go index d3d291fcc9675..c7a84d6b33e5f 100644 --- a/services/mailer/mail_test.go +++ b/services/mailer/mail_test.go @@ -35,10 +35,12 @@ const tmpl = ` func TestComposeIssueCommentMessage(t *testing.T) { assert.NoError(t, models.PrepareTestDatabase()) - var MailService setting.Mailer + var mailService = setting.Mailer{ + From: "test@gitea.com", + } - MailService.From = "test@gitea.com" - setting.MailService = &MailService + setting.MailService = &mailService + setting.Domain = "localhost" doer := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User) repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1, Owner: doer}).(*models.Repository) @@ -58,15 +60,16 @@ func TestComposeIssueCommentMessage(t *testing.T) { assert.Equal(t, subject[0], "Re: "+mailSubject(issue), "Comment reply subject should contain Re:") assert.Equal(t, inreplyTo[0], "", "In-Reply-To header doesn't match") assert.Equal(t, references[0], "", "References header doesn't match") - } func TestComposeIssueMessage(t *testing.T) { assert.NoError(t, models.PrepareTestDatabase()) - var MailService setting.Mailer + var mailService = setting.Mailer{ + From: "test@gitea.com", + } - MailService.From = "test@gitea.com" - setting.MailService = &MailService + setting.MailService = &mailService + setting.Domain = "localhost" doer := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User) repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1, Owner: doer}).(*models.Repository) From 46e236f02df545e254e8927af7368fe41981b897 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 24 Sep 2019 09:44:08 +0800 Subject: [PATCH 14/18] don't expose db functions --- models/context.go | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/models/context.go b/models/context.go index 2d81793cfb66d..f19b05818547c 100644 --- a/models/context.go +++ b/models/context.go @@ -4,51 +4,11 @@ package models -import "xorm.io/builder" - // DBContext represents a db context type DBContext struct { e Engine } -// Insert inserts a object to database -func (ctx *DBContext) Insert(obj interface{}) error { - _, err := ctx.e.Insert(obj) - return err -} - -// LoadByID loads record from database according id, if it's not exist return ErrNotExist -func (ctx *DBContext) LoadByID(id int64, obj interface{}) error { - has, err := ctx.e.ID(id).Get(obj) - if err != nil { - return err - } else if !has { - return ErrNotExist{ID: id} - } - return nil -} - -// FindByConditions loads records by conditions -func (ctx *DBContext) FindByConditions(conds builder.Cond, objs interface{}) error { - return ctx.e.Where(conds).Find(objs) -} - -// DeleteByID deletes a object by id -func (ctx *DBContext) DeleteByID(id int64, obj interface{}) error { - _, err := ctx.e.ID(id).NoAutoCondition().Delete(obj) - return err -} - -// UpdateByID updates a record -func (ctx *DBContext) UpdateByID(id int64, obj interface{}, cols ...string) error { - sess := ctx.e.ID(id) - if len(cols) > 0 { - sess.Cols(cols...) - } - _, err := sess.Update(obj) - return err -} - // WithContext represents executing database operations func WithContext(f func(ctx DBContext) error) error { return f(DBContext{x}) From 861bfd982e478745ff5b20f159485cff7797c8ba Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 24 Sep 2019 09:58:28 +0800 Subject: [PATCH 15/18] make code clear --- routers/user/auth.go | 6 +++--- routers/user/auth_openid.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/routers/user/auth.go b/routers/user/auth.go index be0bffd3611bf..c20ce83b77512 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -949,7 +949,7 @@ func LinkAccountPostRegister(ctx *context.Context, cpt *captcha.Captcha, form au // Send confirmation email if setting.Service.RegisterEmailConfirm && u.ID > 1 { - mailer.SendActivateAccountMail(ctx.Context, u) + mailer.SendActivateAccountMail(ctx.Locale, u) ctx.Data["IsSendRegisterMail"] = true ctx.Data["Email"] = u.Email @@ -1096,7 +1096,7 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo // Send confirmation email, no need for social account. if setting.Service.RegisterEmailConfirm && u.ID > 1 { - mailer.SendActivateAccountMail(ctx.Context, u) + mailer.SendActivateAccountMail(ctx.Locale, u) ctx.Data["IsSendRegisterMail"] = true ctx.Data["Email"] = u.Email @@ -1128,7 +1128,7 @@ func Activate(ctx *context.Context) { ctx.Data["ResendLimited"] = true } else { ctx.Data["ActiveCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, ctx.Locale.Language()) - mailer.SendActivateAccountMail(ctx.Context, ctx.User) + mailer.SendActivateAccountMail(ctx.Locale, ctx.User) if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { log.Error("Set cache(MailResendLimit) fail: %v", err) diff --git a/routers/user/auth_openid.go b/routers/user/auth_openid.go index 243d8c1a544d4..ccaea8264f087 100644 --- a/routers/user/auth_openid.go +++ b/routers/user/auth_openid.go @@ -445,7 +445,7 @@ func RegisterOpenIDPost(ctx *context.Context, cpt *captcha.Captcha, form auth.Si // Send confirmation email, no need for social account. if setting.Service.RegisterEmailConfirm && u.ID > 1 { - mailer.SendActivateAccountMail(ctx.Context, u) + mailer.SendActivateAccountMail(ctx.Locale, u) ctx.Data["IsSendRegisterMail"] = true ctx.Data["Email"] = u.Email From 5cfdaf521e814beb24532b284bdbd607c2c49098 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 24 Sep 2019 10:22:09 +0800 Subject: [PATCH 16/18] add DefaultDBContext --- models/context.go | 27 +++++++++++++++++++++++++-- models/issue_user_test.go | 2 +- routers/admin/users.go | 2 +- routers/api/v1/admin/user.go | 2 +- routers/user/auth.go | 2 +- routers/user/setting/account.go | 2 +- services/mailer/mail_comment.go | 6 ++---- services/mailer/mail_issue.go | 6 ++---- 8 files changed, 34 insertions(+), 15 deletions(-) diff --git a/models/context.go b/models/context.go index f19b05818547c..3ca4a7578c717 100644 --- a/models/context.go +++ b/models/context.go @@ -9,13 +9,36 @@ type DBContext struct { e Engine } +var defaultDBContext = DBContext{x} + +// DefaultDBContext represents a DBContext with default Engine +func DefaultDBContext() DBContext { + return defaultDBContext +} + +type committer interface { + Commit() error + Close() +} + +// TxDBContext represents a transaction DBContext +func TxDBContext() (DBContext, committer, error) { + sess := x.NewSession() + if err := sess.Begin(); err != nil { + sess.Close() + return DBContext{}, nil, err + } + + return DBContext{sess}, sess, nil +} + // WithContext represents executing database operations func WithContext(f func(ctx DBContext) error) error { return f(DBContext{x}) } -// WithTransaction represents executing database operations on a trasaction -func WithTransaction(f func(ctx DBContext) error) error { +// WithTx represents executing database operations on a trasaction +func WithTx(f func(ctx DBContext) error) error { sess := x.NewSession() if err := sess.Begin(); err != nil { sess.Close() diff --git a/models/issue_user_test.go b/models/issue_user_test.go index a1071c820fd9c..a57ab33f9ec1a 100644 --- a/models/issue_user_test.go +++ b/models/issue_user_test.go @@ -50,7 +50,7 @@ func TestUpdateIssueUsersByMentions(t *testing.T) { issue := AssertExistsAndLoadBean(t, &Issue{ID: 1}).(*Issue) uids := []int64{2, 5} - assert.NoError(t, UpdateIssueUsersByMentions(DBContext{x}, issue.ID, uids)) + assert.NoError(t, UpdateIssueUsersByMentions(DefaultDBContext(), issue.ID, uids)) for _, uid := range uids { AssertExistsAndLoadBean(t, &IssueUser{IssueID: issue.ID, UID: uid}, "is_mentioned=1") } diff --git a/routers/admin/users.go b/routers/admin/users.go index cef21a18d9393..660f116682806 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -118,7 +118,7 @@ func NewUserPost(ctx *context.Context, form auth.AdminCreateUserForm) { // Send email notification. if form.SendNotify { - mailer.SendRegisterNotifyMail(ctx.Context, u) + mailer.SendRegisterNotifyMail(ctx.Locale, u) } ctx.Flash.Success(ctx.Tr("admin.users.new_success", u.Name)) diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 09e6b7d9746e8..70076b626b347 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -89,7 +89,7 @@ func CreateUser(ctx *context.APIContext, form api.CreateUserOption) { // Send email notification. if form.SendNotify { - mailer.SendRegisterNotifyMail(ctx.Context.Context, u) + mailer.SendRegisterNotifyMail(ctx.Locale, u) } ctx.JSON(201, convert.ToUser(u, ctx.IsSigned, ctx.User.IsAdmin)) } diff --git a/routers/user/auth.go b/routers/user/auth.go index c20ce83b77512..3def867f6456d 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -1250,7 +1250,7 @@ func ForgotPasswdPost(ctx *context.Context) { return } - mailer.SendResetPasswordMail(ctx.Context, u) + mailer.SendResetPasswordMail(ctx.Locale, u) if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { log.Error("Set cache(MailResendLimit) fail: %v", err) diff --git a/routers/user/setting/account.go b/routers/user/setting/account.go index c7f0e87bba505..71d98fd3b9676 100644 --- a/routers/user/setting/account.go +++ b/routers/user/setting/account.go @@ -131,7 +131,7 @@ func EmailPost(ctx *context.Context, form auth.AddEmailForm) { // Send confirmation email if setting.Service.RegisterEmailConfirm { - mailer.SendActivateEmailMail(ctx.Context, ctx.User, email) + mailer.SendActivateEmailMail(ctx.Locale, ctx.User, email) if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { log.Error("Set cache(MailResendLimit) fail: %v", err) diff --git a/services/mailer/mail_comment.go b/services/mailer/mail_comment.go index c0998f9361583..cb477f887b5cc 100644 --- a/services/mailer/mail_comment.go +++ b/services/mailer/mail_comment.go @@ -14,10 +14,8 @@ import ( // MailParticipantsComment sends new comment emails to repository watchers // and mentioned people. -func MailParticipantsComment(c *models.Comment, opType models.ActionType, issue *models.Issue) (err error) { - return models.WithContext(func(ctx models.DBContext) error { - return mailParticipantsComment(ctx, c, opType, issue) - }) +func MailParticipantsComment(c *models.Comment, opType models.ActionType, issue *models.Issue) error { + return mailParticipantsComment(models.DefaultDBContext(), c, opType, issue) } func mailParticipantsComment(ctx models.DBContext, c *models.Comment, opType models.ActionType, issue *models.Issue) (err error) { diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index f5c849efce9d2..92d2c5a8795f8 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -118,10 +118,8 @@ func mailIssueCommentToParticipants(issue *models.Issue, doer *models.User, cont // MailParticipants sends new issue thread created emails to repository watchers // and mentioned people. -func MailParticipants(issue *models.Issue, doer *models.User, opType models.ActionType) (err error) { - return models.WithContext(func(ctx models.DBContext) error { - return mailParticipants(ctx, issue, doer, opType) - }) +func MailParticipants(issue *models.Issue, doer *models.User, opType models.ActionType) error { + return mailParticipants(models.DefaultDBContext(), issue, doer, opType) } func mailParticipants(ctx models.DBContext, issue *models.Issue, doer *models.User, opType models.ActionType) (err error) { From d602808fbbef8c2bde5a363b6664eaa3060eaf4d Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 24 Sep 2019 10:30:09 +0800 Subject: [PATCH 17/18] fix build --- models/context.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/models/context.go b/models/context.go index 3ca4a7578c717..06a92f256d5f0 100644 --- a/models/context.go +++ b/models/context.go @@ -16,13 +16,14 @@ func DefaultDBContext() DBContext { return defaultDBContext } -type committer interface { +// Committer represents an interface to Commit or Close the dbcontext +type Committer interface { Commit() error Close() } // TxDBContext represents a transaction DBContext -func TxDBContext() (DBContext, committer, error) { +func TxDBContext() (DBContext, Committer, error) { sess := x.NewSession() if err := sess.Begin(); err != nil { sess.Close() From 6f8ae1aa4b3a1faada4ab2ab872d0c10f1690ed9 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 24 Sep 2019 11:24:16 +0800 Subject: [PATCH 18/18] fix bug --- models/context.go | 4 +--- models/error.go | 2 +- services/mailer/mail.go | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/models/context.go b/models/context.go index 06a92f256d5f0..5f47c595a25d7 100644 --- a/models/context.go +++ b/models/context.go @@ -9,11 +9,9 @@ type DBContext struct { e Engine } -var defaultDBContext = DBContext{x} - // DefaultDBContext represents a DBContext with default Engine func DefaultDBContext() DBContext { - return defaultDBContext + return DBContext{x} } // Committer represents an interface to Commit or Close the dbcontext diff --git a/models/error.go b/models/error.go index eba29709d5a07..9974287a0aef1 100644 --- a/models/error.go +++ b/models/error.go @@ -23,7 +23,7 @@ func IsErrNotExist(err error) bool { } func (err ErrNotExist) Error() string { - return fmt.Sprintf("record is not exist [id: %d]", err.ID) + return fmt.Sprintf("record does not exist [id: %d]", err.ID) } // ErrNameReserved represents a "reserved name" error. diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 542ebf7d5ad5a..3f0a789dc4cd4 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -109,6 +109,7 @@ func SendActivateEmailMail(locale Locale, u *models.User, email *models.EmailAdd // SendRegisterNotifyMail triggers a notify e-mail by admin created a account. func SendRegisterNotifyMail(locale Locale, u *models.User) { if setting.MailService == nil { + log.Warn("SendRegisterNotifyMail is being invoked but mail service hasn't been initialized") return }