add html_url on api issue-comment

This commit is contained in:
nazoking
2015-04-20 14:32:16 +09:00
parent c467594199
commit 5568acc5f3
5 changed files with 12 additions and 8 deletions

View File

@@ -1,6 +1,7 @@
package gitbucket.core.api package gitbucket.core.api
import gitbucket.core.model.IssueComment import gitbucket.core.model.IssueComment
import gitbucket.core.util.RepositoryName
import java.util.Date import java.util.Date
@@ -13,14 +14,16 @@ case class ApiComment(
user: ApiUser, user: ApiUser,
body: String, body: String,
created_at: Date, created_at: Date,
updated_at: Date) updated_at: Date)(repositoryName: RepositoryName, issueId: Int){
val html_url = ApiPath(s"/${repositoryName.fullName}/issues/${issueId}#comment-${id}")
}
object ApiComment{ object ApiComment{
def apply(comment: IssueComment, user: ApiUser): ApiComment = def apply(comment: IssueComment, repositoryName: RepositoryName, issueId: Int, user: ApiUser): ApiComment =
ApiComment( ApiComment(
id = comment.commentId, id = comment.commentId,
user = user, user = user,
body = comment.content, body = comment.content,
created_at = comment.registeredDate, created_at = comment.registeredDate,
updated_at = comment.updatedDate) updated_at = comment.updatedDate)(repositoryName, issueId)
} }

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[ApiIssue]() FieldSerializer[ApiPullRequest.Commit]() + FieldSerializer[ApiIssue]() + FieldSerializer[ApiComment]()
def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](format => def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](format =>

View File

@@ -86,7 +86,7 @@ trait IssuesControllerBase extends ControllerBase {
issueId <- params("id").toIntOpt issueId <- params("id").toIntOpt
comments = getCommentsForApi(repository.owner, repository.name, issueId.toInt) comments = getCommentsForApi(repository.owner, repository.name, issueId.toInt)
} yield { } yield {
JsonFormat(comments.map{ case (issueComment, user) => ApiComment(issueComment, ApiUser(user)) }) JsonFormat(comments.map{ case (issueComment, user) => ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user)) })
}).getOrElse(NotFound) }).getOrElse(NotFound)
}) })
@@ -190,7 +190,7 @@ trait IssuesControllerBase extends ControllerBase {
(issue, id) <- handleComment(issueId, Some(body), repository)() (issue, id) <- handleComment(issueId, Some(body), repository)()
issueComment <- getComment(repository.owner, repository.name, id.toString()) issueComment <- getComment(repository.owner, repository.name, id.toString())
} yield { } yield {
JsonFormat(ApiComment(issueComment, ApiUser(context.loginAccount.get))) JsonFormat(ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(context.loginAccount.get)))
}) getOrElse NotFound }) getOrElse NotFound
}) })

View File

@@ -273,7 +273,7 @@ object WebHookService {
action = "created", action = "created",
repository = ApiRepository(repository, repositoryUser), repository = ApiRepository(repository, repositoryUser),
issue = ApiIssue(issue, RepositoryName(repository), ApiUser(issueUser)), issue = ApiIssue(issue, RepositoryName(repository), ApiUser(issueUser)),
comment = ApiComment(comment, ApiUser(commentUser)), comment = ApiComment(comment, RepositoryName(repository), issue.issueId, ApiUser(commentUser)),
sender = ApiUser(sender)) sender = ApiUser(sender))
} }
} }

View File

@@ -90,11 +90,12 @@ class JsonFormatSpec extends Specification {
user = apiUser, user = apiUser,
body= "Me too", body= "Me too",
created_at= date1, created_at= date1,
updated_at= date1) updated_at= date1)(RepositoryName("octocat","Hello-World"), 100)
val apiCommentJson = s"""{ val apiCommentJson = s"""{
"id": 1, "id": 1,
"body": "Me too", "body": "Me too",
"user": $apiUserJson, "user": $apiUserJson,
"html_url" : "${context.baseUrl}/octocat/Hello-World/issues/100#comment-1",
"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"
}""" }"""