Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 06:25:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

add html_url and comments_url on api issue

Browse Source
This commit is contained in:
nazoking
2015-04-20 13:19:17 +09:00
parent 43b7f83082
commit c467594199
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/gitbucket/core/api/ApiIssue.scala
View File

@@ -1,6 +1,7 @@
package gitbucket.core.api package gitbucket.core.api
import gitbucket.core.model.Issue import gitbucket.core.model.Issue
import gitbucket.core.util.RepositoryName
import java.util.Date import java.util.Date
@@ -16,10 +17,13 @@ case class ApiIssue(
state: String, state: String,
created_at: Date, created_at: Date,
updated_at: Date, updated_at: Date,
body: String) body: String)(repositoryName: RepositoryName){
val comments_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/issues/${number}/comments")
val html_url = ApiPath(s"/${repositoryName.fullName}/issues/${number}")
}
object ApiIssue{ object ApiIssue{
def apply(issue: Issue, user: ApiUser): ApiIssue = def apply(issue: Issue, repositoryName: RepositoryName, user: ApiUser): ApiIssue =
ApiIssue( ApiIssue(
number = issue.issueId, number = issue.issueId,
title = issue.title, title = issue.title,
@@ -27,5 +31,5 @@ object ApiIssue{
state = if(issue.closed){ "closed" }else{ "open" }, state = if(issue.closed){ "closed" }else{ "open" },
body = issue.content.getOrElse(""), body = issue.content.getOrElse(""),
created_at = issue.registeredDate, created_at = issue.registeredDate,
updated_at = issue.updatedDate) updated_at = issue.updatedDate)(repositoryName)
} }

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

@@ -23,7 +23,7 @@ object JsonFormat {
) + FieldSerializer[ApiUser]() + FieldSerializer[ApiPullRequest]() + FieldSerializer[ApiRepository]() + ) + FieldSerializer[ApiUser]() + FieldSerializer[ApiPullRequest]() + FieldSerializer[ApiRepository]() +
FieldSerializer[ApiCommitListItem.Parent]() + FieldSerializer[ApiCommitListItem]() + FieldSerializer[ApiCommitListItem.Commit]() + FieldSerializer[ApiCommitListItem.Parent]() + FieldSerializer[ApiCommitListItem]() + FieldSerializer[ApiCommitListItem.Commit]() +
FieldSerializer[ApiCommitStatus]() + FieldSerializer[ApiCommit]() + FieldSerializer[ApiCombinedCommitStatus]() + FieldSerializer[ApiCommitStatus]() + FieldSerializer[ApiCommit]() + FieldSerializer[ApiCombinedCommitStatus]() +
FieldSerializer[ApiPullRequest.Commit]() FieldSerializer[ApiPullRequest.Commit]() + FieldSerializer[ApiIssue]()
def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](format => def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](format =>

4
src/main/scala/gitbucket/core/service/WebHookService.scala
View File

@@ -90,7 +90,7 @@ trait WebHookPullRequestService extends WebHookService {
action = action, action = action,
number = issue.issueId, number = issue.issueId,
repository = ApiRepository(repository, ApiUser(repoOwner)), repository = ApiRepository(repository, ApiUser(repoOwner)),
issue = ApiIssue(issue, ApiUser(issueUser)), issue = ApiIssue(issue, RepositoryName(repository), ApiUser(issueUser)),
sender = ApiUser(sender)) sender = ApiUser(sender))
} }
} }
@@ -272,7 +272,7 @@ object WebHookService {
WebHookIssueCommentPayload( WebHookIssueCommentPayload(
action = "created", action = "created",
repository = ApiRepository(repository, repositoryUser), repository = ApiRepository(repository, repositoryUser),
issue = ApiIssue(issue, ApiUser(issueUser)), issue = ApiIssue(issue, RepositoryName(repository), ApiUser(issueUser)),
comment = ApiComment(comment, ApiUser(commentUser)), comment = ApiComment(comment, ApiUser(commentUser)),
sender = ApiUser(sender)) sender = ApiUser(sender))
} }

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

@@ -157,13 +157,15 @@ class JsonFormatSpec extends Specification {
state = "open", state = "open",
body = "I'm having a problem with this.", body = "I'm having a problem with this.",
created_at = date1, created_at = date1,
updated_at = date1) updated_at = date1)(RepositoryName("octocat","Hello-World"))
val apiIssueJson = s"""{ val apiIssueJson = s"""{
"number": 1347, "number": 1347,
"state": "open", "state": "open",
"title": "Found a bug", "title": "Found a bug",
"body": "I'm having a problem with this.", "body": "I'm having a problem with this.",
"user": $apiUserJson, "user": $apiUserJson,
"comments_url": "${context.baseUrl}/api/v3/repos/octocat/Hello-World/issues/1347/comments",
"html_url": "${context.baseUrl}/octocat/Hello-World/issues/1347",
"created_at": "2011-04-14T16:00:49Z", "created_at": "2011-04-14T16:00:49Z",
"updated_at": "2011-04-14T16:00:49Z" "updated_at": "2011-04-14T16:00:49Z"
}""" }"""