Fix code remarks

lambdaworks · Nov 21, 2023 · d1561c0 · d1561c0
1 parent 0a8bbe1
commit d1561c0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/modules/integration/src/test/scala/zio/elasticsearch/HttpExecutorSpec.scala b/modules/integration/src/test/scala/zio/elasticsearch/HttpExecutorSpec.scala
@@ -467,7 +467,7 @@ object HttpExecutorSpec extends IntegrationSpec {
             Executor.execute(ElasticRequest.createIndex(firstSearchIndex)),
             Executor.execute(ElasticRequest.deleteIndex(firstSearchIndex)).orDie
           ),
-          test("aggregate using terms aggregation") {
+          test("aggregate using terms aggregation with max aggregation as a sub aggregation") {
             checkOnce(genDocumentId, genTestDocument, genDocumentId, genTestDocument) {
               (firstDocumentId, firstDocument, secondDocumentId, secondDocument) =>
                 for {

diff --git a/modules/library/src/main/scala/zio/elasticsearch/executor/response/AggregationResponse.scala b/modules/library/src/main/scala/zio/elasticsearch/executor/response/AggregationResponse.scala
@@ -118,7 +118,7 @@ private[elasticsearch] object AvgAggregationResponse {
   implicit val decoder: JsonDecoder[AvgAggregationResponse] = DeriveJsonDecoder.gen[AvgAggregationResponse]
 }
 
-private[elasticsearch] sealed trait BucketDecoder extends JsonDecoderOps {
+private[elasticsearch] sealed trait BucketDecoder {
   implicit class BucketDecoder(fields: Chunk[(String, Json)]) {
     val allFields: Map[String, Any] = fields.flatMap { case (field, data) =>
       field match {
@@ -156,6 +156,8 @@ private[elasticsearch] sealed trait BucketDecoder extends JsonDecoderOps {
                   )
                 )
               )
+            case str if str.contains("filter#") =>
+              Some(field -> data.unsafeAs[FilterAggregationResponse](FilterAggregationResponse.decoder))
             case str if str.contains("max#") =>
               Some(field -> MaxAggregationResponse(value = objFields("value").unsafeAs[Double]))
             case str if str.contains("min#") =>
@@ -199,6 +201,8 @@ private[elasticsearch] sealed trait BucketDecoder extends JsonDecoderOps {
             (field.split("#")(1), data.asInstanceOf[CardinalityAggregationResponse])
           case str if str.contains("extended_stats#") =>
             (field.split("#")(1), data.asInstanceOf[ExtendedStatsAggregationResponse])
+          case str if str.contains("filter#") =>
+            (field.split("#")(1), data.asInstanceOf[FilterAggregationResponse])
           case str if str.contains("max#") =>
             (field.split("#")(1), data.asInstanceOf[MaxAggregationResponse])
           case str if str.contains("min#") =>
@@ -220,6 +224,13 @@ private[elasticsearch] sealed trait BucketDecoder extends JsonDecoderOps {
         }
     }
   }
+
+  implicit class JsonDecoderOps(json: Json) {
+    def unsafeAs[A](implicit decoder: JsonDecoder[A]): A =
+      (json.as[A]: @unchecked) match {
+        case Right(decoded) => decoded
+      }
+  }
 }
 
 private[elasticsearch] final case class CardinalityAggregationResponse(value: Int) extends AggregationResponse
@@ -273,15 +284,6 @@ private[elasticsearch] object FilterAggregationResponse extends BucketDecoder {
   }
 }
 
-private[elasticsearch] sealed trait JsonDecoderOps {
-  implicit class JsonDecoderOps(json: Json) {
-    def unsafeAs[A](implicit decoder: JsonDecoder[A]): A =
-      (json.as[A]: @unchecked) match {
-        case Right(decoded) => decoded
-      }
-  }
-}
-
 private[elasticsearch] final case class MaxAggregationResponse(value: Double) extends AggregationResponse
 
 private[elasticsearch] object MaxAggregationResponse {