(refs #2)Implementing 'Pull Requests' tab in the dashboard.

src/main/scala/app/DashboardController.scala

@@ -4,11 +4,11 @@ import service._
 import util.UsersAuthenticator
 
 class DashboardController extends DashboardControllerBase
-  with IssuesService with RepositoryService with AccountService
+  with IssuesService with PullRequestService with RepositoryService with AccountService
   with UsersAuthenticator
 
 trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService with RepositoryService with UsersAuthenticator =>
+  self: IssuesService with PullRequestService with RepositoryService with UsersAuthenticator =>
 
   get("/dashboard/issues/repos")(usersOnly {
     searchIssues("all")
@@ -22,6 +22,14 @@ trait DashboardControllerBase extends ControllerBase {
     searchIssues("created_by")
   })
 
+  get("/dashboard/pulls")(usersOnly {
+    searchPullRequests("created_by")
+  })
+
+  get("/dashboard/pulls/public")(usersOnly {
+    searchPullRequests("all")
+  })
+
   private def searchIssues(filter: String) = {
     import IssuesService._
 
@@ -54,4 +62,36 @@ trait DashboardControllerBase extends ControllerBase {
     
   }
 
+  private def searchPullRequests(filter: String) = {
+    import IssuesService._
+    import PullRequestService._
+
+    // condition
+    val sessionKey = "dashboard/pulls"
+    val condition = if(request.getQueryString == null)
+      session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
+    else IssueSearchCondition(request)
+
+    session.put(sessionKey, condition)
+
+    val userName = context.loginAccount.get.userName
+    val repositories = getUserRepositories(userName, baseUrl).map(repo => repo.owner -> repo.name)
+    val filterUser = Map(filter -> userName)
+    val page = IssueSearchCondition.page(request)
+
+    dashboard.html.pulls(
+      pulls.html.listparts(
+        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, repositories: _*),
+        page,
+        countIssue(condition.copy(state = "open"), filterUser, false, repositories: _*),
+        countIssue(condition.copy(state = "closed"), filterUser, false, repositories: _*),
+        condition),
+      countIssue(condition, Map.empty, true, repositories: _*),
+      getPullRequestCount(condition.state == "closed", userName, None),
+      condition,
+      filter)
+
+  }
+
+
 }

src/main/scala/app/PullRequestsController.scala

@@ -386,7 +386,7 @@ trait PullRequestsControllerBase extends ControllerBase {
 
     pulls.html.list(
       searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
-      getPullRequestCount(condition.state == "closed", Some(owner, repoName)),
+      getPullRequestCount(condition.state == "closed", owner, Some(repoName)),
       userName,
       page,
       countIssue(condition.copy(state = "open"), filterUser, true, owner -> repoName),

src/main/scala/service/PullRequestService.scala

@@ -18,13 +18,13 @@ trait PullRequestService { self: IssuesService =>
     } else None
   }
 
-  def getPullRequestCount(closed: Boolean, repository: Option[(String, String)]): List[PullRequestCount] =
+  def getPullRequestCount(closed: Boolean, owner: 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 repository.get._1, repository.isDefined) &&
-        (t1.repositoryName is repository.get._2, repository.isDefined)
+        (t1.userName       is owner.bind) &&
+        (t1.repositoryName is repository.get.bind, repository.isDefined)
       }
       .groupBy { case (t1, t2) => t2.openedUserName }
       .map { case (userName, t) => userName ~ t.length }