to fix sql query specifications

Author: fupelaqu

bridge/src/test/scala/app/softnetwork/elastic/sql/SQLQuerySpec.scala

@@ -1205,11 +1205,6 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
         |        }
         |      },
         |      "aggs": {
-        |        "ct": {
-        |          "value_count": {
-        |            "field": "identifier2"
-        |          }
-        |        },
         |        "lastSeen": {
         |          "max": {
         |            "field": "createdAt",
@@ -1218,6 +1213,11 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
         |              "source": "def param1 = (doc['createdAt'].size() == 0 ? null : doc['createdAt'].value); (param1 == null) ? null : LocalDate.parse(param1, DateTimeFormatter.ofPattern(\"yyyy-MM-dd\"))"
         |            }
         |          }
+        |        },
+        |        "ct": {
+        |          "value_count": {
+        |            "field": "identifier2"
+        |          }
         |        }
         |      }
         |    }
@@ -1373,11 +1373,6 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
         |        }
         |      },
         |      "aggs": {
-        |        "ct": {
-        |          "value_count": {
-        |            "field": "identifier2"
-        |          }
-        |        },
         |        "lastSeen": {
         |          "max": {
         |            "field": "createdAt",
@@ -1386,6 +1381,11 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
         |              "source": "def param1 = (doc['createdAt'].size() == 0 ? null : doc['createdAt'].value); (param1 == null) ? null : ZonedDateTime.parse(param1, DateTimeFormatter.ofPattern(\"yyyy-MM-dd HH:mm:ss.SSS XXX\")).truncatedTo(ChronoUnit.MINUTES).get(ChronoField.YEAR)"
         |            }
         |          }
+        |        },
+        |        "ct": {
+        |          "value_count": {
+        |            "field": "identifier2"
+        |          }
         |        }
         |      }
         |    }

es6/bridge/src/test/scala/app/softnetwork/elastic/sql/SQLQuerySpec.scala

@@ -1205,11 +1205,6 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       |        }
       |      },
       |      "aggs": {
-      |        "ct": {
-      |          "value_count": {
-      |            "field": "identifier2"
-      |          }
-      |        },
       |        "lastSeen": {
       |          "max": {
       |            "field": "createdAt",
@@ -1218,6 +1213,11 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       |              "source": "def param1 = (doc['createdAt'].size() == 0 ? null : doc['createdAt'].value); (param1 == null) ? null : LocalDate.parse(param1, DateTimeFormatter.ofPattern(\"yyyy-MM-dd\"))"
       |            }
       |          }
+      |        },
+      |        "ct": {
+      |          "value_count": {
+      |            "field": "identifier2"
+      |          }
       |        }
       |      }
       |    }
@@ -1373,11 +1373,6 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       |        }
       |      },
       |      "aggs": {
-      |        "ct": {
-      |          "value_count": {
-      |            "field": "identifier2"
-      |          }
-      |        },
       |        "lastSeen": {
       |          "max": {
       |            "field": "createdAt",
@@ -1386,6 +1381,11 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       |              "source": "def param1 = (doc['createdAt'].size() == 0 ? null : doc['createdAt'].value); (param1 == null) ? null : ZonedDateTime.parse(param1, DateTimeFormatter.ofPattern(\"yyyy-MM-dd HH:mm:ss.SSS XXX\")).truncatedTo(ChronoUnit.MINUTES).get(ChronoField.YEAR)"
       |            }
       |          }
+      |        },
+      |        "ct": {
+      |          "value_count": {
+      |            "field": "identifier2"
+      |          }
       |        }
       |      }
       |    }

sql/src/main/scala/app/softnetwork/elastic/sql/function/aggregate/package.scala

@@ -216,7 +216,7 @@ package object aggregate {
     override def window: Window = ARRAY_AGG
     override def withPartitionBy(partitionBy: Seq[Identifier]): WindowFunction =
       this.copy(partitionBy = partitionBy)
-    override def withFields(fields: Seq[Field]): WindowFunction = this.copy(fields = fields)
+    override def withFields(fields: Seq[Field]): WindowFunction = this
     override def update(request: SQLSearchRequest): WindowFunction = super
       .update(request)
       .asInstanceOf[ArrayAgg]