Skip to content

Commit dc0f9f2

Browse files
mifitousjmini
mifitous
and
jmini
authored
add reviewers related fields to MergeRequestEvent webhook event (#916)
Co-authored-by: Jeremie Bresson <jeremie.bresson@unblu.com>
1 parent 1e112a5 commit dc0f9f2

File tree

3 files changed

+110
-66
lines changed

3 files changed

+110
-66
lines changed

‎src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public class EventMergeRequest {
6060
private Integer timeEstimate;
6161
private Duration humanTimeEstimate;
6262
private List<Long> assigneeIds;
63+
private List<Long> reviewerIds;
6364

6465
public Long getAssigneeId() {
6566
return this.assigneeId;
@@ -437,6 +438,14 @@ public void setAssigneeIds(List<Long> assigneeIds) {
437438
this.assigneeIds = assigneeIds;
438439
}
439440

441+
public List<Long> getReviewerIds() {
442+
return reviewerIds;
443+
}
444+
445+
public void setReviewerIds(List<Long> reviewerIds) {
446+
this.reviewerIds = reviewerIds;
447+
}
448+
440449
@Override
441450
public String toString() {
442451
return (JacksonJson.toJsonString(this));

‎src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.List;
44

55
import org.gitlab4j.api.models.Assignee;
6+
import org.gitlab4j.api.models.Reviewer;
67
import org.gitlab4j.api.models.User;
78
import org.gitlab4j.api.utils.JacksonJson;
89

@@ -18,6 +19,7 @@ public class MergeRequestEvent extends AbstractEvent {
1819
private List<EventLabel> labels;
1920
private MergeRequestChanges changes;
2021
private List<Assignee> assignees;
22+
private List<Reviewer> reviewers;
2123

2224
public String getObjectKind() {
2325
return (OBJECT_KIND);
@@ -84,6 +86,14 @@ public void setAssignees(List<Assignee> assignees) {
8486
this.assignees = assignees;
8587
}
8688

89+
public List<Reviewer> getReviewers() {
90+
return reviewers;
91+
}
92+
93+
public void setReviewers(List<Reviewer> reviewers) {
94+
this.reviewers = reviewers;
95+
}
96+
8797
public static class ObjectAttributes extends EventMergeRequest {
8898
}
8999

‎src/test/resources/org/gitlab4j/api/merge-request-event.json‎

Lines changed: 91 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,89 @@
11
{
22
"object_kind": "merge_request",
33
"user": {
4+
"id": 1,
45
"name": "Administrator",
56
"username": "root",
6-
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
7+
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
8+
"email": "admin@example.com"
79
},
810
"project": {
9-
"name": "awesome_project",
10-
"description": "",
11-
"web_url": "http://example.com/awesome_space/awesome_project",
12-
"git_ssh_url": "git@example.com:awesome_space/awesome_project.git",
13-
"git_http_url": "http://example.com/awesome_space/awesome_project.git",
14-
"namespace": "awesome_space",
11+
"id": 1,
12+
"name": "Gitlab Test",
13+
"description": "Aut reprehenderit ut est.",
14+
"web_url": "http://example.com/gitlabhq/gitlab-test",
15+
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
16+
"git_ssh_url": "git@example.com:gitlabhq/gitlab-test.git",
17+
"git_http_url": "http://example.com/gitlabhq/gitlab-test.git",
18+
"namespace": "GitlabHQ",
1519
"visibility_level": 20,
16-
"path_with_namespace": "awesome_space/awesome_project",
20+
"path_with_namespace": "gitlabhq/gitlab-test",
1721
"default_branch": "master",
18-
"homepage": "http://example.com/awesome_space/awesome_project",
19-
"url": "git@example.com:awesome_space/awesome_project.git",
20-
"ssh_url": "git@example.com:awesome_space/awesome_project.git",
21-
"http_url": "http://example.com/awesome_space/awesome_project.git"
22+
"homepage": "http://example.com/gitlabhq/gitlab-test",
23+
"url": "http://example.com/gitlabhq/gitlab-test.git",
24+
"ssh_url": "git@example.com:gitlabhq/gitlab-test.git",
25+
"http_url": "http://example.com/gitlabhq/gitlab-test.git"
2226
},
2327
"repository": {
24-
"name": "awesome_project",
25-
"url": "git@example.com:awesome_space/awesome_project.git",
26-
"description": "",
27-
"homepage": "http://example.com/awesome_space/awesome_project"
28+
"name": "Gitlab Test",
29+
"url": "http://example.com/gitlabhq/gitlab-test.git",
30+
"description": "Aut reprehenderit ut est.",
31+
"homepage": "http://example.com/gitlabhq/gitlab-test"
2832
},
2933
"object_attributes": {
3034
"id": 99,
35+
"iid": 1,
3136
"target_branch": "master",
3237
"source_branch": "ms-viewport",
3338
"source_project_id": 14,
3439
"author_id": 51,
40+
"assignee_ids": [
41+
6
42+
],
3543
"assignee_id": 6,
44+
"reviewer_ids": [
45+
6
46+
],
3647
"title": "MS-Viewport",
3748
"created_at": "2013-12-03T17:23:34Z",
3849
"updated_at": "2013-12-03T17:23:34Z",
3950
"state": "opened",
51+
"work_in_progress": false,
4052
"merge_status": "unchecked",
4153
"target_project_id": 14,
42-
"iid": 1,
43-
"merge_commit_sha": "5f72688f7af57df23ee7510cec59b909289964f1",
4454
"description": "",
45-
"source":{
46-
"name":"Awesome Project",
47-
"description":"Aut reprehenderit ut est.",
48-
"web_url":"http://example.com/awesome_space/awesome_project",
49-
"git_ssh_url":"git@example.com:awesome_space/awesome_project.git",
50-
"git_http_url":"http://example.com/awesome_space/awesome_project.git",
51-
"namespace":"Awesome Space",
52-
"visibility_level":20,
53-
"path_with_namespace":"awesome_space/awesome_project",
54-
"default_branch":"master",
55-
"homepage":"http://example.com/awesome_space/awesome_project",
56-
"url":"http://example.com/awesome_space/awesome_project.git",
57-
"ssh_url":"git@example.com:awesome_space/awesome_project.git",
58-
"http_url":"http://example.com/awesome_space/awesome_project.git"
55+
"url": "http://example.com/diaspora/merge_requests/1",
56+
"source": {
57+
"name": "Awesome Project",
58+
"description": "Aut reprehenderit ut est.",
59+
"web_url": "http://example.com/awesome_space/awesome_project",
60+
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
61+
"git_ssh_url": "git@example.com:awesome_space/awesome_project.git",
62+
"git_http_url": "http://example.com/awesome_space/awesome_project.git",
63+
"namespace": "Awesome Space",
64+
"visibility_level": 20,
65+
"path_with_namespace": "awesome_space/awesome_project",
66+
"default_branch": "master",
67+
"homepage": "http://example.com/awesome_space/awesome_project",
68+
"url": "http://example.com/awesome_space/awesome_project.git",
69+
"ssh_url": "git@example.com:awesome_space/awesome_project.git",
70+
"http_url": "http://example.com/awesome_space/awesome_project.git"
5971
},
6072
"target": {
61-
"name":"Awesome Project",
62-
"description":"Aut reprehenderit ut est.",
63-
"web_url":"http://example.com/awesome_space/awesome_project",
64-
"git_ssh_url":"git@example.com:awesome_space/awesome_project.git",
65-
"git_http_url":"http://example.com/awesome_space/awesome_project.git",
66-
"namespace":"Awesome Space",
67-
"visibility_level":20,
68-
"path_with_namespace":"awesome_space/awesome_project",
69-
"default_branch":"master",
70-
"homepage":"http://example.com/awesome_space/awesome_project",
71-
"url":"http://example.com/awesome_space/awesome_project.git",
72-
"ssh_url":"git@example.com:awesome_space/awesome_project.git",
73-
"http_url":"http://example.com/awesome_space/awesome_project.git"
73+
"name": "Awesome Project",
74+
"description": "Aut reprehenderit ut est.",
75+
"web_url": "http://example.com/awesome_space/awesome_project",
76+
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
77+
"git_ssh_url": "git@example.com:awesome_space/awesome_project.git",
78+
"git_http_url": "http://example.com/awesome_space/awesome_project.git",
79+
"namespace": "Awesome Space",
80+
"visibility_level": 20,
81+
"path_with_namespace": "awesome_space/awesome_project",
82+
"default_branch": "master",
83+
"homepage": "http://example.com/awesome_space/awesome_project",
84+
"url": "http://example.com/awesome_space/awesome_project.git",
85+
"ssh_url": "git@example.com:awesome_space/awesome_project.git",
86+
"http_url": "http://example.com/awesome_space/awesome_project.git"
7487
},
7588
"last_commit": {
7689
"id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
@@ -82,32 +95,28 @@
8295
"email": "gitlabdev@dv6700.(none)"
8396
}
8497
},
85-
"work_in_progress": false,
86-
"url": "http://example.com/diaspora/merge_requests/1",
87-
"action": "open",
88-
"assignee": {
89-
"name": "User1",
90-
"username": "user1",
91-
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
92-
}
98+
"action": "open"
9399
},
94-
"labels": [{
95-
"id": 206,
96-
"title": "API",
97-
"color": "#ffffff",
98-
"project_id": 14,
99-
"created_at": "2013-12-03T17:15:43Z",
100-
"updated_at": "2013-12-03T17:15:43Z",
101-
"template": false,
102-
"description": "API related issues",
103-
"type": "ProjectLabel",
104-
"group_id": 41
105-
}],
100+
"labels": [
101+
{
102+
"id": 206,
103+
"title": "API",
104+
"color": "#ffffff",
105+
"project_id": 14,
106+
"created_at": "2013-12-03T17:15:43Z",
107+
"updated_at": "2013-12-03T17:15:43Z",
108+
"template": false,
109+
"description": "API related issues",
110+
"type": "ProjectLabel",
111+
"group_id": 41
112+
}
113+
],
106114
"changes": {
107115
"author_id": {
108116
"current":2
109117
},
110118
"updated_at": {
119+
"previous": "2013-09-15T16:50:55Z",
111120
"current": "2013-12-03T17:23:34Z"
112121
},
113122
"updated_by_id": {
@@ -155,5 +164,21 @@
155164
"group_id": 41
156165
}]
157166
}
158-
}
167+
},
168+
"assignees": [
169+
{
170+
"id": 6,
171+
"name": "User1",
172+
"username": "user1",
173+
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
174+
}
175+
],
176+
"reviewers": [
177+
{
178+
"id": 6,
179+
"name": "User1",
180+
"username": "user1",
181+
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
182+
}
183+
]
159184
}

0 commit comments

Comments
 (0)