From a0c2db7a09a6fad91a0cbb48efe2f211c105a405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= <theophile.diot900@gmail.com>
Date: Mon, 5 Dec 2022 17:18:30 +0100
Subject: [PATCH] Fix how the config is get from the database

---
 src/common/db/Database.py | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/common/db/Database.py b/src/common/db/Database.py
index a89104dfd..d76eca3f3 100644
--- a/src/common/db/Database.py
+++ b/src/common/db/Database.py
@@ -689,8 +689,10 @@ class Database:
                     multisite.append(setting.id)
 
             for service in session.query(Services).with_entities(Services.id).all():
+                checked_settings = []
                 for key, value in deepcopy(config).items():
                     original_key = key
+                    suffix = 0
                     if self.suffix_rx.search(key):
                         suffix = int(key.split("_")[-1])
                         key = key[: -len(str(suffix)) - 1]
@@ -699,21 +701,32 @@ class Database:
                         continue
 
                     config[f"{service.id}_{original_key}"] = value
-                    suffix = 0
 
-                    service_setting = (
+                    if original_key not in checked_settings:
+                        checked_settings.append(original_key)
+                    else:
+                        continue
+
+                    service_settings = (
                         session.query(Services_settings)
                         .with_entities(
                             Services_settings.value,
                             Services_settings.suffix,
                             Services_settings.method,
                         )
-                        .filter_by(service_id=service.id, setting_id=key, suffix=suffix)
-                        .first()
+                        .filter_by(service_id=service.id, setting_id=key)
+                        .all()
                     )
 
-                    if service_setting:
-                        config[f"{service.id}_{original_key}"] = (
+                    for service_setting in service_settings:
+                        config[
+                            f"{service.id}_{key}"
+                            + (
+                                f"_{service_setting.suffix}"
+                                if service_setting.suffix > 0
+                                else ""
+                            )
+                        ] = (
                             service_setting.value
                             if methods is False
                             else {