Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add reviewers related fields to MergeRequestEvent webhook event #916

Merged
merged 4 commits into from
Apr 4, 2023
Merged

add reviewers related fields to MergeRequestEvent webhook event #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4d13ac
add reviewers related fields to MergeRequestEvent webhook event
mifitous Feb 16, 2023
585e640
Merge branch 'gitlab4j:master' into add-missing-reviewers-to-MergeReq…
mifitous Apr 2, 2023
6d93f13
updated merge-request-event from GitLab official doc
mifitous Apr 2, 2023
869238e
Update test JSON to make the test green
jmini Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public class EventMergeRequest {
private Integer timeEstimate;
private Duration humanTimeEstimate;
private List<Long> assigneeIds;
private List<Long> reviewerIds;

public Long getAssigneeId() {
return this.assigneeId;
Expand Down Expand Up @@ -437,6 +438,14 @@ public void setAssigneeIds(List<Long> assigneeIds) {
this.assigneeIds = assigneeIds;
}

public List<Long> getReviewerIds() {
return reviewerIds;
}

public void setReviewerIds(List<Long> reviewerIds) {
this.reviewerIds = reviewerIds;
}

@Override
public String toString() {
return (JacksonJson.toJsonString(this));
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.List;

import org.gitlab4j.api.models.Assignee;
import org.gitlab4j.api.models.Reviewer;
import org.gitlab4j.api.models.User;
import org.gitlab4j.api.utils.JacksonJson;

Expand All @@ -18,6 +19,7 @@ public class MergeRequestEvent extends AbstractEvent {
private List<EventLabel> labels;
private MergeRequestChanges changes;
private List<Assignee> assignees;
private List<Reviewer> reviewers;

public String getObjectKind() {
return (OBJECT_KIND);
Expand Down Expand Up @@ -84,6 +86,14 @@ public void setAssignees(List<Assignee> assignees) {
this.assignees = assignees;
}

public List<Reviewer> getReviewers() {
return reviewers;
}

public void setReviewers(List<Reviewer> reviewers) {
this.reviewers = reviewers;
}

public static class ObjectAttributes extends EventMergeRequest {
}

Expand Down
157 changes: 91 additions & 66 deletions src/test/resources/org/gitlab4j/api/merge-request-event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,89 @@
{
"object_kind": "merge_request",
"user": {
"id": 1,
"name": "Administrator",
"username": "root",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
"email": "[email protected]"
},
"project": {
"name": "awesome_project",
"description": "",
"web_url": "http://example.com/awesome_space/awesome_project",
"git_ssh_url": "[email protected]:awesome_space/awesome_project.git",
"git_http_url": "http://example.com/awesome_space/awesome_project.git",
"namespace": "awesome_space",
"id": 1,
"name": "Gitlab Test",
"description": "Aut reprehenderit ut est.",
"web_url": "http://example.com/gitlabhq/gitlab-test",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
"git_ssh_url": "[email protected]:gitlabhq/gitlab-test.git",
"git_http_url": "http://example.com/gitlabhq/gitlab-test.git",
"namespace": "GitlabHQ",
"visibility_level": 20,
"path_with_namespace": "awesome_space/awesome_project",
"path_with_namespace": "gitlabhq/gitlab-test",
"default_branch": "master",
"homepage": "http://example.com/awesome_space/awesome_project",
"url": "git@example.com:awesome_space/awesome_project.git",
"ssh_url": "[email protected]:awesome_space/awesome_project.git",
"http_url": "http://example.com/awesome_space/awesome_project.git"
"homepage": "http://example.com/gitlabhq/gitlab-test",
"url": "http://example.com/gitlabhq/gitlab-test.git",
"ssh_url": "[email protected]:gitlabhq/gitlab-test.git",
"http_url": "http://example.com/gitlabhq/gitlab-test.git"
},
"repository": {
"name": "awesome_project",
"url": "git@example.com:awesome_space/awesome_project.git",
"description": "",
"homepage": "http://example.com/awesome_space/awesome_project"
"name": "Gitlab Test",
"url": "http://example.com/gitlabhq/gitlab-test.git",
"description": "Aut reprehenderit ut est.",
"homepage": "http://example.com/gitlabhq/gitlab-test"
},
"object_attributes": {
"id": 99,
"iid": 1,
"target_branch": "master",
"source_branch": "ms-viewport",
"source_project_id": 14,
"author_id": 51,
"assignee_ids": [
6
],
"assignee_id": 6,
"reviewer_ids": [
6
],
"title": "MS-Viewport",
"created_at": "2013-12-03T17:23:34Z",
"updated_at": "2013-12-03T17:23:34Z",
"state": "opened",
"work_in_progress": false,
"merge_status": "unchecked",
"target_project_id": 14,
"iid": 1,
"merge_commit_sha": "5f72688f7af57df23ee7510cec59b909289964f1",
"description": "",
"source":{
"name":"Awesome Project",
"description":"Aut reprehenderit ut est.",
"web_url":"http://example.com/awesome_space/awesome_project",
"git_ssh_url":"[email protected]:awesome_space/awesome_project.git",
"git_http_url":"http://example.com/awesome_space/awesome_project.git",
"namespace":"Awesome Space",
"visibility_level":20,
"path_with_namespace":"awesome_space/awesome_project",
"default_branch":"master",
"homepage":"http://example.com/awesome_space/awesome_project",
"url":"http://example.com/awesome_space/awesome_project.git",
"ssh_url":"[email protected]:awesome_space/awesome_project.git",
"http_url":"http://example.com/awesome_space/awesome_project.git"
"url": "http://example.com/diaspora/merge_requests/1",
"source": {
"name": "Awesome Project",
"description": "Aut reprehenderit ut est.",
"web_url": "http://example.com/awesome_space/awesome_project",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
"git_ssh_url": "[email protected]:awesome_space/awesome_project.git",
"git_http_url": "http://example.com/awesome_space/awesome_project.git",
"namespace": "Awesome Space",
"visibility_level": 20,
"path_with_namespace": "awesome_space/awesome_project",
"default_branch": "master",
"homepage": "http://example.com/awesome_space/awesome_project",
"url": "http://example.com/awesome_space/awesome_project.git",
"ssh_url": "[email protected]:awesome_space/awesome_project.git",
"http_url": "http://example.com/awesome_space/awesome_project.git"
},
"target": {
"name":"Awesome Project",
"description":"Aut reprehenderit ut est.",
"web_url":"http://example.com/awesome_space/awesome_project",
"git_ssh_url":"[email protected]:awesome_space/awesome_project.git",
"git_http_url":"http://example.com/awesome_space/awesome_project.git",
"namespace":"Awesome Space",
"visibility_level":20,
"path_with_namespace":"awesome_space/awesome_project",
"default_branch":"master",
"homepage":"http://example.com/awesome_space/awesome_project",
"url":"http://example.com/awesome_space/awesome_project.git",
"ssh_url":"[email protected]:awesome_space/awesome_project.git",
"http_url":"http://example.com/awesome_space/awesome_project.git"
"name": "Awesome Project",
"description": "Aut reprehenderit ut est.",
"web_url": "http://example.com/awesome_space/awesome_project",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
"git_ssh_url": "[email protected]:awesome_space/awesome_project.git",
"git_http_url": "http://example.com/awesome_space/awesome_project.git",
"namespace": "Awesome Space",
"visibility_level": 20,
"path_with_namespace": "awesome_space/awesome_project",
"default_branch": "master",
"homepage": "http://example.com/awesome_space/awesome_project",
"url": "http://example.com/awesome_space/awesome_project.git",
"ssh_url": "[email protected]:awesome_space/awesome_project.git",
"http_url": "http://example.com/awesome_space/awesome_project.git"
},
"last_commit": {
"id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
Expand All @@ -82,32 +95,28 @@
"email": "gitlabdev@dv6700.(none)"
}
},
"work_in_progress": false,
"url": "http://example.com/diaspora/merge_requests/1",
"action": "open",
"assignee": {
"name": "User1",
"username": "user1",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
}
"action": "open"
},
"labels": [{
"id": 206,
"title": "API",
"color": "#ffffff",
"project_id": 14,
"created_at": "2013-12-03T17:15:43Z",
"updated_at": "2013-12-03T17:15:43Z",
"template": false,
"description": "API related issues",
"type": "ProjectLabel",
"group_id": 41
}],
"labels": [
{
"id": 206,
"title": "API",
"color": "#ffffff",
"project_id": 14,
"created_at": "2013-12-03T17:15:43Z",
"updated_at": "2013-12-03T17:15:43Z",
"template": false,
"description": "API related issues",
"type": "ProjectLabel",
"group_id": 41
}
],
"changes": {
"author_id": {
"current":2
},
"updated_at": {
"previous": "2013-09-15T16:50:55Z",
"current": "2013-12-03T17:23:34Z"
},
"updated_by_id": {
Expand Down Expand Up @@ -155,5 +164,21 @@
"group_id": 41
}]
}
}
},
"assignees": [
{
"id": 6,
"name": "User1",
"username": "user1",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
}
],
"reviewers": [
{
"id": 6,
"name": "User1",
"username": "user1",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
}
]
}