OK-711: example of making domain objects for queries

europass-publisher/src/main/scala/fi/oph/kouta/europass/ElasticClient.scala

@@ -12,18 +12,28 @@ import java.util.concurrent.CompletableFuture
 
 import scala.collection.immutable.Stream.concat
 
+abstract class Query
+
+case class MatchQuery(`match`: Map[String, String]) extends Query
+
+case class Search(
+  query: Query,
+  size: Integer,
+  sort: Map[String, String],
+  search_after: Option[List[String]]
+)
+
 object ElasticQueries {
   import org.json4s.JsonDSL._
+  implicit val formats = DefaultFormats
 
-  def toteutusSearch(after: Option[String]) : JValue = {
-    val query = (("query" -> ("match" -> ("tila" -> "julkaistu"))) ~
-                  ("size" -> 1000) ~
-                  ("sort" -> ("oid.keyword" -> "asc")))
-    after match {
-      case None => query
-      case Some(s) => query ~ ("search_after" -> List(after))
-    }
-  }
+  def toteutusSearch(after: Option[String]) : JValue =
+    Extraction.decompose(Search(
+      MatchQuery(Map("tila" -> "julkaistu")),
+      1000,
+      Map("oid.keyword" -> "asc"),
+      after.map(List(_))
+    ))
 }
 
 object ElasticClient extends Logging with KoutaJsonFormats {