[MI-3338]:Fixed issue mattermost#954 'DM comment notifications not wo…

…rking' (#61)

* [MI-3338]:Fixed issue mattermost#954 'DM comment notifications not working'

* [MI-3338]:Fixed CI

server/utils.go

@@ -84,25 +84,25 @@ func (p *Plugin) CreateBotDMtoMMUserID(mattermostUserID, format string, args ...
 
 func (p *Plugin) replaceJiraAccountIds(instanceID types.ID, body string) string {
 	result := body
-
 	for _, uname := range parseJIRAUsernamesFromText(body) {
-		if !strings.HasPrefix(uname, "accountid:") {
-			continue
+		jiraUserIDOrName := ""
+		if strings.HasPrefix(uname, "accountid:") {
+			jiraUserIDOrName = uname[len("accountid:"):]
+		} else {
+			jiraUserIDOrName = uname
 		}
 
-		jiraUserID := uname[len("accountid:"):]
-		mattermostUserID, err := p.userStore.LoadMattermostUserID(instanceID, jiraUserID)
+		mattermostUserID, err := p.userStore.LoadMattermostUserID(instanceID, jiraUserIDOrName)
 		if err != nil {
 			continue
 		}
-		c, err := p.userStore.LoadConnection(instanceID, mattermostUserID)
-		if err != nil {
+
+		user, appErr := p.API.GetUser(string(mattermostUserID))
+		if appErr != nil {
 			continue
 		}
 
-		if c.DisplayName != "" {
-			result = strings.ReplaceAll(result, uname, c.DisplayName)
-		}
+		result = strings.ReplaceAll(result, uname, user.Username)
 	}
 
 	return result

server/webhook_http_test.go

@@ -628,6 +628,9 @@ func TestWebhookHTTP(t *testing.T) {
 			}
 			model.ParseSlackAttachment(rPost, rAttachments)
 			api.On("CreatePost", mock.AnythingOfType("*model.Post")).Return(rPost, nil)
+			api.On("GetUser", mock.AnythingOfType("string")).Return(&model.User{
+				Username: "test-username",
+			}, nil)
 
 			p := Plugin{}
 			p.updateConfig(func(conf *config) {