diff --git a/src/main/scala/gitbucket/core/api/ApiPullRequest.scala b/src/main/scala/gitbucket/core/api/ApiPullRequest.scala index 3ae6ac0..b83673f 100644 --- a/src/main/scala/gitbucket/core/api/ApiPullRequest.scala +++ b/src/main/scala/gitbucket/core/api/ApiPullRequest.scala @@ -3,7 +3,6 @@ import gitbucket.core.model.{Account, Issue, IssueComment, PullRequest} import java.util.Date - /** * https://developer.github.com/v3/pulls/ */ @@ -19,7 +18,8 @@ merged_by: Option[ApiUser], title: String, body: String, - user: ApiUser) { + user: ApiUser, + assignee: Option[ApiUser]){ val html_url = ApiPath(s"${base.repo.html_url.path}/pull/${number}") //val diff_url = ApiPath(s"${base.repo.html_url.path}/pull/${number}.diff") //val patch_url = ApiPath(s"${base.repo.html_url.path}/pull/${number}.patch") @@ -39,6 +39,7 @@ headRepo: ApiRepository, baseRepo: ApiRepository, user: ApiUser, + assignee: Option[ApiUser], mergedComment: Option[(IssueComment, Account)] ): ApiPullRequest = ApiPullRequest( @@ -59,14 +60,16 @@ merged_by = mergedComment.map { case (_, account) => ApiUser(account) }, title = issue.title, body = issue.content.getOrElse(""), - user = user + user = user, + assignee = assignee ) case class Commit( sha: String, ref: String, repo: ApiRepository)(baseOwner:String){ - val label = if( baseOwner == repo.owner.login ){ ref }else{ s"${repo.owner.login}:${ref}" } + val label = if( baseOwner == repo.owner.login ){ ref } else { s"${repo.owner.login}:${ref}" } val user = repo.owner } + } diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala index 6360847..1199921 100644 --- a/src/main/scala/gitbucket/core/controller/ApiController.scala +++ b/src/main/scala/gitbucket/core/controller/ApiController.scala @@ -501,7 +501,7 @@ val condition = IssueSearchCondition(request) val baseOwner = getAccountByUserName(repository.owner).get - val issues: List[(Issue, Account, Int, PullRequest, Repository, Account)] = + val issues: List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] = searchPullRequestByApi( condition = condition, offset = (page - 1) * PullRequestLimit, @@ -509,13 +509,14 @@ repos = repository.owner -> repository.name ) - JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner) => + JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner, assignee) => ApiPullRequest( issue = issue, pullRequest = pullRequest, headRepo = ApiRepository(headRepo, ApiUser(headOwner)), baseRepo = ApiRepository(repository, ApiUser(baseOwner)), user = ApiUser(issueUser), + assignee = assignee.map(ApiUser.apply), mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId) ) }) @@ -532,6 +533,7 @@ baseOwner <- users.get(repository.owner) headOwner <- users.get(pullRequest.requestUserName) issueUser <- users.get(issue.openedUserName) + assignee = issue.assignedUserName.flatMap { userName => getAccountByUserName(userName, false) } headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName) } yield { JsonFormat(ApiPullRequest( @@ -540,6 +542,7 @@ headRepo = ApiRepository(headRepo, ApiUser(headOwner)), baseRepo = ApiRepository(repository, ApiUser(baseOwner)), user = ApiUser(issueUser), + assignee = assignee.map(ApiUser.apply), mergedComment = getMergedComment(repository.owner, repository.name, issue.issueId) )) }) getOrElse NotFound() diff --git a/src/main/scala/gitbucket/core/service/IssuesService.scala b/src/main/scala/gitbucket/core/service/IssuesService.scala index 8c183b8..18ab1d1 100644 --- a/src/main/scala/gitbucket/core/service/IssuesService.scala +++ b/src/main/scala/gitbucket/core/service/IssuesService.scala @@ -202,15 +202,16 @@ * @return (issue, issueUser, commentCount, pullRequest, headRepo, headOwner) */ def searchPullRequestByApi(condition: IssueSearchCondition, offset: Int, limit: Int, repos: (String, String)*) - (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account)] = { + (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account, Option[Account])] = { // get issues and comment count and labels searchIssueQueryBase(condition, true, offset, limit, repos) - .join(PullRequests).on { case t1 ~ t2 ~ i ~ t3 => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) } - .join(Repositories).on { case t1 ~ t2 ~ i ~ t3 ~ t4 => t4.byRepository(t1.userName, t1.repositoryName) } - .join(Accounts ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 => t5.userName === t1.openedUserName } - .join(Accounts ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => t6.userName === t4.userName } - .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => i asc } - .map { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => (t1, t5, t2.commentCount, t3, t4, t6) } + .join (PullRequests).on { case t1 ~ t2 ~ i ~ t3 => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) } + .join (Repositories).on { case t1 ~ t2 ~ i ~ t3 ~ t4 => t4.byRepository(t1.userName, t1.repositoryName) } + .join (Accounts ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 => t5.userName === t1.openedUserName } + .join (Accounts ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => t6.userName === t4.userName } + .joinLeft(Accounts ).on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => t7.userName === t1.assignedUserName} + .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => i asc } + .map { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 ~ t7 => (t1, t5, t2.commentCount, t3, t4, t6, t7) } .list } diff --git a/src/main/scala/gitbucket/core/service/WebHookService.scala b/src/main/scala/gitbucket/core/service/WebHookService.scala index 1558115..fb17fe1 100644 --- a/src/main/scala/gitbucket/core/service/WebHookService.scala +++ b/src/main/scala/gitbucket/core/service/WebHookService.scala @@ -228,16 +228,18 @@ callWebHookOf(repository.owner, repository.name, WebHook.PullRequest){ for{ (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId) - users = getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set(sender)) + users = getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName, issue.openedUserName), Set(sender)) baseOwner <- users.get(repository.owner) headOwner <- users.get(pullRequest.requestUserName) issueUser <- users.get(issue.openedUserName) + assignee = issue.assignedUserName.flatMap { userName => getAccountByUserName(userName, false) } headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName) } yield { WebHookPullRequestPayload( action = action, issue = issue, issueUser = issueUser, + assignee = assignee, pullRequest = pullRequest, headRepository = headRepo, headOwner = headOwner, @@ -273,12 +275,14 @@ import WebHookService._ for{ ((issue, issueUser, pullRequest, baseOwner, headOwner), webHooks) <- getPullRequestsByRequestForWebhook(requestRepository.owner, requestRepository.name, requestBranch) + assignee = issue.assignedUserName.flatMap { userName => getAccountByUserName(userName, false) } baseRepo <- getRepository(pullRequest.userName, pullRequest.repositoryName) } yield { val payload = WebHookPullRequestPayload( action = action, issue = issue, issueUser = issueUser, + assignee = assignee, pullRequest = pullRequest, headRepository = requestRepository, headOwner = headOwner, @@ -306,6 +310,7 @@ baseOwner <- users.get(repository.owner) headOwner <- users.get(pullRequest.requestUserName) issueUser <- users.get(issue.openedUserName) + assignee = issue.assignedUserName.flatMap { userName => getAccountByUserName(userName, false) } headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName) } yield { WebHookPullRequestReviewCommentPayload( @@ -313,6 +318,7 @@ comment = comment, issue = issue, issueUser = issueUser, + assignee = assignee, pullRequest = pullRequest, headRepository = headRepo, headOwner = headOwner, @@ -424,6 +430,7 @@ def apply(action: String, issue: Issue, issueUser: Account, + assignee: Option[Account], pullRequest: PullRequest, headRepository: RepositoryInfo, headOwner: Account, @@ -441,6 +448,7 @@ headRepo = headRepoPayload, baseRepo = baseRepoPayload, user = ApiUser(issueUser), + assignee = assignee.map(ApiUser.apply), mergedComment = mergedComment ) @@ -495,6 +503,7 @@ comment: CommitComment, issue: Issue, issueUser: Account, + assignee: Option[Account], pullRequest: PullRequest, headRepository: RepositoryInfo, headOwner: Account, @@ -502,7 +511,7 @@ baseOwner: Account, sender: Account, mergedComment: Option[(IssueComment, Account)] - ) : WebHookPullRequestReviewCommentPayload = { + ): WebHookPullRequestReviewCommentPayload = { val headRepoPayload = ApiRepository(headRepository, headOwner) val baseRepoPayload = ApiRepository(baseRepository, baseOwner) val senderPayload = ApiUser(sender) @@ -521,6 +530,7 @@ headRepo = headRepoPayload, baseRepo = baseRepoPayload, user = ApiUser(issueUser), + assignee = assignee.map(ApiUser.apply), mergedComment = mergedComment ), repository = baseRepoPayload, diff --git a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala index ecf421a..e78d229 100644 --- a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala +++ b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala @@ -281,7 +281,8 @@ merged_by = Some(apiUser), title = "new-feature", body = "Please pull these awesome changes", - user = apiUser + user = apiUser, + assignee = Some(apiUser) ) val apiPullRequestJson = s"""{ @@ -311,6 +312,7 @@ "title": "new-feature", "body": "Please pull these awesome changes", "user": $apiUserJson, + "assignee": $apiUserJson, "html_url": "${context.baseUrl}/octocat/Hello-World/pull/1347", "url": "${context.baseUrl}/api/v3/repos/octocat/Hello-World/pulls/1347", "commits_url": "${context.baseUrl}/api/v3/repos/octocat/Hello-World/pulls/1347/commits",