fixed elasticsearch-connector version

levelsbeyond · Jul 7, 2020 · 20b084d · 20b084d
1 parent 28e41ab
commit 20b084d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/source/layers/aws-sdk-layer/nodejs/package.json b/source/layers/aws-sdk-layer/nodejs/package.json
@@ -7,7 +7,7 @@
   "author": "aws-mediaent-solutions",
   "license": "ISC",
   "dependencies": {
-    "aws-sdk": "^2.469.0"
+    "aws-sdk": "^2.709.0"
   },
   "scripts": {
     "pretest": "npm install",

diff --git a/source/layers/core-lib/.eslintrc.json b/source/layers/core-lib/.eslintrc.json
@@ -20,7 +20,18 @@
     "prefer-object-spread": 0,
     "arrow-parens": 0,
     "implicit-arrow-linebreak": 0,
-    "operator-linebreak": 0
+    "operator-linebreak": 0,
+    "no-nested-ternary": 0,
+    "no-param-reassign": 0,
+    "import/no-unresolved": 0,
+    "class-methods-use-this": 0,
+    "no-await-in-loop": 0,
+    "no-continue": 0,
+    "import/no-extraneous-dependencies": 0,
+    "no-unused-vars": 0,
+    "no-plusplus": 0,
+    "no-console": 0,
+    "prefer-destructuring": 0
   },
   "env": {
     "es6": true,

diff --git a/source/layers/core-lib/lib/baseIndex.js b/source/layers/core-lib/lib/baseIndex.js
@@ -7,18 +7,8 @@
 /**
  * @author MediaEnt Solutions
  */
-
-/* eslint-disable class-methods-use-this */
-/* eslint-disable no-unused-vars */
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint-disable no-console */
-/* eslint-disable max-classes-per-file */
-/* eslint-disable import/no-unresolved */
-/* eslint-disable implicit-arrow-linebreak */
 const AWS = require('aws-sdk');
-const {
-  AmazonConnection,
-} = require('aws-elasticsearch-connector');
+const AmazonConnection = require('aws-elasticsearch-connector');
 
 const {
   Client,
@@ -174,7 +164,7 @@ class BaseIndex {
   async searchDocument(params) {
     const size = Number.parseInt(params.pageSize || BaseIndex.Constants.DefaultPageSize, 10);
     const from = Number.parseInt(params.token || 0, 10);
-    const query = params.exact ? params.query : `*${params.query}*`;
+    const operator = params.exact ? 'AND' : 'OR';
 
     const response = await this.client.search({
       index: this.indexName,
@@ -193,7 +183,8 @@ class BaseIndex {
         }],
         query: {
           query_string: {
-            query,
+            default_operator: operator,
+            query: params.query,
           },
         },
       },

diff --git a/source/layers/core-lib/package.json b/source/layers/core-lib/package.json
@@ -5,8 +5,8 @@
   "main": "index.js",
   "private": true,
   "dependencies": {
-    "@elastic/elasticsearch": "^6.8.2",
-    "aws-elasticsearch-connector": "^8.0.0",
+    "@elastic/elasticsearch": "6.8.2",
+    "aws-elasticsearch-connector": "8.0.0",
     "deepmerge": "^2.1.1",
     "mime": "^2.3.1"
   },