@opra/elastic 1.9.1 → 1.9.3

package/cjs/elastic-entity-service.js

@@ -201,13 +201,10 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
                 ? { ids: { values: [command.documentId] } }
                 : undefined,
             options?.filter,
-            options?.request?.query,
+            // options?.request?.query,
         ]);
-        let query = {
-            ...options?.request?.query,
-            ...filterQuery,
-        };
-        if (!Object.keys(query).length)
+        let query = this._mergeQueries(options?.request?.query, filterQuery);
+        if (!(query && Object.keys(query).length))
             query = { match_all: {} };
         const request = {
             from: options?.skip,
@@ -417,6 +414,46 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             throw e;
         }
     }
+    _mergeQueries(requestQuery, filterQuery) {
+        if (requestQuery) {
+            let subQuery = false;
+            if (requestQuery.function_score) {
+                subQuery = true;
+                if (Array.isArray(requestQuery.function_score)) {
+                    requestQuery.function_score.forEach(item => {
+                        item.filter = this._mergeQueries(item.filter, filterQuery);
+                    });
+                }
+                else {
+                    requestQuery.function_score.query = this._mergeQueries(requestQuery.function_score.query, filterQuery);
+                }
+            }
+            if (requestQuery.dis_max) {
+                subQuery = true;
+                requestQuery.dis_max.queries?.map(q => this._mergeQueries(q, filterQuery));
+            }
+            if (requestQuery.constant_score) {
+                subQuery = true;
+                requestQuery.constant_score.filter = this._mergeQueries(requestQuery.constant_score.filter, filterQuery);
+            }
+            if (requestQuery.has_child) {
+                subQuery = true;
+                requestQuery.has_child.query = this._mergeQueries(requestQuery.has_child.query, filterQuery);
+            }
+            if (requestQuery.has_parent) {
+                subQuery = true;
+                requestQuery.has_parent.query = this._mergeQueries(requestQuery.has_parent.query, filterQuery);
+            }
+            if (requestQuery.script_score) {
+                subQuery = true;
+                requestQuery.script_score.query = this._mergeQueries(requestQuery.script_score.query, filterQuery);
+            }
+            return subQuery
+                ? requestQuery
+                : elastic_adapter_js_1.ElasticAdapter.prepareFilter([requestQuery, filterQuery]);
+        }
+        return filterQuery;
+    }
     async _beforeCreate(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     command) {

package/esm/elastic-entity-service.js

@@ -198,13 +198,10 @@ export class ElasticEntityService extends ElasticService {
                 ? { ids: { values: [command.documentId] } }
                 : undefined,
             options?.filter,
-            options?.request?.query,
+            // options?.request?.query,
         ]);
-        let query = {
-            ...options?.request?.query,
-            ...filterQuery,
-        };
-        if (!Object.keys(query).length)
+        let query = this._mergeQueries(options?.request?.query, filterQuery);
+        if (!(query && Object.keys(query).length))
             query = { match_all: {} };
         const request = {
             from: options?.skip,
@@ -414,6 +411,46 @@ export class ElasticEntityService extends ElasticService {
             throw e;
         }
     }
+    _mergeQueries(requestQuery, filterQuery) {
+        if (requestQuery) {
+            let subQuery = false;
+            if (requestQuery.function_score) {
+                subQuery = true;
+                if (Array.isArray(requestQuery.function_score)) {
+                    requestQuery.function_score.forEach(item => {
+                        item.filter = this._mergeQueries(item.filter, filterQuery);
+                    });
+                }
+                else {
+                    requestQuery.function_score.query = this._mergeQueries(requestQuery.function_score.query, filterQuery);
+                }
+            }
+            if (requestQuery.dis_max) {
+                subQuery = true;
+                requestQuery.dis_max.queries?.map(q => this._mergeQueries(q, filterQuery));
+            }
+            if (requestQuery.constant_score) {
+                subQuery = true;
+                requestQuery.constant_score.filter = this._mergeQueries(requestQuery.constant_score.filter, filterQuery);
+            }
+            if (requestQuery.has_child) {
+                subQuery = true;
+                requestQuery.has_child.query = this._mergeQueries(requestQuery.has_child.query, filterQuery);
+            }
+            if (requestQuery.has_parent) {
+                subQuery = true;
+                requestQuery.has_parent.query = this._mergeQueries(requestQuery.has_parent.query, filterQuery);
+            }
+            if (requestQuery.script_score) {
+                subQuery = true;
+                requestQuery.script_score.query = this._mergeQueries(requestQuery.script_score.query, filterQuery);
+            }
+            return subQuery
+                ? requestQuery
+                : ElasticAdapter.prepareFilter([requestQuery, filterQuery]);
+        }
+        return filterQuery;
+    }
     async _beforeCreate(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     command) {

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@opra/elastic",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "description": "Opra Elastic Search adapter package",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "@jsopen/objects": "^1.5.0",
     "tslib": "^2.8.1",
-    "valgen": "^5.12.0"
+    "valgen": "^5.13.0"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": ">=8.7.0 <9",
-    "@opra/common": "^1.9.1",
-    "@opra/core": "^1.9.1"
+    "@opra/common": "^1.9.3",
+    "@opra/core": "^1.9.3"
   },
   "type": "module",
   "exports": {

package/types/elastic-entity-service.d.ts

@@ -278,6 +278,7 @@ export declare class ElasticEntityService<T extends object = any> extends Elasti
      */
     getOutputCodec(operation: string): IsObject.Validator<T>;
     protected _executeCommand(command: ElasticEntityService.CommandInfo, commandFn: () => any): Promise<any>;
+    protected _mergeQueries(requestQuery?: estypes.QueryDslQueryContainer, filterQuery?: estypes.QueryDslQueryContainer): estypes.QueryDslQueryContainer | undefined;
     protected _beforeCreate(command: ElasticEntityService.CreateCommand): Promise<void>;
     protected _beforeUpdate(command: ElasticEntityService.UpdateCommand<T>): Promise<void>;
     protected _beforeUpdateMany(command: ElasticEntityService.UpdateCommand<T>): Promise<void>;