Merge pull request #34 from SOFTNETWORK-APP/fix/repl

- Return all requested fields in their original SQL SELECT order
- Flatten inner hits arrays into individual rows. Each inner hit element produces its own row with parent fields duplicated. Recursive for multi-level nesting

Author: fupelaqu

.gitignore

@@ -17,4 +17,6 @@ es8/testkit
 es9/bridge
 es9/testkit
 testkit/target*
-*.sc
+*.sc
+_bmad*
+docker/data

build.sbt

@@ -20,7 +20,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "softclient4es"
 
-ThisBuild / version := "0.16.1"
+ThisBuild / version := "0.17.0"
 
 ThisBuild / scalaVersion := scala213
 

core/src/main/scala/app/softnetwork/elastic/client/AggregateApi.scala

@@ -128,6 +128,7 @@ trait SingleValueAggregateApi
         }
       }
       // Execute the search
+      implicit val context: ConversionContext = NativeContext
       search(sqlQuery)
         .flatMap { response =>
           val results = response.results

core/src/main/scala/app/softnetwork/elastic/client/ElasticClientDelegator.scala

@@ -248,6 +248,9 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
   override def loadSchema(index: String): ElasticResult[Schema] =
     delegate.loadSchema(index)
 
+  override def invalidateSchema(index: String): Unit = delegate.invalidateSchema(index)
+  override def invalidateAllSchemas(): Unit = delegate.invalidateAllSchemas()
+
   override private[client] def executeCreateIndex(
     index: String,
     settings: String,
@@ -1115,7 +1118,9 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
     * @return
     *   the Elasticsearch response
     */
-  override def search(statement: SearchStatement): ElasticResult[ElasticResponse] =
+  override def search(statement: SearchStatement)(implicit
+    context: ConversionContext
+  ): ElasticResult[ElasticResponse] =
     delegate.search(statement)
 
   /** Search for documents / aggregations matching the Elasticsearch query.
@@ -1132,9 +1137,11 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
   override def singleSearch(
     elasticQuery: ElasticQuery,
     fieldAliases: ListMap[String, String],
-    aggregations: ListMap[String, SQLAggregation]
-  ): ElasticResult[ElasticResponse] =
-    delegate.singleSearch(elasticQuery, fieldAliases, aggregations)
+    aggregations: ListMap[String, SQLAggregation],
+    fields: Seq[String] = Seq.empty,
+    nestedHits: Map[String, Seq[(String, String)]] = Map.empty
+  )(implicit context: ConversionContext): ElasticResult[ElasticResponse] =
+    delegate.singleSearch(elasticQuery, fieldAliases, aggregations, fields, nestedHits)
 
   /** Multi-search with Elasticsearch queries.
     *
@@ -1150,9 +1157,11 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
   override def multiSearch(
     elasticQueries: ElasticQueries,
     fieldAliases: ListMap[String, String],
-    aggregations: ListMap[String, SQLAggregation]
-  ): ElasticResult[ElasticResponse] =
-    delegate.multiSearch(elasticQueries, fieldAliases, aggregations)
+    aggregations: ListMap[String, SQLAggregation],
+    fields: Seq[String] = Seq.empty,
+    nestedHits: Map[String, Seq[(String, String)]] = Map.empty
+  )(implicit context: ConversionContext): ElasticResult[ElasticResponse] =
+    delegate.multiSearch(elasticQueries, fieldAliases, aggregations, fields, nestedHits)
 
   /** Asynchronous search for documents / aggregations matching the SQL query.
     *
@@ -1162,7 +1171,8 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
     *   a Future containing the Elasticsearch response
     */
   override def searchAsync(statement: SearchStatement)(implicit
-    ec: ExecutionContext
+    ec: ExecutionContext,
+    context: ConversionContext
   ): Future[ElasticResult[ElasticResponse]] = delegate.searchAsync(statement)
 
   /** Asynchronous search for documents / aggregations matching the Elasticsearch query.
@@ -1179,9 +1189,14 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
   override def singleSearchAsync(
     elasticQuery: ElasticQuery,
     fieldAliases: ListMap[String, String],
-    aggregations: ListMap[String, SQLAggregation]
-  )(implicit ec: ExecutionContext): Future[ElasticResult[ElasticResponse]] =
-    delegate.singleSearchAsync(elasticQuery, fieldAliases, aggregations)
+    aggregations: ListMap[String, SQLAggregation],
+    fields: Seq[String] = Seq.empty,
+    nestedHits: Map[String, Seq[(String, String)]] = Map.empty
+  )(implicit
+    ec: ExecutionContext,
+    context: ConversionContext
+  ): Future[ElasticResult[ElasticResponse]] =
+    delegate.singleSearchAsync(elasticQuery, fieldAliases, aggregations, fields, nestedHits)
 
   /** Asynchronous multi-search with Elasticsearch queries.
     *
@@ -1197,9 +1212,14 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
   override def multiSearchAsync(
     elasticQueries: ElasticQueries,
     fieldAliases: ListMap[String, String],
-    aggregations: ListMap[String, SQLAggregation]
-  )(implicit ec: ExecutionContext): Future[ElasticResult[ElasticResponse]] =
-    delegate.multiSearchAsync(elasticQueries, fieldAliases, aggregations)
+    aggregations: ListMap[String, SQLAggregation],
+    fields: Seq[String] = Seq.empty,
+    nestedHits: Map[String, Seq[(String, String)]] = Map.empty
+  )(implicit
+    ec: ExecutionContext,
+    context: ConversionContext
+  ): Future[ElasticResult[ElasticResponse]] =
+    delegate.multiSearchAsync(elasticQueries, fieldAliases, aggregations, fields, nestedHits)
 
   /** Searches and converts results into typed entities from an SQL query.
     *
@@ -1374,7 +1394,8 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
   /** Create a scrolling source with automatic strategy selection
     */
   override def scroll(statement: SearchStatement, config: ScrollConfig)(implicit
-    system: ActorSystem
+    system: ActorSystem,
+    context: ConversionContext
   ): Source[(ListMap[String, Any], ScrollMetrics), NotUsed] = delegate.scroll(statement, config)
 
   /** Scroll and convert results into typed entities from an SQL query.
@@ -1408,7 +1429,10 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
     fieldAliases: ListMap[String, String],
     aggregations: ListMap[String, SQLAggregation],
     config: ScrollConfig
-  )(implicit system: ActorSystem): Source[ListMap[String, Any], NotUsed] = {
+  )(implicit
+    system: ActorSystem,
+    context: ConversionContext
+  ): Source[ListMap[String, Any], NotUsed] = {
     delegate.scrollClassic(elasticQuery, fieldAliases, aggregations, config)
   }
 
@@ -1417,7 +1441,10 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
     fieldAliases: ListMap[String, String],
     config: ScrollConfig,
     hasSorts: Boolean
-  )(implicit system: ActorSystem): Source[ListMap[String, Any], NotUsed] = {
+  )(implicit
+    system: ActorSystem,
+    context: ConversionContext
+  ): Source[ListMap[String, Any], NotUsed] = {
     delegate.searchAfter(elasticQuery, fieldAliases, config, hasSorts)
   }
 
@@ -1426,7 +1453,7 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
     fieldAliases: ListMap[String, String],
     config: ScrollConfig,
     hasSorts: Boolean
-  )(implicit system: ActorSystem) = {
+  )(implicit system: ActorSystem, context: ConversionContext) = {
     delegate.pitSearchAfter(elasticQuery, fieldAliases, config, hasSorts)
   }