From a82e579d57d0a162ecdac34b5022f55abe6788cf Mon Sep 17 00:00:00 2001
From: distkloc <rectpali+ws@gmail.com>
Date: Thu, 10 Mar 2016 02:08:09 +0900
Subject: [PATCH] Add pull_request key in list issues api if an issue is a pull
 request

---
 src/main/scala/gitbucket/core/api/ApiIssue.scala       | 10 ++++++++++
 src/test/scala/gitbucket/core/api/JsonFormatSpec.scala |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/src/main/scala/gitbucket/core/api/ApiIssue.scala b/src/main/scala/gitbucket/core/api/ApiIssue.scala
index a73a335bf..47374ed33 100644
--- a/src/main/scala/gitbucket/core/api/ApiIssue.scala
+++ b/src/main/scala/gitbucket/core/api/ApiIssue.scala
@@ -20,6 +20,16 @@ case class ApiIssue(
   body: String)(repositoryName: RepositoryName, isPullRequest: Boolean){
   val comments_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/issues/${number}/comments")
   val html_url = ApiPath(s"/${repositoryName.fullName}/${if(isPullRequest){ "pull" }else{ "issues" }}/${number}")
+  val pull_request = if (isPullRequest) {
+    Some(Map(
+      "url" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/pulls/${number}"),
+      "html_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}")
+      // "diff_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.diff"),
+      // "patch_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.patch")
+    ))
+  } else {
+    None
+  }
 }
 
 object ApiIssue{
diff --git a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
index 4768f7385..4d84fe554 100644
--- a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
+++ b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
@@ -252,6 +252,12 @@ class JsonFormatSpec extends FunSuite {
     "user": $apiUserJson,
     "comments_url": "${context.baseUrl}/api/v3/repos/octocat/Hello-World/issues/1347/comments",
     "html_url": "${context.baseUrl}/octocat/Hello-World/pull/1347",
+    "pull_request": {
+      "url": "${context.baseUrl}/api/v3/repos/octocat/Hello-World/pulls/1347",
+      "html_url": "${context.baseUrl}/octocat/Hello-World/pull/1347"
+      // "diff_url": "${context.baseUrl}/octocat/Hello-World/pull/1347.diff",
+      // "patch_url": "${context.baseUrl}/octocat/Hello-World/pull/1347.patch"
+    },
     "created_at": "2011-04-14T16:00:49Z",
     "updated_at": "2011-04-14T16:00:49Z"
   }"""