Add paging info in search API

scalacenter · Feb 16, 2021 · 3f84d64 · 3f84d64
1 parent 041c971
commit 3f84d64
Showing 1 changed file with 11 additions and 1 deletion.
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
@@ -28,6 +28,10 @@ object SearchApi {
   implicit val formatReleaseOptions: OFormat[ReleaseOptions] =
     Json.format[ReleaseOptions]
 
+  implicit val formatResult: OFormat[Result] =
+    Json.format[Result]
+
+  case class Result(currentPage: Int, pageTotal: Int, items: Seq[Project])
   case class Project(
       organization: String,
       repository: String,
@@ -164,7 +168,13 @@ class SearchApi(
                 searchParams(user) { params =>
                   val result = dataRepository
                     .findProjects(params)
-                    .map(page => page.items.map(convertProject(params.cli)))
+                    .map { page => 
+                      SearchApi.Result(
+                        currentPage = page.pagination.current,
+                        pageTotal = page.pagination.pageCount,
+                        items = page.items.map(convertProject(params.cli))
+                      )
+                    }
                   complete(result)
                 }
               }