Plain body enabled

Signed-off-by: Juan Iscar <[email protected]>

notification/mailer/mailer.go

@@ -8,10 +8,10 @@ import (
 )
 
 type Email struct {
-	Subject, Body, From string
-	Tos, Ccs, Bccs      []string
-	FromName            string //Name of sender ej: M. Bison
-	Attachements        []Attachement
+	Subject, Body, PlainBody, From string
+	Tos, Ccs, Bccs                 []string
+	FromName                       string //Name of sender ej: M. Bison
+	Attachements                   []Attachement
 }
 
 type Attachement struct {

notification/mailer/mailer_test.go

@@ -22,7 +22,8 @@ var _ = Describe("mailer", func() {
 			email.From = "[email protected]"
 			email.FromName = "M. Bison"
 			email.Subject = "Surrender!"
-			email.Body = "I go to win!"
+			email.Body = "<b>I go to win!</b>"
+			email.PlainBody = "I go to win!"
 			email.Tos = []string{"[email protected]"}
 			email.Ccs = []string{"[email protected]"}
 			email.Bccs = []string{"[email protected]"}
@@ -34,7 +35,8 @@ var _ = Describe("mailer", func() {
 			Expect(mockEmail.From).To(Equal("[email protected]"))
 			Expect(mockEmail.FromName).To(Equal("M. Bison"))
 			Expect(mockEmail.Subject).To(Equal("Surrender!"))
-			Expect(mockEmail.Body).To(Equal("I go to win!"))
+			Expect(mockEmail.Body).To(Equal("<b>I go to win!</b>"))
+			Expect(mockEmail.PlainBody).To(Equal("I go to win!"))
 			Expect(len(mockEmail.Tos)).To(Equal(1))
 			Expect(len(mockEmail.Ccs)).To(Equal(1))
 			Expect(len(mockEmail.Bccs)).To(Equal(1))

notification/mailer/mock.go

@@ -12,7 +12,7 @@ func mockSend(errToReturn error) (sendInterface, *Email) {
 	r := new(Email)
 
 	return func(email Email) error {
-		*r = Email{email.Subject, email.Body, email.From, email.Tos, email.Ccs, email.Bccs, email.FromName, email.Attachements}
+		*r = Email{email.Subject, email.Body, email.PlainBody, email.From, email.Tos, email.Ccs, email.Bccs, email.FromName, email.Attachements}
 		return errToReturn
 	}, r
 }

notification/mailer/sengrid.go

@@ -16,11 +16,11 @@ func sengridSender(email Email) error {
 	beego.Info("Sending email through Sendgrid... Recipient: ", email.Tos[0])
 
 	fromMail := mail.NewEmail(email.FromName, email.From)
-	body := mail.NewContent("text/html", email.Body)
 
 	m := mail.NewV3Mail()
 	m.SetFrom(fromMail)
-	m.AddContent(body)
+	contents := buildBodies(email)
+	m.AddContent(contents...)
 
 	for _, atachement := range email.Attachements {
 		encoded := base64.StdEncoding.EncodeToString(atachement.Data)
@@ -37,6 +37,7 @@ func sengridSender(email Email) error {
 	p.AddCCs(convertMails(email.Ccs)...)
 	p.AddBCCs(convertMails(email.Bccs)...)
 	p.Subject = email.Subject
+
 	m.AddPersonalizations(p)
 
 	request := sendgrid.GetRequest(
@@ -58,3 +59,13 @@ func convertMails(addresses []string) []*mail.Email {
 	}
 	return mails
 }
+
+func buildBodies(email Email) (contents []*mail.Content) {
+	if email.PlainBody != "" {
+		contents = append(contents, mail.NewContent("text/plain", email.PlainBody))
+	}
+	if email.Body != "" {
+		contents = append(contents, mail.NewContent("text/html", email.Body))
+	}
+	return
+}