Add search page data in search api result

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

Hide file tree

Showing 2 changed files with 25 additions and 8 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,7 +20,6 @@ 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] =
@@ -32,8 +31,16 @@ object SearchApi {
   case class Project(
       organization: String,
       repository: String,
-      logo: Option[String] = None,
-      artifacts: List[String] = Nil
+      logo: Option[String],
+      stars: Option[Int],
+      forks: Option[Int],
+      contributorCount: Option[Int],
+      topics: Set[String],
+      artifacts: List[String],
+      scalaVersion: List[String],
+      scalaJsVersion: List[String],
+      scalaNativeVersion: List[String],
+      sbtVersion: List[String]
   )
 
   case class ReleaseOptions(
@@ -214,13 +221,23 @@ class SearchApi(
       }
     }
 
-  private def convertProject(cli: Boolean)(project: Project): SearchApi.Project = {
+  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
+      project.github.flatMap(_.stars),
+      project.github.flatMap(_.forks),
+      project.github.map(_.contributorCount),
+      project.github.map(_.topics).getOrElse(Set.empty),
+      project.artifacts,
+      project.scalaVersion,
+      project.sbtVersion,
+      project.scalaJsVersion,
+      project.scalaNativeVersion
     )
   }
 

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,7 +10,7 @@ package object routes {
       (
         "q" ? "*",
         "page".as[Int] ? 1,
-        "total".as[Int] ? SearchParams.resultsPerPage,                
+        "total".as[Int] ? SearchParams.resultsPerPage,
         "sort".?,
         "topics".as[String].*,
         "targetTypes".as[String].*,
@@ -20,7 +20,7 @@ package object routes {
         "sbtVersions".as[String].*,
         "contributingSearch".as[Boolean] ? false,
         "cli".as[Boolean] ? false,
-        "you".?,
+        "you".?
       )
     ).tmap {
       case (
@@ -36,7 +36,7 @@ package object routes {
             sbtVersions,
             contributingSearch,
             cli,
-            you,
+            you
           ) =>
         val userRepos = you
           .flatMap(_ => user.map(_.repos))