From 992a0a6f2cfce88f2330e340005359cbfd1cac32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jovan=20Kruni=C4=87?= Date: Fri, 5 Jul 2019 15:14:48 +0200 Subject: [PATCH] build: update @openstapps/core version Adjust code accordingly Related to #2 --- src/storage/elasticsearch/elasticsearch.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/storage/elasticsearch/elasticsearch.ts b/src/storage/elasticsearch/elasticsearch.ts index 07eba923..d7fa4d8d 100644 --- a/src/storage/elasticsearch/elasticsearch.ts +++ b/src/storage/elasticsearch/elasticsearch.ts @@ -548,20 +548,22 @@ export class Elasticsearch implements Database { throw new Error('Database is undefined. You have to configure the query build'); } + // check if the database version is defined and in the expected format if (typeof this.config.internal.database.version === 'undefined' || typeof this.config.internal.database.version !== 'string') { throw new Error('Database version is malformed. Check your config file'); } + // create elasticsearch configuration out of data from database configuration const esConfig: ElasticsearchConfig = { - name: 'elasticsearch', + name: this.config.internal.database.name as 'elasticsearch', version: this.config.internal.database.version, }; if (typeof this.config.internal.database.query !== 'undefined') { - esConfig.query = - this.config.internal.database - .query as ElasticsearchQueryDisMaxConfig | ElasticsearchQueryQueryStringConfig; + esConfig.query = + this.config.internal.database + .query as ElasticsearchQueryDisMaxConfig | ElasticsearchQueryQueryStringConfig; } const searchRequest: ES.SearchParams = {