fix search api

scalacenter · Feb 16, 2021 · 36d2ead · 36d2ead
1 parent a4d0498
commit 36d2ead
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 18 deletions.
diff --git a/server/src/main/scala/ch.epfl.scala.index.server/routes/api/SearchApi.scala b/server/src/main/scala/ch.epfl.scala.index.server/routes/api/SearchApi.scala
@@ -20,6 +20,7 @@ import com.softwaremill.session.SessionOptions.{refreshable, usingCookies}
 import play.api.libs.json._
 
 import scala.concurrent.ExecutionContext
+import akka.http.scaladsl.model.HttpHeader
 
 object SearchApi {
   implicit val formatProject: OFormat[Project] =
@@ -91,7 +92,8 @@ class SearchApi(
   val routes: Route =
     pathPrefix("api") {
       cors() {
-        path("search") {
+        // deprecated endpoint replaced by api/search endpoint
+        path("search-old") {
           get {
             parameters(
               (
@@ -125,17 +127,6 @@ class SearchApi(
                   sbtVersion
                 )
 
-                def convert(project: Project): SearchApi.Project = {
-                  import project._
-                  val artifacts0 = if (cli) cliArtifacts.toList else artifacts
-                  SearchApi.Project(
-                    organization,
-                    repository,
-                    project.github.flatMap(_.logo.map(_.target)),
-                    artifacts0
-                  )
-                }
-
                 scalaTarget match {
                   case Some(_) =>
                     val searchParams = SearchParams(
@@ -147,7 +138,7 @@ class SearchApi(
                     )
                     val result = dataRepository
                       .findProjects(searchParams)
-                      .map(page => page.items.map(p => convert(p)))
+                      .map(page => page.items.map(convertProject(cli)))
                     complete(OK, result)
 
                   case None =>
@@ -158,6 +149,19 @@ class SearchApi(
             }
           }
         } ~
+          path("search") {
+            get {
+              optionalSession(refreshable, usingCookies) { userId =>
+                val user = session.getUser(userId)
+                searchParams(user) { params =>
+                  val result = dataRepository
+                    .findProjects(params)
+                    .map(page => page.items.map(convertProject(params.cli)))
+                  complete(result)
+                }
+              }
+            }
+          } ~
           path("project") {
             get {
               parameters(
@@ -201,16 +205,25 @@ class SearchApi(
               optionalSession(refreshable, usingCookies) { userId =>
                 val user = session.getUser(userId)
                 searchParams(user) { params =>
-                  complete {
-                    autocomplete(params)
-                  }
+                  val autoCompletion = autocomplete(params)
+                  complete(autoCompletion)
                 }
               }
             }
           }
       }
     }
 
+  private def convertProject(cli: Boolean)(project: Project): SearchApi.Project = {
+    val artifacts = if (cli) project.cliArtifacts.toList else project.artifacts
+    SearchApi.Project(
+      project.organization,
+      project.repository,
+      project.github.flatMap(_.logo.map(_.target)),
+      project.artifacts
+    )
+  }
+
   private def getReleaseOptions(
       projectRef: Project.Reference,
       scalaTarget: Option[ScalaTarget],

diff --git a/server/src/main/scala/ch.epfl.scala.index.server/routes/package.scala b/server/src/main/scala/ch.epfl.scala.index.server/routes/package.scala
@@ -10,29 +10,33 @@ package object routes {
       (
         "q" ? "*",
         "page".as[Int] ? 1,
+        "total".as[Int] ? SearchParams.resultsPerPage,                
         "sort".?,
         "topics".as[String].*,
         "targetTypes".as[String].*,
         "scalaVersions".as[String].*,
         "scalaJsVersions".as[String].*,
         "scalaNativeVersions".as[String].*,
         "sbtVersions".as[String].*,
+        "contributingSearch".as[Boolean] ? false,
+        "cli".as[Boolean] ? false,
         "you".?,
-        "contributingSearch".as[Boolean] ? false
       )
     ).tmap {
       case (
             q,
             page,
+            total,
             sort,
             topics,
             targetTypes,
             scalaVersions,
             scalaJsVersions,
             scalaNativeVersions,
             sbtVersions,
+            contributingSearch,
+            cli,
             you,
-            contributingSearch
           ) =>
         val userRepos = you
           .flatMap(_ => user.map(_.repos))
@@ -42,8 +46,10 @@ package object routes {
           page,
           sort,
           userRepos,
+          total = total,
           topics = topics.toList,
           targetTypes = targetTypes.toList,
+          cli = cli,
           scalaVersions = scalaVersions.toList,
           scalaJsVersions = scalaJsVersions.toList,
           scalaNativeVersions = scalaNativeVersions.toList,