Merge pull request '#293_complaints' (#326) from #293_complaints into 1.1.0

Reviewed-on: sh-edraft.de/kd_discord_bot#326
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>

kdb-bot/.cpl/schematic_db_table.py

@@ -1,100 +0,0 @@
-from cpl_cli.abc.generate_schematic_abc import GenerateSchematicABC
-
-
-class DBTable(GenerateSchematicABC):
-    def __init__(self, *args: str):
-        GenerateSchematicABC.__init__(self, *args)
-        self._name = self._name.replace("_db_table", "")
-        self._class_name = self._class_name.split("Db_table")[0]
-
-    def get_code(self) -> str:
-        import textwrap
-
-        code = textwrap.dedent(
-            """\
-                from datetime import datetime
-
-                from cpl_core.database import TableABC
-                
-                
-                class $ClassName(TableABC):
-                    def __init__(
-                        self,
-                        value: str,
-                        created_at: datetime = None,
-                        modified_at: datetime = None,
-                        id=0,
-                    ):
-                        self._id = id
-                        self._value = value
-                
-                        TableABC.__init__(self)
-                        self._created_at = created_at if created_at is not None else self._created_at
-                        self._modified_at = modified_at if modified_at is not None else self._modified_at
-                
-                    @property
-                    def value(self) -> str:
-                        return self._value
-                
-                    @value.setter
-                    def value(self, value: str):
-                        self._value = value
-                
-                    @staticmethod
-                    def get_select_all_string() -> str:
-                        return str(
-                            f\"""
-                                SELECT * FROM `$TableName`;
-                            \"""
-                        )
-                
-                    @staticmethod
-                    def get_select_by_id_string(id: int) -> str:
-                        return str(
-                            f\"""
-                                SELECT * FROM `$TableName`
-                                WHERE `Id` = {id};
-                            \"""
-                        )
-                
-                    @property
-                    def insert_string(self) -> str:
-                        return str(
-                            f\"""
-                                INSERT INTO `$TableName` (
-                                    `Value`
-                                ) VALUES (
-                                    {self._value}
-                                );
-                            \"""
-                        )
-                
-                    @property
-                    def udpate_string(self) -> str:
-                        return str(
-                            f\"""
-                                UPDATE `$TableName`
-                                SET `Value` = {self._value}
-                                WHERE `Id` = {self._id};
-                            \"""
-                        )
-                
-                    @property
-                    def delete_string(self) -> str:
-                        return str(
-                            f\"""
-                                DELETE FROM `$TableName`
-                                WHERE `Id` = {self._id};
-                            \"""
-                        )
-            """
-        )
-        return self.build_code_str(
-            code,
-            ClassName=self._class_name,
-            TableName=self._class_name,
-        )
-
-    @classmethod
-    def register(cls):
-        GenerateSchematicABC.register(cls, "db-table", [])

kdb-bot/.cpl/schematic_migration.py

@@ -1,55 +0,0 @@
-from cpl_cli.abc.generate_schematic_abc import GenerateSchematicABC
-
-
-class Migration(GenerateSchematicABC):
-    def __init__(self, *args: str):
-        GenerateSchematicABC.__init__(self, *args)
-
-    def get_code(self) -> str:
-        import textwrap
-
-        code = textwrap.dedent(
-            """\
-                from bot_core.logging.database_logger import DatabaseLogger
-                from bot_data.abc.migration_abc import MigrationABC
-                from bot_data.db_context import DBContext
-                
-                
-                class $ClassName(MigrationABC):
-                    name = "1.0_$ClassName"
-                
-                    def __init__(self, logger: DatabaseLogger, db: DBContext):
-                        MigrationABC.__init__(self)
-                        self._logger = logger
-                        self._db = db
-                        self._cursor = db.cursor
-                
-                    def upgrade(self):
-                        self._logger.debug(__name__, "Running upgrade")
-                
-                        self._cursor.execute(
-                            str(
-                                f\"""
-                                    CREATE TABLE IF NOT EXISTS `$TableName` (
-                                        `Id` BIGINT NOT NULL AUTO_INCREMENT,
-                                        `CreatedAt` DATETIME(6),
-                                        `LastModifiedAt` DATETIME(6),
-                                        PRIMARY KEY(`Id`)
-                                    );
-                                \"""
-                            )
-                        )
-                
-                    def downgrade(self):
-                        self._cursor.execute("DROP TABLE `$TableName`;")
-            """
-        )
-        return self.build_code_str(
-            code,
-            ClassName=self._class_name,
-            TableName=self._class_name.split("Migration")[0],
-        )
-
-    @classmethod
-    def register(cls):
-        GenerateSchematicABC.register(cls, "migration", [])

kdb-bot/.cpl/schematic_query.py

@@ -1,7 +1,7 @@
 from cpl_cli.abc.generate_schematic_abc import GenerateSchematicABC
 
 
-class Query(GenerateSchematicABC):
+class query(GenerateSchematicABC):
     def __init__(self, *args: str):
         GenerateSchematicABC.__init__(self, *args)
 

kdb-bot/cpl-workspace.json

@@ -11,7 +11,6 @@
       "auto-role": "src/modules/auto_role/auto-role.json",
       "base": "src/modules/base/base.json",
       "boot-log": "src/modules/boot_log/boot-log.json",
-      "config": "src/modules/config/config.json",
       "database": "src/modules/database/database.json",
       "level": "src/modules/level/level.json",
       "permission": "src/modules/permission/permission.json",

kdb-bot/src/bot/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot/application.py

@@ -71,7 +71,7 @@ class Application(DiscordBotApplicationABC):
                 self._api.stop()
 
             await self._bot.close()
-            await self._data_integrity.check_data_integrity(is_for_shutdown=True)
+            self._data_integrity.check_data_integrity(is_for_shutdown=True)
             self._logger.info(__name__, f"Stopped {DiscordBotService.__name__}")
         except Exception as e:
             self._logger.error(__name__, "stop failed", e)

kdb-bot/src/bot/bot.json

@@ -3,8 +3,8 @@
     "Name": "bot",
     "Version": {
       "Major": "1",
-      "Minor": "1",
-      "Micro": "0"
+      "Minor": "0",
+      "Micro": "7"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,26 +16,24 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2023.4.0.post5",
+      "cpl-core==2023.4.0.post2",
       "cpl-translation==2023.4.0.post1",
       "cpl-query==2023.4.0.post1",
       "cpl-discord==2023.4.0.post3",
       "Flask==2.3.2",
       "Flask-Classful==0.14.2",
-      "Flask-Cors==4.0.0",
-      "PyJWT==2.8.0",
+      "Flask-Cors==3.0.10",
+      "PyJWT==2.7.0",
       "waitress==2.1.2",
       "Flask-SocketIO==5.3.4",
       "eventlet==0.33.3",
       "requests-oauthlib==1.3.1",
       "icmplib==3.0.3",
-      "ariadne==0.20.1",
-      "cryptography==41.0.2",
-      "discord>=2.3.2"
+      "ariadne==0.19.1"
     ],
     "DevDependencies": [
       "cpl-cli==2023.4.0.post3",
-      "pygount==1.6.1"
+      "pygount==1.5.1"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},
@@ -60,11 +58,9 @@
       "../bot_core/bot-core.json",
       "../bot_data/bot-data.json",
       "../bot_graphql/bot-graphql.json",
-      "../modules/achievements/achievements.json",
       "../modules/auto_role/auto-role.json",
       "../modules/base/base.json",
       "../modules/boot_log/boot-log.json",
-      "../modules/config/config.json",
       "../modules/database/database.json",
       "../modules/level/level.json",
       "../modules/permission/permission.json",

kdb-bot/src/bot/extension/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot.extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot/extension/init_bot_extension.py

@@ -3,7 +3,7 @@ from cpl_core.configuration import ConfigurationABC
 from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_discord.service import DiscordBotServiceABC
 
-from bot_data.model.technician_config import TechnicianConfig
+from bot_core.configuration.bot_settings import BotSettings
 
 
 class InitBotExtension(ApplicationExtensionABC):
@@ -11,6 +11,6 @@ class InitBotExtension(ApplicationExtensionABC):
         ApplicationExtensionABC.__init__(self)
 
     async def run(self, config: ConfigurationABC, services: ServiceProviderABC):
-        settings = config.get_configuration(TechnicianConfig)
+        settings = config.get_configuration(BotSettings)
 
         bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC, max_messages=settings.cache_max_messages)

kdb-bot/src/bot/main.py

@@ -15,7 +15,6 @@ from bot.startup_settings_extension import StartupSettingsExtension
 from bot_api.app_api_extension import AppApiExtension
 from bot_core.core_extension.core_extension import CoreExtension
 from modules.boot_log.boot_log_extension import BootLogExtension
-from modules.config.config_extension import ConfigExtension
 from modules.database.database_extension import DatabaseExtension
 
 
@@ -31,10 +30,9 @@ class Program:
             .use_extension(StartupDiscordExtension)
             .use_extension(StartupModuleExtension)
             .use_extension(StartupMigrationExtension)
-            .use_extension(DatabaseExtension)
-            .use_extension(ConfigExtension)
             .use_extension(InitBotExtension)
             .use_extension(BootLogExtension)
+            .use_extension(DatabaseExtension)
             .use_extension(AppApiExtension)
             .use_extension(CoreExtension)
             .use_startup(Startup)

kdb-bot/src/bot/module_list.py

@@ -9,7 +9,6 @@ from modules.achievements.achievements_module import AchievementsModule
 from modules.auto_role.auto_role_module import AutoRoleModule
 from modules.base.base_module import BaseModule
 from modules.boot_log.boot_log_module import BootLogModule
-from modules.config.config_module import ConfigModule
 from modules.database.database_module import DatabaseModule
 from modules.level.level_module import LevelModule
 from modules.permission.permission_module import PermissionModule
@@ -25,10 +24,9 @@ class ModuleList:
             [
                 CoreModule,  # has to be first!
                 DataModule,
-                ConfigModule,  # has to be before db check
-                DatabaseModule,
                 GraphQLModule,
                 PermissionModule,
+                DatabaseModule,
                 AutoRoleModule,
                 BaseModule,
                 LevelModule,

kdb-bot/src/bot/startup_migration_extension.py

@@ -9,8 +9,6 @@ from bot_data.migration.api_key_migration import ApiKeyMigration
 from bot_data.migration.api_migration import ApiMigration
 from bot_data.migration.auto_role_fix1_migration import AutoRoleFix1Migration
 from bot_data.migration.auto_role_migration import AutoRoleMigration
-from bot_data.migration.config_feature_flags_migration import ConfigFeatureFlagsMigration
-from bot_data.migration.config_migration import ConfigMigration
 from bot_data.migration.db_history_migration import DBHistoryMigration
 from bot_data.migration.initial_migration import InitialMigration
 from bot_data.migration.level_migration import LevelMigration
@@ -46,5 +44,3 @@ class StartupMigrationExtension(StartupExtensionABC):
         services.add_transient(MigrationABC, UserWarningMigration)  # 21.02.2023 #35 - 1.0.0
         services.add_transient(MigrationABC, DBHistoryMigration)  # 06.03.2023 #246 - 1.0.0
         services.add_transient(MigrationABC, AchievementsMigration)  # 14.06.2023 #268 - 1.1.0
-        services.add_transient(MigrationABC, ConfigMigration)  # 19.07.2023 #127 - 1.1.0
-        services.add_transient(MigrationABC, ConfigFeatureFlagsMigration)  # 15.08.2023 #334 - 1.1.0

kdb-bot/src/bot/startup_settings_extension.py

@@ -1,6 +1,6 @@
 import os
 from datetime import datetime
-from typing import Optional, Type, Callable
+from typing import Callable, Type, Optional
 
 from cpl_core.application import StartupExtensionABC
 from cpl_core.configuration import ConfigurationABC
@@ -8,6 +8,10 @@ from cpl_core.dependency_injection import ServiceCollectionABC
 from cpl_core.environment import ApplicationEnvironmentABC
 
 from bot_core.configuration.bot_logging_settings import BotLoggingSettings
+from bot_core.configuration.bot_settings import BotSettings
+from modules.base.configuration.base_settings import BaseSettings
+from modules.boot_log.configuration.boot_log_settings import BootLogSettings
+from modules.permission.configuration.permission_settings import PermissionSettings
 
 
 class StartupSettingsExtension(StartupExtensionABC):
@@ -29,6 +33,12 @@ class StartupSettingsExtension(StartupExtensionABC):
         configuration.add_json_file(f"config/feature-flags.{environment.host_name}.json", optional=True)
 
         configuration.add_configuration("Startup_StartTime", str(self._start_time))
+        self._configure_settings_with_sub_settings(configuration, BotSettings, lambda x: x.servers, lambda x: x.id)
+        self._configure_settings_with_sub_settings(configuration, BaseSettings, lambda x: x.servers, lambda x: x.id)
+        self._configure_settings_with_sub_settings(configuration, BootLogSettings, lambda x: x.servers, lambda x: x.id)
+        self._configure_settings_with_sub_settings(
+            configuration, PermissionSettings, lambda x: x.servers, lambda x: x.id
+        )
         self._configure_settings_with_sub_settings(
             configuration, BotLoggingSettings, lambda x: x.files, lambda x: x.key
         )

kdb-bot/src/bot/translation/de.json

@@ -151,7 +151,6 @@
       }
     },
     "base": {
-      "member_left_message": "{} hat uns leider verlassen :(",
       "complaints": {
         "title": "Beschwerde einreichen",
         "label": "Beschwerde",

kdb-bot/src/bot_api/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/bot-api.json

@@ -3,8 +3,8 @@
     "Name": "bot-api",
     "Version": {
       "Major": "1",
-      "Minor": "1",
-      "Micro": "0"
+      "Minor": "0",
+      "Micro": "7"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/bot_api/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/configuration/api_settings.py

@@ -1,13 +1,16 @@
+import traceback
+
 from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console import Console
 
 
 class ApiSettings(ConfigurationModelABC):
-    def __init__(self, port: int = None, host: str = None, redirect_uri: bool = None):
+    def __init__(self):
         ConfigurationModelABC.__init__(self)
 
-        self._port = 80 if port is None else port
-        self._host = "" if host is None else host
-        self._redirect_to_https = False if redirect_uri is None else redirect_uri
+        self._port = 80
+        self._host = ""
+        self._redirect_to_https = False
 
     @property
     def port(self) -> int:
@@ -20,3 +23,12 @@ class ApiSettings(ConfigurationModelABC):
     @property
     def redirect_to_https(self) -> bool:
         return self._redirect_to_https
+
+    def from_dict(self, settings: dict):
+        try:
+            self._port = int(settings["Port"])
+            self._host = settings["Host"]
+            self._redirect_to_https = bool(settings["RedirectToHTTPS"])
+        except Exception as e:
+            Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
+            Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

kdb-bot/src/bot_api/configuration/authentication_settings.py

@@ -1,22 +1,19 @@
+import traceback
+from datetime import datetime
+
 from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console import Console
 
 
 class AuthenticationSettings(ConfigurationModelABC):
-    def __init__(
-        self,
-        secret_key: str = None,
-        issuer: str = None,
-        audience: str = None,
-        token_expire_time: int = None,
-        refresh_token_expire_time: int = None,
-    ):
+    def __init__(self):
         ConfigurationModelABC.__init__(self)
 
-        self._secret_key = "" if secret_key is None else secret_key
-        self._issuer = "" if issuer is None else issuer
-        self._audience = "" if audience is None else audience
-        self._token_expire_time = 0 if token_expire_time is None else token_expire_time
-        self._refresh_token_expire_time = 0 if refresh_token_expire_time is None else refresh_token_expire_time
+        self._secret_key = ""
+        self._issuer = ""
+        self._audience = ""
+        self._token_expire_time = 0
+        self._refresh_token_expire_time = 0
 
     @property
     def secret_key(self) -> str:
@@ -37,3 +34,14 @@ class AuthenticationSettings(ConfigurationModelABC):
     @property
     def refresh_token_expire_time(self) -> int:
         return self._refresh_token_expire_time
+
+    def from_dict(self, settings: dict):
+        try:
+            self._secret_key = settings["SecretKey"]
+            self._issuer = settings["Issuer"]
+            self._audience = settings["Audience"]
+            self._token_expire_time = int(settings["TokenExpireTime"])
+            self._refresh_token_expire_time = int(settings["RefreshTokenExpireTime"])
+        except Exception as e:
+            Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
+            Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

kdb-bot/src/bot_api/configuration/discord_authentication_settings.py

@@ -1,23 +1,19 @@
+import traceback
+
 from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console import Console
 from cpl_query.extension import List
 
 
 class DiscordAuthenticationSettings(ConfigurationModelABC):
-    def __init__(
-        self,
-        client_secret: str = None,
-        redirect_uri: str = None,
-        scope: list = None,
-        token_url: str = None,
-        auth_url: str = None,
-    ):
+    def __init__(self):
         ConfigurationModelABC.__init__(self)
 
-        self._client_secret = "" if client_secret is None else client_secret
-        self._redirect_url = "" if redirect_uri is None else redirect_uri
-        self._scope = List() if scope is None else List(str, scope)
-        self._token_url = "" if token_url is None else token_url
-        self._auth_url = "" if auth_url is None else auth_url
+        self._client_secret = ""
+        self._redirect_url = ""
+        self._scope = List()
+        self._token_url = ""
+        self._auth_url = ""
 
     @property
     def client_secret(self) -> str:
@@ -38,3 +34,14 @@ class DiscordAuthenticationSettings(ConfigurationModelABC):
     @property
     def auth_url(self) -> str:
         return self._auth_url
+
+    def from_dict(self, settings: dict):
+        try:
+            self._client_secret = settings["ClientSecret"]
+            self._redirect_url = settings["RedirectURL"]
+            self._scope = List(str, settings["Scope"])
+            self._token_url = settings["TokenURL"]
+            self._auth_url = settings["AuthURL"]
+        except Exception as e:
+            Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
+            Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

kdb-bot/src/bot_api/configuration/frontend_settings.py

@@ -1,12 +1,22 @@
+import traceback
+
 from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console import Console
 
 
 class FrontendSettings(ConfigurationModelABC):
-    def __init__(self, url: str = None):
+    def __init__(self):
         ConfigurationModelABC.__init__(self)
 
-        self._url = "" if url is None else url
+        self._url = ""
 
     @property
     def url(self) -> str:
         return self._url
+
+    def from_dict(self, settings: dict):
+        try:
+            self._url = settings["URL"]
+        except Exception as e:
+            Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
+            Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

kdb-bot/src/bot_api/configuration/version_settings.py

@@ -0,0 +1,49 @@
+from typing import Optional
+
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_cli.configuration.version_settings_name_enum import VersionSettingsNameEnum
+
+
+class VersionSettings(ConfigurationModelABC):
+    def __init__(self, major: str = None, minor: str = None, micro: str = None):
+        ConfigurationModelABC.__init__(self)
+
+        self._major: Optional[str] = major
+        self._minor: Optional[str] = minor
+        self._micro: Optional[str] = micro
+
+    @property
+    def major(self) -> str:
+        return self._major
+
+    @property
+    def minor(self) -> str:
+        return self._minor
+
+    @property
+    def micro(self) -> str:
+        return self._micro
+
+    def to_str(self) -> str:
+        if self._micro is None:
+            return f"{self._major}.{self._minor}"
+        else:
+            return f"{self._major}.{self._minor}.{self._micro}"
+
+    def from_dict(self, settings: dict):
+        self._major = settings[VersionSettingsNameEnum.major.value]
+        self._minor = settings[VersionSettingsNameEnum.minor.value]
+        micro = settings[VersionSettingsNameEnum.micro.value]
+        if micro != "":
+            self._micro = micro
+
+    def to_dict(self) -> dict:
+        version = {
+            VersionSettingsNameEnum.major.value: self._major,
+            VersionSettingsNameEnum.minor.value: self._minor,
+        }
+
+        if self._micro is not None:
+            version[VersionSettingsNameEnum.micro.value] = self._micro
+
+        return version

kdb-bot/src/bot_api/controller/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.controller"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/event/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.event"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/exception/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/filter/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.filter"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/filter/discord/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.filter.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/model/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/model/discord/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.model.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/route/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.route"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/transformer/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.transformer"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/abc/client_utils_abc.py

@@ -7,8 +7,8 @@ from cpl_query.extension import List
 from discord.ext.commands import Context
 
 from bot_data.model.auto_role_rule import AutoRoleRule
-from bot_data.model.server_config import ServerConfig
 from bot_data.model.user import User
+from modules.base.configuration.base_server_settings import BaseServerSettings
 
 
 class ClientUtilsABC(ABC):
@@ -53,7 +53,7 @@ class ClientUtilsABC(ABC):
         self,
         created_at: datetime,
         user: User,
-        settings: ServerConfig,
+        settings: BaseServerSettings,
         is_reaction: bool = False,
     ) -> bool:
         pass

kdb-bot/src/bot_core/bot-core.json

@@ -3,8 +3,8 @@
     "Name": "bot-core",
     "Version": {
       "Major": "1",
-      "Minor": "1",
-      "Micro": "0"
+      "Minor": "0",
+      "Micro": "7"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

kdb-bot/src/bot_core/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/configuration/bot_logging_settings.py

@@ -6,12 +6,12 @@ from bot_core.configuration.file_logging_settings import FileLoggingSettings
 
 
 class BotLoggingSettings(ConfigurationModelABC):
-    def __init__(self, **kwargs: dict):
+    def __init__(self, custom_logs: dict = None):
         ConfigurationModelABC.__init__(self)
         self._files: List[FileLoggingSettings] = List(FileLoggingSettings)
 
-        if kwargs is not None:
-            self._files_from_dict(kwargs)
+        if custom_logs is not None:
+            self._files_from_dict(custom_logs)
 
     @property
     def files(self) -> List[FileLoggingSettings]:
@@ -21,5 +21,6 @@ class BotLoggingSettings(ConfigurationModelABC):
         files = List(FileLoggingSettings)
         for s in settings:
             settings[s]["Key"] = s
-            files.append(JSONProcessor.process(FileLoggingSettings, settings[s]))
+            st = JSONProcessor.process(FileLoggingSettings, settings[s])
+            files.append(st)
         self._files = files

kdb-bot/src/bot_core/configuration/bot_settings.py

@@ -0,0 +1,79 @@
+from cpl_core.configuration import ConfigurationModelABC
+from cpl_query.extension import List
+
+from bot_api.json_processor import JSONProcessor
+from bot_core.configuration.server_settings import ServerSettings
+
+
+class BotSettings(ConfigurationModelABC):
+    def __init__(
+        self,
+        technicians: list = None,
+        wait_for_restart: int = 2,
+        wait_for_shutdown: int = 2,
+        cache_max_messages: int = 1000,
+        server_settings: dict = None,
+    ):
+        ConfigurationModelABC.__init__(self)
+
+        self._technicians: List[int] = List(int) if technicians is None else technicians
+        self._wait_for_restart = wait_for_restart
+        self._wait_for_shutdown = wait_for_shutdown
+        self._cache_max_messages = cache_max_messages
+
+        self._servers: List[ServerSettings] = List(ServerSettings)
+
+        if server_settings is not None:
+            self._servers_from_dict(server_settings)
+
+    @property
+    def servers(self) -> List[ServerSettings]:
+        return self._servers
+
+    @property
+    def technicians(self) -> List[int]:
+        return self._technicians
+
+    @property
+    def wait_for_restart(self) -> int:
+        return self._wait_for_restart
+
+    @property
+    def wait_for_shutdown(self) -> int:
+        return self._wait_for_shutdown
+
+    @property
+    def cache_max_messages(self) -> int:
+        return self._cache_max_messages
+
+    def _servers_from_dict(self, settings: dict):
+        servers = List(ServerSettings)
+        for s in settings:
+            settings[s]["id"] = int(s)
+            st = JSONProcessor.process(ServerSettings, settings[s])
+            servers.append(st)
+        self._servers = servers
+
+    # def from_dict(self, settings: dict):
+    #     try:
+    #         self._technicians = settings["Technicians"]
+    #         self._wait_for_restart = settings["WaitForRestart"]
+    #         self._wait_for_shutdown = settings["WaitForShutdown"]
+    #         settings.pop("Technicians")
+    #         settings.pop("WaitForRestart")
+    #         settings.pop("WaitForShutdown")
+    #
+    #         if "CacheMaxMessages" in settings:
+    #             self._cache_max_messages = settings["CacheMaxMessages"]
+    #             settings.pop("CacheMaxMessages")
+    #
+    #         servers = List(ServerSettings)
+    #         for s in settings:
+    #             st = ServerSettings()
+    #             settings[s]["Id"] = s
+    #             st.from_dict(settings[s])
+    #             servers.append(st)
+    #         self._servers = servers
+    #     except Exception as e:
+    #         Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
+    #         Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

kdb-bot/src/bot_core/configuration/feature_flags_enum.py

@@ -5,12 +5,12 @@ class FeatureFlagsEnum(Enum):
     # modules
     achievements_module = "AchievementsModule"
     api_module = "ApiModule"
+    admin_module = "AdminModule"
     auto_role_module = "AutoRoleModule"
     base_module = "BaseModule"
     boot_log_module = "BootLogModule"
     core_module = "CoreModule"
     core_extension_module = "CoreExtensionModule"
-    config_module = "ConfigModule"
     data_module = "DataModule"
     database_module = "DatabaseModule"
     level_module = "LevelModule"

kdb-bot/src/bot_core/configuration/feature_flags_settings.py

@@ -1,48 +1,34 @@
+import traceback
+
 from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console import Console
 
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 
 
 class FeatureFlagsSettings(ConfigurationModelABC):
-    _flags = {
-        # modules
-        FeatureFlagsEnum.achievements_module.value: False,  # 14.06.2023 #268
-        FeatureFlagsEnum.api_module.value: False,  # 13.10.2022 #70
-        FeatureFlagsEnum.auto_role_module.value: False,  # 03.10.2022 #54
-        FeatureFlagsEnum.base_module.value: True,  # 02.10.2022 #48
-        FeatureFlagsEnum.boot_log_module.value: True,  # 02.10.2022 #48
-        FeatureFlagsEnum.core_module.value: True,  # 03.10.2022 #56
-        FeatureFlagsEnum.core_extension_module.value: True,  # 03.10.2022 #56
-        FeatureFlagsEnum.data_module.value: True,  # 03.10.2022 #56
-        FeatureFlagsEnum.database_module.value: True,  # 02.10.2022 #48
-        FeatureFlagsEnum.moderator_module.value: False,  # 02.10.2022 #48
-        FeatureFlagsEnum.permission_module.value: True,  # 02.10.2022 #48
-        FeatureFlagsEnum.config_module.value: True,  # 19.07.2023 #127
-        # features
-        FeatureFlagsEnum.api_only.value: False,  # 13.10.2022 #70
-        FeatureFlagsEnum.presence.value: True,  # 03.10.2022 #56
-        FeatureFlagsEnum.version_in_presence.value: False,  # 21.03.2023 #253
-    }
-
-    def __init__(self, **kwargs: dict):
+    def __init__(self):
         ConfigurationModelABC.__init__(self)
 
-        if len(kwargs.keys()) == 0:
-            return
-
-        for flag in [f.value for f in FeatureFlagsEnum]:
-            self._load_flag(kwargs, FeatureFlagsEnum(flag))
-
-    @classmethod
-    def get_flag_from_dict(cls, flags: dict, key: FeatureFlagsEnum) -> bool:
-        def get_flag():
-            if key.value not in cls._flags:
-                return False
-            return cls._flags[key.value]
-
-        if key.value not in flags:
-            return get_flag()
-        return flags[key.value]
+        self._flags = {
+            # modules
+            FeatureFlagsEnum.achievements_module.value: False,  # 14.06.2023 #268
+            FeatureFlagsEnum.api_module.value: False,  # 13.10.2022 #70
+            FeatureFlagsEnum.admin_module.value: False,  # 02.10.2022 #48
+            FeatureFlagsEnum.auto_role_module.value: True,  # 03.10.2022 #54
+            FeatureFlagsEnum.base_module.value: True,  # 02.10.2022 #48
+            FeatureFlagsEnum.boot_log_module.value: True,  # 02.10.2022 #48
+            FeatureFlagsEnum.core_module.value: True,  # 03.10.2022 #56
+            FeatureFlagsEnum.core_extension_module.value: True,  # 03.10.2022 #56
+            FeatureFlagsEnum.data_module.value: True,  # 03.10.2022 #56
+            FeatureFlagsEnum.database_module.value: True,  # 02.10.2022 #48
+            FeatureFlagsEnum.moderator_module.value: False,  # 02.10.2022 #48
+            FeatureFlagsEnum.permission_module.value: True,  # 02.10.2022 #48
+            # features
+            FeatureFlagsEnum.api_only.value: False,  # 13.10.2022 #70
+            FeatureFlagsEnum.presence.value: True,  # 03.10.2022 #56
+            FeatureFlagsEnum.version_in_presence.value: False,  # 21.03.2023 #253
+        }
 
     def get_flag(self, key: FeatureFlagsEnum) -> bool:
         if key.value not in self._flags:
@@ -54,3 +40,11 @@ class FeatureFlagsSettings(ConfigurationModelABC):
             return
 
         self._flags[key.value] = bool(settings[key.value])
+
+    def from_dict(self, settings: dict):
+        try:
+            for flag in [f.value for f in FeatureFlagsEnum]:
+                self._load_flag(settings, FeatureFlagsEnum(flag))
+        except Exception as e:
+            Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
+            Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

kdb-bot/src/bot_core/configuration/file_logging_settings.py

@@ -17,3 +17,11 @@ class FileLoggingSettings(LoggingSettings):
     @property
     def key(self) -> str:
         return self._key
+
+    # def from_dict(self, settings: dict):
+    #     try:
+    #         self._key = settings["Key"]
+    #         super().from_dict(settings)
+    #     except Exception as e:
+    #         Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
+    #         Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

kdb-bot/src/bot_core/configuration/server_settings.py

@@ -0,0 +1,36 @@
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+
+
+class ServerSettings(ConfigurationModelABC):
+    def __init__(
+        self,
+        id: int = None,
+        message_delete_timer: int = None,
+        notification_chat_id: int = None,
+    ):
+        ConfigurationModelABC.__init__(self)
+
+        self._id: int = id
+        self._message_delete_timer: int = message_delete_timer
+        self._notification_chat_id: int = notification_chat_id
+
+    @property
+    def id(self) -> int:
+        return self._id
+
+    @property
+    def message_delete_timer(self) -> int:
+        return self._message_delete_timer
+
+    @property
+    def notification_chat_id(self) -> int:
+        return self._notification_chat_id
+
+    # def from_dict(self, settings: dict):
+    #     try:
+    #         self._id = int(settings["Id"])
+    #         self._message_delete_timer = int(settings["MessageDeleteTimer"])
+    #         self._notification_chat_id = int(settings["NotificationChatId"])
+    #     except Exception as e:
+    #         Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in settings")
+    #         Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

kdb-bot/src/bot_core/core_extension/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.core_extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/core_module.py

@@ -11,7 +11,6 @@ from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.events.core_on_ready_event import CoreOnReadyEvent
 from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
 from bot_core.service.client_utils_service import ClientUtilsService
-from bot_core.service.config_service import ConfigService
 from bot_core.service.data_integrity_service import DataIntegrityService
 from bot_core.service.message_service import MessageService
 
@@ -24,7 +23,6 @@ class CoreModule(ModuleABC):
         pass
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
-        services.add_transient(ConfigService)
         services.add_transient(MessageServiceABC, MessageService)
         services.add_transient(ClientUtilsABC, ClientUtilsService)
         services.add_transient(DataIntegrityService)

kdb-bot/src/bot_core/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/exception/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/pipes/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.pipes"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/service/client_utils_service.py

@@ -25,9 +25,9 @@ from bot_data.abc.user_message_count_per_hour_repository_abc import (
     UserMessageCountPerHourRepositoryABC,
 )
 from bot_data.model.auto_role_rule import AutoRoleRule
-from bot_data.model.server_config import ServerConfig
 from bot_data.model.user import User
 from bot_data.model.user_message_count_per_hour import UserMessageCountPerHour
+from modules.base.configuration.base_server_settings import BaseServerSettings
 
 
 class ClientUtilsService(ClientUtilsABC):
@@ -139,7 +139,7 @@ class ClientUtilsService(ClientUtilsABC):
         self,
         created_at: datetime,
         user: User,
-        settings: ServerConfig,
+        settings: BaseServerSettings,
         is_reaction: bool = False,
     ) -> bool:
         umcph = None

kdb-bot/src/bot_core/service/config_service.py

@@ -1,50 +0,0 @@
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC
-
-from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
-from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
-from bot_data.abc.technician_config_repository_abc import TechnicianConfigRepositoryABC
-from bot_data.model.server import Server
-from bot_data.model.technician_config import TechnicianConfig
-from bot_data.service.server_config_seeder import ServerConfigSeeder
-from bot_data.service.technician_config_seeder import TechnicianConfigSeeder
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
-
-
-class ConfigService:
-    def __init__(
-        self,
-        config: ConfigurationABC,
-        services: ServiceProviderABC,
-        technician_config_repo: TechnicianConfigRepositoryABC,
-        server_config_repo: ServerConfigRepositoryABC,
-        tech_seeder: TechnicianConfigSeeder,
-        server_seeder: ServerConfigSeeder,
-    ):
-        self._config = config
-        self._services = services
-        self._technician_config_repo = technician_config_repo
-        self._server_config_repo = server_config_repo
-
-        self._tech_seeder = tech_seeder
-        self._server_seeder = server_seeder
-
-    async def reload_technician_config(self):
-        if not self._technician_config_repo.does_technician_config_exists():
-            await self._tech_seeder.seed()
-
-        technician_config = self._technician_config_repo.get_technician_config()
-        self._config.add_configuration(TechnicianConfig, technician_config)
-        self._config.add_configuration(FeatureFlagsSettings, FeatureFlagsSettings(**technician_config.feature_flags))
-
-    async def reload_server_config(self, server: Server):
-        if not self._server_config_repo.does_server_config_exists(server.id):
-            await self._server_seeder.seed()
-
-        server_config = self._server_config_repo.get_server_config_by_server(server.id)
-        self._config.add_configuration(
-            f"{type(server_config).__name__}_{server_config.server.discord_id}", server_config
-        )
-
-        permissions: PermissionServiceABC = self._services.get_service(PermissionServiceABC)
-        permissions.on_ready()

kdb-bot/src/bot_core/service/data_integrity_service.py

@@ -19,13 +19,13 @@ from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.client import Client
 from bot_data.model.known_user import KnownUser
 from bot_data.model.server import Server
-from bot_data.model.server_config import ServerConfig
 from bot_data.model.user import User
 from bot_data.model.user_joined_server import UserJoinedServer
 from bot_data.model.user_joined_voice_channel import UserJoinedVoiceChannel
 from bot_data.service.seeder_service import SeederService
 from bot_data.service.user_repository_service import ServerRepositoryABC
 from modules.achievements.achievement_service import AchievementService
+from modules.base.configuration.base_server_settings import BaseServerSettings
 
 
 class DataIntegrityService:
@@ -174,7 +174,7 @@ class DataIntegrityService:
 
                     self._logger.warn(__name__, f"User not found in database: {u.id}")
                     self._logger.debug(__name__, f"Add user: {u.id}")
-                    self._users.add_user(User(u.id, 0, 0, 0, server))
+                    self._users.add_user(User(u.id, 0, server))
                     self._db_context.save_changes()
 
                     self._logger.debug(__name__, f"Added User: {u.id}")
@@ -255,7 +255,7 @@ class DataIntegrityService:
         self._logger.debug(__name__, f"Start checking UserJoinedVoiceChannel table")
         for guild in self._bot.guilds:
             guild: discord.Guild = guild
-            settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild.id}")
+            settings: BaseServerSettings = self._config.get_configuration(f"BaseServerSettings_{guild.id}")
 
             server = self._servers.find_server_by_discord_id(guild.id)
             if server is None:
@@ -291,7 +291,7 @@ class DataIntegrityService:
                         self._user_joins_vc.update_user_joined_voice_channel(join)
 
                         if self._is_for_shutdown:
-                            user.xp += round(join.time * settings.xp_per_ontime_hour)
+                            user.xp = round(join.time * settings.xp_per_ontime_hour)
                             self._users.update_user(user)
 
                         self._db_context.save_changes()
@@ -347,7 +347,7 @@ class DataIntegrityService:
                             f"Active UserJoinedGameServer found in database: {guild.id}:{member.id}@{join.joined_on}",
                         )
                         join.leaved_on = datetime.now()
-                        settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild.id}")
+                        settings: BaseServerSettings = self._config.get_configuration(f"BaseServerSettings_{guild.id}")
 
                         if (
                             (join.leaved_on - join.joined_on).total_seconds() / 60 / 60
@@ -356,14 +356,14 @@ class DataIntegrityService:
 
                         self._user_joined_gs.update_user_joined_game_server(join)
                         if self._is_for_shutdown:
-                            user.xp += round(join.time * settings.xp_per_ontime_hour)
+                            user.xp = round(join.time * settings.xp_per_ontime_hour)
                             self._users.update_user(user)
 
                         self._db_context.save_changes()
             except Exception as e:
                 self._logger.error(__name__, f"Cannot get UserJoinedGameServer", e)
 
-    async def _check_for_user_achievements(self):
+    def _check_for_user_achievements(self):
         self._logger.debug(__name__, f"Start checking UserGotAchievement table")
 
         for guild in self._bot.guilds:
@@ -380,9 +380,9 @@ class DataIntegrityService:
                 if user is None:
                     self._logger.fatal(__name__, f"User not found in database: {member.id}")
 
-                await self._achievements.validate_achievements_for_user(user)
+                self._bot.loop.create_task(self._achievements.validate_achievements_for_user(user))
 
-    async def check_data_integrity(self, is_for_shutdown=False):
+    def check_data_integrity(self, is_for_shutdown=False):
         if is_for_shutdown != self._is_for_shutdown:
             self._is_for_shutdown = is_for_shutdown
 
@@ -393,4 +393,4 @@ class DataIntegrityService:
         self._check_user_joins()
         self._check_user_joins_vc()
         self._check_user_joined_gs()
-        await self._check_for_user_achievements()
+        self._check_for_user_achievements()

kdb-bot/src/bot_core/service/message_service.py

@@ -10,10 +10,10 @@ from discord import Interaction
 from discord.ext.commands import Context
 
 from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.configuration.server_settings import ServerSettings
 from bot_core.helper.log_message_helper import LogMessageHelper
 from bot_core.logging.message_logger import MessageLogger
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
-from bot_data.model.server_config import ServerConfig
 
 
 class MessageService(MessageServiceABC):
@@ -33,7 +33,7 @@ class MessageService(MessageServiceABC):
 
     async def delete_messages(self, messages: List[discord.Message], guild_id: int, without_tracking=False):
         self._logger.debug(__name__, f"Try to delete {messages.count()} messages")
-        server_st: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild_id}")
+        server_st: ServerSettings = self._config.get_configuration(f"ServerSettings_{guild_id}")
         await asyncio.sleep(server_st.message_delete_timer)
         for message in messages:
             await self.delete_message(message, mass_delete=True, without_tracking=without_tracking)
@@ -50,7 +50,7 @@ class MessageService(MessageServiceABC):
             else None
         )
 
-        server_st: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild_id}")
+        server_st: ServerSettings = self._config.get_configuration(f"ServerSettings_{guild_id}")
         if not mass_delete:
             await asyncio.sleep(server_st.message_delete_timer)
         self._logger.debug(

kdb-bot/src/bot_data/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_data/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_data/abc/data_seeder_abc.py

@@ -7,5 +7,5 @@ class DataSeederABC(ABC):
         pass
 
     @abstractmethod
-    async def seed(self):
+    def seed(self):
         pass

kdb-bot/src/bot_data/abc/server_config_repository_abc.py

@@ -1,59 +0,0 @@
-from abc import ABC, abstractmethod
-
-from bot_data.model.server_afk_channel_ids_config import ServerAFKChannelIdsConfig
-from bot_data.model.server_config import ServerConfig
-from bot_data.model.server_team_role_ids_config import ServerTeamRoleIdsConfig
-
-
-class ServerConfigRepositoryABC(ABC):
-    @abstractmethod
-    def __init__(self):
-        pass
-
-    @abstractmethod
-    def does_server_config_exists(self, server_id: int) -> bool:
-        pass
-
-    @abstractmethod
-    def get_server_config_by_server(self, server_id: int) -> ServerConfig:
-        pass
-
-    @abstractmethod
-    def get_server_config_by_id(self, config_id: int) -> ServerConfig:
-        pass
-
-    @abstractmethod
-    def add_server_config(self, server_config: ServerConfig):
-        pass
-
-    @abstractmethod
-    def update_server_config(self, server_config: ServerConfig):
-        pass
-
-    @abstractmethod
-    def delete_server_config(self, server_config: ServerConfig):
-        pass
-
-    @abstractmethod
-    def add_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
-        pass
-
-    @abstractmethod
-    def update_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
-        pass
-
-    @abstractmethod
-    def delete_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
-        pass
-
-    @abstractmethod
-    def add_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
-        pass
-
-    @abstractmethod
-    def update_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
-        pass
-
-    @abstractmethod
-    def delete_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
-        pass

kdb-bot/src/bot_data/abc/technician_config_repository_abc.py

@@ -1,55 +0,0 @@
-from abc import ABC, abstractmethod
-
-from bot_data.model.technician_config import TechnicianConfig
-from bot_data.model.technician_id_config import TechnicianIdConfig
-from bot_data.model.technician_ping_url_config import TechnicianPingUrlConfig
-
-
-class TechnicianConfigRepositoryABC(ABC):
-    @abstractmethod
-    def __init__(self):
-        pass
-
-    @abstractmethod
-    def does_technician_config_exists(self) -> bool:
-        pass
-
-    @abstractmethod
-    def get_technician_config(self) -> TechnicianConfig:
-        pass
-
-    @abstractmethod
-    def add_technician_config(self, technician_config: TechnicianConfig):
-        pass
-
-    @abstractmethod
-    def update_technician_config(self, technician_config: TechnicianConfig):
-        pass
-
-    @abstractmethod
-    def delete_technician_config(self, technician_config: TechnicianConfig):
-        pass
-
-    @abstractmethod
-    def add_technician_id_config(self, technician_id: TechnicianIdConfig):
-        pass
-
-    @abstractmethod
-    def update_technician_id_config(self, technician_id: TechnicianIdConfig):
-        pass
-
-    @abstractmethod
-    def delete_technician_id_config(self, technician_id: TechnicianIdConfig):
-        pass
-
-    @abstractmethod
-    def add_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
-        pass
-
-    @abstractmethod
-    def update_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
-        pass
-
-    @abstractmethod
-    def delete_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
-        pass

kdb-bot/src/bot_data/bot-data.json

@@ -3,8 +3,8 @@
     "Name": "bot-data",
     "Version": {
       "Major": "1",
-      "Minor": "1",
-      "Micro": "0"
+      "Minor": "0",
+      "Micro": "7"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

kdb-bot/src/bot_data/data_module.py

@@ -10,13 +10,10 @@ from bot_data.abc.api_key_repository_abc import ApiKeyRepositoryABC
 from bot_data.abc.auth_user_repository_abc import AuthUserRepositoryABC
 from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
-from bot_data.abc.data_seeder_abc import DataSeederABC
 from bot_data.abc.game_server_repository_abc import GameServerRepositoryABC
 from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
 from bot_data.abc.level_repository_abc import LevelRepositoryABC
-from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from bot_data.abc.technician_config_repository_abc import TechnicianConfigRepositoryABC
 from bot_data.abc.user_game_ident_repository_abc import UserGameIdentRepositoryABC
 from bot_data.abc.user_joined_game_server_repository_abc import UserJoinedGameServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
@@ -38,11 +35,7 @@ from bot_data.service.game_server_repository_service import GameServerRepository
 from bot_data.service.known_user_repository_service import KnownUserRepositoryService
 from bot_data.service.level_repository_service import LevelRepositoryService
 from bot_data.service.seeder_service import SeederService
-from bot_data.service.server_config_repository_service import ServerConfigRepositoryService
-from bot_data.service.server_config_seeder import ServerConfigSeeder
 from bot_data.service.server_repository_service import ServerRepositoryService
-from bot_data.service.technician_config_repository_service import TechnicianConfigRepositoryService
-from bot_data.service.technician_config_seeder import TechnicianConfigSeeder
 from bot_data.service.user_game_ident_repository_service import UserGameIdentRepositoryService
 from bot_data.service.user_joined_game_server_repository_service import UserJoinedGameServerRepositoryService
 from bot_data.service.user_joined_server_repository_service import (
@@ -87,9 +80,5 @@ class DataModule(ModuleABC):
         services.add_transient(GameServerRepositoryABC, GameServerRepositoryService)
         services.add_transient(UserGameIdentRepositoryABC, UserGameIdentRepositoryService)
         services.add_transient(AchievementRepositoryABC, AchievementRepositoryService)
-        services.add_transient(TechnicianConfigRepositoryABC, TechnicianConfigRepositoryService)
-        services.add_transient(ServerConfigRepositoryABC, ServerConfigRepositoryService)
 
         services.add_transient(SeederService)
-        services.add_transient(DataSeederABC, TechnicianConfigSeeder)
-        services.add_transient(DataSeederABC, ServerConfigSeeder)

kdb-bot/src/bot_data/migration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data.migration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_data/migration/config_feature_flags_migration.py

@@ -1,29 +0,0 @@
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.migration_abc import MigrationABC
-from bot_data.db_context import DBContext
-
-
-class ConfigFeatureFlagsMigration(MigrationABC):
-    name = "1.1.0_ConfigFeatureFlagsMigration"
-
-    def __init__(self, logger: DatabaseLogger, db: DBContext):
-        MigrationABC.__init__(self)
-        self._logger = logger
-        self._db = db
-        self._cursor = db.cursor
-
-    def upgrade(self):
-        self._logger.debug(__name__, "Running upgrade")
-
-        self._cursor.execute(
-            str("""ALTER TABLE CFG_Technician ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER CacheMaxMessages;""")
-        )
-
-        self._cursor.execute(
-            str("""ALTER TABLE CFG_Server ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId;""")
-        )
-
-    def downgrade(self):
-        self._logger.debug(__name__, "Running downgrade")
-        self._cursor.execute("ALTER TABLE CFG_Technician DROP COLUMN FeatureFlags;")
-        self._cursor.execute("ALTER TABLE CFG_Server DROP COLUMN FeatureFlags;")

kdb-bot/src/bot_data/migration/config_migration.py

@@ -1,155 +0,0 @@
-import os
-
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.migration_abc import MigrationABC
-from bot_data.db_context import DBContext
-
-
-class ConfigMigration(MigrationABC):
-    name = "1.1.0_ConfigMigration"
-
-    def __init__(self, logger: DatabaseLogger, db: DBContext):
-        MigrationABC.__init__(self)
-        self._logger = logger
-        self._db = db
-        self._cursor = db.cursor
-
-    def _exec(self, file: str):
-        path = f"{os.path.dirname(os.path.realpath(__file__))}/db_history_scripts"
-        sql = open(f"{path}/{file}").read()
-
-        for statement in sql.split("\n\n"):
-            self._cursor.execute(statement + ";")
-
-    def upgrade(self):
-        self._logger.debug(__name__, "Running upgrade")
-        self._server_upgrade()
-        self._technician_upgrade()
-
-        self._exec("config/server.sql")
-        self._exec("config/server_afk_channels.sql")
-        self._exec("config/server_team_roles.sql")
-        self._exec("config/technician.sql")
-        self._exec("config/technician_ids.sql")
-        self._exec("config/technician_ping_urls.sql")
-
-    def _server_upgrade(self):
-        self._cursor.execute(
-            str(
-                f"""
-                    CREATE TABLE IF NOT EXISTS `CFG_Server` (
-                        `Id` BIGINT NOT NULL AUTO_INCREMENT,
-                        `MessageDeleteTimer` BIGINT NOT NULL DEFAULT 6,
-                        `NotificationChatId` BIGINT NOT NULL,
-                        `MaxVoiceStateHours` BIGINT NOT NULL DEFAULT 6,
-                        `XpPerMessage` BIGINT NOT NULL DEFAULT 1,
-                        `XpPerReaction` BIGINT NOT NULL DEFAULT 1,
-                        `MaxMessageXpPerHour` BIGINT NOT NULL DEFAULT 20,
-                        `XpPerOntimeHour` BIGINT NOT NULL DEFAULT 10,
-                        `XpPerEventParticipation` BIGINT NOT NULL DEFAULT 10,
-                        `XpPerAchievement` BIGINT NOT NULL DEFAULT 10,
-                        `AFKCommandChannelId` BIGINT NOT NULL,
-                        `HelpVoiceChannelId` BIGINT NOT NULL,
-                        `TeamChannelId` BIGINT NOT NULL,
-                        `LoginMessageChannelId` BIGINT NOT NULL,
-                        `ServerId` BIGINT NOT NULL,
-                        `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6),
-                        `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                        PRIMARY KEY(`Id`),
-                        FOREIGN KEY (`ServerId`) REFERENCES `Servers`(`ServerId`)
-                    );
-                """
-            )
-        )
-
-        self._cursor.execute(
-            str(
-                f"""
-                    CREATE TABLE IF NOT EXISTS `CFG_ServerAFKChannelIds` (
-                        `Id` BIGINT NOT NULL AUTO_INCREMENT,
-                        `ChannelId` BIGINT NOT NULL,
-                        `ServerId` BIGINT NOT NULL,
-                        `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6),
-                        `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                        PRIMARY KEY(`Id`),
-                        FOREIGN KEY (`ServerId`) REFERENCES `Servers`(`ServerId`)
-                    );
-                """
-            )
-        )
-
-        self._cursor.execute(
-            str(
-                f"""
-                    CREATE TABLE IF NOT EXISTS `CFG_ServerTeamRoleIds` (
-                        `Id` BIGINT NOT NULL AUTO_INCREMENT,
-                        `RoleId` BIGINT NOT NULL,
-                        `TeamMemberType` ENUM('Moderator', 'Admin') NOT NULL,
-                        `ServerId` BIGINT NOT NULL,
-                        `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6),
-                        `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                        PRIMARY KEY(`Id`),
-                        FOREIGN KEY (`ServerId`) REFERENCES `Servers`(`ServerId`)
-                    );
-                """
-            )
-        )
-
-    def _technician_upgrade(self):
-        self._cursor.execute(
-            str(
-                f"""
-                    CREATE TABLE IF NOT EXISTS `CFG_Technician` (
-                        `Id` BIGINT NOT NULL AUTO_INCREMENT,
-                        `HelpCommandReferenceUrl` VARCHAR(255) NOT NULL,
-                        `WaitForRestart` BIGINT NOT NULL DEFAULT 8,
-                        `WaitForShutdown` BIGINT NOT NULL DEFAULT 8,
-                        `CacheMaxMessages` BIGINT NOT NULL DEFAULT 1000000,
-                        `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6),
-                        `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                        PRIMARY KEY(`Id`)
-                    );
-                """
-            )
-        )
-
-        self._cursor.execute(
-            str(
-                f"""
-                    CREATE TABLE IF NOT EXISTS `CFG_TechnicianPingUrls` (
-                        `Id` BIGINT NOT NULL AUTO_INCREMENT,
-                        `URL` VARCHAR(255) NOT NULL,
-                        `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6),
-                        `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                        PRIMARY KEY(`Id`)
-                    );
-                """
-            )
-        )
-
-        self._cursor.execute(
-            str(
-                f"""
-                    CREATE TABLE IF NOT EXISTS `CFG_TechnicianIds` (
-                        `Id` BIGINT NOT NULL AUTO_INCREMENT,
-                        `TechnicianId` BIGINT NOT NULL,
-                        `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6),
-                        `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                        PRIMARY KEY(`Id`)
-                    );
-                """
-            )
-        )
-
-    def downgrade(self):
-        self._logger.debug(__name__, "Running downgrade")
-        self._server_downgrade()
-        self._technician_downgrade()
-
-    def _server_downgrade(self):
-        self._cursor.execute("DROP TABLE `CFG_Server`;")
-
-    def _technician_downgrade(self):
-        self._cursor.execute("DROP TABLE `CFG_Technician`;")
-        self._cursor.execute("DROP TABLE `CFG_TechnicianPingUrls`;")
-        self._cursor.execute("DROP TABLE `CFG_TechnicianIds`;")

kdb-bot/src/bot_data/migration/db_history_scripts/config/server.sql

@@ -1,117 +0,0 @@
-CREATE TABLE IF NOT EXISTS `CFG_ServerHistory`
-(
-    `Id`    BIGINT(20)  NOT NULL,
-    `MessageDeleteTimer` BIGINT NOT NULL DEFAULT 6,
-    `NotificationChatId` BIGINT NOT NULL,
-    `MaxVoiceStateHours` BIGINT NOT NULL DEFAULT 6,
-    `XpPerMessage` BIGINT NOT NULL DEFAULT 1,
-    `XpPerReaction` BIGINT NOT NULL DEFAULT 1,
-    `MaxMessageXpPerHour` BIGINT NOT NULL DEFAULT 20,
-    `XpPerOntimeHour` BIGINT NOT NULL DEFAULT 10,
-    `XpPerEventParticipation` BIGINT NOT NULL DEFAULT 10,
-    `XpPerAchievement` BIGINT NOT NULL DEFAULT 10,
-    `AFKCommandChannelId` BIGINT NOT NULL,
-    `HelpVoiceChannelId` BIGINT NOT NULL,
-    `TeamChannelId` BIGINT NOT NULL,
-    `LoginMessageChannelId` BIGINT NOT NULL,
-    `ServerId` BIGINT NOT NULL,
-    `Deleted` BOOL DEFAULT FALSE,
-    `DateFrom` DATETIME(6) NOT NULL,
-    `DateTo` DATETIME(6) NOT NULL
-);
-
-DROP TRIGGER IF EXISTS `TR_CFG_ServerUpdate`;
-
-CREATE TRIGGER `TR_CFG_ServerUpdate`
-    AFTER UPDATE
-    ON `CFG_Server`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_ServerHistory` (
-        `Id`,
-        `MessageDeleteTimer`,
-        `NotificationChatId`,
-        `MaxVoiceStateHours`,
-        `XpPerMessage`,
-        `XpPerReaction`,
-        `MaxMessageXpPerHour`,
-        `XpPerOntimeHour`,
-        `XpPerEventParticipation`,
-        `XpPerAchievement`,
-        `AFKCommandChannelId`,
-        `HelpVoiceChannelId`,
-        `TeamChannelId`,
-        `LoginMessageChannelId`,
-        `ServerId`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.MessageDeleteTimer,
-        OLD.NotificationChatId,
-        OLD.MaxVoiceStateHours,
-        OLD.XpPerMessage,
-        OLD.XpPerReaction,
-        OLD.MaxMessageXpPerHour,
-        OLD.XpPerOntimeHour,
-        OLD.XpPerEventParticipation,
-        OLD.XpPerAchievement,
-        OLD.AFKCommandChannelId,
-        OLD.HelpVoiceChannelId,
-        OLD.TeamChannelId,
-        OLD.LoginMessageChannelId,
-        OLD.ServerId,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;
-
-DROP TRIGGER IF EXISTS `TR_CFG_ServerDelete`;
-
-CREATE TRIGGER `TR_CFG_ServerDelete`
-    AFTER DELETE
-    ON `CFG_Server`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_ServerHistory` (
-        `Id`,
-        `MessageDeleteTimer`,
-        `NotificationChatId`,
-        `MaxVoiceStateHours`,
-        `XpPerMessage`,
-        `XpPerReaction`,
-        `MaxMessageXpPerHour`,
-        `XpPerOntimeHour`,
-        `XpPerEventParticipation`,
-        `XpPerAchievement`,
-        `AFKCommandChannelId`,
-        `HelpVoiceChannelId`,
-        `TeamChannelId`,
-        `LoginMessageChannelId`,
-        `ServerId`,
-        `Deleted`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.MessageDeleteTimer,
-        OLD.NotificationChatId,
-        OLD.MaxVoiceStateHours,
-        OLD.XpPerMessage,
-        OLD.XpPerReaction,
-        OLD.MaxMessageXpPerHour,
-        OLD.XpPerOntimeHour,
-        OLD.XpPerEventParticipation,
-        OLD.XpPerAchievement,
-        OLD.AFKCommandChannelId,
-        OLD.HelpVoiceChannelId,
-        OLD.TeamChannelId,
-        OLD.LoginMessageChannelId,
-        OLD.ServerId,
-        TRUE,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;

kdb-bot/src/bot_data/migration/db_history_scripts/config/server_afk_channels.sql

@@ -1,57 +0,0 @@
-CREATE TABLE IF NOT EXISTS `CFG_ServerAFKChannelIdsHistory`
-(
-    `Id`    BIGINT(20)  NOT NULL,
-    `ChannelId` BIGINT NOT NULL,
-    `ServerId` BIGINT NOT NULL,
-    `Deleted` BOOL DEFAULT FALSE,
-    `DateFrom` DATETIME(6) NOT NULL,
-    `DateTo` DATETIME(6) NOT NULL
-);
-
-DROP TRIGGER IF EXISTS `TR_CFG_ServerAFKChannelIdsUpdate`;
-
-CREATE TRIGGER `TR_CFG_ServerAFKChannelIdsUpdate`
-    AFTER UPDATE
-    ON `CFG_ServerAFKChannelIds`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_ServerAFKChannelIdsHistory` (
-        `Id`,
-        `ChannelId`,
-        `ServerId`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.ChannelId,
-        OLD.ServerId,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;
-
-DROP TRIGGER IF EXISTS `TR_CFG_ServerAFKChannelIdsDelete`;
-
-CREATE TRIGGER `TR_CFG_ServerAFKChannelIdsDelete`
-    AFTER DELETE
-    ON `CFG_ServerAFKChannelIds`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_ServerAFKChannelIdsHistory` (
-        `Id`,
-        `ChannelId`,
-        `ServerId`,
-        `Deleted`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.ChannelId,
-        OLD.ServerId,
-        TRUE,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;

kdb-bot/src/bot_data/migration/db_history_scripts/config/server_team_roles.sql

@@ -1,62 +0,0 @@
-CREATE TABLE IF NOT EXISTS `CFG_ServerTeamRoleIdsHistory`
-(
-    `Id`    BIGINT(20)  NOT NULL,
-    `RoleId` BIGINT NOT NULL,
-    `TeamMemberType` ENUM('Moderator', 'Admin') NOT NULL,
-    `ServerId` BIGINT NOT NULL,
-    `Deleted` BOOL DEFAULT FALSE,
-    `DateFrom` DATETIME(6) NOT NULL,
-    `DateTo` DATETIME(6) NOT NULL
-);
-
-DROP TRIGGER IF EXISTS `TR_CFG_ServerTeamRoleIdsUpdate`;
-
-CREATE TRIGGER `TR_CFG_ServerTeamRoleIdsUpdate`
-    AFTER UPDATE
-    ON `CFG_ServerTeamRoleIds`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_ServerTeamRoleIdsHistory` (
-        `Id`,
-        `RoleId`,
-        `TeamMemberType`,
-        `ServerId`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.RoleId,
-        OLD.TeamMemberType,
-        OLD.ServerId,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;
-
-DROP TRIGGER IF EXISTS `TR_CFG_ServerTeamRoleIdsDelete`;
-
-CREATE TRIGGER `TR_CFG_ServerTeamRoleIdsDelete`
-    AFTER DELETE
-    ON `CFG_ServerTeamRoleIds`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_ServerTeamRoleIdsHistory` (
-        `Id`,
-        `RoleId`,
-        `TeamMemberType`,
-        `ServerId`,
-        `Deleted`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.RoleId,
-        OLD.TeamMemberType,
-        OLD.ServerId,
-        TRUE,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;

kdb-bot/src/bot_data/migration/db_history_scripts/config/technician.sql

@@ -1,67 +0,0 @@
-CREATE TABLE IF NOT EXISTS `CFG_TechnicianHistory`
-(
-    `Id`    BIGINT(20)  NOT NULL,
-    `HelpCommandReferenceUrl` VARCHAR(255) NOT NULL,
-    `WaitForRestart` BIGINT NOT NULL DEFAULT 8,
-    `WaitForShutdown` BIGINT NOT NULL DEFAULT 8,
-    `CacheMaxMessages` BIGINT NOT NULL DEFAULT 1000000,
-    `Deleted` BOOL DEFAULT FALSE,
-    `DateFrom` DATETIME(6) NOT NULL,
-    `DateTo` DATETIME(6) NOT NULL
-);
-
-DROP TRIGGER IF EXISTS `TR_CFG_TechnicianUpdate`;
-
-CREATE TRIGGER `TR_CFG_TechnicianUpdate`
-    AFTER UPDATE
-    ON `CFG_Technician`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_TechnicianHistory` (
-        `Id`,
-        `HelpCommandReferenceUrl`,
-        `WaitForRestart`,
-        `WaitForShutdown`,
-        `CacheMaxMessages`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.HelpCommandReferenceUrl,
-        OLD.WaitForRestart,
-        OLD.WaitForShutdown,
-        OLD.CacheMaxMessages,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;
-
-DROP TRIGGER IF EXISTS `TR_CFG_TechnicianDelete`;
-
-CREATE TRIGGER `TR_CFG_TechnicianDelete`
-    AFTER DELETE
-    ON `CFG_Technician`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_TechnicianHistory` (
-        `Id`,
-        `HelpCommandReferenceUrl`,
-        `WaitForRestart`,
-        `WaitForShutdown`,
-        `CacheMaxMessages`,
-        `Deleted`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.HelpCommandReferenceUrl,
-        OLD.WaitForRestart,
-        OLD.WaitForShutdown,
-        OLD.CacheMaxMessages,
-        TRUE,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;

kdb-bot/src/bot_data/migration/db_history_scripts/config/technician_ids.sql

@@ -1,52 +0,0 @@
-CREATE TABLE IF NOT EXISTS `CFG_TechnicianIdsHistory`
-(
-    `Id`    BIGINT(20)  NOT NULL,
-    `TechnicianId` BIGINT NOT NULL,
-    `Deleted` BOOL DEFAULT FALSE,
-    `DateFrom` DATETIME(6) NOT NULL,
-    `DateTo` DATETIME(6) NOT NULL
-);
-
-DROP TRIGGER IF EXISTS `TR_CFG_TechnicianIdsUpdate`;
-
-CREATE TRIGGER `TR_CFG_TechnicianIdsUpdate`
-    AFTER UPDATE
-    ON `CFG_TechnicianIds`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_TechnicianIdsHistory` (
-        `Id`,
-        `TechnicianId`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.TechnicianId,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;
-
-DROP TRIGGER IF EXISTS `TR_CFG_TechnicianIdsDelete`;
-
-CREATE TRIGGER `TR_CFG_TechnicianIdsDelete`
-    AFTER DELETE
-    ON `CFG_TechnicianIds`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_TechnicianIdsHistory` (
-        `Id`,
-        `TechnicianId`,
-        `Deleted`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.TechnicianId,
-        TRUE,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;

kdb-bot/src/bot_data/migration/db_history_scripts/config/technician_ping_urls.sql

@@ -1,52 +0,0 @@
-CREATE TABLE IF NOT EXISTS `CFG_TechnicianPingUrlsHistory`
-(
-    `Id`    BIGINT(20)  NOT NULL,
-    `URL` VARCHAR(255) NOT NULL,
-    `Deleted` BOOL DEFAULT FALSE,
-    `DateFrom` DATETIME(6) NOT NULL,
-    `DateTo` DATETIME(6) NOT NULL
-);
-
-DROP TRIGGER IF EXISTS `TR_CFG_TechnicianPingUrlsUpdate`;
-
-CREATE TRIGGER `TR_CFG_TechnicianPingUrlsUpdate`
-    AFTER UPDATE
-    ON `CFG_TechnicianPingUrls`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_TechnicianPingUrlsHistory` (
-        `Id`,
-        `URL`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.URL,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;
-
-DROP TRIGGER IF EXISTS `TR_CFG_TechnicianPingUrlsDelete`;
-
-CREATE TRIGGER `TR_CFG_TechnicianPingUrlsDelete`
-    AFTER DELETE
-    ON `CFG_TechnicianPingUrls`
-    FOR EACH ROW
-BEGIN
-    INSERT INTO `CFG_TechnicianPingUrlsHistory` (
-        `Id`,
-        `URL`,
-        `Deleted`,
-        `DateFrom`,
-        `DateTo`
-    )
-    VALUES (
-        OLD.Id,
-        OLD.URL,
-        TRUE,
-        OLD.LastModifiedAt,
-        CURRENT_TIMESTAMP(6)
-    );
-END;

kdb-bot/src/bot_data/model/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_data/model/achievement.py

@@ -108,15 +108,6 @@ class Achievement(TableABC):
         """
         )
 
-    @staticmethod
-    def get_select_by_server_id_string(id: int) -> str:
-        return str(
-            f"""
-            SELECT * FROM `Achievements`
-            WHERE `ServerId` = {id};
-        """
-        )
-
     @property
     def insert_string(self) -> str:
         return str(

kdb-bot/src/bot_data/model/server_afk_channel_ids_config.py

@@ -1,85 +0,0 @@
-from datetime import datetime
-
-from cpl_core.database import TableABC
-
-
-class ServerAFKChannelIdsConfig(TableABC):
-    def __init__(
-        self,
-        channel_id: int,
-        server_id: int,
-        created_at: datetime = None,
-        modified_at: datetime = None,
-        id=0,
-    ):
-        self._id = id
-        self._channel_id = channel_id
-        self._server_id = server_id
-
-        TableABC.__init__(self)
-        self._created_at = created_at if created_at is not None else self._created_at
-        self._modified_at = modified_at if modified_at is not None else self._modified_at
-
-    @property
-    def channel_id(self) -> int:
-        return self._channel_id
-
-    @staticmethod
-    def get_select_all_string() -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_ServerAFKChannelIds`;
-            """
-        )
-
-    @staticmethod
-    def get_select_by_id_string(id: int) -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_ServerAFKChannelIds`
-                WHERE `Id` = {id};
-            """
-        )
-
-    @staticmethod
-    def get_select_by_server_id_string(server_id: int) -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_ServerAFKChannelIds`
-                WHERE `ServerId` = {server_id};
-            """
-        )
-
-    @property
-    def insert_string(self) -> str:
-        return str(
-            f"""
-                INSERT INTO `CFG_ServerAFKChannelIds` (
-                    `ChannelId`,
-                    `ServerId`
-                ) VALUES (
-                    {self._channel_id},
-                    {self._server_id}
-                );
-            """
-        )
-
-    @property
-    def udpate_string(self) -> str:
-        return str(
-            f"""
-                UPDATE `CFG_ServerAFKChannelIds`
-                SET `ChannelId` = {self._channel_id},
-                `ServerId` = {self._server_id}
-                WHERE `Id` = {self._id};
-            """
-        )
-
-    @property
-    def delete_string(self) -> str:
-        return str(
-            f"""
-                DELETE FROM `CFG_ServerAFKChannelIds`
-                WHERE `ChannelId` = {self._channel_id};
-            """
-        )

kdb-bot/src/bot_data/model/server_config.py

@@ -1,293 +0,0 @@
-import json
-from datetime import datetime
-
-from cpl_core.configuration import ConfigurationModelABC
-from cpl_core.database import TableABC
-from cpl_query.extension import List
-
-from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
-from bot_data.model.server import Server
-from bot_data.model.server_team_role_ids_config import ServerTeamRoleIdsConfig
-
-
-class ServerConfig(TableABC, ConfigurationModelABC):
-    def __init__(
-        self,
-        message_delete_timer: int,
-        notification_chat_id: int,
-        max_voice_state_hours: int,
-        xp_per_message: int,
-        xp_per_reaction: int,
-        max_message_xp_per_hour: int,
-        xp_per_ontime_hour: int,
-        xp_per_event_participation: int,
-        xp_per_achievement: int,
-        afk_command_channel_id: int,
-        help_voice_channel_id: int,
-        team_channel_id: int,
-        login_message_channel_id: int,
-        feature_flags: dict[FeatureFlagsEnum],
-        server: Server,
-        afk_channel_ids: List[int],
-        team_role_ids: List[ServerTeamRoleIdsConfig],
-        created_at: datetime = None,
-        modified_at: datetime = None,
-        id=0,
-    ):
-        self._id = id
-        self._message_delete_timer = message_delete_timer
-        self._notification_chat_id = notification_chat_id
-        self._max_voice_state_hours = max_voice_state_hours
-        self._xp_per_message = xp_per_message
-        self._xp_per_reaction = xp_per_reaction
-        self._max_message_xp_per_hour = max_message_xp_per_hour
-        self._xp_per_ontime_hour = xp_per_ontime_hour
-        self._xp_per_event_participation = xp_per_event_participation
-        self._xp_per_achievement = xp_per_achievement
-        self._afk_command_channel_id = afk_command_channel_id
-        self._help_voice_channel_id = help_voice_channel_id
-        self._team_channel_id = team_channel_id
-        self._login_message_channel_id = login_message_channel_id
-        self._feature_flags = feature_flags
-        self._server = server
-        self._afk_channel_ids = afk_channel_ids
-        self._team_role_ids = team_role_ids
-
-        TableABC.__init__(self)
-        self._created_at = created_at if created_at is not None else self._created_at
-        self._modified_at = modified_at if modified_at is not None else self._modified_at
-
-    @property
-    def id(self) -> int:
-        return self._id
-
-    @property
-    def message_delete_timer(self) -> int:
-        return self._message_delete_timer
-
-    @message_delete_timer.setter
-    def message_delete_timer(self, value: int):
-        self._message_delete_timer = value
-
-    @property
-    def notification_chat_id(self) -> int:
-        return self._notification_chat_id
-
-    @notification_chat_id.setter
-    def notification_chat_id(self, value: int):
-        self._notification_chat_id = value
-
-    @property
-    def max_voice_state_hours(self) -> int:
-        return self._max_voice_state_hours
-
-    @max_voice_state_hours.setter
-    def max_voice_state_hours(self, value: int):
-        self._max_voice_state_hours = value
-
-    @property
-    def xp_per_message(self) -> int:
-        return self._xp_per_message
-
-    @xp_per_message.setter
-    def xp_per_message(self, value: int):
-        self._xp_per_message = value
-
-    @property
-    def xp_per_reaction(self) -> int:
-        return self._xp_per_reaction
-
-    @xp_per_reaction.setter
-    def xp_per_reaction(self, value: int):
-        self._xp_per_reaction = value
-
-    @property
-    def max_message_xp_per_hour(self) -> int:
-        return self._max_message_xp_per_hour
-
-    @max_message_xp_per_hour.setter
-    def max_message_xp_per_hour(self, value: int):
-        self._max_message_xp_per_hour = value
-
-    @property
-    def xp_per_ontime_hour(self) -> int:
-        return self._xp_per_ontime_hour
-
-    @xp_per_ontime_hour.setter
-    def xp_per_ontime_hour(self, value: int):
-        self._xp_per_ontime_hour = value
-
-    @property
-    def xp_per_event_participation(self) -> int:
-        return self._xp_per_event_participation
-
-    @xp_per_event_participation.setter
-    def xp_per_event_participation(self, value: int):
-        self._xp_per_event_participation = value
-
-    @property
-    def xp_per_achievement(self) -> int:
-        return self._xp_per_achievement
-
-    @xp_per_achievement.setter
-    def xp_per_achievement(self, value: int):
-        self._xp_per_achievement = value
-
-    @property
-    def afk_command_channel_id(self) -> int:
-        return self._afk_command_channel_id
-
-    @afk_command_channel_id.setter
-    def afk_command_channel_id(self, value: int):
-        self._afk_command_channel_id = value
-
-    @property
-    def help_voice_channel_id(self) -> int:
-        return self._help_voice_channel_id
-
-    @help_voice_channel_id.setter
-    def help_voice_channel_id(self, value: int):
-        self._help_voice_channel_id = value
-
-    @property
-    def team_channel_id(self) -> int:
-        return self._team_channel_id
-
-    @team_channel_id.setter
-    def team_channel_id(self, value: int):
-        self._team_channel_id = value
-
-    @property
-    def login_message_channel_id(self) -> int:
-        return self._login_message_channel_id
-
-    @login_message_channel_id.setter
-    def login_message_channel_id(self, value: int):
-        self._login_message_channel_id = value
-
-    @property
-    def feature_flags(self) -> dict[FeatureFlagsEnum]:
-        return self._feature_flags
-
-    @feature_flags.setter
-    def feature_flags(self, value: dict[FeatureFlagsEnum]):
-        self._feature_flags = value
-
-    @property
-    def afk_channel_ids(self) -> List[int]:
-        return self._afk_channel_ids
-
-    @afk_channel_ids.setter
-    def afk_channel_ids(self, value: List[int]):
-        self._afk_channel_ids = value
-
-    @property
-    def team_role_ids(self) -> List[ServerTeamRoleIdsConfig]:
-        return self._team_role_ids
-
-    @team_role_ids.setter
-    def team_role_ids(self, value: List[ServerTeamRoleIdsConfig]):
-        self._team_role_ids = value
-
-    @property
-    def server(self) -> Server:
-        return self._server
-
-    @staticmethod
-    def get_select_all_string() -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_Server`;
-            """
-        )
-
-    @staticmethod
-    def get_select_by_id_string(id: int) -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_Server`
-                WHERE `Id` = {id};
-            """
-        )
-
-    @staticmethod
-    def get_select_by_server_id_string(server_id: int) -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_Server`
-                WHERE `ServerId` = {server_id};
-            """
-        )
-
-    @property
-    def insert_string(self) -> str:
-        return str(
-            f"""
-                INSERT INTO `CFG_Server` (
-                    `MessageDeleteTimer`,
-                    `NotificationChatId`,
-                    `MaxVoiceStateHours`,
-                    `XpPerMessage`,
-                    `XpPerReaction`,
-                    `MaxMessageXpPerHour`,
-                    `XpPerOntimeHour`,
-                    `XpPerEventParticipation`,
-                    `XpPerAchievement`,
-                    `AFKCommandChannelId`,
-                    `HelpVoiceChannelId`,
-                    `TeamChannelId`,
-                    `LoginMessageChannelId`,
-                    `FeatureFlags`,
-                    `ServerId`
-                ) VALUES (
-                    {self._message_delete_timer},
-                    {self._notification_chat_id},
-                    {self._max_voice_state_hours},
-                    {self._xp_per_message},
-                    {self._xp_per_reaction},
-                    {self._max_message_xp_per_hour},
-                    {self._xp_per_ontime_hour},
-                    {self._xp_per_event_participation},
-                    {self._xp_per_achievement},
-                    {self._afk_command_channel_id},
-                    {self._help_voice_channel_id},
-                    {self._team_channel_id},
-                    {self._login_message_channel_id},
-                    '{json.dumps(self._feature_flags)}',
-                    {self._server.id}
-                );
-            """
-        )
-
-    @property
-    def udpate_string(self) -> str:
-        return str(
-            f"""
-                UPDATE `CFG_Server`
-                SET `MessageDeleteTimer` = {self._message_delete_timer},
-                `NotificationChatId` = {self._notification_chat_id},
-                `MaxVoiceStateHours` = {self._max_voice_state_hours},
-                `XpPerMessage` = {self._xp_per_message},
-                `XpPerReaction` = {self._xp_per_reaction},
-                `MaxMessageXpPerHour` = {self._max_message_xp_per_hour},
-                `XpPerOntimeHour` = {self._xp_per_ontime_hour},
-                `XpPerEventParticipation` = {self._xp_per_event_participation},
-                `XpPerAchievement` = {self._xp_per_achievement},
-                `AFKCommandChannelId` = {self._afk_command_channel_id},
-                `HelpVoiceChannelId` = {self._help_voice_channel_id},
-                `TeamChannelId` = {self._team_channel_id},
-                `LoginMessageChannelId` = {self._login_message_channel_id},
-                `FeatureFlags` = '{json.dumps(self._feature_flags)}',
-                `ServerId` = {self._server.id}
-                WHERE `Id` = {self._id};
-            """
-        )
-
-    @property
-    def delete_string(self) -> str:
-        return str(
-            f"""
-                DELETE FROM `CFG_Server`
-                WHERE `Id` = {self._id};
-            """
-        )

kdb-bot/src/bot_data/model/server_config_history.py

@@ -1,108 +0,0 @@
-from bot_data.abc.history_table_abc import HistoryTableABC
-
-
-class ServerConfigHistory(HistoryTableABC):
-    def __init__(
-        self,
-        message_delete_timer: int,
-        notification_chat_id: int,
-        max_voice_state_hours: int,
-        xp_per_message: int,
-        xp_per_reaction: int,
-        max_message_xp_per_hour: int,
-        xp_per_ontime_hour: int,
-        xp_per_event_participation: int,
-        xp_per_achievement: int,
-        afk_command_channel_id: int,
-        help_voice_channel_id: int,
-        team_channel_id: int,
-        login_message_channel_id: int,
-        feature_flags: dict[str],
-        server_id: int,
-        deleted: bool,
-        date_from: str,
-        date_to: str,
-        id=0,
-    ):
-        HistoryTableABC.__init__(self)
-
-        self._id = id
-        self._message_delete_timer = message_delete_timer
-        self._notification_chat_id = notification_chat_id
-        self._max_voice_state_hours = max_voice_state_hours
-        self._xp_per_message = xp_per_message
-        self._xp_per_reaction = xp_per_reaction
-        self._max_message_xp_per_hour = max_message_xp_per_hour
-        self._xp_per_ontime_hour = xp_per_ontime_hour
-        self._xp_per_event_participation = xp_per_event_participation
-        self._xp_per_achievement = xp_per_achievement
-        self._afk_command_channel_id = afk_command_channel_id
-        self._help_voice_channel_id = help_voice_channel_id
-        self._team_channel_id = team_channel_id
-        self._login_message_channel_id = login_message_channel_id
-        self._feature_flags = feature_flags
-        self._server_id = server_id
-
-        self._deleted = deleted
-        self._date_from = date_from
-        self._date_to = date_to
-
-    @property
-    def message_delete_timer(self) -> int:
-        return self._message_delete_timer
-
-    @property
-    def notification_chat_id(self) -> int:
-        return self._notification_chat_id
-
-    @property
-    def max_voice_state_hours(self) -> int:
-        return self._max_voice_state_hours
-
-    @property
-    def xp_per_message(self) -> int:
-        return self._xp_per_message
-
-    @property
-    def xp_per_reaction(self) -> int:
-        return self._xp_per_reaction
-
-    @property
-    def max_message_xp_per_hour(self) -> int:
-        return self._max_message_xp_per_hour
-
-    @property
-    def xp_per_ontime_hour(self) -> int:
-        return self._xp_per_ontime_hour
-
-    @property
-    def xp_per_event_participation(self) -> int:
-        return self._xp_per_event_participation
-
-    @property
-    def xp_per_achievement(self) -> int:
-        return self._xp_per_achievement
-
-    @property
-    def afk_command_channel_id(self) -> int:
-        return self._afk_command_channel_id
-
-    @property
-    def help_voice_channel_id(self) -> int:
-        return self._help_voice_channel_id
-
-    @property
-    def team_channel_id(self) -> int:
-        return self._team_channel_id
-
-    @property
-    def login_message_channel_id(self) -> int:
-        return self._login_message_channel_id
-
-    @property
-    def feature_flags(self) -> dict[str]:
-        return self._feature_flags
-
-    @property
-    def server_id(self) -> int:
-        return self._server_id

kdb-bot/src/bot_data/model/server_team_role_ids_config.py

@@ -1,100 +0,0 @@
-from datetime import datetime
-
-from cpl_core.database import TableABC
-
-from bot_data.model.team_member_type_enum import TeamMemberTypeEnum
-
-
-class ServerTeamRoleIdsConfig(TableABC):
-    def __init__(
-        self,
-        role_id: int,
-        team_member_type: TeamMemberTypeEnum,
-        server_id: int,
-        created_at: datetime = None,
-        modified_at: datetime = None,
-        id=0,
-    ):
-        self._id = id
-        self._role_id = role_id
-        self._team_member_type = team_member_type
-        self._server_id = server_id
-
-        TableABC.__init__(self)
-        self._created_at = created_at if created_at is not None else self._created_at
-        self._modified_at = modified_at if modified_at is not None else self._modified_at
-
-    @property
-    def id(self) -> int:
-        return self._id
-
-    @property
-    def role_id(self) -> int:
-        return self._role_id
-
-    @property
-    def team_member_type(self) -> TeamMemberTypeEnum:
-        return self._team_member_type
-
-    @staticmethod
-    def get_select_all_string() -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_ServerTeamRoleIds`;
-            """
-        )
-
-    @staticmethod
-    def get_select_by_id_string(id: int) -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_ServerTeamRoleIds`
-                WHERE `Id` = {id};
-            """
-        )
-
-    @staticmethod
-    def get_select_by_server_id_string(server_id: int) -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_ServerTeamRoleIds`
-                WHERE `ServerId` = {server_id};
-            """
-        )
-
-    @property
-    def insert_string(self) -> str:
-        return str(
-            f"""
-                INSERT INTO `CFG_ServerTeamRoleIds` (
-                    `RoleId`,
-                    `TeamMemberType`,
-                    `ServerId`
-                ) VALUES (
-                    {self._role_id},
-                    '{self._team_member_type.value}',
-                    {self._server_id}
-                );
-            """
-        )
-
-    @property
-    def udpate_string(self) -> str:
-        return str(
-            f"""
-                UPDATE `CFG_ServerTeamRoleIds`
-                SET `RoleId` = {self._role_id},
-                `TeamMemberType` = '{self._team_member_type.value}',
-                `ServerId` = {self._server_id}
-                WHERE `Id` = {self._id};
-            """
-        )
-
-    @property
-    def delete_string(self) -> str:
-        return str(
-            f"""
-                DELETE FROM `CFG_ServerTeamRoleIds`
-                WHERE `RoleId` = {self._role_id};
-            """
-        )

kdb-bot/src/bot_data/model/team_member_type_enum.py

@@ -1,6 +0,0 @@
-from enum import Enum
-
-
-class TeamMemberTypeEnum(Enum):
-    moderator = "Moderator"
-    admin = "Admin"

kdb-bot/src/bot_data/model/technician_config.py

@@ -1,152 +0,0 @@
-import json
-from datetime import datetime
-
-from cpl_core.configuration import ConfigurationModelABC
-from cpl_core.database import TableABC
-from cpl_query.extension import List
-
-from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
-
-
-class TechnicianConfig(TableABC, ConfigurationModelABC):
-    def __init__(
-        self,
-        help_command_reference_url: str,
-        wait_for_restart: int,
-        wait_for_shutdown: int,
-        cache_max_messages: int,
-        feature_flags: dict[FeatureFlagsEnum],
-        technician_ids: List[int],
-        ping_urls: List[str],
-        created_at: datetime = None,
-        modified_at: datetime = None,
-        id=0,
-    ):
-        self._id = id
-        self._help_command_reference_url = help_command_reference_url
-        self._wait_for_restart = wait_for_restart
-        self._wait_for_shutdown = wait_for_shutdown
-        self._cache_max_messages = cache_max_messages
-        self._feature_flags = feature_flags
-        self._technician_ids = technician_ids
-        self._ping_urls = ping_urls
-
-        TableABC.__init__(self)
-        self._created_at = created_at if created_at is not None else self._created_at
-        self._modified_at = modified_at if modified_at is not None else self._modified_at
-
-    @property
-    def id(self) -> int:
-        return self._id
-
-    @property
-    def help_command_reference_url(self) -> str:
-        return self._help_command_reference_url
-
-    @help_command_reference_url.setter
-    def help_command_reference_url(self, value: str):
-        self._help_command_reference_url = value
-
-    @property
-    def wait_for_restart(self) -> int:
-        return self._wait_for_restart
-
-    @wait_for_restart.setter
-    def wait_for_restart(self, value: int):
-        self._wait_for_restart = value
-
-    @property
-    def wait_for_shutdown(self) -> int:
-        return self._wait_for_shutdown
-
-    @wait_for_shutdown.setter
-    def wait_for_shutdown(self, value: int):
-        self._wait_for_shutdown = value
-
-    @property
-    def cache_max_messages(self) -> int:
-        return self._cache_max_messages
-
-    @cache_max_messages.setter
-    def cache_max_messages(self, value: int):
-        self._cache_max_messages = value
-
-    @property
-    def feature_flags(self) -> dict[FeatureFlagsEnum]:
-        return self._feature_flags
-
-    @feature_flags.setter
-    def feature_flags(self, value: dict[FeatureFlagsEnum]):
-        self._feature_flags = value
-
-    @property
-    def technician_ids(self) -> List[int]:
-        return self._technician_ids
-
-    @technician_ids.setter
-    def technician_ids(self, value: List[int]):
-        self._technician_ids = value
-
-    @property
-    def ping_urls(self) -> List[str]:
-        return self._ping_urls
-
-    @ping_urls.setter
-    def ping_urls(self, value: List[str]):
-        self._ping_urls = value
-
-    @staticmethod
-    def get_select_all_string() -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_Technician`;
-            """
-        )
-
-    @staticmethod
-    def get_select_by_id_string(id: int) -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_Technician`
-                WHERE `Id` = {id};
-            """
-        )
-
-    @property
-    def insert_string(self) -> str:
-        return str(
-            f"""
-                INSERT INTO `CFG_Technician` (
-                    `HelpCommandReferenceUrl`, `WaitForRestart`, `WaitForShutdown`, `CacheMaxMessages`, `FeatureFlags`
-                ) VALUES (
-                    '{self._help_command_reference_url}',
-                    {self._wait_for_restart},
-                    {self._wait_for_shutdown},
-                    {self._cache_max_messages},
-                    '{json.dumps(self._feature_flags)}'
-                );
-            """
-        )
-
-    @property
-    def udpate_string(self) -> str:
-        return str(
-            f"""
-                UPDATE `CFG_Technician`
-                SET `HelpCommandReferenceUrl` = '{self._help_command_reference_url}',
-                `WaitForRestart` = {self._wait_for_restart},
-                `WaitForShutdown` = {self._wait_for_shutdown},
-                `CacheMaxMessages` = {self._cache_max_messages},
-                `FeatureFlags` = '{json.dumps(self._feature_flags)}'
-                WHERE `Id` = {self._id};
-            """
-        )
-
-    @property
-    def delete_string(self) -> str:
-        return str(
-            f"""
-                DELETE FROM `CFG_Technician`
-                WHERE `Id` = {self._id};
-            """
-        )

kdb-bot/src/bot_data/model/technician_config_history.py

@@ -1,58 +0,0 @@
-from bot_data.abc.history_table_abc import HistoryTableABC
-
-
-class TechnicianConfigHistory(HistoryTableABC):
-    def __init__(
-        self,
-        help_command_reference_url: str,
-        wait_for_restart: int,
-        wait_for_shutdown: int,
-        cache_max_messages: int,
-        deleted: bool,
-        date_from: str,
-        date_to: str,
-        id=0,
-    ):
-        HistoryTableABC.__init__(self)
-
-        self._id = id
-        self._help_command_reference_url = help_command_reference_url
-        self._wait_for_restart = wait_for_restart
-        self._wait_for_shutdown = wait_for_shutdown
-        self._cache_max_messages = cache_max_messages
-
-        self._deleted = deleted
-        self._date_from = date_from
-        self._date_to = date_to
-
-    @property
-    def help_command_reference_url(self) -> str:
-        return self._help_command_reference_url
-
-    @help_command_reference_url.setter
-    def help_command_reference_url(self, value: str):
-        self._help_command_reference_url = value
-
-    @property
-    def wait_for_restart(self) -> int:
-        return self._wait_for_restart
-
-    @wait_for_restart.setter
-    def wait_for_restart(self, value: int):
-        self._wait_for_restart = value
-
-    @property
-    def wait_for_shutdown(self) -> int:
-        return self._wait_for_shutdown
-
-    @wait_for_shutdown.setter
-    def wait_for_shutdown(self, value: int):
-        self._wait_for_shutdown = value
-
-    @property
-    def cache_max_messages(self) -> int:
-        return self._cache_max_messages
-
-    @cache_max_messages.setter
-    def cache_max_messages(self, value: int):
-        self._cache_max_messages = value

kdb-bot/src/bot_data/model/technician_id_config.py

@@ -1,79 +0,0 @@
-from datetime import datetime
-
-from cpl_core.database import TableABC
-
-
-class TechnicianIdConfig(TableABC):
-    def __init__(
-        self,
-        technician_id: str,
-        created_at: datetime = None,
-        modified_at: datetime = None,
-        id=0,
-    ):
-        self._id = id
-        self._technician_id = technician_id
-
-        TableABC.__init__(self)
-        self._created_at = created_at if created_at is not None else self._created_at
-        self._modified_at = modified_at if modified_at is not None else self._modified_at
-
-    @property
-    def id(self) -> int:
-        return self._id
-
-    @property
-    def technician_id(self) -> str:
-        return self._technician_id
-
-    @technician_id.setter
-    def technician_id(self, value: str):
-        self._technician_id = value
-
-    @staticmethod
-    def get_select_all_string() -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_TechnicianIds`;
-            """
-        )
-
-    @staticmethod
-    def get_select_by_id_string(id: int) -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_TechnicianIds`
-                WHERE `Id` = {id};
-            """
-        )
-
-    @property
-    def insert_string(self) -> str:
-        return str(
-            f"""
-                INSERT INTO `CFG_TechnicianIds` (
-                    `TechnicianId`
-                ) VALUES (
-                    '{self._technician_id}'
-                );
-            """
-        )
-
-    @property
-    def udpate_string(self) -> str:
-        return str(
-            f"""
-                UPDATE `CFG_TechnicianIds`
-                SET `TechnicianId` = '{self._technician_id}'
-                WHERE `Id` = {self._id};
-            """
-        )
-
-    @property
-    def delete_string(self) -> str:
-        return str(
-            f"""
-                DELETE FROM `CFG_TechnicianIds`
-                WHERE `TechnicianId` = {self._technician_id};
-            """
-        )

kdb-bot/src/bot_data/model/technician_id_config_history.py

@@ -1,28 +0,0 @@
-from bot_data.abc.history_table_abc import HistoryTableABC
-
-
-class TechnicianIdConfigHistory(HistoryTableABC):
-    def __init__(
-        self,
-        technician_id: int,
-        deleted: bool,
-        date_from: str,
-        date_to: str,
-        id=0,
-    ):
-        HistoryTableABC.__init__(self)
-
-        self._id = id
-        self._technician_id = technician_id
-
-        self._deleted = deleted
-        self._date_from = date_from
-        self._date_to = date_to
-
-    @property
-    def technician_id(self) -> int:
-        return self._technician_id
-
-    @technician_id.setter
-    def technician_id(self, value: int):
-        self._technician_id = value

kdb-bot/src/bot_data/model/technician_ping_url_config.py

@@ -1,79 +0,0 @@
-from datetime import datetime
-
-from cpl_core.database import TableABC
-
-
-class TechnicianPingUrlConfig(TableABC):
-    def __init__(
-        self,
-        ping_url: str,
-        created_at: datetime = None,
-        modified_at: datetime = None,
-        id=0,
-    ):
-        self._id = id
-        self._ping_url = ping_url
-
-        TableABC.__init__(self)
-        self._created_at = created_at if created_at is not None else self._created_at
-        self._modified_at = modified_at if modified_at is not None else self._modified_at
-
-    @property
-    def id(self) -> int:
-        return self._id
-
-    @property
-    def ping_url(self) -> str:
-        return self._ping_url
-
-    @ping_url.setter
-    def ping_url(self, value: str):
-        self._ping_url = value
-
-    @staticmethod
-    def get_select_all_string() -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_TechnicianPingUrls`;
-            """
-        )
-
-    @staticmethod
-    def get_select_by_id_string(id: int) -> str:
-        return str(
-            f"""
-                SELECT * FROM `CFG_TechnicianPingUrls`
-                WHERE `Id` = {id};
-            """
-        )
-
-    @property
-    def insert_string(self) -> str:
-        return str(
-            f"""
-                INSERT INTO `CFG_TechnicianPingUrls` (
-                    `URL`
-                ) VALUES (
-                    '{self._ping_url}'
-                );
-            """
-        )
-
-    @property
-    def udpate_string(self) -> str:
-        return str(
-            f"""
-                UPDATE `CFG_TechnicianPingUrls`
-                SET `URL` = '{self._ping_url}'
-                WHERE `Id` = {self._id};
-            """
-        )
-
-    @property
-    def delete_string(self) -> str:
-        return str(
-            f"""
-                DELETE FROM `CFG_TechnicianPingUrls`
-                WHERE `URL` = '{self._ping_url}';
-            """
-        )

kdb-bot/src/bot_data/model/technician_ping_url_config_history.py

@@ -1,28 +0,0 @@
-from bot_data.abc.history_table_abc import HistoryTableABC
-
-
-class TechnicianPingUrlConfigHistory(HistoryTableABC):
-    def __init__(
-        self,
-        url: str,
-        deleted: bool,
-        date_from: str,
-        date_to: str,
-        id=0,
-    ):
-        HistoryTableABC.__init__(self)
-
-        self._id = id
-        self._url = url
-
-        self._deleted = deleted
-        self._date_from = date_from
-        self._date_to = date_to
-
-    @property
-    def url(self) -> str:
-        return self._url
-
-    @url.setter
-    def url(self, value: str):
-        self._url = value

kdb-bot/src/bot_data/model/user.py

@@ -15,8 +15,8 @@ class User(TableABC):
         self,
         dc_id: int,
         xp: int,
-        reaction_count: int,
         message_count: int,
+        reaction_count: int,
         server: Optional[Server],
         created_at: datetime = None,
         modified_at: datetime = None,
@@ -25,8 +25,8 @@ class User(TableABC):
         self._user_id = id
         self._discord_id = dc_id
         self._xp = xp
-        self._reaction_count = reaction_count
         self._message_count = message_count
+        self._reaction_count = reaction_count
         self._server = server
 
         TableABC.__init__(self)

kdb-bot/src/bot_data/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_data/service/achievements_repository_service.py

@@ -65,8 +65,8 @@ class AchievementRepositoryService(AchievementRepositoryABC):
 
     def get_achievements_by_server_id(self, server_id: int) -> List[Achievement]:
         achievements = List(Achievement)
-        self._logger.trace(__name__, f"Send SQL command: {Achievement.get_select_by_server_id_string(server_id)}")
-        results = self._context.select(Achievement.get_select_by_server_id_string(server_id))
+        self._logger.trace(__name__, f"Send SQL command: {Achievement.get_select_by_id_string(server_id)}")
+        results = self._context.select(Achievement.get_select_all_string())
         for result in results:
             self._logger.trace(__name__, f"Get user with id {result[0]}")
             achievements.append(self._from_result(result))

kdb-bot/src/bot_data/service/auth_user_repository_service.py

@@ -1,4 +1,3 @@
-from enum import Enum
 from typing import Optional
 
 from cpl_core.database.context import DatabaseContextABC
@@ -101,17 +100,9 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
         ):
             crit_sort_direction = criteria.sort_direction.lower()
             if crit_sort_direction == "desc" or crit_sort_direction == "descending":
-                query = query.order_by_descending(
-                    lambda x: getattr(x, criteria.sort_column)
-                    if not isinstance(getattr(x, criteria.sort_column), Enum)
-                    else getattr(x, criteria.sort_column).value
-                )
+                query = query.order_by_descending(lambda x: getattr(x, criteria.sort_column))
             else:
-                query = query.order_by(
-                    lambda x: getattr(x, criteria.sort_column)
-                    if not isinstance(getattr(x, criteria.sort_column), Enum)
-                    else getattr(x, criteria.sort_column).value
-                )
+                query = query.order_by(lambda x: getattr(x, criteria.sort_column))
 
         result = FilteredResult()
         result.total_count = query.count()

kdb-bot/src/bot_data/service/server_config_repository_service.py

@@ -1,128 +0,0 @@
-import json
-
-from cpl_core.database.context import DatabaseContextABC
-from cpl_query.extension import List
-
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
-from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from bot_data.model.server_afk_channel_ids_config import ServerAFKChannelIdsConfig
-from bot_data.model.server_config import ServerConfig
-from bot_data.model.server_team_role_ids_config import ServerTeamRoleIdsConfig
-from bot_data.model.team_member_type_enum import TeamMemberTypeEnum
-
-
-class ServerConfigRepositoryService(ServerConfigRepositoryABC):
-    def __init__(self, logger: DatabaseLogger, db_context: DatabaseContextABC, servers: ServerRepositoryABC):
-        ServerConfigRepositoryABC.__init__(self)
-
-        self._logger = logger
-        self._context = db_context
-        self._servers = servers
-
-    def _get_team_role_ids(self, server_id: int) -> List[ServerTeamRoleIdsConfig]:
-        ids = List(ServerTeamRoleIdsConfig)
-        self._logger.trace(
-            __name__, f"Send SQL command: {ServerTeamRoleIdsConfig.get_select_by_server_id_string(server_id)}"
-        )
-        results = self._context.select(ServerTeamRoleIdsConfig.get_select_by_server_id_string(server_id))
-        for result in results:
-            self._logger.trace(__name__, f"Got ServerTeamRoleIdsConfig with id {result[0]}")
-            ids.append(
-                ServerTeamRoleIdsConfig(
-                    result[1], TeamMemberTypeEnum(result[2]), result[3], result[4], result[5], id=result[0]
-                )
-            )
-
-        return ids
-
-    def _get_afk_channel_ids(self, server_id: int) -> List[int]:
-        urls = List(int)
-        self._logger.trace(
-            __name__,
-            f"Send SQL command: {ServerAFKChannelIdsConfig.get_select_by_server_id_string(server_id)}",
-        )
-        results = self._context.select(ServerAFKChannelIdsConfig.get_select_by_server_id_string(server_id))
-        for result in results:
-            self._logger.trace(__name__, f"Got ServerAFKChannelIdsConfig with id {result[0]}")
-            urls.append(result[1])
-
-        return urls
-
-    def _from_result(self, result: tuple) -> ServerConfig:
-        return ServerConfig(
-            result[1],
-            result[2],
-            result[3],
-            result[4],
-            result[5],
-            result[6],
-            result[7],
-            result[8],
-            result[9],
-            result[10],
-            result[11],
-            result[12],
-            result[13],
-            json.loads(result[14]),
-            self._servers.get_server_by_id(result[15]),
-            self._get_afk_channel_ids(result[15]),
-            self._get_team_role_ids(result[15]),
-            result[16],
-            result[17],
-            id=result[0],
-        )
-
-    def does_server_config_exists(self, server_id: int) -> bool:
-        self._logger.trace(__name__, f"Send SQL command: {ServerConfig.get_select_by_server_id_string(server_id)}")
-        result = self._context.select(ServerConfig.get_select_by_server_id_string(server_id))
-
-        return len(result) > 0
-
-    def get_server_config_by_server(self, server_id: int) -> ServerConfig:
-        self._logger.trace(__name__, f"Send SQL command: {ServerConfig.get_select_by_server_id_string(server_id)}")
-        result = self._context.select(ServerConfig.get_select_by_server_id_string(server_id))[0]
-
-        return self._from_result(result)
-
-    def get_server_config_by_id(self, config_id: int) -> ServerConfig:
-        self._logger.trace(__name__, f"Send SQL command: {ServerConfig.get_select_by_id_string(config_id)}")
-        result = self._context.select(ServerConfig.get_select_by_id_string(config_id))[0]
-
-        return self._from_result(result)
-
-    def add_server_config(self, server_config: ServerConfig):
-        self._logger.trace(__name__, f"Send SQL command: {server_config.insert_string}")
-        self._context.cursor.execute(server_config.insert_string)
-
-    def update_server_config(self, server_config: ServerConfig):
-        self._logger.trace(__name__, f"Send SQL command: {server_config.udpate_string}")
-        self._context.cursor.execute(server_config.udpate_string)
-
-    def delete_server_config(self, server_config: ServerConfig):
-        self._logger.trace(__name__, f"Send SQL command: {server_config.delete_string}")
-        self._context.cursor.execute(server_config.delete_string)
-
-    def add_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
-        self._logger.trace(__name__, f"Send SQL command: {server_team_role_id.insert_string}")
-        self._context.cursor.execute(server_team_role_id.insert_string)
-
-    def update_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
-        self._logger.trace(__name__, f"Send SQL command: {server_team_role_id.udpate_string}")
-        self._context.cursor.execute(server_team_role_id.udpate_string)
-
-    def delete_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
-        self._logger.trace(__name__, f"Send SQL command: {server_team_role_id.delete_string}")
-        self._context.cursor.execute(server_team_role_id.delete_string)
-
-    def add_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
-        self._logger.trace(__name__, f"Send SQL command: {server_afk_channel.insert_string}")
-        self._context.cursor.execute(server_afk_channel.insert_string)
-
-    def update_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
-        self._logger.trace(__name__, f"Send SQL command: {server_afk_channel.udpate_string}")
-        self._context.cursor.execute(server_afk_channel.udpate_string)
-
-    def delete_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
-        self._logger.trace(__name__, f"Send SQL command: {server_afk_channel.delete_string}")
-        self._context.cursor.execute(server_afk_channel.delete_string)

kdb-bot/src/bot_data/service/server_config_seeder.py

@@ -1,63 +0,0 @@
-from cpl_core.database.context import DatabaseContextABC
-from cpl_discord.container import Guild
-from cpl_discord.service import DiscordBotServiceABC
-
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.data_seeder_abc import DataSeederABC
-from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
-from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from bot_data.model.server_config import ServerConfig
-
-
-class ServerConfigSeeder(DataSeederABC):
-    def __init__(
-        self,
-        logger: DatabaseLogger,
-        bot: DiscordBotServiceABC,
-        servers: ServerRepositoryABC,
-        server_config: ServerConfigRepositoryABC,
-        db: DatabaseContextABC,
-    ):
-        DataSeederABC.__init__(self)
-
-        self._logger = logger
-        self._bot = bot
-        self._servers = servers
-        self._server_config = server_config
-        self._db = db
-
-    async def seed(self):
-        try:
-            for guild in self._bot.guilds:
-                guild: Guild = guild
-                server = self._servers.get_server_by_discord_id(guild.id)
-                if self._server_config.does_server_config_exists(server.id):
-                    continue
-
-                config = ServerConfig(
-                    6,
-                    guild.system_channel.id,
-                    6,
-                    1,
-                    1,
-                    20,
-                    10,
-                    10,
-                    10,
-                    guild.system_channel.id,
-                    guild.system_channel.id,
-                    guild.system_channel.id,
-                    guild.system_channel.id,
-                    {},
-                    server,
-                    [],
-                    [],
-                )
-
-                self._server_config.add_server_config(config)
-
-                self._db.save_changes()
-                self._logger.debug(__name__, "Seeded technician config")
-
-        except Exception as e:
-            self._logger.error(__name__, f"Seeding technician config failed", e)

kdb-bot/src/bot_data/service/technician_config_repository_service.py

@@ -1,100 +0,0 @@
-import json
-
-from cpl_core.database.context import DatabaseContextABC
-from cpl_query.extension import List
-
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.technician_config_repository_abc import TechnicianConfigRepositoryABC
-from bot_data.model.technician_config import TechnicianConfig
-from bot_data.model.technician_id_config import TechnicianIdConfig
-from bot_data.model.technician_ping_url_config import TechnicianPingUrlConfig
-
-
-class TechnicianConfigRepositoryService(TechnicianConfigRepositoryABC):
-    def __init__(self, logger: DatabaseLogger, db_context: DatabaseContextABC):
-        TechnicianConfigRepositoryABC.__init__(self)
-
-        self._logger = logger
-        self._context = db_context
-
-    def _get_technician_ids(self) -> List[int]:
-        ids = List(int)
-        self._logger.trace(__name__, f"Send SQL command: {TechnicianIdConfig.get_select_all_string()}")
-        results = self._context.select(TechnicianIdConfig.get_select_all_string())
-        for result in results:
-            self._logger.trace(__name__, f"Got TechnicianId with id {result[0]}")
-            ids.append(result[1])
-
-        return ids
-
-    def _get_technician_ping_urls(self) -> List[str]:
-        urls = List(str)
-        self._logger.trace(__name__, f"Send SQL command: {TechnicianPingUrlConfig.get_select_all_string()}")
-        results = self._context.select(TechnicianPingUrlConfig.get_select_all_string())
-        for result in results:
-            self._logger.trace(__name__, f"Got TechnicianPingUrl with id {result[0]}")
-            urls.append(result[1])
-
-        return urls
-
-    def _from_result(self, result: tuple) -> TechnicianConfig:
-        return TechnicianConfig(
-            result[1],
-            result[2],
-            result[3],
-            result[4],
-            json.loads(result[5]),
-            self._get_technician_ids(),
-            self._get_technician_ping_urls(),
-            result[6],
-            result[7],
-            id=result[0],
-        )
-
-    def does_technician_config_exists(self) -> bool:
-        self._logger.trace(__name__, f"Send SQL command: {TechnicianConfig.get_select_all_string()}")
-        result = self._context.select(TechnicianConfig.get_select_all_string())
-
-        return len(result) > 0
-
-    def get_technician_config(self) -> TechnicianConfig:
-        self._logger.trace(__name__, f"Send SQL command: {TechnicianConfig.get_select_all_string()}")
-        result = self._context.select(TechnicianConfig.get_select_all_string())[0]
-
-        return self._from_result(result)
-
-    def add_technician_config(self, technician_config: TechnicianConfig):
-        self._logger.trace(__name__, f"Send SQL command: {technician_config.insert_string}")
-        self._context.cursor.execute(technician_config.insert_string)
-
-    def update_technician_config(self, technician_config: TechnicianConfig):
-        self._logger.trace(__name__, f"Send SQL command: {technician_config.udpate_string}")
-        self._context.cursor.execute(technician_config.udpate_string)
-
-    def delete_technician_config(self, technician_config: TechnicianConfig):
-        self._logger.trace(__name__, f"Send SQL command: {technician_config.delete_string}")
-        self._context.cursor.execute(technician_config.delete_string)
-
-    def add_technician_id_config(self, technician_id: TechnicianIdConfig):
-        self._logger.trace(__name__, f"Send SQL command: {technician_id.insert_string}")
-        self._context.cursor.execute(technician_id.insert_string)
-
-    def update_technician_id_config(self, technician_id: TechnicianIdConfig):
-        self._logger.trace(__name__, f"Send SQL command: {technician_id.udpate_string}")
-        self._context.cursor.execute(technician_id.udpate_string)
-
-    def delete_technician_id_config(self, technician_id: TechnicianIdConfig):
-        self._logger.trace(__name__, f"Send SQL command: {technician_id.delete_string}")
-        self._context.cursor.execute(technician_id.delete_string)
-
-    def add_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
-        self._logger.trace(__name__, f"Send SQL command: {technician_ping_url.insert_string}")
-        self._context.cursor.execute(technician_ping_url.insert_string)
-
-    def update_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
-        self._logger.trace(__name__, f"Send SQL command: {technician_ping_url.udpate_string}")
-        self._context.cursor.execute(technician_ping_url.udpate_string)
-
-    def delete_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
-        self._logger.trace(__name__, f"Send SQL command: {technician_ping_url.delete_string}")
-        self._context.cursor.execute(technician_ping_url.delete_string)

kdb-bot/src/bot_data/service/technician_config_seeder.py

@@ -1,50 +0,0 @@
-from cpl_core.database.context import DatabaseContextABC
-from cpl_query.extension import List
-
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.data_seeder_abc import DataSeederABC
-from bot_data.abc.technician_config_repository_abc import TechnicianConfigRepositoryABC
-from bot_data.model.technician_config import TechnicianConfig
-from bot_data.model.technician_id_config import TechnicianIdConfig
-from bot_data.model.technician_ping_url_config import TechnicianPingUrlConfig
-
-
-class TechnicianConfigSeeder(DataSeederABC):
-    def __init__(
-        self,
-        logger: DatabaseLogger,
-        technician_config: TechnicianConfigRepositoryABC,
-        db: DatabaseContextABC,
-    ):
-        DataSeederABC.__init__(self)
-
-        self._logger = logger
-        self._technician_config = technician_config
-        self._db = db
-
-    async def seed(self):
-        try:
-            if self._technician_config.does_technician_config_exists():
-                return
-
-            config = TechnicianConfig(
-                "https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot/wiki/Befehle",
-                8,
-                8,
-                1000000,
-                {},
-                List(int, [240160344557879316]),
-                List(str, ["www.google.com", "www.sh-edraft.de", "www.keksdose-gaming.de"]),
-            )
-
-            self._technician_config.add_technician_config(config)
-            for technician in config.technician_ids:
-                self._technician_config.add_technician_id_config(TechnicianIdConfig(technician))
-
-            for url in config.ping_urls:
-                self._technician_config.add_technician_ping_url_config(TechnicianPingUrlConfig(url))
-
-            self._db.save_changes()
-            self._logger.debug(__name__, "Seeded technician config")
-        except Exception as e:
-            self._logger.error(__name__, f"Seeding technician config failed", e)

kdb-bot/src/bot_graphql/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_graphql/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.0.7"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_graphql/abc/query_abc.py

@@ -2,14 +2,12 @@ from typing import Callable
 
 from ariadne import ObjectType
 from cpl_core.dependency_injection import ServiceProviderABC
-from cpl_core.type import T
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_query.extension import List
 
 from bot_api.exception.service_error_code_enum import ServiceErrorCode
 from bot_api.exception.service_exception import ServiceException
 from bot_api.route.route import Route
-from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_data.model.auth_role_enum import AuthRoleEnum
 from bot_data.model.auth_user import AuthUser
 from bot_data.model.auto_role import AutoRole
@@ -18,7 +16,6 @@ from bot_data.model.client import Client
 from bot_data.model.known_user import KnownUser
 from bot_data.model.level import Level
 from bot_data.model.server import Server
-from bot_data.model.server_config import ServerConfig
 from bot_data.model.user import User
 from bot_data.model.user_joined_game_server import UserJoinedGameServer
 from bot_data.model.user_joined_server import UserJoinedServer
@@ -68,12 +65,8 @@ class QueryABC(ObjectType):
         self.set_field(f"{name}s", wrapper)
         self.set_field(f"{name}Count", lambda *args: wrapper(*args).count())
 
-    def _can_user_see_element(self, user: AuthUser, element: T) -> bool:
-        @ServiceProviderABC.inject
-        def get_services(services: ServiceProviderABC) -> ServiceProviderABC:
-            return services
-
-        services = get_services()
+    @ServiceProviderABC.inject
+    def _can_user_see_element(self, user: AuthUser, element, services: ServiceProviderABC) -> bool:
         permissions: PermissionService = services.get_service(PermissionService)
         bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC)
 
@@ -89,12 +82,12 @@ class QueryABC(ObjectType):
                     break
 
         elif type(element) == AutoRoleRule:
-            element: AutoRoleRule = element
+            element: AutoRole = element
             for u in user.users:
                 u: User = u
                 guild = bot.get_guild(u.server.discord_id)
                 member = guild.get_member(u.discord_id)
-                if permissions.is_member_moderator(member) and u.server.id == element.auto_role.server.id:
+                if permissions.is_member_moderator(member) and u.server.id == element.server.id:
                     access = True
                     break
 
@@ -164,24 +157,6 @@ class QueryABC(ObjectType):
                     access = True
                     break
 
-        elif type(element) == ServerConfig:
-            for u in user.users:
-                u: User = u
-                guild = bot.get_guild(u.server.discord_id)
-                member = guild.get_member(u.discord_id)
-                if permissions.is_member_technician(member):
-                    access = True
-                    break
-
-        elif type(element) == dict and "key" in element and element["key"] in [e.value for e in FeatureFlagsEnum]:
-            for u in user.users:
-                u: User = u
-                guild = bot.get_guild(u.server.discord_id)
-                member = guild.get_member(u.discord_id)
-                if permissions.is_member_technician(member):
-                    access = True
-                    break
-
         return access
 
     @ServiceProviderABC.inject