Unverified Commit 57a7cc54 authored by Gautier de Saint Martin Lacaze's avatar Gautier de Saint Martin Lacaze Committed by GitHub
Browse files

Merge pull request #670 from yuezhuangshi/add-field-to-note-event

Add more field to NoteEvent.ObjectAttributes
parents 955d1a36 abd17e08
...@@ -131,6 +131,8 @@ public class NoteEvent extends AbstractEvent { ...@@ -131,6 +131,8 @@ public class NoteEvent extends AbstractEvent {
private Integer id; private Integer id;
private String note; private String note;
private String discussionId;
private String type;
private NoteableType noteableType; private NoteableType noteableType;
private Integer authorId; private Integer authorId;
private Date createdAt; private Date createdAt;
...@@ -160,6 +162,22 @@ public class NoteEvent extends AbstractEvent { ...@@ -160,6 +162,22 @@ public class NoteEvent extends AbstractEvent {
this.note = note; this.note = note;
} }
public String getDiscussionId() {
return discussionId;
}
public void setDiscussionId(String discussionId) {
this.discussionId = discussionId;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public NoteableType getNoteableType() { public NoteableType getNoteableType() {
return noteableType; return noteableType;
} }
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
"object_attributes": { "object_attributes": {
"id": 1243, "id": 1243,
"note": "This is a commit comment. How does this work?", "note": "This is a commit comment. How does this work?",
"discussion_id": "56e2b4210419aed077d47ca2dc00551c7c4ac882",
"type": "DiscussionNote",
"noteable_type": "Commit", "noteable_type": "Commit",
"author_id": 1, "author_id": 1,
"created_at": "2015-05-17T18:08:09Z", "created_at": "2015-05-17T18:08:09Z",
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
"object_attributes": { "object_attributes": {
"id": 1241, "id": 1241,
"note": "Hello world", "note": "Hello world",
"discussion_id": "56e2b4210419aed077d47ca2dc00551c7c4ac882",
"type": "DiscussionNote",
"noteable_type": "Issue", "noteable_type": "Issue",
"author_id": 1, "author_id": 1,
"created_at": "2015-05-17T17:06:40Z", "created_at": "2015-05-17T17:06:40Z",
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
"object_attributes": { "object_attributes": {
"id": 1244, "id": 1244,
"note": "This MR needs work.", "note": "This MR needs work.",
"discussion_id": "56e2b4210419aed077d47ca2dc00551c7c4ac882",
"type": "DiscussionNote",
"noteable_type": "MergeRequest", "noteable_type": "MergeRequest",
"author_id": 1, "author_id": 1,
"created_at": "2015-05-17T18:21:36Z", "created_at": "2015-05-17T18:21:36Z",
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
"object_attributes": { "object_attributes": {
"id": 1245, "id": 1245,
"note": "Is this snippet doing what it's supposed to be doing?", "note": "Is this snippet doing what it's supposed to be doing?",
"discussion_id": "56e2b4210419aed077d47ca2dc00551c7c4ac882",
"type": "DiscussionNote",
"noteable_type": "Snippet", "noteable_type": "Snippet",
"author_id": 1, "author_id": 1,
"created_at": "2015-05-17T18:35:50Z", "created_at": "2015-05-17T18:35:50Z",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment