[MI-2088]: Review fixes of #872

server/command.go

@@ -18,7 +18,13 @@ import (
 	"github.com/mattermost/mattermost-plugin-jira/server/utils/types"
 )
 
-const commandTrigger = "jira"
+const (
+	commandTrigger     = "jira"
+	subCommandAssignee = "assignee"
+	subCommandMention  = "mention"
+	subCommandReporter = "reporter"
+	subCommandWatching = "watching"
+)
 
 var jiraCommandHandler = CommandHandler{
 	handlers: map[string]CommandHandlerFunc{

server/issue.go

@@ -529,15 +529,15 @@ func (p *Plugin) httpGetJiraProjectMetadata(w http.ResponseWriter, r *http.Reque
 			Value: project.Key,
 			Label: project.Name,
 		}
-		issueTypes := make([]option, len(project.IssueTypes))
-		for index, issueType := range project.IssueTypes {
+		issueTypes := []option{}
+		for _, issueType := range project.IssueTypes {
 			if issueType.Subtasks {
 				continue
 			}
-			issueTypes[index] = option{
+			issueTypes = append(issueTypes, option{
 				Value: issueType.Id,
 				Label: issueType.Name,
-			}
+			})
 		}
 		issues[project.Key] = issueTypes
 	}

server/issue_test.go

@@ -427,7 +427,6 @@ func TestApplyReporterNotification(t *testing.T) {
 			}
 		})
 	}
-
 }
 
 func TestGetUserSetting(t *testing.T) {

server/settings.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"strings"
-
 	"github.com/mattermost/mattermost-server/v6/model"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 
 	"github.com/mattermost/mattermost-plugin-jira/server/utils/types"
 )
@@ -14,14 +14,15 @@ const (
 
 	errStoreNewSettings = "Could not store new settings. Please contact your system administrator. Error: %v"
 	errConnectToJira    = "Your account is not connected to Jira. Please type `/jira connect`. %v"
-	subCommandAssignee  = "assignee"
-	subCommandMention   = "mention"
-	subCommandReporter  = "reporter"
-	subCommandWatching  = "watching"
+
+	notificationRoleAssignee = "assignee"
+	notificationRoleMention  = "mention"
+	notificationRoleReporter = "reporter"
+	notificationRoleWatching = "watching"
 )
 
-func (connection *Connection) sendNotification(role string, hasNotification bool) bool {
-	if role != subCommandAssignee && role != subCommandMention && role != subCommandReporter && role != subCommandWatching {
+func (connection *Connection) updateRolesForDMNotification(role string, hasNotification bool) bool {
+	if role != notificationRoleAssignee && role != notificationRoleMention && role != notificationRoleReporter && role != notificationRoleWatching {
 		return false
 	}
 	if connection.Settings.RolesForDMNotification == nil {
@@ -50,7 +51,7 @@ func (p *Plugin) settingsNotifications(header *model.CommandArgs, instanceID, ma
 	if connection.Settings == nil {
 		connection.Settings = &ConnectionSettings{}
 	}
-	if !connection.sendNotification(args[1], value) {
+	if !connection.updateRolesForDMNotification(args[1], value) {
 		return p.responsef(header, helpText)
 	}
 
@@ -69,5 +70,5 @@ func (p *Plugin) settingsNotifications(header *model.CommandArgs, instanceID, ma
 		notifications = settingOn
 	}
 
-	return p.responsef(header, "Settings updated.\n\t%s notifications %s.", strings.Title(args[1]), notifications)
+	return p.responsef(header, "Settings updated.\n\t%s notifications %s.", cases.Title(language.Und, cases.NoLower).String(args[1]), notifications)
 }

server/subscribe_test.go

@@ -1380,6 +1380,7 @@ func TestGetChannelsSubscribed(t *testing.T) {
 
 			r := bytes.NewReader(data)
 			bb, err := ioutil.ReadAll(r)
+
 			require.Nil(t, err)
 			wh, err := ParseWebhook(bb)
 			assert.Nil(t, err)

server/webhook_worker.go

@@ -39,10 +39,12 @@ func (ww webhookWorker) process(msg *webhookMessage) (err error) {
 	if err != nil {
 		return err
 	}
+
 	v := wh.(*webhook)
 	if err = v.JiraWebhook.expandIssue(ww.p, msg.InstanceID); err != nil {
 		return err
 	}
+
 	ww.p.checkIssueWatchers(v, msg.InstanceID)
 	ww.p.applyReporterNotification(v, msg.InstanceID, v.Issue.Fields.Reporter)