Enable elastic query syntax (#1202)

BykhovDenis · web-flow · commit e875f51ad3b4 · 2022-03-25T16:04:46.000+07:00
Signed-off-by: Denis Bykhov &lt;80476319+BykhovDenis@users.noreply.github.com&gt;
diff --git a/server/elastic/src/adapter.ts b/server/elastic/src/adapter.ts
@@ -27,14 +27,13 @@ class ElasticAdapter implements FullTextAdapter {
 
   async search (_class: Ref<Class<Doc>>, query: DocumentQuery<Doc>, size: number | undefined, from: number | undefined): Promise<IndexedDoc[]> {
     if (query.$search === undefined) return []
-    const search = query.$search.replace(/[\\/+\-=&><!()|{}^"~*&:[\]]/g, '\\$&')
-
     const request: any = {
       bool: {
         must: [
           {
-            multi_match: {
-              query: search
+            query_string: {
+              query: query.$search,
+              default_operator: 'and'
             }
           }
         ],

Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,13 @@ class ElasticAdapter implements FullTextAdapter {`
`27`	`27`
`28`	`28`	`async search (_class: Ref<Class<Doc>>, query: DocumentQuery<Doc>, size: number \| undefined, from: number \| undefined): Promise<IndexedDoc[]> {`
`29`	`29`	`if (query.$search === undefined) return []`
`30`		`- const search = query.$search.replace(/[\\/+\-=&><!()\|{}^"~*&:[\]]/g, '\\$&')`
`31`		`-`
`32`	`30`	`const request: any = {`
`33`	`31`	`bool: {`
`34`	`32`	`must: [`
`35`	`33`	`{`
`36`		`- multi_match: {`
`37`		`- query: search`
	`34`	`+ query_string: {`
	`35`	`+ query: query.$search,`
	`36`	`+ default_operator: 'and'`
`38`	`37`	`}`
`39`	`38`	`}`
`40`	`39`	`],`