Refactor code

lambdaworks · May 12, 2023 · 3e21d1d · 3e21d1d
1 parent 2745f22
commit 3e21d1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/modules/library/src/main/scala/zio/elasticsearch/ElasticRequest.scala b/modules/library/src/main/scala/zio/elasticsearch/ElasticRequest.scala
@@ -360,7 +360,9 @@ object ElasticRequest {
   sealed trait AggregateRequest extends ElasticRequest[AggregationResult]
 
   private[elasticsearch] final case class Aggregate(index: IndexName, aggregation: ElasticAggregation)
-      extends AggregateRequest
+      extends AggregateRequest {
+    def toJson: Json = Obj("aggs" -> aggregation.toJson)
+  }
 
   sealed trait BulkRequest
       extends ElasticRequest[BulkResponse]
@@ -423,6 +425,8 @@ object ElasticRequest {
   ) extends CountRequest { self =>
     def routing(value: Routing): CountRequest =
       self.copy(routing = Some(value))
+
+    def toJson: Json = query.fold(Obj())(q => Obj("query" -> q.toJson(fieldPath = None)))
   }
 
   sealed trait CreateRequest
@@ -522,6 +526,8 @@ object ElasticRequest {
 
     def routing(value: Routing): DeleteByQueryRequest =
       self.copy(routing = Some(value))
+
+    def toJson: Json = Obj("query" -> query.toJson(fieldPath = None))
   }
 
   sealed trait DeleteIndexRequest extends ElasticRequest[DeletionOutcome]

diff --git a/modules/library/src/main/scala/zio/elasticsearch/executor/HttpExecutor.scala b/modules/library/src/main/scala/zio/elasticsearch/executor/HttpExecutor.scala
@@ -114,7 +114,7 @@ private[elasticsearch] final class HttpExecutor private (esConfig: ElasticConfig
         .post(uri"${esConfig.uri}/${r.index}/$Search?typed_keys")
         .response(asJson[SearchWithAggregationsResponse])
         .contentType(ApplicationJson)
-        .body(Obj("aggs" -> r.aggregation.toJson))
+        .body(r.toJson)
     ).flatMap { response =>
       response.code match {
         case HttpOk =>
@@ -156,10 +156,9 @@ private[elasticsearch] final class HttpExecutor private (esConfig: ElasticConfig
       .get(uri"${esConfig.uri}/${r.index}/$Count".withParams(getQueryParams(List(("routing", r.routing)))))
       .contentType(ApplicationJson)
       .response(asJson[CountResponse])
+      .body()
 
-    sendRequestWithCustomResponse(
-      r.query.fold(req)(query => req.body(Obj("query" -> query.toJson(fieldPath = None))))
-    ).flatMap { response =>
+    sendRequestWithCustomResponse(r.query.fold(req)(_ => req.body(r.toJson))).flatMap { response =>
       response.code match {
         case HttpOk =>
           response.body
@@ -288,7 +287,7 @@ private[elasticsearch] final class HttpExecutor private (esConfig: ElasticConfig
       baseRequest
         .post(uri)
         .contentType(ApplicationJson)
-        .body(Obj("query" -> r.query.toJson(fieldPath = None)))
+        .body(r.toJson)
     ).flatMap { response =>
       response.code match {
         case HttpOk       => ZIO.succeed(DeletionOutcome.Deleted)