Add support for multiple to email addresses in single recepient (#226)

* Add support for multiple to comma seperated email addresses in single recepient

Signed-off-by: gokulav137 <[email protected]>

* Refactor emailService to make Send testable and Add Testcases
	- emailService now consist of client and html
	- NewEmailService creates the client from opts and store html seperately
	- Send now directly calls the client instead of creating the client and calling

Signed-off-by: gokulav137 <[email protected]>

* Add trim while parsing recepient for emailService
	- seperate out parsing logic
	- add test for parseTo method

Signed-off-by: gokulav137 <[email protected]>

---------

Signed-off-by: gokulav137 <[email protected]>
Signed-off-by: gokulav137 <[email protected]>
Co-authored-by: pasha-codefresh <[email protected]>

Author: gokulav137

pkg/services/email.go

@@ -2,8 +2,10 @@ package services
 
 import (
 	"bytes"
+	"strings"
 	texttemplate "text/template"
 
+	"gomodules.xyz/notify"
 	"gomodules.xyz/notify/smtp"
 
 	"github.com/argoproj/notifications-engine/pkg/util/text"
@@ -60,32 +62,46 @@ type EmailOptions struct {
 }
 
 type emailService struct {
-	opts EmailOptions
+	client notify.ByEmail
+	html   bool
 }
 
-func NewEmailService(opts EmailOptions) NotificationService {
-	return &emailService{opts: opts}
+func NewEmailService(opts EmailOptions) *emailService {
+	return &emailService{
+		client: smtp.New(smtp.Options{
+			From:               opts.From,
+			Host:               opts.Host,
+			Port:               opts.Port,
+			InsecureSkipVerify: opts.InsecureSkipVerify,
+			Password:           opts.Password,
+			Username:           opts.Username,
+		}),
+		html: opts.Html,
+	}
 }
 
 func (s *emailService) Send(notification Notification, dest Destination) error {
 	subject := ""
 	body := notification.Message
+	to := s.parseTo(dest.Recipient)
 	if notification.Email != nil {
 		subject = notification.Email.Subject
 		body = text.Coalesce(notification.Email.Body, body)
 	}
-	email := smtp.New(smtp.Options{
-		From:               s.opts.From,
-		Host:               s.opts.Host,
-		Port:               s.opts.Port,
-		InsecureSkipVerify: s.opts.InsecureSkipVerify,
-		Password:           s.opts.Password,
-		Username:           s.opts.Username,
-	}).WithSubject(subject).WithBody(body).To(dest.Recipient)
-
-	if s.opts.Html {
+
+	email := s.client.WithSubject(subject).WithBody(body).To(to[0], to[1:]...)
+
+	if s.html {
 		return email.SendHtml()
 	} else {
 		return email.Send()
 	}
 }
+
+func (s *emailService) parseTo(recipient string) []string {
+	to := strings.Split(recipient, ",")
+	for i, email := range to {
+		to[i] = strings.Trim(email, " ")
+	}
+	return to
+}

pkg/services/email_test.go

@@ -5,6 +5,8 @@ import (
 	"text/template"
 
 	"github.com/stretchr/testify/assert"
+	"gomodules.xyz/notify"
+	"k8s.io/utils/strings/slices"
 )
 
 func TestGetTemplater_Email(t *testing.T) {
@@ -33,3 +35,74 @@ func TestGetTemplater_Email(t *testing.T) {
 	assert.Equal(t, "hello", notification.Email.Subject)
 	assert.Equal(t, "world", notification.Email.Body)
 }
+
+type mockClient struct {
+	notify.ByEmail
+}
+
+func (c *mockClient) Send() error {
+	return nil
+}
+
+func (c *mockClient) SendHtml() error {
+	return nil
+}
+
+func (c *mockClient) WithSubject(string) notify.ByEmail {
+	return c
+}
+
+func (c *mockClient) WithBody(string) notify.ByEmail {
+	return c
+}
+
+func (c *mockClient) To(string, ...string) notify.ByEmail {
+	return c
+}
+
+func TestSend_SingleRecepient(t *testing.T) {
+	es := emailService{&mockClient{}, false}
+	err := es.Send(Notification{}, Destination{Recipient: "[email protected]"})
+	if err != nil {
+		t.Error("Error while sending email")
+	}
+}
+
+func TestSend_MultipleRecepient(t *testing.T) {
+	es := emailService{&mockClient{}, true}
+	// two email addresses
+	err := es.Send(Notification{}, Destination{Recipient: "[email protected],[email protected]"})
+	if err != nil {
+		t.Error("Error while sending email")
+	}
+	// three email addresses
+	err = es.Send(Notification{}, Destination{Recipient: "[email protected],[email protected],[email protected]"})
+	if err != nil {
+		t.Error("Error while sending email")
+	}
+}
+
+func TestNewEmailService(t *testing.T) {
+	es := NewEmailService(EmailOptions{Html: true})
+	if es.html != true {
+		t.Error("Html set incorrectly")
+	}
+}
+
+func TestParseTo(t *testing.T) {
+	es := emailService{}
+	testCases := []struct {
+		recepient string
+		want      []string
+	}{
+		{"[email protected]", []string{"[email protected]"}},
+		{" [email protected] ", []string{"[email protected]"}},
+		{" [email protected]  , [email protected],[email protected]", []string{"[email protected]", "[email protected]", "[email protected]"}},
+	}
+	for _, testCase := range testCases {
+		got := es.parseTo(testCase.recepient)
+		if !slices.Equal(testCase.want, got) {
+			t.Errorf("Failed to parse \"%v\", got: %v", testCase.recepient, got)
+		}
+	}
+}