From f5c6b64cd900ee54b79a304605fbc8256e15af55 Mon Sep 17 00:00:00 2001
From: cvermand <33010418+bidoubiwa@users.noreply.github.com>
Date: Wed, 10 Jun 2020 12:20:11 +0200
Subject: [PATCH] Fixes bug with custom settings (#28)

* Fixes bug with custom settings

* remove unecessary duplicate
---
 scraper/src/config/config_loader.py         | 2 +-
 scraper/src/meilisearch_helper.py           | 6 ++++--
 scraper/src/tests/config_loader/abstract.py | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scraper/src/config/config_loader.py b/scraper/src/config/config_loader.py
index 0bab415..59b5379 100644
--- a/scraper/src/config/config_loader.py
+++ b/scraper/src/config/config_loader.py
@@ -26,7 +26,7 @@ class ConfigLoader:
     allowed_domains = None
     api_key = None
     app_id = None
-    custom_settings = None
+    custom_settings = {}
     extra_records = []
     index_uid = None
     index_uid_tmp = None
diff --git a/scraper/src/meilisearch_helper.py b/scraper/src/meilisearch_helper.py
index 3383f90..ac0e269 100644
--- a/scraper/src/meilisearch_helper.py
+++ b/scraper/src/meilisearch_helper.py
@@ -103,9 +103,11 @@ class MeiliSearchHelper:
 
     def __init__(self, host_url, api_key, index_uid, custom_settings):
         self.meilisearch_client = meilisearch.Client(host_url, api_key)
-        self.__delete_and_create_index(index_uid)
         self.meilisearch_index = self.__delete_and_create_index(index_uid)
-        settings = {**MeiliSearchHelper.SETTINGS, **custom_settings}
+        self.add_settings(MeiliSearchHelper.SETTINGS, custom_settings)
+
+    def add_settings(self, default_settings, custom_settings):
+        settings = {**default_settings, **custom_settings}
         self.meilisearch_index.update_settings(settings)
 
     def add_records(self, records, url, from_sitemap):
diff --git a/scraper/src/tests/config_loader/abstract.py b/scraper/src/tests/config_loader/abstract.py
index c9f230f..6b0ea9f 100644
--- a/scraper/src/tests/config_loader/abstract.py
+++ b/scraper/src/tests/config_loader/abstract.py
@@ -7,7 +7,7 @@ def config(additional_config={}):
         'allowed_domains': 'allowed_domains',
         'api_key': 'api_key',
         'app_id': 'app_id',
-        'custom_settings': {},
+        'custom_settings': None,
         'hash_strategy': 'hash_strategy',
         'index_uid': 'index_uid',
         'selectors': [],