diff --git a/src/main/scala/app/DashboardController.scala b/src/main/scala/app/DashboardController.scala index 8fe73bf..bf5e11e 100644 --- a/src/main/scala/app/DashboardController.scala +++ b/src/main/scala/app/DashboardController.scala @@ -96,7 +96,7 @@ condition, None, false), - getPullRequestCountGroupByUser(condition.state == "closed", userName, None), + getPullRequestCountGroupByUser(condition.state == "closed", None, None), getRepositoryNamesOfUser(userName).map { RepoName => (userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0)) }.sortBy(_._3).reverse, diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 0f08602..174160f 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -466,7 +466,7 @@ pulls.html.list( searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName), - getPullRequestCountGroupByUser(condition.state == "closed", owner, Some(repoName)), + getPullRequestCountGroupByUser(condition.state == "closed", Some(owner), Some(repoName)), userName, page, countIssue(condition.copy(state = "open" ), filterUser, true, owner -> repoName), diff --git a/src/main/scala/service/PullRequestService.scala b/src/main/scala/service/PullRequestService.scala index 07f7145..34254ae 100644 --- a/src/main/scala/service/PullRequestService.scala +++ b/src/main/scala/service/PullRequestService.scala @@ -19,12 +19,12 @@ .map(pr => pr.commitIdTo ~ pr.commitIdFrom) .update((commitIdTo, commitIdFrom)) - def getPullRequestCountGroupByUser(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] = + def getPullRequestCountGroupByUser(closed: Boolean, owner: Option[String], repository: Option[String]): List[PullRequestCount] = Query(PullRequests) .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) } .filter { case (t1, t2) => (t2.closed is closed.bind) && - (t1.userName is owner.bind) && + (t1.userName is owner.get.bind, owner.isDefined) && (t1.repositoryName is repository.get.bind, repository.isDefined) } .groupBy { case (t1, t2) => t2.openedUserName }