Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 14:05:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

add 'state' attribute to ApiPullRequest object

Browse Source 
fixes #1844
This commit is contained in:
Matthieu Brouillard
2018-01-19 11:24:43 +01:00
parent 2ee70dc1b2
commit 47489d9cb1
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/gitbucket/core/api/ApiPullRequest.scala
View File

@@ -8,6 +8,7 @@ import java.util.Date
*/ */
case class ApiPullRequest( case class ApiPullRequest(
number: Int, number: Int,
state: String,
updated_at: Date, updated_at: Date,
created_at: Date, created_at: Date,
head: ApiPullRequest.Commit, head: ApiPullRequest.Commit,
@@ -44,6 +45,7 @@ object ApiPullRequest{
): ApiPullRequest = ): ApiPullRequest =
ApiPullRequest( ApiPullRequest(
number = issue.issueId, number = issue.issueId,
state = if (issue.closed) "closed" else "open",
updated_at = issue.updatedDate, updated_at = issue.updatedDate,
created_at = issue.registeredDate, created_at = issue.registeredDate,
head = Commit( head = Commit(

2
src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
View File

@@ -265,6 +265,7 @@ class JsonFormatSpec extends FunSuite {
val apiPullRequest = ApiPullRequest( val apiPullRequest = ApiPullRequest(
number = 1347, number = 1347,
state = "open",
updated_at = date1, updated_at = date1,
created_at = date1, created_at = date1,
head = ApiPullRequest.Commit( head = ApiPullRequest.Commit(
@@ -287,6 +288,7 @@ class JsonFormatSpec extends FunSuite {
val apiPullRequestJson = s"""{ val apiPullRequestJson = s"""{
"number": 1347, "number": 1347,
"state" : "open",
"updated_at": "2011-04-14T16:00:49Z", "updated_at": "2011-04-14T16:00:49Z",
"created_at": "2011-04-14T16:00:49Z", "created_at": "2011-04-14T16:00:49Z",
// "closed_at": "2011-04-14T16:00:49Z", // "closed_at": "2011-04-14T16:00:49Z",