[MM-340] Update list of users to notify during multiple events update

mattermost · Apr 3, 2024 · 16bbb47 · 16bbb47
1 parent f4d5e9c
commit 16bbb47
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/server/webhook/merge_request.go b/server/webhook/merge_request.go
@@ -124,7 +124,7 @@ func (w *webhook) handleDMMergeRequest(event *gitlab.MergeEvent) ([]*HandleWebho
 				message = fmt.Sprintf("[%s](%s) updated the merge request [%s!%v](%s)", senderGitlabUsername, w.gitlabRetreiver.GetUserURL(senderGitlabUsername), event.ObjectAttributes.Target.PathWithNamespace, event.ObjectAttributes.IID, event.ObjectAttributes.URL)
 				handlers = []*HandleWebhook{{
 					Message: message,
-					ToUsers: []string{authorGitlabUsername},
+					ToUsers: toUsers,
 					From:    senderGitlabUsername,
 				}}
 			}

diff --git a/server/webhook/merge_request_fixture_test.go b/server/webhook/merge_request_fixture_test.go
@@ -920,8 +920,8 @@ const MultipleEventsMergeRequest = `{
 				"object_kind":"merge_request",
 				"event_type":"merge_request",
 				"user":{
-					"name":"manland",
-					"username":"manland",
+					"name":"Administrator",
+					"username":"root",
 					"avatar_url":"https://www.gravatar.com/avatar/c6b552a4cd47f7cf1701ea5b650cd2e3?s=80\\u0026d=identicon"
 				},
 				"project":{
@@ -969,7 +969,7 @@ const MultipleEventsMergeRequest = `{
 							"email":"admin@example.com"
 						}
 					},
-					"assignee_ids": [],
+					"assignee_ids": [50],
 					"action":"update"
 				},
 				"labels":[
@@ -1003,6 +1003,14 @@ const MultipleEventsMergeRequest = `{
 						}]
 					}
 				},
+				"assignees": [
+					{
+						"id": 50,
+						"name": "manland",
+						"username": "manland",
+						"avatar_url": "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\\u0026d=identicon"
+					}
+				],
 				"repository":{
 					"name":"webhook",
 					"url":"ssh://rmaneschi@localhost:2222/manland/webhook.git",

diff --git a/server/webhook/merge_request_test.go b/server/webhook/merge_request_test.go
@@ -137,14 +137,14 @@ var testDataMergeRequest = []testDataMergeRequestStr{
 			},
 		},
 	}, {
-		testTitle:       "Manland updates labels, title and description of merge-request",
+		testTitle:       "Root updates labels, title and description of merge-request",
 		fixture:         MultipleEventsMergeRequest,
 		gitlabRetreiver: newFakeWebhook([]*subscription.Subscription{}),
 		res: []*HandleWebhook{{
-			Message:    "[manland](http://my.gitlab.com/manland) updated the merge request [manland/webhook!4](http://localhost:3000/manland/webhook/merge_requests/4)",
-			ToUsers:    []string{"root"},
+			Message:    "[root](http://my.gitlab.com/root) updated the merge request [manland/webhook!4](http://localhost:3000/manland/webhook/merge_requests/4)",
+			ToUsers:    []string{"manland"},
 			ToChannels: []string{},
-			From:       "manland",
+			From:       "root",
 		}},
 	}, {
 		testTitle:       "user assign manland as assignee to the merge-request",