Merge pull request #94 from maximehuran/feature/improve-search-accuracy

Improve search accurary, boost name match, and add code search
monsieurbiz · Aug 31, 2021 · 0f1ef8a · 0f1ef8a
2 parents c6c26cb + eaa2e9c
commit 0f1ef8a
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 28 deletions.
diff --git a/src/Resources/config/elasticsearch/queries/instant.yaml b/src/Resources/config/elasticsearch/queries/instant.yaml
@@ -8,17 +8,49 @@ query:
       - term:
           channel: "{{CHANNEL}}"
     must:
-      nested:
-        path: attributes
-        query:
-          bool:
-            must:
-              multi_match:
-                query: "{{QUERY}}"
-                fields:
-                  - attributes.value
-                fuzziness: 1
-            should:
-              rank_feature:
-                field: attributes.score
-                boost: 100
+      - bool:
+          should:
+            - term:
+                code: "{{QUERY}}"
+            - nested:
+                path: attributes
+                query:
+                  - bool:
+                      filter:
+                        - multi_match:
+                            query: "{{QUERY}}"
+                            fields:
+                              - attributes.value
+                            fuzziness: 1
+                      should:
+                        - rank_feature:
+                            field: attributes.score
+                        - multi_match:
+                            query: "{{QUERY}}"
+                            fields:
+                              - attributes.value^2
+    should:
+      - nested:
+          path: attributes
+          query:
+            - bool:
+                must:
+                  - multi_match:
+                      query: "{{QUERY}}"
+                      fields:
+                        - attributes.value^6
+                  - multi_match:
+                      query: "name"
+                      fields:
+                        - attributes.code
+            - bool:
+                must:
+                  - multi_match:
+                      query: "{{QUERY}}"
+                      fields:
+                        - attributes.value^4
+                      fuzziness: 1
+                  - multi_match:
+                      query: "name"
+                      fields:
+                        - attributes.code
diff --git a/src/Resources/config/elasticsearch/queries/search.yaml b/src/Resources/config/elasticsearch/queries/search.yaml
@@ -8,17 +8,49 @@ query:
       - term:
           channel: "{{CHANNEL}}"
     must:
-      nested:
-        path: attributes
-        query:
-          bool:
-            must:
-              multi_match:
-                query: "{{QUERY}}"
-                fields:
-                  - attributes.value
-                fuzziness: 1
-            should:
-              rank_feature:
-                field: attributes.score
-                boost: 100
+      - bool:
+          should:
+            - term:
+                code: "{{QUERY}}"
+            - nested:
+                path: attributes
+                query:
+                  - bool:
+                      filter:
+                        - multi_match:
+                            query: "{{QUERY}}"
+                            fields:
+                              - attributes.value
+                            fuzziness: 1
+                      should:
+                        - rank_feature:
+                            field: attributes.score
+                        - multi_match:
+                            query: "{{QUERY}}"
+                            fields:
+                              - attributes.value^2
+    should:
+      - nested:
+          path: attributes
+          query:
+            - bool:
+                must:
+                  - multi_match:
+                      query: "{{QUERY}}"
+                      fields:
+                        - attributes.value^6
+                  - multi_match:
+                      query: "name"
+                      fields:
+                        - attributes.code
+            - bool:
+                must:
+                  - multi_match:
+                      query: "{{QUERY}}"
+                      fields:
+                        - attributes.value^4
+                      fuzziness: 1
+                  - multi_match:
+                      query: "name"
+                      fields:
+                        - attributes.code