Simplified emailing system and combined mailer and notifications packages

pkg/models/emails.go

@@ -5,12 +5,11 @@ import "errors"
 var ErrInvalidEmailCode = errors.New("Invalid or expired email code")
 
 type SendEmailCommand struct {
-	To      []string
-	From    string
-	Subject string
-	Body    string
-	Massive bool
-	Info    string
+	To       []string
+	Template string
+	Data     map[string]interface{}
+	Massive  bool
+	Info     string
 }
 
 type SendResetPasswordEmailCommand struct {
@@ -21,20 +20,3 @@ type ValidateResetPasswordCodeQuery struct {
 	Code   string
 	Result *User
 }
-
-// create mail content
-func (m *SendEmailCommand) Content() string {
-	contentType := "text/html; charset=UTF-8"
-	content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body
-	return content
-}
-
-// Create html mail command
-func NewSendEmailCommand(To []string, From, Subject, Body string) SendEmailCommand {
-	return SendEmailCommand{
-		To:      To,
-		From:    From,
-		Subject: Subject,
-		Body:    Body,
-	}
-}