[Jasoet] Merge utility helper to particular app

gopaytech · Aug 5, 2019 · e934aed · e934aed
1 parent 53c643e
commit e934aed
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 92 deletions.
diff --git a/internal/app/cli/command/list/lister.go b/internal/app/cli/command/list/lister.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"proctor/internal/pkg/utility/sort"
+	"proctor/internal/app/cli/sort"
 )
 
 func NewCmd(printer io.Printer, proctorDClient daemon.Client) *cobra.Command {

diff --git a/internal/pkg/utility/sort/sort.go → internal/app/cli/sort/sort.go b/internal/pkg/utility/sort/sort.go → internal/app/cli/sort/sort.go
diff --git a/internal/pkg/utility/sort/sort_test.go → internal/app/cli/sort/sort_test.go b/internal/pkg/utility/sort/sort_test.go → internal/app/cli/sort/sort_test.go
diff --git a/internal/app/service/infra/mail/mailer.go b/internal/app/service/infra/mail/mailer.go
@@ -1,14 +1,14 @@
 package mail
 
 import (
+	"bytes"
 	"fmt"
 	"net/smtp"
 	"strings"
 
 	executionContextModel "proctor/internal/app/service/execution/model"
 	"proctor/internal/app/service/infra/config"
 	scheduleModel "proctor/internal/app/service/schedule/model"
-	"proctor/internal/pkg/utility"
 )
 
 type Mailer interface {
@@ -42,10 +42,18 @@ func constructMessage(jobName string, executionID uint64, executionStatus string
 	subject := "Subject: " + jobName + " | scheduled execution " + executionStatus
 	body := "Proc execution details:\n" +
 		"\nName:\t" + jobName +
-		"\nArgs:\t" + utility.MapToString(executionArgs) +
+		"\nArgs:\t" + MapToString(executionArgs) +
 		"\nID:\t" + fmt.Sprint(executionID) +
 		"\nStatus:\t" + executionStatus +
 		"\n\n\nThis is an auto-generated email"
 
 	return []byte(subject + "\n\n" + body)
 }
+
+func MapToString(someMap map[string]string) string {
+	b := new(bytes.Buffer)
+	for key, value := range someMap {
+		_, _ = fmt.Fprintf(b, "%s=\"%s\",", key, value)
+	}
+	return strings.TrimRight(b.String(), ",")
+}
diff --git a/internal/app/service/infra/mail/mailer_test.go b/internal/app/service/infra/mail/mailer_test.go
@@ -13,7 +13,6 @@ import (
 	executionStatus "proctor/internal/app/service/execution/status"
 	"proctor/internal/app/service/infra/config"
 	scheduleModel "proctor/internal/app/service/schedule/model"
-	"proctor/internal/pkg/utility"
 )
 
 func TestSendMail(t *testing.T) {
@@ -98,7 +97,7 @@ func TestSendMail(t *testing.T) {
 
 	receivedMail := cmdbuf.String()
 
-	stringifiedJobArgs := utility.MapToString(executionContext.Args)
+	stringifiedJobArgs := MapToString(executionContext.Args)
 	var sendMailClient = `EHLO localhost
 HELO localhost
 MAIL FROM:<` + config.MailUsername() + `>

diff --git a/internal/pkg/utility/buffer.go b/internal/pkg/utility/buffer.go
diff --git a/internal/pkg/utility/utils.go b/internal/pkg/utility/utils.go