diff --git a/bot/cpl-workspace.json b/bot/cpl-workspace.json index d08ceb87..74d016e7 100644 --- a/bot/cpl-workspace.json +++ b/bot/cpl-workspace.json @@ -21,7 +21,8 @@ "checks": "tools/checks/checks.json", "get-version": "tools/get_version/get-version.json", "post-build": "tools/post_build/post-build.json", - "set-version": "tools/set_version/set-version.json" + "set-version": "tools/set_version/set-version.json", + "migration-to-sql": "tools/migration_to_sql/migration-to-sql.json" }, "Scripts": { "format": "black ./", diff --git a/bot/src/bot/__init__.py b/bot/src/bot/__init__.py index 66492481..2c48083c 100644 --- a/bot/src/bot/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot/bot b/bot/src/bot/bot old mode 100644 new mode 100755 diff --git a/bot/src/bot/bot.json b/bot/src/bot/bot.json index fc54fc03..3df77fe5 100644 --- a/bot/src/bot/bot.json +++ b/bot/src/bot/bot.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -37,7 +37,8 @@ ], "DevDependencies": [ "cpl-cli==2023.4.0.post3", - "pygount==1.6.1" + "pygount==1.6.1", + "black==23.10.1" ], "PythonVersion": ">=3.10.4", "PythonPath": {}, diff --git a/bot/src/bot/extension/__init__.py b/bot/src/bot/extension/__init__.py index 6e06c4c1..11e2f1a9 100644 --- a/bot/src/bot/extension/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/__init__.py b/bot/src/bot_api/__init__.py index b184402c..df9c0c6a 100644 --- a/bot/src/bot_api/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/abc/__init__.py b/bot/src/bot_api/abc/__init__.py index 3a5ba57d..875a258f 100644 --- a/bot/src/bot_api/abc/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/bot-api.json b/bot/src/bot_api/bot-api.json index 8a7c4b87..e78dd5fc 100644 --- a/bot/src/bot_api/bot-api.json +++ b/bot/src/bot_api/bot-api.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/bot_api/configuration/__init__.py b/bot/src/bot_api/configuration/__init__.py index 56302478..acc0d2a9 100644 --- a/bot/src/bot_api/configuration/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/controller/__init__.py b/bot/src/bot_api/controller/__init__.py index edcd5576..1a9d01c3 100644 --- a/bot/src/bot_api/controller/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/controller/auth_controller.py b/bot/src/bot_api/controller/auth_controller.py index 983b5fb9..12ec2b9b 100644 --- a/bot/src/bot_api/controller/auth_controller.py +++ b/bot/src/bot_api/controller/auth_controller.py @@ -14,7 +14,10 @@ from bot_api.model.reset_password_dto import ResetPasswordDTO from bot_api.model.token_dto import TokenDTO from bot_api.model.update_auth_user_dto import UpdateAuthUserDTO from bot_api.route.route import Route +from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum +from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings from bot_data.model.auth_role_enum import AuthRoleEnum +from bot_data.model.technician_config import TechnicianConfig class AuthController: @@ -30,6 +33,7 @@ class AuthController: mail_settings: EMailClientSettings, mailer: EMailClientABC, auth_service: AuthServiceABC, + technician_config: TechnicianConfig, ): self._config = config self._env = env @@ -39,6 +43,7 @@ class AuthController: self._mail_settings = mail_settings self._mailer = mailer self._auth_service = auth_service + self._technician_config = technician_config @Route.get(f"{BasePath}/users") @Route.authorize(role=AuthRoleEnum.admin) @@ -70,17 +75,32 @@ class AuthController: @Route.post(f"{BasePath}/register") async def register(self): + if not FeatureFlagsSettings.get_flag_from_dict( + self._technician_config.feature_flags, FeatureFlagsEnum.basic_registration + ): + return + dto: AuthUserDTO = JSONProcessor.process(AuthUserDTO, request.get_json(force=True, silent=True)) self._auth_service.add_auth_user(dto) return "", 200 @Route.post(f"{BasePath}/register-by-id/") async def register_id(self, id: str): + if not FeatureFlagsSettings.get_flag_from_dict( + self._technician_config.feature_flags, FeatureFlagsEnum.basic_registration + ): + return + result = await self._auth_service.confirm_email_async(id) return jsonify(result) @Route.post(f"{BasePath}/login") async def login(self) -> Response: + if not FeatureFlagsSettings.get_flag_from_dict( + self._technician_config.feature_flags, FeatureFlagsEnum.basic_login + ): + return jsonify({}) + dto: AuthUserDTO = JSONProcessor.process(AuthUserDTO, request.get_json(force=True, silent=True)) result = await self._auth_service.login_async(dto) return jsonify(result.to_dict()) @@ -100,6 +120,11 @@ class AuthController: @Route.post(f"{BasePath}/forgot-password/") async def forgot_password(self, email: str): + if not FeatureFlagsSettings.get_flag_from_dict( + self._technician_config.feature_flags, FeatureFlagsEnum.basic_login + ): + return "", 409 + await self._auth_service.forgot_password_async(email) return "", 200 @@ -110,6 +135,11 @@ class AuthController: @Route.post(f"{BasePath}/reset-password") async def reset_password(self): + if not FeatureFlagsSettings.get_flag_from_dict( + self._technician_config.feature_flags, FeatureFlagsEnum.basic_login + ): + return "", 409 + dto: ResetPasswordDTO = JSONProcessor.process(ResetPasswordDTO, request.get_json(force=True, silent=True)) await self._auth_service.reset_password_async(dto) return "", 200 diff --git a/bot/src/bot_api/controller/gui_controller.py b/bot/src/bot_api/controller/gui_controller.py index c047b0e3..1f97d852 100644 --- a/bot/src/bot_api/controller/gui_controller.py +++ b/bot/src/bot_api/controller/gui_controller.py @@ -12,6 +12,9 @@ from bot_api.logging.api_logger import ApiLogger from bot_api.model.settings_dto import SettingsDTO from bot_api.model.version_dto import VersionDTO from bot_api.route.route import Route +from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum +from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings +from bot_data.model.technician_config import TechnicianConfig class GuiController: @@ -82,3 +85,11 @@ class GuiController: ) self._mailer.send_mail(mail) return "", 200 + + @Route.get(f"{BasePath}/has-feature-flag/") + async def has_feature_flag(self, flag: str): + settings: TechnicianConfig = self._config.get_configuration(TechnicianConfig) + return { + "key": flag, + "value": FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum(flag)), + } diff --git a/bot/src/bot_api/event/__init__.py b/bot/src/bot_api/event/__init__.py index 32143bf9..6df9eef0 100644 --- a/bot/src/bot_api/event/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/exception/__init__.py b/bot/src/bot_api/exception/__init__.py index 8417333d..074f8b7f 100644 --- a/bot/src/bot_api/exception/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/filter/__init__.py b/bot/src/bot_api/filter/__init__.py index 4872be0f..7e1611d0 100644 --- a/bot/src/bot_api/filter/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/filter/discord/__init__.py b/bot/src/bot_api/filter/discord/__init__.py index e021de24..61a90876 100644 --- a/bot/src/bot_api/filter/discord/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/logging/__init__.py b/bot/src/bot_api/logging/__init__.py index 8a9a8373..a6edbdab 100644 --- a/bot/src/bot_api/logging/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/model/__init__.py b/bot/src/bot_api/model/__init__.py index 7f0d1116..af65112c 100644 --- a/bot/src/bot_api/model/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/model/discord/__init__.py b/bot/src/bot_api/model/discord/__init__.py index 7916a455..239b55f8 100644 --- a/bot/src/bot_api/model/discord/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/route/__init__.py b/bot/src/bot_api/route/__init__.py index e7485a60..3869fb82 100644 --- a/bot/src/bot_api/route/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/service/__init__.py b/bot/src/bot_api/service/__init__.py index 0a5bb2c5..3a6d2aed 100644 --- a/bot/src/bot_api/service/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_api/transformer/__init__.py b/bot/src/bot_api/transformer/__init__.py index 934740e5..91d52f24 100644 --- a/bot/src/bot_api/transformer/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/__init__.py b/bot/src/bot_core/__init__.py index 9697a829..67d1ae08 100644 --- a/bot/src/bot_core/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/abc/__init__.py b/bot/src/bot_core/abc/__init__.py index b5bb27ab..51f03ef1 100644 --- a/bot/src/bot_core/abc/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/abc/task_abc.py b/bot/src/bot_core/abc/task_abc.py index 5f578a99..9bbd3e54 100644 --- a/bot/src/bot_core/abc/task_abc.py +++ b/bot/src/bot_core/abc/task_abc.py @@ -21,7 +21,7 @@ class TaskABC(commands.Cog): @ServiceProviderABC.inject async def _wait_until_ready(self, config: ConfigurationABC, logger: TaskLogger, bot: DiscordBotServiceABC): - logger.debug(__name__, f"Waiting before {type(self).__name__}") + logger.debug(__name__, f"Waiting before ready {type(self).__name__}") await bot.wait_until_ready() async def wait(): diff --git a/bot/src/bot_core/bot-core.json b/bot/src/bot_core/bot-core.json index 4cd4141c..88bca2f3 100644 --- a/bot/src/bot_core/bot-core.json +++ b/bot/src/bot_core/bot-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/src/bot_core/configuration/__init__.py b/bot/src/bot_core/configuration/__init__.py index 69f1cb6c..8f30f1b4 100644 --- a/bot/src/bot_core/configuration/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/configuration/feature_flags_enum.py b/bot/src/bot_core/configuration/feature_flags_enum.py index 6d051b0c..61a4652e 100644 --- a/bot/src/bot_core/configuration/feature_flags_enum.py +++ b/bot/src/bot_core/configuration/feature_flags_enum.py @@ -27,3 +27,6 @@ class FeatureFlagsEnum(Enum): short_role_name = "ShortRoleName" technician_full_access = "TechnicianFullAccess" steam_special_offers = "SteamSpecialOffers" + scheduled_events = "ScheduledEvents" + basic_registration = "BasicRegistration" + basic_login = "BasicLogin" diff --git a/bot/src/bot_core/configuration/feature_flags_settings.py b/bot/src/bot_core/configuration/feature_flags_settings.py index 0ed95e71..cbea9a97 100644 --- a/bot/src/bot_core/configuration/feature_flags_settings.py +++ b/bot/src/bot_core/configuration/feature_flags_settings.py @@ -29,6 +29,9 @@ class FeatureFlagsSettings(ConfigurationModelABC): FeatureFlagsEnum.short_role_name.value: False, # 28.09.2023 #378 FeatureFlagsEnum.technician_full_access.value: False, # 03.10.2023 #393 FeatureFlagsEnum.steam_special_offers.value: False, # 11.10.2023 #188 + FeatureFlagsEnum.scheduled_events.value: False, # 14.11.2023 #410 + FeatureFlagsEnum.basic_registration.value: False, # 19.11.2023 #440 + FeatureFlagsEnum.basic_login.value: False, # 19.11.2023 #440 } def __init__(self, **kwargs: dict): diff --git a/bot/src/bot_core/core_extension/__init__.py b/bot/src/bot_core/core_extension/__init__.py index c995ae74..4c6536e7 100644 --- a/bot/src/bot_core/core_extension/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/events/__init__.py b/bot/src/bot_core/events/__init__.py index 1924190f..a8c10680 100644 --- a/bot/src/bot_core/events/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/exception/__init__.py b/bot/src/bot_core/exception/__init__.py index fe85c817..90187d93 100644 --- a/bot/src/bot_core/exception/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/helper/__init__.py b/bot/src/bot_core/helper/__init__.py index 99171d59..2a55905b 100644 --- a/bot/src/bot_core/helper/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/logging/__init__.py b/bot/src/bot_core/logging/__init__.py index c1b4c53e..e0321bbb 100644 --- a/bot/src/bot_core/logging/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/pipes/__init__.py b/bot/src/bot_core/pipes/__init__.py index bd5f25f4..b894175a 100644 --- a/bot/src/bot_core/pipes/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/service/__init__.py b/bot/src/bot_core/service/__init__.py index 7a69b0e2..d4e02c25 100644 --- a/bot/src/bot_core/service/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_core/service/data_integrity_service.py b/bot/src/bot_core/service/data_integrity_service.py index 83f53551..fb6797f3 100644 --- a/bot/src/bot_core/service/data_integrity_service.py +++ b/bot/src/bot_core/service/data_integrity_service.py @@ -92,7 +92,7 @@ class DataIntegrityService: except Exception as e: self._logger.error(__name__, f"Cannot get user", e) - def _check_servers(self): + def check_servers(self): self._logger.debug(__name__, f"Start checking Servers table") for g in self._bot.guilds: g: discord.Guild = g @@ -411,7 +411,7 @@ class DataIntegrityService: await self._check_default_role() self._check_known_users() - self._check_servers() + self.check_servers() self._check_clients() self._check_users() self._check_user_joins() diff --git a/bot/src/bot_data/__init__.py b/bot/src/bot_data/__init__.py index f731036c..352e5ee4 100644 --- a/bot/src/bot_data/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_data/abc/__init__.py b/bot/src/bot_data/abc/__init__.py index 5aeb87ae..15cf6b03 100644 --- a/bot/src/bot_data/abc/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_data/abc/scheduled_event_repository_abc.py b/bot/src/bot_data/abc/scheduled_event_repository_abc.py new file mode 100644 index 00000000..ff0d54c2 --- /dev/null +++ b/bot/src/bot_data/abc/scheduled_event_repository_abc.py @@ -0,0 +1,35 @@ +from abc import ABC, abstractmethod + +from cpl_query.extension import List + +from bot_data.model.scheduled_event import ScheduledEvent + + +class ScheduledEventRepositoryABC(ABC): + @abstractmethod + def __init__(self): + pass + + @abstractmethod + def get_scheduled_events(self) -> List[ScheduledEvent]: + pass + + @abstractmethod + def get_scheduled_event_by_id(self, id: int) -> ScheduledEvent: + pass + + @abstractmethod + def get_scheduled_events_by_server_id(self, id: int) -> List[ScheduledEvent]: + pass + + @abstractmethod + def add_scheduled_event(self, scheduled_event: ScheduledEvent): + pass + + @abstractmethod + def update_scheduled_event(self, scheduled_event: ScheduledEvent): + pass + + @abstractmethod + def delete_scheduled_event(self, scheduled_event: ScheduledEvent): + pass diff --git a/bot/src/bot_data/bot-data.json b/bot/src/bot_data/bot-data.json index e4c1a314..e2a92ba9 100644 --- a/bot/src/bot_data/bot-data.json +++ b/bot/src/bot_data/bot-data.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/src/bot_data/data_module.py b/bot/src/bot_data/data_module.py index cec9cb37..5d20e874 100644 --- a/bot/src/bot_data/data_module.py +++ b/bot/src/bot_data/data_module.py @@ -14,6 +14,7 @@ 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.scheduled_event_repository_abc import ScheduledEventRepositoryABC from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC from bot_data.abc.server_repository_abc import ServerRepositoryABC from bot_data.abc.short_role_name_repository_abc import ShortRoleNameRepositoryABC @@ -45,6 +46,7 @@ from bot_data.service.client_repository_service import ClientRepositoryService from bot_data.service.game_server_repository_service import GameServerRepositoryService from bot_data.service.known_user_repository_service import KnownUserRepositoryService from bot_data.service.level_repository_service import LevelRepositoryService +from bot_data.service.scheduled_event_repository_service import ScheduledEventRepositoryService from bot_data.service.seeder_service import SeederService from bot_data.service.server_config_repository_service import ( ServerConfigRepositoryService, @@ -115,6 +117,7 @@ class DataModule(ModuleABC): services.add_transient(ServerConfigRepositoryABC, ServerConfigRepositoryService) services.add_transient(ShortRoleNameRepositoryABC, ShortRoleNameRepositoryService) services.add_transient(SteamSpecialOfferRepositoryABC, SteamSpecialOfferRepositoryService) + services.add_transient(ScheduledEventRepositoryABC, ScheduledEventRepositoryService) services.add_transient(SeederService) services.add_transient(DataSeederABC, TechnicianConfigSeeder) diff --git a/bot/src/bot_data/migration/achievements_migration.py b/bot/src/bot_data/migration/achievements_migration.py deleted file mode 100644 index f3a454d3..00000000 --- a/bot/src/bot_data/migration/achievements_migration.py +++ /dev/null @@ -1,127 +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 AchievementsMigration(MigrationABC): - name = "1.1.0_AchievementsMigration" - - 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 `Achievements` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Name` VARCHAR(255) NOT NULL, - `Description` VARCHAR(255) NOT NULL, - `Attribute` VARCHAR(255) NOT NULL, - `Operator` VARCHAR(255) NOT NULL, - `Value` VARCHAR(255) NOT NULL, - `ServerId` BIGINT, - `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 `AchievementsHistory` - ( - `Id` BIGINT(20) NOT NULL, - `Name` VARCHAR(255) NOT NULL, - `Description` VARCHAR(255) NOT NULL, - `Attribute` VARCHAR(255) NOT NULL, - `Operator` VARCHAR(255) NOT NULL, - `Value` VARCHAR(255) NOT NULL, - `ServerId` BIGINT, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `UserGotAchievements` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `UserId` BIGINT, - `AchievementId` BIGINT, - `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 (`UserId`) REFERENCES `Users`(`UserId`), - FOREIGN KEY (`AchievementId`) REFERENCES `Achievements`(`Id`) - ); - """ - ) - ) - - # A join table history between users and achievements is not necessary. - - self._cursor.execute(str(f"""ALTER TABLE Users ADD MessageCount BIGINT NOT NULL DEFAULT 0 AFTER XP;""")) - self._cursor.execute(str(f"""ALTER TABLE Users ADD ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;""")) - self._cursor.execute(str(f"""ALTER TABLE UsersHistory ADD MessageCount BIGINT NOT NULL DEFAULT 0 AFTER XP;""")) - self._cursor.execute(str(f"""ALTER TABLE UsersHistory ADD ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;""")) - - self._cursor.execute(str(f"""DROP TRIGGER IF EXISTS `TR_AchievementsUpdate`;""")) - self._cursor.execute( - str( - f""" - CREATE TRIGGER `TR_AchievementsUpdate` - AFTER UPDATE - ON `Achievements` - FOR EACH ROW - BEGIN - INSERT INTO `AchievementsHistory` ( - `Id`, `Name`, `Description`, `Attribute`, `Operator`, `Value`, `ServerId`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.Name, OLD.Description, OLD.Attribute, OLD.Operator, OLD.Value, OLD.ServerId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); - END; - """ - ) - ) - - self._cursor.execute(str(f"""DROP TRIGGER IF EXISTS `TR_AchievementsDelete`;""")) - - self._cursor.execute( - str( - f""" - CREATE TRIGGER `TR_AchievementsDelete` - AFTER DELETE - ON `Achievements` - FOR EACH ROW - BEGIN - INSERT INTO `AchievementsHistory` ( - `Id`, `Name`, `Description`, `Attribute`, `Operator`, `Value`, `ServerId`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.Name, OLD.Description, OLD.Attribute, OLD.Operator, OLD.Value, OLD.ServerId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); - END; - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `Achievements`;") - - self._cursor.execute(str(f"""ALTER TABLE Users DROP COLUMN MessageCount;""")) - self._cursor.execute(str(f"""ALTER TABLE Users DROP COLUMN ReactionCount;""")) diff --git a/bot/src/bot_data/migration/api_key_migration.py b/bot/src/bot_data/migration/api_key_migration.py deleted file mode 100644 index 0712974b..00000000 --- a/bot/src/bot_data/migration/api_key_migration.py +++ /dev/null @@ -1,38 +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 ApiKeyMigration(MigrationABC): - name = "1.0.0_ApiKeyMigration" - - 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 `ApiKeys` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Identifier` VARCHAR(255) NOT NULL, - `Key` VARCHAR(255) NOT NULL, - `CreatorId` BIGINT NULL, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`Id`), - FOREIGN KEY (`CreatorId`) REFERENCES `Users`(`UserId`), - CONSTRAINT UC_Identifier_Key UNIQUE (`Identifier`,`Key`), - CONSTRAINT UC_Key UNIQUE (`Key`) - ); - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `ApiKeys`;") diff --git a/bot/src/bot_data/migration/api_migration.py b/bot/src/bot_data/migration/api_migration.py deleted file mode 100644 index e67eb53f..00000000 --- a/bot/src/bot_data/migration/api_migration.py +++ /dev/null @@ -1,61 +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 ApiMigration(MigrationABC): - name = "0.3_ApiMigration" - - 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 `AuthUsers` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `FirstName` VARCHAR(255), - `LastName` VARCHAR(255), - `EMail` VARCHAR(255), - `Password` VARCHAR(255), - `PasswordSalt` VARCHAR(255), - `RefreshToken` VARCHAR(255), - `ConfirmationId` VARCHAR(255) DEFAULT NULL, - `ForgotPasswordId` VARCHAR(255) DEFAULT NULL, - `OAuthId` VARCHAR(255) DEFAULT NULL, - `RefreshTokenExpiryTime` DATETIME(6) NOT NULL, - `AuthRole` INT NOT NULL DEFAULT 0, - `CreatedAt` DATETIME(6) NOT NULL, - `LastModifiedAt` DATETIME(6) NOT NULL, - PRIMARY KEY(`Id`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `AuthUserUsersRelations`( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `AuthUserId` BIGINT DEFAULT NULL, - `UserId` BIGINT DEFAULT NULL, - `CreatedAt` DATETIME(6) NOT NULL, - `LastModifiedAt` DATETIME(6) NOT NULL, - PRIMARY KEY(`Id`), - FOREIGN KEY (`AuthUserId`) REFERENCES `AuthUsers`(`Id`), - FOREIGN KEY (`UserId`) REFERENCES `Users`(`UserId`) - ); - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `AuthUsers`;") - self._cursor.execute("DROP TABLE `AuthUserUsersRelations`;") diff --git a/bot/src/bot_data/migration/auto_role_fix1_migration.py b/bot/src/bot_data/migration/auto_role_fix1_migration.py deleted file mode 100644 index 70a8e30e..00000000 --- a/bot/src/bot_data/migration/auto_role_fix1_migration.py +++ /dev/null @@ -1,33 +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 AutoRoleFix1Migration(MigrationABC): - name = "0.3.0_AutoRoleFixMigration" - - 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""" - ALTER TABLE AutoRoles ADD DiscordChannelId BIGINT NOT NULL AFTER ServerId; - """ - ) - ) - - def downgrade(self): - self._cursor.execute( - str( - f""" - ALTER TABLE AutoRoles DROP COLUMN DiscordChannelId; - """ - ) - ) diff --git a/bot/src/bot_data/migration/auto_role_migration.py b/bot/src/bot_data/migration/auto_role_migration.py deleted file mode 100644 index 4b8e0090..00000000 --- a/bot/src/bot_data/migration/auto_role_migration.py +++ /dev/null @@ -1,53 +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 AutoRoleMigration(MigrationABC): - name = "0.2.1_AutoRoleMigration" - - 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 `AutoRoles` ( - `AutoRoleId` BIGINT NOT NULL AUTO_INCREMENT, - `ServerId` BIGINT, - `DiscordMessageId` BIGINT NOT NULL, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`AutoRoleId`), - FOREIGN KEY (`ServerId`) REFERENCES `Servers`(`ServerId`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `AutoRoleRules` ( - `AutoRoleRuleId` BIGINT NOT NULL AUTO_INCREMENT, - `AutoRoleId` BIGINT, - `DiscordEmojiName` VARCHAR(64), - `DiscordRoleId` BIGINT NOT NULL, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`AutoRoleRuleId`), - FOREIGN KEY (`AutoRoleId`) REFERENCES `AutoRoles`(`AutoRoleId`) - ); - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `AutoRole`;") - self._cursor.execute("DROP TABLE `AutoRoleRules`;") diff --git a/bot/src/bot_data/migration/birthday_migration.py b/bot/src/bot_data/migration/birthday_migration.py deleted file mode 100644 index 607de4d3..00000000 --- a/bot/src/bot_data/migration/birthday_migration.py +++ /dev/null @@ -1,84 +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 BirthdayMigration(MigrationABC): - name = "1.2.0_BirthdayMigration" - - 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""" - ALTER TABLE Users - ADD Birthday DATE NULL AFTER MessageCount; - """ - ) - ) - - self._cursor.execute( - str( - f""" - ALTER TABLE UsersHistory - ADD Birthday DATE NULL AFTER MessageCount; - """ - ) - ) - self._exec(__file__, "users.sql") - - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_Server - ADD XpForBirthday BIGINT(20) NOT NULL DEFAULT 0 AFTER XpPerAchievement; - """ - ) - ) - - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_ServerHistory - ADD XpForBirthday BIGINT(20) NOT NULL DEFAULT 0 AFTER XpPerAchievement; - """ - ) - ) - self._exec(__file__, "config/server.sql") - - def downgrade(self): - self._cursor.execute( - str( - f""" - ALTER TABLE Users DROP COLUMN Birthday; - """ - ) - ) - self._cursor.execute( - str( - f""" - ALTER TABLE UsersHistory DROP COLUMN Birthday; - """ - ) - ) - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_Server DROP COLUMN XpForBirthday; - """ - ) - ) - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_ServerHistory DROP COLUMN XpForBirthday; - """ - ) - ) diff --git a/bot/src/bot_data/migration/config_feature_flags_migration.py b/bot/src/bot_data/migration/config_feature_flags_migration.py deleted file mode 100644 index f9046565..00000000 --- a/bot/src/bot_data/migration/config_feature_flags_migration.py +++ /dev/null @@ -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;") diff --git a/bot/src/bot_data/migration/config_migration.py b/bot/src/bot_data/migration/config_migration.py deleted file mode 100644 index d65ac06d..00000000 --- a/bot/src/bot_data/migration/config_migration.py +++ /dev/null @@ -1,145 +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 ConfigMigration(MigrationABC): - name = "1.1.0_ConfigMigration" - - def __init__(self, logger: DatabaseLogger, db: DBContext): - MigrationABC.__init__(self) - self._logger = logger - self._db = db - - def upgrade(self): - self._logger.debug(__name__, "Running upgrade") - self._server_upgrade() - self._technician_upgrade() - - self._exec(__file__, "config/server.sql") - self._exec(__file__, "config/server_afk_channels.sql") - self._exec(__file__, "config/server_team_roles.sql") - self._exec(__file__, "config/technician.sql") - self._exec(__file__, "config/technician_ids.sql") - self._exec(__file__, "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`;") diff --git a/bot/src/bot_data/migration/db_history_migration.py b/bot/src/bot_data/migration/db_history_migration.py deleted file mode 100644 index 5452d9e5..00000000 --- a/bot/src/bot_data/migration/db_history_migration.py +++ /dev/null @@ -1,56 +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 DBHistoryMigration(MigrationABC): - name = "1.0.0_DBHistoryMigration" - prio = 1 - - 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._exec(__file__, "api_keys.sql") - self._exec(__file__, "auth_users.sql") - self._exec(__file__, "auth_user_users_relation.sql") - self._exec(__file__, "auto_role_rules.sql") - self._exec(__file__, "auto_roles.sql") - self._exec(__file__, "clients.sql") - self._exec(__file__, "game_servers.sql") - self._exec(__file__, "known_users.sql") - self._exec(__file__, "levels.sql") - self._exec(__file__, "servers.sql") - self._exec(__file__, "user_game_idents.sql") - self._exec(__file__, "user_joined_game_servers.sql") - self._exec(__file__, "user_joined_servers.sql") - self._exec(__file__, "user_joined_voice_channel.sql") - self._exec(__file__, "user_message_count_per_hour.sql") - self._exec(__file__, "users.sql") - self._exec(__file__, "user_warnings.sql") - - self._logger.debug(__name__, "Finished history upgrade") - - def downgrade(self): - self._cursor.execute("DROP TABLE `ApiKeysHistory`;") - self._cursor.execute("DROP TABLE `AuthUsersHistory`;") - self._cursor.execute("DROP TABLE `AuthUserUsersRelationsHistory`;") - self._cursor.execute("DROP TABLE `AutoRoleRulesHistory`;") - self._cursor.execute("DROP TABLE `AutoRolesHistory`;") - self._cursor.execute("DROP TABLE `ClientsHistory`;") - self._cursor.execute("DROP TABLE `GameServersHistory`;") - self._cursor.execute("DROP TABLE `KnownUsersHistory`;") - self._cursor.execute("DROP TABLE `LevelsHistory`;") - self._cursor.execute("DROP TABLE `ServersHistory`;") - self._cursor.execute("DROP TABLE `UserGameIdentsHistory`;") - self._cursor.execute("DROP TABLE `UserJoinedGameServerHistory`;") - self._cursor.execute("DROP TABLE `UserJoinedServersHistory`;") - self._cursor.execute("DROP TABLE `UserJoinedVoiceChannelHistory`;") - self._cursor.execute("DROP TABLE `UserMessageCountPerHourHistory`;") - self._cursor.execute("DROP TABLE `UsersHistory`;") - self._cursor.execute("DROP TABLE `UserWarningsHistory`;") diff --git a/bot/src/bot_data/migration/db_history_scripts/api_keys.sql b/bot/src/bot_data/migration/db_history_scripts/api_keys.sql deleted file mode 100644 index 10285da4..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/api_keys.sql +++ /dev/null @@ -1,46 +0,0 @@ -ALTER TABLE `ApiKeys` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `ApiKeys` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `ApiKeysHistory` -( - `Id` BIGINT(20) NOT NULL, - `Identifier` VARCHAR(255) NOT NULL, - `Key` VARCHAR(255) NOT NULL, - `CreatorId` BIGINT(20) DEFAULT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_ApiKeysUpdate`; - -CREATE TRIGGER `TR_ApiKeysUpdate` - AFTER UPDATE - ON `ApiKeys` - FOR EACH ROW -BEGIN - INSERT INTO `ApiKeysHistory` ( - `Id`, `Identifier`, `Key`, `CreatorId`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.Identifier, OLD.Key, OLD.CreatorId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_ApiKeysDelete`; - -CREATE TRIGGER `TR_ApiKeysDelete` - AFTER DELETE - ON `ApiKeys` - FOR EACH ROW -BEGIN - INSERT INTO `ApiKeysHistory` ( - `Id`, `Identifier`, `Key`, `CreatorId`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.Identifier, OLD.Key, OLD.CreatorId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/auth_user_users_relation.sql b/bot/src/bot_data/migration/db_history_scripts/auth_user_users_relation.sql deleted file mode 100644 index 2ce0d762..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/auth_user_users_relation.sql +++ /dev/null @@ -1,46 +0,0 @@ -ALTER TABLE `AuthUserUsersRelations` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `AuthUserUsersRelations` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - - -CREATE TABLE IF NOT EXISTS `AuthUserUsersRelationsHistory` -( - `Id` BIGINT(20) NOT NULL, - `AuthUserId` BIGINT(20) DEFAULT NULL, - `UserId` BIGINT(20) DEFAULT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_AuthUserUsersRelationsUpdate`; - -CREATE TRIGGER `TR_AuthUserUsersRelationsUpdate` - AFTER UPDATE - ON `AuthUserUsersRelations` - FOR EACH ROW -BEGIN - INSERT INTO `AuthUserUsersRelationsHistory` ( - `Id`, `AuthUserId`, `UserId`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.AuthUserId, OLD.UserId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_AuthUserUsersRelationsDelete`; - -CREATE TRIGGER `TR_AuthUserUsersRelationsDelete` - AFTER DELETE - ON `AuthUserUsersRelations` - FOR EACH ROW -BEGIN - INSERT INTO `AuthUserUsersRelationsHistory` ( - `Id`, `AuthUserId`, `UserId`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.AuthUserId, OLD.UserId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/auth_users.sql b/bot/src/bot_data/migration/db_history_scripts/auth_users.sql deleted file mode 100644 index ab22cc65..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/auth_users.sql +++ /dev/null @@ -1,62 +0,0 @@ -ALTER TABLE `AuthUsers` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `AuthUsers` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `AuthUsersHistory` -( - `Id` BIGINT(20) NOT NULL, - `FirstName` VARCHAR(255) DEFAULT NULL, - `LastName` VARCHAR(255) DEFAULT NULL, - `EMail` VARCHAR(255) DEFAULT NULL, - `Password` VARCHAR(255) DEFAULT NULL, - `PasswordSalt` VARCHAR(255) DEFAULT NULL, - `RefreshToken` VARCHAR(255) DEFAULT NULL, - `ConfirmationId` VARCHAR(255) DEFAULT NULL, - `ForgotPasswordId` VARCHAR(255) DEFAULT NULL, - `OAuthId` VARCHAR(255) DEFAULT NULL, - `RefreshTokenExpiryTime` DATETIME(6) NOT NULL, - `AuthRole` BIGINT(11) NOT NULL DEFAULT 0, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_AuthUsersUpdate`; - -CREATE TRIGGER `TR_AuthUsersUpdate` - AFTER UPDATE - ON `AuthUsers` - FOR EACH ROW -BEGIN - INSERT INTO `AuthUsersHistory` ( - `Id`, `FirstName`, `LastName`, `EMail`, `Password`, `PasswordSalt`, - `RefreshToken`, `ConfirmationId`, `ForgotPasswordId`, `OAuthId`, - `RefreshTokenExpiryTime`, `AuthRole`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.FirstName, OLD.LastName, OLD.EMail, OLD.Password, OLD.PasswordSalt, OLD.RefreshToken, - OLD.ConfirmationId, OLD.ForgotPasswordId, OLD.OAuthId, OLD.RefreshTokenExpiryTime, OLD.AuthRole, - OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_AuthUsersDelete`; - -CREATE TRIGGER `TR_AuthUsersDelete` - AFTER DELETE - ON `AuthUsers` - FOR EACH ROW -BEGIN - INSERT INTO `AuthUsersHistory` ( - `Id`, `FirstName`, `LastName`, `EMail`, `Password`, `PasswordSalt`, `RefreshToken`, - `ConfirmationId`, `ForgotPasswordId`, `OAuthId`, `RefreshTokenExpiryTime`, - `AuthRole`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.FirstName, OLD.LastName, OLD.EMail, OLD.Password, OLD.PasswordSalt, OLD.RefreshToken, - OLD.ConfirmationId, OLD.ForgotPasswordId, OLD.OAuthId, OLD.RefreshTokenExpiryTime, OLD.AuthRole, TRUE, - OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/auto_role_rules.sql b/bot/src/bot_data/migration/db_history_scripts/auto_role_rules.sql deleted file mode 100644 index bcfa5f77..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/auto_role_rules.sql +++ /dev/null @@ -1,46 +0,0 @@ -ALTER TABLE `AutoRoleRules` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `AutoRoleRules` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `AutoRoleRulesHistory` -( - `Id` BIGINT(20) NOT NULL, - `AutoRoleId` BIGINT(20) DEFAULT NULL, - `DiscordEmojiName` VARCHAR(64) DEFAULT NULL, - `DiscordRoleId` BIGINT(20) NOT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_AutoRoleRulesUpdate`; - -CREATE TRIGGER `TR_AutoRoleRulesUpdate` - AFTER UPDATE - ON `AutoRoleRules` - FOR EACH ROW -BEGIN - INSERT INTO `AutoRoleRulesHistory` ( - `Id`, `AutoRoleId`, `DiscordEmojiName`, `DiscordRoleId`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.AutoRoleRuleId, OLD.AutoRoleId, OLD.DiscordEmojiName, OLD.DiscordRoleId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_AutoRoleRulesDelete`; - -CREATE TRIGGER `TR_AutoRoleRulesDelete` - AFTER DELETE - ON `AutoRoleRules` - FOR EACH ROW -BEGIN - INSERT INTO `AutoRoleRulesHistory` ( - `Id`, `AutoRoleId`, `DiscordEmojiName`, `DiscordRoleId`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.AutoRoleRuleId, OLD.AutoRoleId, OLD.DiscordEmojiName, OLD.DiscordRoleId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/auto_roles.sql b/bot/src/bot_data/migration/db_history_scripts/auto_roles.sql deleted file mode 100644 index 7b78ea02..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/auto_roles.sql +++ /dev/null @@ -1,48 +0,0 @@ -ALTER TABLE `AutoRoles` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `AutoRoles` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `AutoRolesHistory` -( - `Id` BIGINT(20) NOT NULL, - `ServerId` BIGINT(20) DEFAULT NULL, - `DiscordChannelId` BIGINT(20) NOT NULL, - `DiscordMessageId` BIGINT(20) NOT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_AutoRolesUpdate`; - -CREATE TRIGGER `TR_AutoRolesUpdate` - AFTER UPDATE - ON `AutoRoles` - FOR EACH ROW -BEGIN - INSERT INTO `AutoRolesHistory` ( - `Id`, `ServerId`, `DiscordChannelId`, `DiscordMessageId`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.AutoRoleId, OLD.ServerId, OLD.DiscordChannelId, OLD.DiscordMessageId, OLD.LastModifiedAt, - CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_AutoRolesDelete`; - -CREATE TRIGGER `TR_AutoRolesDelete` - AFTER DELETE - ON `AutoRoles` - FOR EACH ROW -BEGIN - INSERT INTO `AutoRolesHistory` ( - `Id`, `ServerId`, `DiscordChannelId`, `DiscordMessageId`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.AutoRoleId, OLD.ServerId, OLD.DiscordChannelId, OLD.DiscordMessageId, TRUE, OLD.LastModifiedAt, - CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/clients.sql b/bot/src/bot_data/migration/db_history_scripts/clients.sql deleted file mode 100644 index b1048785..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/clients.sql +++ /dev/null @@ -1,54 +0,0 @@ -ALTER TABLE `Clients` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `Clients` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `ClientsHistory` -( - `Id` BIGINT(20) NOT NULL, - `DiscordId` BIGINT(20) NOT NULL, - `SentMessageCount` BIGINT(20) NOT NULL DEFAULT 0, - `ReceivedMessageCount` BIGINT(20) NOT NULL DEFAULT 0, - `DeletedMessageCount` BIGINT(20) NOT NULL DEFAULT 0, - `ReceivedCommandsCount` BIGINT(20) NOT NULL DEFAULT 0, - `MovedUsersCount` BIGINT(20) NOT NULL DEFAULT 0, - `ServerId` BIGINT(20) DEFAULT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_ClientsUpdate`; - -CREATE TRIGGER `TR_ClientsUpdate` - AFTER UPDATE - ON `Clients` - FOR EACH ROW -BEGIN - INSERT INTO `ClientsHistory` ( - `Id`, `DiscordId`, `SentMessageCount`, `ReceivedMessageCount`, `DeletedMessageCount`, - `ReceivedCommandsCount`, `MovedUsersCount`, `ServerId`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.ClientId, OLD.DiscordClientId, OLD.SentMessageCount, OLD.ReceivedMessageCount, OLD.DeletedMessageCount, - OLD.ReceivedCommandsCount, OLD.MovedUsersCount, OLD.ServerId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_ClientsDelete`; - -CREATE TRIGGER `TR_ClientsDelete` - AFTER DELETE - ON `Clients` - FOR EACH ROW -BEGIN - INSERT INTO `ClientsHistory` ( - `Id`, `DiscordId`, `SentMessageCount`, `ReceivedMessageCount`, `DeletedMessageCount`, - `ReceivedCommandsCount`, `MovedUsersCount`, `ServerId`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.ClientId, OLD.DiscordClientId, OLD.SentMessageCount, OLD.ReceivedMessageCount, OLD.DeletedMessageCount, - OLD.ReceivedCommandsCount, OLD.MovedUsersCount, OLD.ServerId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/config/server_afk_channels.sql b/bot/src/bot_data/migration/db_history_scripts/config/server_afk_channels.sql deleted file mode 100644 index 4dfd7e31..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/config/server_afk_channels.sql +++ /dev/null @@ -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; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/config/server_team_roles.sql b/bot/src/bot_data/migration/db_history_scripts/config/server_team_roles.sql deleted file mode 100644 index 8733da4d..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/config/server_team_roles.sql +++ /dev/null @@ -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; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/config/technician_ids.sql b/bot/src/bot_data/migration/db_history_scripts/config/technician_ids.sql deleted file mode 100644 index 251d4b30..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/config/technician_ids.sql +++ /dev/null @@ -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; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/config/technician_ping_urls.sql b/bot/src/bot_data/migration/db_history_scripts/config/technician_ping_urls.sql deleted file mode 100644 index d61c3cce..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/config/technician_ping_urls.sql +++ /dev/null @@ -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; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/game_servers.sql b/bot/src/bot_data/migration/db_history_scripts/game_servers.sql deleted file mode 100644 index 091cbf51..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/game_servers.sql +++ /dev/null @@ -1,46 +0,0 @@ -ALTER TABLE `GameServers` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `GameServers` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `GameServersHistory` -( - `Id` BIGINT(20) NOT NULL, - `Name` VARCHAR(255) NOT NULL, - `ServerId` BIGINT(20) NOT NULL, - `ApiKeyId` BIGINT(20) NOT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_GameServersUpdate`; - -CREATE TRIGGER `TR_GameServersUpdate` - AFTER UPDATE - ON `GameServers` - FOR EACH ROW -BEGIN - INSERT INTO `GameServersHistory` ( - `Id`, `Name`, `ServerId`, `ApiKeyId`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.Name, OLD.ServerId, OLD.ApiKeyId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_GameServersDelete`; - -CREATE TRIGGER `TR_GameServersDelete` - AFTER DELETE - ON `GameServers` - FOR EACH ROW -BEGIN - INSERT INTO `GameServersHistory` ( - `Id`, `Name`, `ServerId`, `ApiKeyId`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.Name, OLD.ServerId, OLD.ApiKeyId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/known_users.sql b/bot/src/bot_data/migration/db_history_scripts/known_users.sql deleted file mode 100644 index 5263aa8d..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/known_users.sql +++ /dev/null @@ -1,44 +0,0 @@ -ALTER TABLE `KnownUsers` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `KnownUsers` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `KnownUsersHistory` -( - `Id` BIGINT(20) NOT NULL, - `DiscordId` BIGINT(20) NOT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_KnownUsersUpdate`; - -CREATE TRIGGER `TR_KnownUsersUpdate` - AFTER UPDATE - ON `KnownUsers` - FOR EACH ROW -BEGIN - INSERT INTO `KnownUsersHistory` ( - `Id`, `DiscordId`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.KnownUserId, OLD.DiscordId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_KnownUsersDelete`; - -CREATE TRIGGER `TR_KnownUsersDelete` - AFTER DELETE - ON `KnownUsers` - FOR EACH ROW -BEGIN - INSERT INTO `KnownUsersHistory` ( - `Id`, `DiscordId`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.KnownUserId, OLD.DiscordId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/levels.sql b/bot/src/bot_data/migration/db_history_scripts/levels.sql deleted file mode 100644 index 6ba534e2..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/levels.sql +++ /dev/null @@ -1,50 +0,0 @@ -ALTER TABLE `Levels` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `Levels` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `LevelsHistory` -( - `Id` BIGINT(20) NOT NULL, - `Name` VARCHAR(255) NOT NULL, - `Color` VARCHAR(8) NOT NULL, - `MinXp` BIGINT(20) NOT NULL, - `PermissionInt` BIGINT(20) NOT NULL, - `ServerId` BIGINT(20) DEFAULT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_LevelsUpdate`; - -CREATE TRIGGER `TR_LevelsUpdate` - AFTER UPDATE - ON `Levels` - FOR EACH ROW -BEGIN - INSERT INTO `LevelsHistory` ( - `Id`, `Name`, `Color`, `MinXp`, `PermissionInt`, `ServerId`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.Name, OLD.Color, OLD.MinXp, OLD.PermissionInt, OLD.ServerId, OLD.LastModifiedAt, - CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_LevelsDelete`; - -CREATE TRIGGER `TR_LevelsDelete` - AFTER DELETE - ON `Levels` - FOR EACH ROW -BEGIN - INSERT INTO `LevelsHistory` ( - `Id`, `Name`, `Color`, `MinXp`, `PermissionInt`, `ServerId`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.Name, OLD.Color, OLD.MinXp, OLD.PermissionInt, OLD.ServerId, TRUE, OLD.LastModifiedAt, - CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/servers.sql b/bot/src/bot_data/migration/db_history_scripts/servers.sql deleted file mode 100644 index 2d9d6c49..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/servers.sql +++ /dev/null @@ -1,44 +0,0 @@ -ALTER TABLE `Servers` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `Servers` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `ServersHistory` -( - `Id` BIGINT(20) NOT NULL, - `DiscordId` BIGINT(20) NOT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_ServersUpdate`; - -CREATE TRIGGER `TR_ServersUpdate` - AFTER UPDATE - ON `Servers` - FOR EACH ROW -BEGIN - INSERT INTO `ServersHistory` ( - `Id`, `DiscordId`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.ServerId, OLD.DiscordServerId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_ServersDelete`; - -CREATE TRIGGER `TR_ServersDelete` - AFTER DELETE - ON `Servers` - FOR EACH ROW -BEGIN - INSERT INTO `ServersHistory` ( - `Id`, `DiscordId`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.ServerId, OLD.DiscordServerId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/user_game_idents.sql b/bot/src/bot_data/migration/db_history_scripts/user_game_idents.sql deleted file mode 100644 index fab7a21b..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/user_game_idents.sql +++ /dev/null @@ -1,46 +0,0 @@ -ALTER TABLE `UserGameIdents` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `UserGameIdents` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `UserGameIdentsHistory` -( - `Id` BIGINT(20) NOT NULL, - `UserId` BIGINT(20) NOT NULL, - `GameServerId` BIGINT(20) NOT NULL, - `Ident` VARCHAR(255) NOT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_UserGameIdentsUpdate`; - -CREATE TRIGGER `TR_UserGameIdentsUpdate` - AFTER UPDATE - ON `UserGameIdents` - FOR EACH ROW -BEGIN - INSERT INTO `UserGameIdentsHistory` ( - `Id`, `UserId`, `GameServerId`, `Ident`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.UserId, OLD.GameServerId, OLD.Ident, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_UserGameIdentsDelete`; - -CREATE TRIGGER `TR_UserGameIdentsDelete` - AFTER DELETE - ON `UserGameIdents` - FOR EACH ROW -BEGIN - INSERT INTO `UserGameIdentsHistory` ( - `Id`, `UserId`, `GameServerId`, `Ident`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.UserId, OLD.GameServerId, OLD.Ident, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/user_joined_game_servers.sql b/bot/src/bot_data/migration/db_history_scripts/user_joined_game_servers.sql deleted file mode 100644 index 203df921..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/user_joined_game_servers.sql +++ /dev/null @@ -1,47 +0,0 @@ -ALTER TABLE `UserJoinedGameServer` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `UserJoinedGameServer` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `UserJoinedGameServerHistory` -( - `Id` BIGINT(20) NOT NULL, - `UserId` BIGINT(20) NOT NULL, - `GameServerId` BIGINT(20) NOT NULL, - `JoinedOn` DATETIME(6) NOT NULL, - `LeavedOn` DATETIME(6) DEFAULT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_UserJoinedGameServerUpdate`; - -CREATE TRIGGER `TR_UserJoinedGameServerUpdate` - AFTER UPDATE - ON `UserJoinedGameServer` - FOR EACH ROW -BEGIN - INSERT INTO `UserJoinedGameServerHistory` ( - `Id`, `UserId`, `GameServerId`, `JoinedOn`, `LeavedOn`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.UserId, OLD.GameServerId, OLD.JoinedOn, OLD.LeavedOn, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_UserJoinedGameServerDelete`; - -CREATE TRIGGER `TR_UserJoinedGameServerDelete` - AFTER DELETE - ON `UserJoinedGameServer` - FOR EACH ROW -BEGIN - INSERT INTO `UserJoinedGameServerHistory` ( - `Id`, `UserId`, `GameServerId`, `JoinedOn`, `LeavedOn`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.UserId, OLD.GameServerId, OLD.JoinedOn, OLD.LeavedOn, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/user_joined_servers.sql b/bot/src/bot_data/migration/db_history_scripts/user_joined_servers.sql deleted file mode 100644 index 45bc7d1e..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/user_joined_servers.sql +++ /dev/null @@ -1,46 +0,0 @@ -ALTER TABLE `UserJoinedServers` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `UserJoinedServers` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `UserJoinedServersHistory` -( - `Id` BIGINT(20) NOT NULL, - `UserId` BIGINT(20) NOT NULL, - `JoinedOn` DATETIME(6) NOT NULL, - `LeavedOn` DATETIME(6) DEFAULT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_UserJoinedServersUpdate`; - -CREATE TRIGGER `TR_UserJoinedServersUpdate` - AFTER UPDATE - ON `UserJoinedServers` - FOR EACH ROW -BEGIN - INSERT INTO `UserJoinedServersHistory` ( - `Id`, `UserId`, `JoinedOn`, `LeavedOn`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.JoinId, OLD.UserId, OLD.JoinedOn, OLD.LeavedOn, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_UserJoinedServersDelete`; - -CREATE TRIGGER `TR_UserJoinedServersDelete` - AFTER DELETE - ON `UserJoinedServers` - FOR EACH ROW -BEGIN - INSERT INTO `UserJoinedServersHistory` ( - `Id`, `UserId`, `JoinedOn`, `LeavedOn`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.JoinId, OLD.UserId, OLD.JoinedOn, OLD.LeavedOn, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/user_joined_voice_channel.sql b/bot/src/bot_data/migration/db_history_scripts/user_joined_voice_channel.sql deleted file mode 100644 index 8d439f7b..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/user_joined_voice_channel.sql +++ /dev/null @@ -1,49 +0,0 @@ -ALTER TABLE `UserJoinedVoiceChannel` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `UserJoinedVoiceChannel` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `UserJoinedVoiceChannelHistory` -( - `Id` BIGINT(20) NOT NULL, - `UserId` BIGINT(20) NOT NULL, - `DiscordChannelId` BIGINT(20) NOT NULL, - `JoinedOn` DATETIME(6) NOT NULL, - `LeavedOn` DATETIME(6) DEFAULT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_UserJoinedVoiceChannelUpdate`; - -CREATE TRIGGER `TR_UserJoinedVoiceChannelUpdate` - AFTER UPDATE - ON `UserJoinedVoiceChannel` - FOR EACH ROW -BEGIN - INSERT INTO `UserJoinedVoiceChannelHistory` ( - `Id`, `UserId`, `DiscordChannelId`, `JoinedOn`, `LeavedOn`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.JoinId, OLD.UserId, OLD.DiscordChannelId, OLD.JoinedOn, OLD.LeavedOn, OLD.LastModifiedAt, - CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_UserJoinedVoiceChannelDelete`; - -CREATE TRIGGER `TR_UserJoinedVoiceChannelDelete` - AFTER DELETE - ON `UserJoinedVoiceChannel` - FOR EACH ROW -BEGIN - INSERT INTO `UserJoinedVoiceChannelHistory` ( - `Id`, `UserId`, `DiscordChannelId`, `JoinedOn`, `LeavedOn`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.JoinId, OLD.UserId, OLD.DiscordChannelId, OLD.JoinedOn, OLD.LeavedOn, TRUE, OLD.LastModifiedAt, - CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/user_message_count_per_hour.sql b/bot/src/bot_data/migration/db_history_scripts/user_message_count_per_hour.sql deleted file mode 100644 index a86841b8..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/user_message_count_per_hour.sql +++ /dev/null @@ -1,47 +0,0 @@ -ALTER TABLE `UserMessageCountPerHour` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `UserMessageCountPerHour` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `UserMessageCountPerHourHistory` -( - `Id` BIGINT(20) NOT NULL, - `Date` DATETIME(6) NOT NULL, - `Hour` BIGINT(20) DEFAULT NULL, - `XPCount` BIGINT(20) DEFAULT NULL, - `UserId` BIGINT(20) DEFAULT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_UserMessageCountPerHourUpdate`; - -CREATE TRIGGER `TR_UserMessageCountPerHourUpdate` - AFTER UPDATE - ON `UserMessageCountPerHour` - FOR EACH ROW -BEGIN - INSERT INTO `UserMessageCountPerHourHistory` ( - `Id`, `UserId`, `Date`, `Hour`, `XPCount`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.UserId, OLD.Date, OLD.Hour, OLD.XPCount, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_UserMessageCountPerHourDelete`; - -CREATE TRIGGER `TR_UserMessageCountPerHourDelete` - AFTER DELETE - ON `UserMessageCountPerHour` - FOR EACH ROW -BEGIN - INSERT INTO `UserMessageCountPerHourHistory` ( - `Id`, `UserId`, `Date`, `Hour`, `XPCount`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.UserId, OLD.Date, OLD.Hour, OLD.XPCount, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/user_warnings.sql b/bot/src/bot_data/migration/db_history_scripts/user_warnings.sql deleted file mode 100644 index 4371b207..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/user_warnings.sql +++ /dev/null @@ -1,46 +0,0 @@ -ALTER TABLE `UserWarnings` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `UserWarnings` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `UserWarningsHistory` -( - `Id` BIGINT(20) NOT NULL, - `Description` VARCHAR(255) NOT NULL, - `UserId` BIGINT(20) NOT NULL, - `Author` BIGINT(20) DEFAULT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_UserWarningsUpdate`; - -CREATE TRIGGER `TR_UserWarningsUpdate` - AFTER UPDATE - ON `UserWarnings` - FOR EACH ROW -BEGIN - INSERT INTO `UserWarningsHistory` ( - `Id`, `Description`, `UserId`, `Author`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.Description, OLD.UserId, OLD.Author, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; - -DROP TRIGGER IF EXISTS `TR_UserWarningsDelete`; - -CREATE TRIGGER `TR_UserWarningsDelete` - AFTER DELETE - ON `UserWarnings` - FOR EACH ROW -BEGIN - INSERT INTO `UserWarningsHistory` ( - `Id`, `Description`, `UserId`, `Author`, `Deleted`, `DateFrom`, `DateTo` - ) - VALUES ( - OLD.Id, OLD.Description, OLD.UserId, OLD.Author, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6) - ); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/db_history_scripts/users.sql b/bot/src/bot_data/migration/db_history_scripts/users.sql deleted file mode 100644 index a91cf560..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/users.sql +++ /dev/null @@ -1,45 +0,0 @@ -ALTER TABLE `Users` - CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6); - -ALTER TABLE `Users` - CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6); - -CREATE TABLE IF NOT EXISTS `UsersHistory` -( - `Id` BIGINT(20) NOT NULL, - `DiscordId` BIGINT(20) NOT NULL, - `XP` BIGINT(20) NOT NULL DEFAULT 0, - `ReactionCount` BIGINT(20) NOT NULL DEFAULT 0, - `MessageCount` BIGINT(20) NOT NULL DEFAULT 0, - `Birthday` DATE NULL, - `ServerId` BIGINT(20) DEFAULT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); - -DROP TRIGGER IF EXISTS `TR_UsersUpdate`; - -CREATE TRIGGER `TR_UsersUpdate` - AFTER UPDATE - ON `Users` - FOR EACH ROW -BEGIN - INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `Birthday`, `ServerId`, - `DateFrom`, `DateTo`) - VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.Birthday, OLD.ServerId, - OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); -END; - -DROP TRIGGER IF EXISTS `TR_UsersDelete`; - -CREATE TRIGGER `TR_UsersDelete` - AFTER DELETE - ON `Users` - FOR EACH ROW -BEGIN - INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `Birthday`, `ServerId`, - `Deleted`, `DateFrom`, `DateTo`) - VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.Birthday, OLD.ServerId, TRUE, - OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); -END; \ No newline at end of file diff --git a/bot/src/bot_data/migration/default_role_migration.py b/bot/src/bot_data/migration/default_role_migration.py deleted file mode 100644 index 24fd4940..00000000 --- a/bot/src/bot_data/migration/default_role_migration.py +++ /dev/null @@ -1,34 +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 DefaultRoleMigration(MigrationABC): - name = "1.1.3_DefaultRoleMigration" - - 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""" - ALTER TABLE CFG_Server - ADD DefaultRoleId BIGINT NULL AFTER LoginMessageChannelId; - """ - ) - ) - - def downgrade(self): - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_Server DROP COLUMN DefaultRoleId; - """ - ) - ) diff --git a/bot/src/bot_data/migration/fix_updates_migration.py b/bot/src/bot_data/migration/fix_updates_migration.py deleted file mode 100644 index f4d5e020..00000000 --- a/bot/src/bot_data/migration/fix_updates_migration.py +++ /dev/null @@ -1,51 +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 FixUpdatesMigration(MigrationABC): - name = "1.1.7_FixUpdatesMigration" - - 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""" - ALTER TABLE CFG_ServerHistory - ADD DefaultRoleId BIGINT NULL AFTER LoginMessageChannelId; - """ - ) - ) - - self._cursor.execute( - str( - """ALTER TABLE CFG_TechnicianHistory ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER CacheMaxMessages;""" - ) - ) - - self._cursor.execute( - str( - """ALTER TABLE CFG_ServerHistory ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId;""" - ) - ) - - self._exec(__file__, "config/server.sql") - self._exec(__file__, "config/technician.sql") - - def downgrade(self): - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_ServerHistory DROP COLUMN DefaultRoleId; - """ - ) - ) - self._cursor.execute("ALTER TABLE CFG_TechnicianHistory DROP COLUMN FeatureFlags;") - self._cursor.execute("ALTER TABLE CFG_ServerHistory DROP COLUMN FeatureFlags;") diff --git a/bot/src/bot_data/migration/fix_user_history_migration.py b/bot/src/bot_data/migration/fix_user_history_migration.py deleted file mode 100644 index 1aec1fa0..00000000 --- a/bot/src/bot_data/migration/fix_user_history_migration.py +++ /dev/null @@ -1,41 +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 FixUserHistoryMigration(MigrationABC): - name = "1.2.0_FixUserHistoryMigration" - - 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") - - # fix 1.1.0_AchievementsMigration - self._cursor.execute( - str(f"""ALTER TABLE UsersHistory ADD COLUMN ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;""") - ) - self._cursor.execute( - str(f"""ALTER TABLE UsersHistory ADD COLUMN MessageCount BIGINT NOT NULL DEFAULT 0 AFTER ReactionCount;""") - ) - self._exec(__file__, "users.sql") - - def downgrade(self): - self._cursor.execute( - str( - f""" - ALTER TABLE UsersHistory DROP COLUMN MessageCount; - """ - ) - ) - self._cursor.execute( - str( - f""" - ALTER TABLE UsersHistory DROP COLUMN ReactionCount; - """ - ) - ) diff --git a/bot/src/bot_data/migration/initial_migration.py b/bot/src/bot_data/migration/initial_migration.py deleted file mode 100644 index 48551dbd..00000000 --- a/bot/src/bot_data/migration/initial_migration.py +++ /dev/null @@ -1,138 +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 InitialMigration(MigrationABC): - name = "0.1_InitialMigration" - - 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 `MigrationHistory` ( - `MigrationId` VARCHAR(255), - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`MigrationId`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `Servers` ( - `ServerId` BIGINT NOT NULL AUTO_INCREMENT, - `DiscordServerId` BIGINT NOT NULL, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`ServerId`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `Users` ( - `UserId` BIGINT NOT NULL AUTO_INCREMENT, - `DiscordId` BIGINT NOT NULL, - `XP` BIGINT NOT NULL DEFAULT 0, - `ServerId` BIGINT, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - FOREIGN KEY (`ServerId`) REFERENCES Servers(`ServerId`), - PRIMARY KEY(`UserId`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `Clients` ( - `ClientId` BIGINT NOT NULL AUTO_INCREMENT, - `DiscordClientId` BIGINT NOT NULL, - `SentMessageCount` BIGINT NOT NULL DEFAULT 0, - `ReceivedMessageCount` BIGINT NOT NULL DEFAULT 0, - `DeletedMessageCount` BIGINT NOT NULL DEFAULT 0, - `ReceivedCommandsCount` BIGINT NOT NULL DEFAULT 0, - `MovedUsersCount` BIGINT NOT NULL DEFAULT 0, - `ServerId` BIGINT, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - FOREIGN KEY (`ServerId`) REFERENCES Servers(`ServerId`), - PRIMARY KEY(`ClientId`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `KnownUsers` ( - `KnownUserId` BIGINT NOT NULL AUTO_INCREMENT, - `DiscordId` BIGINT NOT NULL, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`KnownUserId`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `UserJoinedServers` ( - `JoinId` BIGINT NOT NULL AUTO_INCREMENT, - `UserId` BIGINT NOT NULL, - `JoinedOn` DATETIME(6) NOT NULL, - `LeavedOn` DATETIME(6), - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - FOREIGN KEY (`UserId`) REFERENCES Users(`UserId`), - PRIMARY KEY(`JoinId`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `UserJoinedVoiceChannel` ( - `JoinId` BIGINT NOT NULL AUTO_INCREMENT, - `UserId` BIGINT NOT NULL, - `DiscordChannelId` BIGINT NOT NULL, - `JoinedOn` DATETIME(6) NOT NULL, - `LeavedOn` DATETIME(6), - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - FOREIGN KEY (`UserId`) REFERENCES Users(`UserId`), - PRIMARY KEY(`JoinId`) - ); - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `Servers`;") - self._cursor.execute("DROP TABLE `Users`;") - self._cursor.execute("DROP TABLE `Clients`;") - self._cursor.execute("DROP TABLE `KnownUsers`;") - self._cursor.execute("DROP TABLE `UserJoinedServers`;") - self._cursor.execute("DROP TABLE `UserJoinedVoiceChannel`;") diff --git a/bot/src/bot_data/migration/level_migration.py b/bot/src/bot_data/migration/level_migration.py deleted file mode 100644 index 20ad3c7b..00000000 --- a/bot/src/bot_data/migration/level_migration.py +++ /dev/null @@ -1,38 +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 LevelMigration(MigrationABC): - name = "0.3_LevelMigration" - - 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 `Levels` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Name` VARCHAR(255) NOT NULL, - `Color` VARCHAR(8) NOT NULL, - `MinXp` BIGINT NOT NULL, - `PermissionInt` BIGINT NOT NULL, - `ServerId` BIGINT, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`Id`), - FOREIGN KEY (`ServerId`) REFERENCES `Servers`(`ServerId`) - ); - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `Levels`;") diff --git a/bot/src/bot_data/migration/maintenance_mode_migration.py b/bot/src/bot_data/migration/maintenance_mode_migration.py deleted file mode 100644 index 467c8604..00000000 --- a/bot/src/bot_data/migration/maintenance_mode_migration.py +++ /dev/null @@ -1,51 +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 MaintenanceModeMigration(MigrationABC): - name = "1.2.0_MaintenanceModeMigration" - - 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""" - ALTER TABLE CFG_Technician - ADD Maintenance BOOLEAN DEFAULT FALSE AFTER MaxSteamOfferCount; - """ - ) - ) - - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_TechnicianHistory - ADD Maintenance BOOLEAN DEFAULT FALSE AFTER MaxSteamOfferCount; - """ - ) - ) - self._exec(__file__, "config/technician.sql") - - def downgrade(self): - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_Technician DROP COLUMN Maintenance; - """ - ) - ) - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_TechnicianHistory DROP COLUMN Maintenance; - """ - ) - ) diff --git a/bot/src/bot_data/migration/max_steam_offer_count_migration.py b/bot/src/bot_data/migration/max_steam_offer_count_migration.py deleted file mode 100644 index fe926c24..00000000 --- a/bot/src/bot_data/migration/max_steam_offer_count_migration.py +++ /dev/null @@ -1,51 +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 MaxSteamOfferCountMigration(MigrationABC): - name = "1.2.0_MaxSteamOfferCountMigration" - - 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""" - ALTER TABLE CFG_Technician - ADD MaxSteamOfferCount BIGINT NOT NULL DEFAULT 250 AFTER CacheMaxMessages; - """ - ) - ) - - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_TechnicianHistory - ADD MaxSteamOfferCount BIGINT NOT NULL DEFAULT 250 AFTER CacheMaxMessages; - """ - ) - ) - self._exec(__file__, "config/technician.sql") - - def downgrade(self): - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_Technician DROP COLUMN MaxSteamOfferCount; - """ - ) - ) - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_TechnicianHistory DROP COLUMN MaxSteamOfferCount; - """ - ) - ) diff --git a/bot/src/bot_data/migration/remove_stats_migration.py b/bot/src/bot_data/migration/remove_stats_migration.py deleted file mode 100644 index e5e621a5..00000000 --- a/bot/src/bot_data/migration/remove_stats_migration.py +++ /dev/null @@ -1,43 +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 RemoveStatsMigration(MigrationABC): - name = "1.0.0_RemoveStatsMigration" - - 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""" - DROP TABLE IF EXISTS `Statistics`; - """ - ) - ) - - def downgrade(self): - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `Statistics` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Name` VARCHAR(255) NOT NULL, - `Description` VARCHAR(255) NOT NULL, - `Code` LONGTEXT NOT NULL, - `ServerId` BIGINT, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`Id`), - FOREIGN KEY (`ServerId`) REFERENCES `Servers`(`ServerId`) - ); - """ - ) - ) diff --git a/bot/src/bot_data/migration/short_role_name_migration.py b/bot/src/bot_data/migration/short_role_name_migration.py deleted file mode 100644 index 7fe5ddfd..00000000 --- a/bot/src/bot_data/migration/short_role_name_migration.py +++ /dev/null @@ -1,40 +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 ShortRoleNameMigration(MigrationABC): - name = "1.1.7_ShortRoleNameMigration" - - 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 `ShortRoleNames` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `ShortName` VARCHAR(255) NOT NULL, - `DiscordRoleId` BIGINT NOT NULL, - `Position` ENUM('before', 'after') NOT NULL, - `ServerId` BIGINT, - `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._exec(__file__, "short_rule_names.sql") - - def downgrade(self): - self._cursor.execute("DROP TABLE `ShortRoleNames`;") - self._cursor.execute("DROP TABLE `ShortRoleNamesHistory`;") diff --git a/bot/src/bot_data/migration/short_role_name_only_highest_migration.py b/bot/src/bot_data/migration/short_role_name_only_highest_migration.py deleted file mode 100644 index 315e22f1..00000000 --- a/bot/src/bot_data/migration/short_role_name_only_highest_migration.py +++ /dev/null @@ -1,51 +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 ShortRoleNameOnlyHighestMigration(MigrationABC): - name = "1.1.9_ShortRoleNameOnlyHighestMigration" - - 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""" - ALTER TABLE CFG_Server - ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId; - """ - ) - ) - - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_ServerHistory - ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId; - """ - ) - ) - self._exec(__file__, "config/server.sql") - - def downgrade(self): - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_Server DROP COLUMN ShortRoleNameSetOnlyHighest; - """ - ) - ) - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_ServerHistory DROP COLUMN ShortRoleNameSetOnlyHighest; - """ - ) - ) diff --git a/bot/src/bot_data/migration/stats_migration.py b/bot/src/bot_data/migration/stats_migration.py deleted file mode 100644 index c28eeda9..00000000 --- a/bot/src/bot_data/migration/stats_migration.py +++ /dev/null @@ -1,37 +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 StatsMigration(MigrationABC): - name = "0.3_StatsMigration" - - 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 `Statistics` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Name` VARCHAR(255) NOT NULL, - `Description` VARCHAR(255) NOT NULL, - `Code` LONGTEXT NOT NULL, - `ServerId` BIGINT, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`Id`), - FOREIGN KEY (`ServerId`) REFERENCES `Servers`(`ServerId`) - ); - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `Statistics`;") diff --git a/bot/src/bot_data/migration/steam_special_offer_migration.py b/bot/src/bot_data/migration/steam_special_offer_migration.py deleted file mode 100644 index 0a35e77d..00000000 --- a/bot/src/bot_data/migration/steam_special_offer_migration.py +++ /dev/null @@ -1,68 +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 SteamSpecialOfferMigration(MigrationABC): - name = "1.2.0_SteamSpecialOfferMigration" - - 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 `SteamSpecialOffers` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Game` VARCHAR(255) NOT NULL, - `OriginalPrice` FLOAT NOT NULL, - `DiscountPrice` FLOAT NOT NULL, - `DiscountPct` 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`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_Server - ADD COLUMN GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest; - """ - ) - ) - - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_ServerHistory - ADD COLUMN GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest; - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `SteamSpecialOffers`;") - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_Server DROP COLUMN ShortRoleNameSetOnlyHighest; - """ - ) - ) - self._cursor.execute( - str( - f""" - ALTER TABLE CFG_ServerHistory DROP COLUMN ShortRoleNameSetOnlyHighest; - """ - ) - ) diff --git a/bot/src/bot_data/migration/user_joined_game_server_migration.py b/bot/src/bot_data/migration/user_joined_game_server_migration.py deleted file mode 100644 index bef8e5aa..00000000 --- a/bot/src/bot_data/migration/user_joined_game_server_migration.py +++ /dev/null @@ -1,77 +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 UserJoinedGameServerMigration(MigrationABC): - name = "1.0.0_UserJoinedGameServerMigration" - - 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 `GameServers` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Name` VARCHAR(255) NOT NULL, - `ServerId` BIGINT NOT NULL, - `ApiKeyId` BIGINT NOT NULL, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - FOREIGN KEY (`ServerId`) REFERENCES Servers(`ServerId`), - FOREIGN KEY (`ApiKeyId`) REFERENCES ApiKeys(`Id`), - PRIMARY KEY(`Id`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `UserJoinedGameServer` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `UserId` BIGINT NOT NULL, - `GameServerId` BIGINT NOT NULL, - `JoinedOn` DATETIME(6) NOT NULL, - `LeavedOn` DATETIME(6), - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - FOREIGN KEY (`UserId`) REFERENCES Users(`UserId`), - FOREIGN KEY (`GameServerId`) REFERENCES GameServers(`Id`), - PRIMARY KEY(`Id`) - ); - """ - ) - ) - - self._cursor.execute( - str( - f""" - CREATE TABLE IF NOT EXISTS `UserGameIdents` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `UserId` BIGINT NOT NULL, - `GameServerId` BIGINT NOT NULL, - `Ident` VARCHAR(255) NOT NULL, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - FOREIGN KEY (`UserId`) REFERENCES Users(`UserId`), - FOREIGN KEY (`GameServerId`) REFERENCES GameServers(`Id`), - CONSTRAINT UC_UserGameIdent UNIQUE (`GameServerId`,`Ident`), - PRIMARY KEY(`Id`) - ); - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `GameServers`;") - self._cursor.execute("DROP TABLE `UserJoinedGameServer`;") - self._cursor.execute("DROP TABLE `UserGameIdents`;") diff --git a/bot/src/bot_data/migration/user_message_count_per_hour_migration.py b/bot/src/bot_data/migration/user_message_count_per_hour_migration.py deleted file mode 100644 index c0c4199a..00000000 --- a/bot/src/bot_data/migration/user_message_count_per_hour_migration.py +++ /dev/null @@ -1,37 +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 UserMessageCountPerHourMigration(MigrationABC): - name = "0.3.1_UserMessageCountPerHourMigration" - - 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 `UserMessageCountPerHour` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Date` DATETIME(6) NOT NULL, - `Hour` BIGINT, - `XPCount` BIGINT, - `UserId` BIGINT, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`Id`), - FOREIGN KEY (`UserId`) REFERENCES `Users`(`UserId`) - ); - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `UserMessageCountPerHour`;") diff --git a/bot/src/bot_data/migration/user_warning_migration.py b/bot/src/bot_data/migration/user_warning_migration.py deleted file mode 100644 index 06e446a0..00000000 --- a/bot/src/bot_data/migration/user_warning_migration.py +++ /dev/null @@ -1,37 +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 UserWarningMigration(MigrationABC): - name = "1.0.0_UserWarningMigration" - - 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 `UserWarnings` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Description` VARCHAR(255) NOT NULL, - `UserId` BIGINT NOT NULL, - `Author` BIGINT NULL, - `CreatedAt` DATETIME(6), - `LastModifiedAt` DATETIME(6), - PRIMARY KEY(`Id`), - FOREIGN KEY (`UserId`) REFERENCES `Users`(`UserId`), - FOREIGN KEY (`Author`) REFERENCES `Users`(`UserId`) - ); - """ - ) - ) - - def downgrade(self): - self._cursor.execute("DROP TABLE `UserWarnings`;") diff --git a/bot/src/bot_data/model/__init__.py b/bot/src/bot_data/model/__init__.py index 71aedfc0..063b19b8 100644 --- a/bot/src/bot_data/model/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_data/model/migration.py b/bot/src/bot_data/model/migration.py new file mode 100644 index 00000000..eaf2f572 --- /dev/null +++ b/bot/src/bot_data/model/migration.py @@ -0,0 +1,17 @@ +class Migration: + def __init__(self, name: str, version: str, script: str): + self._name = name + self._version = version + self._script = script + + @property + def name(self) -> str: + return self._name + + @property + def version(self) -> str: + return self._version + + @property + def script(self) -> str: + return self._script diff --git a/bot/src/bot_data/model/migration_history.py b/bot/src/bot_data/model/migration_history.py index 464591bc..fc09df1b 100644 --- a/bot/src/bot_data/model/migration_history.py +++ b/bot/src/bot_data/model/migration_history.py @@ -2,10 +2,12 @@ from cpl_core.database import TableABC class MigrationHistory(TableABC): - def __init__(self, id: str): + def __init__(self, id: str, created_at=None, modified_at=None): self._id = 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 migration_id(self) -> str: @@ -39,7 +41,17 @@ class MigrationHistory(TableABC): return str( f""" UPDATE `MigrationHistory` - SET LastModifiedAt` = '{self._modified_at}' + SET `LastModifiedAt` = '{self._modified_at}' + WHERE `MigrationId` = '{self._id}'; + """ + ) + + def change_id_string(self, new_name: str) -> str: + return str( + f""" + UPDATE `MigrationHistory` + SET `LastModifiedAt` = '{self._modified_at}', + `MigrationId` = '{new_name}' WHERE `MigrationId` = '{self._id}'; """ ) diff --git a/bot/src/bot_data/model/scheduled_event.py b/bot/src/bot_data/model/scheduled_event.py new file mode 100644 index 00000000..ca762eab --- /dev/null +++ b/bot/src/bot_data/model/scheduled_event.py @@ -0,0 +1,188 @@ +from datetime import datetime +from typing import Optional + +import discord +from cpl_core.database import TableABC + +from bot_data.model.scheduled_event_interval_enum import ScheduledEventIntervalEnum +from bot_data.model.server import Server + + +class ScheduledEvent(TableABC): + def __init__( + self, + interval: ScheduledEventIntervalEnum, + name: str, + description: str, + channel_id: int, + start_time: datetime, + end_time: Optional[datetime], + entity_type: discord.EntityType, + location: Optional[str], + server: Optional[Server], + created_at: datetime = None, + modified_at: datetime = None, + id=0, + ): + self._id = id + self._interval = interval + self._name = name + self._description = description + self._channel_id = channel_id + self._start_time = start_time + self._end_time = end_time + self._entity_type = entity_type + self._location = location + self._server = server + + 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 interval(self) -> ScheduledEventIntervalEnum: + return self._interval + + @interval.setter + def interval(self, value: ScheduledEventIntervalEnum): + self._interval = value + + @property + def name(self) -> str: + return self._name + + @name.setter + def name(self, value: str): + self._name = value + + @property + def description(self) -> str: + return self._description + + @description.setter + def description(self, value: str): + self._description = value + + @property + def channel_id(self) -> int: + return self._channel_id + + @channel_id.setter + def channel_id(self, value: int): + self._channel_id = value + + @property + def start_time(self) -> datetime: + return self._start_time + + @start_time.setter + def start_time(self, value: datetime): + self._start_time = value + + @property + def end_time(self) -> datetime: + return self._end_time + + @end_time.setter + def end_time(self, value: datetime): + self._end_time = value + + @property + def entity_type(self) -> discord.EntityType: + return self._entity_type + + @entity_type.setter + def entity_type(self, value: discord.EntityType): + self._entity_type = value + + @property + def location(self) -> str: + return self._location + + @location.setter + def location(self, value: str): + self._location = value + + @property + def server(self) -> Server: + return self._server + + @server.setter + def server(self, value: Server): + self._server = value + + @staticmethod + def get_select_all_string() -> str: + return str( + f""" + SELECT * FROM `ScheduledEvents`; + """ + ) + + @staticmethod + def get_select_by_id_string(id: int) -> str: + return str( + f""" + SELECT * FROM `ScheduledEvents` + WHERE `Id` = {id}; + """ + ) + + @staticmethod + def get_select_by_server_id_string(s_id: int) -> str: + return str( + f""" + SELECT * FROM `ScheduledEvents` + WHERE `ServerId` = {s_id}; + """ + ) + + @property + def insert_string(self) -> str: + return str( + f""" + INSERT INTO `ScheduledEvents` ( + `Interval`, `Name`, `Description`, `ChannelId`, `StartTime`, `EndTime`, `EntityType`, `Location`, `ServerId` + ) VALUES ( + '{self._interval.value}', + '{self._name}', + {"NULL" if self._description is None else f"'{self._description}'"}, + {"NULL" if self._channel_id is None else f"'{self._channel_id}'"}, + '{self._start_time}', + {"NULL" if self._end_time is None else f"'{self._end_time}'"}, + '{self._entity_type.value}', + {"NULL" if self._location is None else f"'{self._location}'"}, + {self._server.id} + ); + """ + ) + + @property + def udpate_string(self) -> str: + return str( + f""" + UPDATE `ScheduledEvents` + SET `Interval` = '{self._interval.value}', + `Name` = '{self._name}', + `Description` = {"NULL" if self._description is None else f"'{self._description}'"}, + `ChannelId` = {"NULL" if self._channel_id is None else f"'{self._channel_id}'"}, + `StartTime` = '{self._start_time}', + `EndTime` = {"NULL" if self._end_time is None else f"'{self._end_time}'"}, + `EntityType` = '{self._entity_type.value}', + `Location` = {"NULL" if self._location is None else f"'{self._location}'"} + WHERE `Id` = {self._id}; + """ + ) + + @property + def delete_string(self) -> str: + return str( + f""" + DELETE FROM `ScheduledEvents` + WHERE `Id` = {self._id}; + """ + ) diff --git a/bot/src/bot_data/model/scheduled_event_history.py b/bot/src/bot_data/model/scheduled_event_history.py new file mode 100644 index 00000000..b910e796 --- /dev/null +++ b/bot/src/bot_data/model/scheduled_event_history.py @@ -0,0 +1,118 @@ +from datetime import datetime +from typing import Optional + +import discord +from cpl_core.database import TableABC + +from bot_data.abc.history_table_abc import HistoryTableABC +from bot_data.model.server import Server + + +class ScheduledEventHistory(HistoryTableABC): + def __init__( + self, + interval: str, + name: str, + description: str, + channel_id: int, + start_time: datetime, + end_time: Optional[datetime], + entity_type: discord.EntityType, + location: Optional[str], + server: Optional[Server], + deleted: bool, + date_from: str, + date_to: str, + id=0, + ): + HistoryTableABC.__init__(self) + self._id = id + self._interval = interval + self._name = name + self._description = description + self._channel_id = channel_id + self._start_time = start_time + self._end_time = end_time + self._entity_type = entity_type + self._location = location + self._server = server + + self._deleted = deleted + self._date_from = date_from + self._date_to = date_to + + @property + def id(self) -> int: + return self._id + + @property + def interval(self) -> str: + return self._interval + + @interval.setter + def interval(self, value: str): + self._interval = value + + @property + def name(self) -> str: + return self._name + + @name.setter + def name(self, value: str): + self._name = value + + @property + def description(self) -> str: + return self._description + + @description.setter + def description(self, value: str): + self._description = value + + @property + def channel_id(self) -> int: + return self._channel_id + + @channel_id.setter + def channel_id(self, value: int): + self._channel_id = value + + @property + def start_time(self) -> datetime: + return self._start_time + + @start_time.setter + def start_time(self, value: datetime): + self._start_time = value + + @property + def end_time(self) -> datetime: + return self._end_time + + @end_time.setter + def end_time(self, value: datetime): + self._end_time = value + + @property + def entity_type(self) -> discord.EntityType: + return self._entity_type + + @entity_type.setter + def entity_type(self, value: discord.EntityType): + self._entity_type = value + + @property + def location(self) -> str: + return self._location + + @location.setter + def location(self, value: str): + self._location = value + + @property + def server(self) -> Server: + return self._server + + @server.setter + def server(self, value: Server): + self._server = value diff --git a/bot/src/bot_data/model/scheduled_event_interval_enum.py b/bot/src/bot_data/model/scheduled_event_interval_enum.py new file mode 100644 index 00000000..7f13c589 --- /dev/null +++ b/bot/src/bot_data/model/scheduled_event_interval_enum.py @@ -0,0 +1,8 @@ +from enum import Enum + + +class ScheduledEventIntervalEnum(Enum): + daily = "daily" + weekly = "weekly" + monthly = "monthly" + yearly = "yearly" diff --git a/bot/src/bot_data/scripts/0.1.0/1_Initial_down.sql b/bot/src/bot_data/scripts/0.1.0/1_Initial_down.sql new file mode 100644 index 00000000..c1c80bab --- /dev/null +++ b/bot/src/bot_data/scripts/0.1.0/1_Initial_down.sql @@ -0,0 +1,12 @@ +DROP TABLE `Servers`; + +DROP TABLE `Users`; + +DROP TABLE `Clients`; + +DROP TABLE `KnownUsers`; + +DROP TABLE `UserJoinedServers`; + +DROP TABLE `UserJoinedVoiceChannel`; + diff --git a/bot/src/bot_data/scripts/0.1.0/1_Initial_up.sql b/bot/src/bot_data/scripts/0.1.0/1_Initial_up.sql new file mode 100644 index 00000000..64575fdc --- /dev/null +++ b/bot/src/bot_data/scripts/0.1.0/1_Initial_up.sql @@ -0,0 +1,80 @@ +CREATE TABLE IF NOT EXISTS `MigrationHistory` +( + `MigrationId` VARCHAR(255), + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`MigrationId`) +); + +CREATE TABLE IF NOT EXISTS `Servers` +( + `ServerId` BIGINT NOT NULL AUTO_INCREMENT, + `DiscordServerId` BIGINT NOT NULL, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`ServerId`) +); + +CREATE TABLE IF NOT EXISTS `Users` +( + `UserId` BIGINT NOT NULL AUTO_INCREMENT, + `DiscordId` BIGINT NOT NULL, + `XP` BIGINT NOT NULL DEFAULT 0, + `ServerId` BIGINT, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + FOREIGN KEY (`ServerId`) REFERENCES Servers (`ServerId`), + PRIMARY KEY (`UserId`) +); + +CREATE TABLE IF NOT EXISTS `Clients` +( + `ClientId` BIGINT NOT NULL AUTO_INCREMENT, + `DiscordClientId` BIGINT NOT NULL, + `SentMessageCount` BIGINT NOT NULL DEFAULT 0, + `ReceivedMessageCount` BIGINT NOT NULL DEFAULT 0, + `DeletedMessageCount` BIGINT NOT NULL DEFAULT 0, + `ReceivedCommandsCount` BIGINT NOT NULL DEFAULT 0, + `MovedUsersCount` BIGINT NOT NULL DEFAULT 0, + `ServerId` BIGINT, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + FOREIGN KEY (`ServerId`) REFERENCES Servers (`ServerId`), + PRIMARY KEY (`ClientId`) +); + +CREATE TABLE IF NOT EXISTS `KnownUsers` +( + `KnownUserId` BIGINT NOT NULL AUTO_INCREMENT, + `DiscordId` BIGINT NOT NULL, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`KnownUserId`) +); + +CREATE TABLE IF NOT EXISTS `UserJoinedServers` +( + `JoinId` BIGINT NOT NULL AUTO_INCREMENT, + `UserId` BIGINT NOT NULL, + `JoinedOn` DATETIME(6) NOT NULL, + `LeavedOn` DATETIME(6), + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + FOREIGN KEY (`UserId`) REFERENCES Users (`UserId`), + PRIMARY KEY (`JoinId`) +); + +CREATE TABLE IF NOT EXISTS `UserJoinedVoiceChannel` +( + `JoinId` BIGINT NOT NULL AUTO_INCREMENT, + `UserId` BIGINT NOT NULL, + `DiscordChannelId` BIGINT NOT NULL, + `JoinedOn` DATETIME(6) NOT NULL, + `LeavedOn` DATETIME(6), + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + FOREIGN KEY (`UserId`) REFERENCES Users (`UserId`), + PRIMARY KEY (`JoinId`) +); + + diff --git a/bot/src/bot_data/scripts/0.2.2/1_AutoRole_down.sql b/bot/src/bot_data/scripts/0.2.2/1_AutoRole_down.sql new file mode 100644 index 00000000..6e92bfe4 --- /dev/null +++ b/bot/src/bot_data/scripts/0.2.2/1_AutoRole_down.sql @@ -0,0 +1,4 @@ +DROP TABLE `AutoRoleRules`; + + +DROP TABLE `AutoRoles`; diff --git a/bot/src/bot_data/scripts/0.2.2/1_AutoRole_up.sql b/bot/src/bot_data/scripts/0.2.2/1_AutoRole_up.sql new file mode 100644 index 00000000..72737003 --- /dev/null +++ b/bot/src/bot_data/scripts/0.2.2/1_AutoRole_up.sql @@ -0,0 +1,26 @@ +CREATE TABLE IF NOT EXISTS `AutoRoles` +( + `AutoRoleId` BIGINT NOT NULL AUTO_INCREMENT, + `ServerId` BIGINT, + `DiscordMessageId` BIGINT NOT NULL, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`AutoRoleId`), + FOREIGN KEY (`ServerId`) REFERENCES `Servers` (`ServerId`) +); + + + +CREATE TABLE IF NOT EXISTS `AutoRoleRules` +( + `AutoRoleRuleId` BIGINT NOT NULL AUTO_INCREMENT, + `AutoRoleId` BIGINT, + `DiscordEmojiName` VARCHAR(64), + `DiscordRoleId` BIGINT NOT NULL, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`AutoRoleRuleId`), + FOREIGN KEY (`AutoRoleId`) REFERENCES `AutoRoles` (`AutoRoleId`) +); + + diff --git a/bot/src/bot_data/scripts/0.3.0/1_Api_down.sql b/bot/src/bot_data/scripts/0.3.0/1_Api_down.sql new file mode 100644 index 00000000..46021597 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/1_Api_down.sql @@ -0,0 +1,4 @@ +DROP TABLE `AuthUserUsersRelations`; + + +DROP TABLE `AuthUsers`; \ No newline at end of file diff --git a/bot/src/bot_data/scripts/0.3.0/1_Api_up.sql b/bot/src/bot_data/scripts/0.3.0/1_Api_up.sql new file mode 100644 index 00000000..82dbe4ec --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/1_Api_up.sql @@ -0,0 +1,34 @@ +CREATE TABLE IF NOT EXISTS `AuthUsers` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `FirstName` VARCHAR(255), + `LastName` VARCHAR(255), + `EMail` VARCHAR(255), + `Password` VARCHAR(255), + `PasswordSalt` VARCHAR(255), + `RefreshToken` VARCHAR(255), + `ConfirmationId` VARCHAR(255) DEFAULT NULL, + `ForgotPasswordId` VARCHAR(255) DEFAULT NULL, + `OAuthId` VARCHAR(255) DEFAULT NULL, + `RefreshTokenExpiryTime` DATETIME(6) NOT NULL, + `AuthRole` INT NOT NULL DEFAULT 0, + `CreatedAt` DATETIME(6) NOT NULL, + `LastModifiedAt` DATETIME(6) NOT NULL, + PRIMARY KEY (`Id`) +); + + + +CREATE TABLE IF NOT EXISTS `AuthUserUsersRelations` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `AuthUserId` BIGINT DEFAULT NULL, + `UserId` BIGINT DEFAULT NULL, + `CreatedAt` DATETIME(6) NOT NULL, + `LastModifiedAt` DATETIME(6) NOT NULL, + PRIMARY KEY (`Id`), + FOREIGN KEY (`AuthUserId`) REFERENCES `AuthUsers` (`Id`), + FOREIGN KEY (`UserId`) REFERENCES `Users` (`UserId`) +); + + diff --git a/bot/src/bot_data/scripts/0.3.0/2_Level_down.sql b/bot/src/bot_data/scripts/0.3.0/2_Level_down.sql new file mode 100644 index 00000000..301478b2 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/2_Level_down.sql @@ -0,0 +1,2 @@ +DROP TABLE `Levels`; + diff --git a/bot/src/bot_data/scripts/0.3.0/2_Level_up.sql b/bot/src/bot_data/scripts/0.3.0/2_Level_up.sql new file mode 100644 index 00000000..8486755a --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/2_Level_up.sql @@ -0,0 +1,15 @@ +CREATE TABLE IF NOT EXISTS `Levels` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Name` VARCHAR(255) NOT NULL, + `Color` VARCHAR(8) NOT NULL, + `MinXp` BIGINT NOT NULL, + `PermissionInt` BIGINT NOT NULL, + `ServerId` BIGINT, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`Id`), + FOREIGN KEY (`ServerId`) REFERENCES `Servers` (`ServerId`) +); + + diff --git a/bot/src/bot_data/scripts/0.3.0/3_Stats_down.sql b/bot/src/bot_data/scripts/0.3.0/3_Stats_down.sql new file mode 100644 index 00000000..36efa156 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/3_Stats_down.sql @@ -0,0 +1,2 @@ +DROP TABLE `Statistics`; + diff --git a/bot/src/bot_data/scripts/0.3.0/3_Stats_up.sql b/bot/src/bot_data/scripts/0.3.0/3_Stats_up.sql new file mode 100644 index 00000000..ffae8aad --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/3_Stats_up.sql @@ -0,0 +1,14 @@ +CREATE TABLE IF NOT EXISTS `Statistics` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Name` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NOT NULL, + `Code` LONGTEXT NOT NULL, + `ServerId` BIGINT, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`Id`), + FOREIGN KEY (`ServerId`) REFERENCES `Servers` (`ServerId`) +); + + diff --git a/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix1_down.sql b/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix1_down.sql new file mode 100644 index 00000000..bdf0e058 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix1_down.sql @@ -0,0 +1,4 @@ +ALTER TABLE AutoRoles + DROP COLUMN DiscordChannelId; + + diff --git a/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix1_up.sql b/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix1_up.sql new file mode 100644 index 00000000..60745b41 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix1_up.sql @@ -0,0 +1,4 @@ +ALTER TABLE AutoRoles + ADD DiscordChannelId BIGINT NOT NULL AFTER ServerId; + + diff --git a/bot/src/bot_data/scripts/0.3.1/1_UserMessageCountPerHour_down.sql b/bot/src/bot_data/scripts/0.3.1/1_UserMessageCountPerHour_down.sql new file mode 100644 index 00000000..3de96768 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.1/1_UserMessageCountPerHour_down.sql @@ -0,0 +1,2 @@ +DROP TABLE `UserMessageCountPerHour`; + diff --git a/bot/src/bot_data/scripts/0.3.1/1_UserMessageCountPerHour_up.sql b/bot/src/bot_data/scripts/0.3.1/1_UserMessageCountPerHour_up.sql new file mode 100644 index 00000000..fd5bf3c4 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.1/1_UserMessageCountPerHour_up.sql @@ -0,0 +1,14 @@ +CREATE TABLE IF NOT EXISTS `UserMessageCountPerHour` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Date` DATETIME(6) NOT NULL, + `Hour` BIGINT, + `XPCount` BIGINT, + `UserId` BIGINT, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`Id`), + FOREIGN KEY (`UserId`) REFERENCES `Users` (`UserId`) +); + + diff --git a/bot/src/bot_data/scripts/1.0.0/1_ApiKey_down.sql b/bot/src/bot_data/scripts/1.0.0/1_ApiKey_down.sql new file mode 100644 index 00000000..79fa3b1b --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/1_ApiKey_down.sql @@ -0,0 +1,2 @@ +DROP TABLE `ApiKeys`; + diff --git a/bot/src/bot_data/scripts/1.0.0/1_ApiKey_up.sql b/bot/src/bot_data/scripts/1.0.0/1_ApiKey_up.sql new file mode 100644 index 00000000..fd9b504b --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/1_ApiKey_up.sql @@ -0,0 +1,15 @@ +CREATE TABLE IF NOT EXISTS `ApiKeys` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Identifier` VARCHAR(255) NOT NULL, + `Key` VARCHAR(255) NOT NULL, + `CreatorId` BIGINT NULL, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`Id`), + FOREIGN KEY (`CreatorId`) REFERENCES `Users` (`UserId`), + CONSTRAINT UC_Identifier_Key UNIQUE (`Identifier`, `Key`), + CONSTRAINT UC_Key UNIQUE (`Key`) +); + + diff --git a/bot/src/bot_data/scripts/1.0.0/2_UserJoinedGameServer_down.sql b/bot/src/bot_data/scripts/1.0.0/2_UserJoinedGameServer_down.sql new file mode 100644 index 00000000..e630662a --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/2_UserJoinedGameServer_down.sql @@ -0,0 +1,8 @@ +DROP TABLE `UserJoinedGameServer`; + + +DROP TABLE `UserGameIdents`; + + +DROP TABLE `GameServers`; + diff --git a/bot/src/bot_data/scripts/1.0.0/2_UserJoinedGameServer_up.sql b/bot/src/bot_data/scripts/1.0.0/2_UserJoinedGameServer_up.sql new file mode 100644 index 00000000..31f3f13d --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/2_UserJoinedGameServer_up.sql @@ -0,0 +1,46 @@ +CREATE TABLE IF NOT EXISTS `GameServers` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Name` VARCHAR(255) NOT NULL, + `ServerId` BIGINT NOT NULL, + `ApiKeyId` BIGINT NOT NULL, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + FOREIGN KEY (`ServerId`) REFERENCES Servers (`ServerId`), + FOREIGN KEY (`ApiKeyId`) REFERENCES ApiKeys (`Id`), + PRIMARY KEY (`Id`) +); + + + +CREATE TABLE IF NOT EXISTS `UserJoinedGameServer` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `UserId` BIGINT NOT NULL, + `GameServerId` BIGINT NOT NULL, + `JoinedOn` DATETIME(6) NOT NULL, + `LeavedOn` DATETIME(6), + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + FOREIGN KEY (`UserId`) REFERENCES Users (`UserId`), + FOREIGN KEY (`GameServerId`) REFERENCES GameServers (`Id`), + PRIMARY KEY (`Id`) +); + + + +CREATE TABLE IF NOT EXISTS `UserGameIdents` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `UserId` BIGINT NOT NULL, + `GameServerId` BIGINT NOT NULL, + `Ident` VARCHAR(255) NOT NULL, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + FOREIGN KEY (`UserId`) REFERENCES Users (`UserId`), + FOREIGN KEY (`GameServerId`) REFERENCES GameServers (`Id`), + CONSTRAINT UC_UserGameIdent UNIQUE (`GameServerId`, `Ident`), + PRIMARY KEY (`Id`) +); + + diff --git a/bot/src/bot_data/scripts/1.0.0/3_RemoveStats_down.sql b/bot/src/bot_data/scripts/1.0.0/3_RemoveStats_down.sql new file mode 100644 index 00000000..ffae8aad --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/3_RemoveStats_down.sql @@ -0,0 +1,14 @@ +CREATE TABLE IF NOT EXISTS `Statistics` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Name` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NOT NULL, + `Code` LONGTEXT NOT NULL, + `ServerId` BIGINT, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`Id`), + FOREIGN KEY (`ServerId`) REFERENCES `Servers` (`ServerId`) +); + + diff --git a/bot/src/bot_data/scripts/1.0.0/3_RemoveStats_up.sql b/bot/src/bot_data/scripts/1.0.0/3_RemoveStats_up.sql new file mode 100644 index 00000000..19a95459 --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/3_RemoveStats_up.sql @@ -0,0 +1,3 @@ +DROP TABLE IF EXISTS `Statistics`; + + diff --git a/bot/src/bot_data/scripts/1.0.0/4_UserWarning_down.sql b/bot/src/bot_data/scripts/1.0.0/4_UserWarning_down.sql new file mode 100644 index 00000000..13d2cfbd --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/4_UserWarning_down.sql @@ -0,0 +1,2 @@ +DROP TABLE `UserWarnings`; + diff --git a/bot/src/bot_data/scripts/1.0.0/4_UserWarning_up.sql b/bot/src/bot_data/scripts/1.0.0/4_UserWarning_up.sql new file mode 100644 index 00000000..29269106 --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/4_UserWarning_up.sql @@ -0,0 +1,14 @@ +CREATE TABLE IF NOT EXISTS `UserWarnings` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Description` VARCHAR(255) NOT NULL, + `UserId` BIGINT NOT NULL, + `Author` BIGINT NULL, + `CreatedAt` DATETIME(6), + `LastModifiedAt` DATETIME(6), + PRIMARY KEY (`Id`), + FOREIGN KEY (`UserId`) REFERENCES `Users` (`UserId`), + FOREIGN KEY (`Author`) REFERENCES `Users` (`UserId`) +); + + diff --git a/bot/src/bot_data/scripts/1.0.0/5_DBHistory_down.sql b/bot/src/bot_data/scripts/1.0.0/5_DBHistory_down.sql new file mode 100644 index 00000000..ff1cdc17 --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/5_DBHistory_down.sql @@ -0,0 +1,34 @@ +DROP TABLE `ApiKeysHistory`; + +DROP TABLE `AuthUsersHistory`; + +DROP TABLE `AuthUserUsersRelationsHistory`; + +DROP TABLE `AutoRoleRulesHistory`; + +DROP TABLE `AutoRolesHistory`; + +DROP TABLE `ClientsHistory`; + +DROP TABLE `GameServersHistory`; + +DROP TABLE `KnownUsersHistory`; + +DROP TABLE `LevelsHistory`; + +DROP TABLE `ServersHistory`; + +DROP TABLE `UserGameIdentsHistory`; + +DROP TABLE `UserJoinedGameServerHistory`; + +DROP TABLE `UserJoinedServersHistory`; + +DROP TABLE `UserJoinedVoiceChannelHistory`; + +DROP TABLE `UserMessageCountPerHourHistory`; + +DROP TABLE `UsersHistory`; + +DROP TABLE `UserWarningsHistory`; + diff --git a/bot/src/bot_data/scripts/1.0.0/5_DBHistory_up.sql b/bot/src/bot_data/scripts/1.0.0/5_DBHistory_up.sql new file mode 100644 index 00000000..76087c03 --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/5_DBHistory_up.sql @@ -0,0 +1,711 @@ +ALTER TABLE `ApiKeys` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `ApiKeys` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `ApiKeysHistory` +( + `Id` BIGINT(20) NOT NULL, + `Identifier` VARCHAR(255) NOT NULL, + `Key` VARCHAR(255) NOT NULL, + `CreatorId` BIGINT(20) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_ApiKeysUpdate`;; + +CREATE TRIGGER `TR_ApiKeysUpdate` + AFTER UPDATE + ON `ApiKeys` + FOR EACH ROW +BEGIN + INSERT INTO `ApiKeysHistory` (`Id`, `Identifier`, `Key`, `CreatorId`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.Identifier, OLD.Key, OLD.CreatorId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_ApiKeysDelete`;; + +CREATE TRIGGER `TR_ApiKeysDelete` + AFTER DELETE + ON `ApiKeys` + FOR EACH ROW +BEGIN + INSERT INTO `ApiKeysHistory` (`Id`, `Identifier`, `Key`, `CreatorId`, `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.Identifier, OLD.Key, OLD.CreatorId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `AuthUsers` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `AuthUsers` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `AuthUsersHistory` +( + `Id` BIGINT(20) NOT NULL, + `FirstName` VARCHAR(255) DEFAULT NULL, + `LastName` VARCHAR(255) DEFAULT NULL, + `EMail` VARCHAR(255) DEFAULT NULL, + `Password` VARCHAR(255) DEFAULT NULL, + `PasswordSalt` VARCHAR(255) DEFAULT NULL, + `RefreshToken` VARCHAR(255) DEFAULT NULL, + `ConfirmationId` VARCHAR(255) DEFAULT NULL, + `ForgotPasswordId` VARCHAR(255) DEFAULT NULL, + `OAuthId` VARCHAR(255) DEFAULT NULL, + `RefreshTokenExpiryTime` DATETIME(6) NOT NULL, + `AuthRole` BIGINT(11) NOT NULL DEFAULT 0, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_AuthUsersUpdate`;; + +CREATE TRIGGER `TR_AuthUsersUpdate` + AFTER UPDATE + ON `AuthUsers` + FOR EACH ROW +BEGIN + INSERT INTO `AuthUsersHistory` (`Id`, `FirstName`, `LastName`, `EMail`, `Password`, `PasswordSalt`, + `RefreshToken`, `ConfirmationId`, `ForgotPasswordId`, `OAuthId`, + `RefreshTokenExpiryTime`, `AuthRole`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.FirstName, OLD.LastName, OLD.EMail, OLD.Password, OLD.PasswordSalt, OLD.RefreshToken, + OLD.ConfirmationId, OLD.ForgotPasswordId, OLD.OAuthId, OLD.RefreshTokenExpiryTime, OLD.AuthRole, + OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_AuthUsersDelete`;; + +CREATE TRIGGER `TR_AuthUsersDelete` + AFTER DELETE + ON `AuthUsers` + FOR EACH ROW +BEGIN + INSERT INTO `AuthUsersHistory` (`Id`, `FirstName`, `LastName`, `EMail`, `Password`, `PasswordSalt`, `RefreshToken`, + `ConfirmationId`, `ForgotPasswordId`, `OAuthId`, `RefreshTokenExpiryTime`, + `AuthRole`, `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.FirstName, OLD.LastName, OLD.EMail, OLD.Password, OLD.PasswordSalt, OLD.RefreshToken, + OLD.ConfirmationId, OLD.ForgotPasswordId, OLD.OAuthId, OLD.RefreshTokenExpiryTime, OLD.AuthRole, TRUE, + OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `AuthUserUsersRelations` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `AuthUserUsersRelations` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + + +CREATE TABLE IF NOT EXISTS `AuthUserUsersRelationsHistory` +( + `Id` BIGINT(20) NOT NULL, + `AuthUserId` BIGINT(20) DEFAULT NULL, + `UserId` BIGINT(20) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_AuthUserUsersRelationsUpdate`;; + +CREATE TRIGGER `TR_AuthUserUsersRelationsUpdate` + AFTER UPDATE + ON `AuthUserUsersRelations` + FOR EACH ROW +BEGIN + INSERT INTO `AuthUserUsersRelationsHistory` (`Id`, `AuthUserId`, `UserId`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.AuthUserId, OLD.UserId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_AuthUserUsersRelationsDelete`;; + +CREATE TRIGGER `TR_AuthUserUsersRelationsDelete` + AFTER DELETE + ON `AuthUserUsersRelations` + FOR EACH ROW +BEGIN + INSERT INTO `AuthUserUsersRelationsHistory` (`Id`, `AuthUserId`, `UserId`, `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.AuthUserId, OLD.UserId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `AutoRoleRules` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `AutoRoleRules` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `AutoRoleRulesHistory` +( + `Id` BIGINT(20) NOT NULL, + `AutoRoleId` BIGINT(20) DEFAULT NULL, + `DiscordEmojiName` VARCHAR(64) DEFAULT NULL, + `DiscordRoleId` BIGINT(20) NOT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_AutoRoleRulesUpdate`;; + +CREATE TRIGGER `TR_AutoRoleRulesUpdate` + AFTER UPDATE + ON `AutoRoleRules` + FOR EACH ROW +BEGIN + INSERT INTO `AutoRoleRulesHistory` (`Id`, `AutoRoleId`, `DiscordEmojiName`, `DiscordRoleId`, `DateFrom`, `DateTo`) + VALUES (OLD.AutoRoleRuleId, OLD.AutoRoleId, OLD.DiscordEmojiName, OLD.DiscordRoleId, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_AutoRoleRulesDelete`;; + +CREATE TRIGGER `TR_AutoRoleRulesDelete` + AFTER DELETE + ON `AutoRoleRules` + FOR EACH ROW +BEGIN + INSERT INTO `AutoRoleRulesHistory` (`Id`, `AutoRoleId`, `DiscordEmojiName`, `DiscordRoleId`, `Deleted`, `DateFrom`, + `DateTo`) + VALUES (OLD.AutoRoleRuleId, OLD.AutoRoleId, OLD.DiscordEmojiName, OLD.DiscordRoleId, TRUE, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `AutoRoles` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `AutoRoles` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `AutoRolesHistory` +( + `Id` BIGINT(20) NOT NULL, + `ServerId` BIGINT(20) DEFAULT NULL, + `DiscordChannelId` BIGINT(20) NOT NULL, + `DiscordMessageId` BIGINT(20) NOT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_AutoRolesUpdate`;; + +CREATE TRIGGER `TR_AutoRolesUpdate` + AFTER UPDATE + ON `AutoRoles` + FOR EACH ROW +BEGIN + INSERT INTO `AutoRolesHistory` (`Id`, `ServerId`, `DiscordChannelId`, `DiscordMessageId`, `DateFrom`, `DateTo`) + VALUES (OLD.AutoRoleId, OLD.ServerId, OLD.DiscordChannelId, OLD.DiscordMessageId, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_AutoRolesDelete`;; + +CREATE TRIGGER `TR_AutoRolesDelete` + AFTER DELETE + ON `AutoRoles` + FOR EACH ROW +BEGIN + INSERT INTO `AutoRolesHistory` (`Id`, `ServerId`, `DiscordChannelId`, `DiscordMessageId`, `Deleted`, `DateFrom`, + `DateTo`) + VALUES (OLD.AutoRoleId, OLD.ServerId, OLD.DiscordChannelId, OLD.DiscordMessageId, TRUE, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `Clients` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `Clients` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `ClientsHistory` +( + `Id` BIGINT(20) NOT NULL, + `DiscordId` BIGINT(20) NOT NULL, + `SentMessageCount` BIGINT(20) NOT NULL DEFAULT 0, + `ReceivedMessageCount` BIGINT(20) NOT NULL DEFAULT 0, + `DeletedMessageCount` BIGINT(20) NOT NULL DEFAULT 0, + `ReceivedCommandsCount` BIGINT(20) NOT NULL DEFAULT 0, + `MovedUsersCount` BIGINT(20) NOT NULL DEFAULT 0, + `ServerId` BIGINT(20) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_ClientsUpdate`;; + +CREATE TRIGGER `TR_ClientsUpdate` + AFTER UPDATE + ON `Clients` + FOR EACH ROW +BEGIN + INSERT INTO `ClientsHistory` (`Id`, `DiscordId`, `SentMessageCount`, `ReceivedMessageCount`, `DeletedMessageCount`, + `ReceivedCommandsCount`, `MovedUsersCount`, `ServerId`, `DateFrom`, `DateTo`) + VALUES (OLD.ClientId, OLD.DiscordClientId, OLD.SentMessageCount, OLD.ReceivedMessageCount, OLD.DeletedMessageCount, + OLD.ReceivedCommandsCount, OLD.MovedUsersCount, OLD.ServerId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_ClientsDelete`;; + +CREATE TRIGGER `TR_ClientsDelete` + AFTER DELETE + ON `Clients` + FOR EACH ROW +BEGIN + INSERT INTO `ClientsHistory` (`Id`, `DiscordId`, `SentMessageCount`, `ReceivedMessageCount`, `DeletedMessageCount`, + `ReceivedCommandsCount`, `MovedUsersCount`, `ServerId`, `Deleted`, `DateFrom`, + `DateTo`) + VALUES (OLD.ClientId, OLD.DiscordClientId, OLD.SentMessageCount, OLD.ReceivedMessageCount, OLD.DeletedMessageCount, + OLD.ReceivedCommandsCount, OLD.MovedUsersCount, OLD.ServerId, TRUE, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `GameServers` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `GameServers` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `GameServersHistory` +( + `Id` BIGINT(20) NOT NULL, + `Name` VARCHAR(255) NOT NULL, + `ServerId` BIGINT(20) NOT NULL, + `ApiKeyId` BIGINT(20) NOT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_GameServersUpdate`;; + +CREATE TRIGGER `TR_GameServersUpdate` + AFTER UPDATE + ON `GameServers` + FOR EACH ROW +BEGIN + INSERT INTO `GameServersHistory` (`Id`, `Name`, `ServerId`, `ApiKeyId`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.Name, OLD.ServerId, OLD.ApiKeyId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_GameServersDelete`;; + +CREATE TRIGGER `TR_GameServersDelete` + AFTER DELETE + ON `GameServers` + FOR EACH ROW +BEGIN + INSERT INTO `GameServersHistory` (`Id`, `Name`, `ServerId`, `ApiKeyId`, `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.Name, OLD.ServerId, OLD.ApiKeyId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `KnownUsers` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `KnownUsers` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `KnownUsersHistory` +( + `Id` BIGINT(20) NOT NULL, + `DiscordId` BIGINT(20) NOT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_KnownUsersUpdate`;; + +CREATE TRIGGER `TR_KnownUsersUpdate` + AFTER UPDATE + ON `KnownUsers` + FOR EACH ROW +BEGIN + INSERT INTO `KnownUsersHistory` (`Id`, `DiscordId`, `DateFrom`, `DateTo`) + VALUES (OLD.KnownUserId, OLD.DiscordId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_KnownUsersDelete`;; + +CREATE TRIGGER `TR_KnownUsersDelete` + AFTER DELETE + ON `KnownUsers` + FOR EACH ROW +BEGIN + INSERT INTO `KnownUsersHistory` (`Id`, `DiscordId`, `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.KnownUserId, OLD.DiscordId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `Levels` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `Levels` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `LevelsHistory` +( + `Id` BIGINT(20) NOT NULL, + `Name` VARCHAR(255) NOT NULL, + `Color` VARCHAR(8) NOT NULL, + `MinXp` BIGINT(20) NOT NULL, + `PermissionInt` BIGINT(20) NOT NULL, + `ServerId` BIGINT(20) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_LevelsUpdate`;; + +CREATE TRIGGER `TR_LevelsUpdate` + AFTER UPDATE + ON `Levels` + FOR EACH ROW +BEGIN + INSERT INTO `LevelsHistory` (`Id`, `Name`, `Color`, `MinXp`, `PermissionInt`, `ServerId`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.Name, OLD.Color, OLD.MinXp, OLD.PermissionInt, OLD.ServerId, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_LevelsDelete`;; + +CREATE TRIGGER `TR_LevelsDelete` + AFTER DELETE + ON `Levels` + FOR EACH ROW +BEGIN + INSERT INTO `LevelsHistory` (`Id`, `Name`, `Color`, `MinXp`, `PermissionInt`, `ServerId`, `Deleted`, `DateFrom`, + `DateTo`) + VALUES (OLD.Id, OLD.Name, OLD.Color, OLD.MinXp, OLD.PermissionInt, OLD.ServerId, TRUE, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `Servers` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `Servers` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `ServersHistory` +( + `Id` BIGINT(20) NOT NULL, + `DiscordId` BIGINT(20) NOT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_ServersUpdate`;; + +CREATE TRIGGER `TR_ServersUpdate` + AFTER UPDATE + ON `Servers` + FOR EACH ROW +BEGIN + INSERT INTO `ServersHistory` (`Id`, `DiscordId`, `DateFrom`, `DateTo`) + VALUES (OLD.ServerId, OLD.DiscordServerId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_ServersDelete`;; + +CREATE TRIGGER `TR_ServersDelete` + AFTER DELETE + ON `Servers` + FOR EACH ROW +BEGIN + INSERT INTO `ServersHistory` (`Id`, `DiscordId`, `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.ServerId, OLD.DiscordServerId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `UserGameIdents` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `UserGameIdents` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `UserGameIdentsHistory` +( + `Id` BIGINT(20) NOT NULL, + `UserId` BIGINT(20) NOT NULL, + `GameServerId` BIGINT(20) NOT NULL, + `Ident` VARCHAR(255) NOT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_UserGameIdentsUpdate`;; + +CREATE TRIGGER `TR_UserGameIdentsUpdate` + AFTER UPDATE + ON `UserGameIdents` + FOR EACH ROW +BEGIN + INSERT INTO `UserGameIdentsHistory` (`Id`, `UserId`, `GameServerId`, `Ident`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.UserId, OLD.GameServerId, OLD.Ident, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_UserGameIdentsDelete`;; + +CREATE TRIGGER `TR_UserGameIdentsDelete` + AFTER DELETE + ON `UserGameIdents` + FOR EACH ROW +BEGIN + INSERT INTO `UserGameIdentsHistory` (`Id`, `UserId`, `GameServerId`, `Ident`, `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.UserId, OLD.GameServerId, OLD.Ident, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `UserJoinedGameServer` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `UserJoinedGameServer` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `UserJoinedGameServerHistory` +( + `Id` BIGINT(20) NOT NULL, + `UserId` BIGINT(20) NOT NULL, + `GameServerId` BIGINT(20) NOT NULL, + `JoinedOn` DATETIME(6) NOT NULL, + `LeavedOn` DATETIME(6) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_UserJoinedGameServerUpdate`;; + +CREATE TRIGGER `TR_UserJoinedGameServerUpdate` + AFTER UPDATE + ON `UserJoinedGameServer` + FOR EACH ROW +BEGIN + INSERT INTO `UserJoinedGameServerHistory` (`Id`, `UserId`, `GameServerId`, `JoinedOn`, `LeavedOn`, `DateFrom`, + `DateTo`) + VALUES (OLD.Id, OLD.UserId, OLD.GameServerId, OLD.JoinedOn, OLD.LeavedOn, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_UserJoinedGameServerDelete`;; + +CREATE TRIGGER `TR_UserJoinedGameServerDelete` + AFTER DELETE + ON `UserJoinedGameServer` + FOR EACH ROW +BEGIN + INSERT INTO `UserJoinedGameServerHistory` (`Id`, `UserId`, `GameServerId`, `JoinedOn`, `LeavedOn`, `Deleted`, + `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.UserId, OLD.GameServerId, OLD.JoinedOn, OLD.LeavedOn, TRUE, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `UserJoinedServers` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `UserJoinedServers` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `UserJoinedServersHistory` +( + `Id` BIGINT(20) NOT NULL, + `UserId` BIGINT(20) NOT NULL, + `JoinedOn` DATETIME(6) NOT NULL, + `LeavedOn` DATETIME(6) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_UserJoinedServersUpdate`;; + +CREATE TRIGGER `TR_UserJoinedServersUpdate` + AFTER UPDATE + ON `UserJoinedServers` + FOR EACH ROW +BEGIN + INSERT INTO `UserJoinedServersHistory` (`Id`, `UserId`, `JoinedOn`, `LeavedOn`, `DateFrom`, `DateTo`) + VALUES (OLD.JoinId, OLD.UserId, OLD.JoinedOn, OLD.LeavedOn, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_UserJoinedServersDelete`;; + +CREATE TRIGGER `TR_UserJoinedServersDelete` + AFTER DELETE + ON `UserJoinedServers` + FOR EACH ROW +BEGIN + INSERT INTO `UserJoinedServersHistory` (`Id`, `UserId`, `JoinedOn`, `LeavedOn`, `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.JoinId, OLD.UserId, OLD.JoinedOn, OLD.LeavedOn, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `UserJoinedVoiceChannel` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `UserJoinedVoiceChannel` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `UserJoinedVoiceChannelHistory` +( + `Id` BIGINT(20) NOT NULL, + `UserId` BIGINT(20) NOT NULL, + `DiscordChannelId` BIGINT(20) NOT NULL, + `JoinedOn` DATETIME(6) NOT NULL, + `LeavedOn` DATETIME(6) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_UserJoinedVoiceChannelUpdate`;; + +CREATE TRIGGER `TR_UserJoinedVoiceChannelUpdate` + AFTER UPDATE + ON `UserJoinedVoiceChannel` + FOR EACH ROW +BEGIN + INSERT INTO `UserJoinedVoiceChannelHistory` (`Id`, `UserId`, `DiscordChannelId`, `JoinedOn`, `LeavedOn`, `DateFrom`, + `DateTo`) + VALUES (OLD.JoinId, OLD.UserId, OLD.DiscordChannelId, OLD.JoinedOn, OLD.LeavedOn, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_UserJoinedVoiceChannelDelete`;; + +CREATE TRIGGER `TR_UserJoinedVoiceChannelDelete` + AFTER DELETE + ON `UserJoinedVoiceChannel` + FOR EACH ROW +BEGIN + INSERT INTO `UserJoinedVoiceChannelHistory` (`Id`, `UserId`, `DiscordChannelId`, `JoinedOn`, `LeavedOn`, `Deleted`, + `DateFrom`, `DateTo`) + VALUES (OLD.JoinId, OLD.UserId, OLD.DiscordChannelId, OLD.JoinedOn, OLD.LeavedOn, TRUE, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `UserMessageCountPerHour` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `UserMessageCountPerHour` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `UserMessageCountPerHourHistory` +( + `Id` BIGINT(20) NOT NULL, + `Date` DATETIME(6) NOT NULL, + `Hour` BIGINT(20) DEFAULT NULL, + `XPCount` BIGINT(20) DEFAULT NULL, + `UserId` BIGINT(20) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_UserMessageCountPerHourUpdate`;; + +CREATE TRIGGER `TR_UserMessageCountPerHourUpdate` + AFTER UPDATE + ON `UserMessageCountPerHour` + FOR EACH ROW +BEGIN + INSERT INTO `UserMessageCountPerHourHistory` (`Id`, `UserId`, `Date`, `Hour`, `XPCount`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.UserId, OLD.Date, OLD.Hour, OLD.XPCount, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_UserMessageCountPerHourDelete`;; + +CREATE TRIGGER `TR_UserMessageCountPerHourDelete` + AFTER DELETE + ON `UserMessageCountPerHour` + FOR EACH ROW +BEGIN + INSERT INTO `UserMessageCountPerHourHistory` (`Id`, `UserId`, `Date`, `Hour`, `XPCount`, `Deleted`, `DateFrom`, + `DateTo`) + VALUES (OLD.Id, OLD.UserId, OLD.Date, OLD.Hour, OLD.XPCount, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `Users` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `Users` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `UsersHistory` +( + `Id` BIGINT(20) NOT NULL, + `DiscordId` BIGINT(20) NOT NULL, + `XP` BIGINT(20) NOT NULL DEFAULT 0, + `ServerId` BIGINT(20) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_UsersUpdate`;; + +CREATE TRIGGER `TR_UsersUpdate` + AFTER UPDATE + ON `Users` + FOR EACH ROW +BEGIN + INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ServerId`, + `DateFrom`, `DateTo`) + VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ServerId, + OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_UsersDelete`;; + +CREATE TRIGGER `TR_UsersDelete` + AFTER DELETE + ON `Users` + FOR EACH ROW +BEGIN + INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ServerId`, + `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ServerId, TRUE, + OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +ALTER TABLE `UserWarnings` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `UserWarnings` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +CREATE TABLE IF NOT EXISTS `UserWarningsHistory` +( + `Id` BIGINT(20) NOT NULL, + `Description` VARCHAR(255) NOT NULL, + `UserId` BIGINT(20) NOT NULL, + `Author` BIGINT(20) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +);; + +DROP TRIGGER IF EXISTS `TR_UserWarningsUpdate`;; + +CREATE TRIGGER `TR_UserWarningsUpdate` + AFTER UPDATE + ON `UserWarnings` + FOR EACH ROW +BEGIN + INSERT INTO `UserWarningsHistory` (`Id`, `Description`, `UserId`, `Author`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.Description, OLD.UserId, OLD.Author, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_UserWarningsDelete`;; + +CREATE TRIGGER `TR_UserWarningsDelete` + AFTER DELETE + ON `UserWarnings` + FOR EACH ROW +BEGIN + INSERT INTO `UserWarningsHistory` (`Id`, `Description`, `UserId`, `Author`, `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.Description, OLD.UserId, OLD.Author, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + diff --git a/bot/src/bot_data/scripts/1.1.0/1_Achievements_down.sql b/bot/src/bot_data/scripts/1.1.0/1_Achievements_down.sql new file mode 100644 index 00000000..ffdb52a3 --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.0/1_Achievements_down.sql @@ -0,0 +1,10 @@ +DROP TABLE `UserGotAchievements`; + +DROP TABLE `Achievements`; + +ALTER TABLE Users DROP COLUMN MessageCount; + +ALTER TABLE Users DROP COLUMN ReactionCount; + +DROP TABLE `AchievementsHistory`; + diff --git a/bot/src/bot_data/scripts/1.1.0/1_Achievements_up.sql b/bot/src/bot_data/scripts/1.1.0/1_Achievements_up.sql new file mode 100644 index 00000000..9ee7e25b --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.0/1_Achievements_up.sql @@ -0,0 +1,88 @@ +CREATE TABLE IF NOT EXISTS `Achievements` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Name` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NOT NULL, + `Attribute` VARCHAR(255) NOT NULL, + `Operator` VARCHAR(255) NOT NULL, + `Value` VARCHAR(255) NOT NULL, + `ServerId` BIGINT, + `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`) +); + + + +CREATE TABLE IF NOT EXISTS `AchievementsHistory` +( + `Id` BIGINT(20) NOT NULL, + `Name` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NOT NULL, + `Attribute` VARCHAR(255) NOT NULL, + `Operator` VARCHAR(255) NOT NULL, + `Value` VARCHAR(255) NOT NULL, + `ServerId` BIGINT, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +); + + + +CREATE TABLE IF NOT EXISTS `UserGotAchievements` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `UserId` BIGINT, + `AchievementId` BIGINT, + `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 (`UserId`) REFERENCES `Users` (`UserId`), + FOREIGN KEY (`AchievementId`) REFERENCES `Achievements` (`Id`) +); + + +ALTER TABLE Users + ADD MessageCount BIGINT NOT NULL DEFAULT 0 AFTER XP; + +ALTER TABLE Users + ADD ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP; + +ALTER TABLE UsersHistory + ADD MessageCount BIGINT NOT NULL DEFAULT 0 AFTER XP; + +ALTER TABLE UsersHistory + ADD ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP; + +DROP TRIGGER IF EXISTS `TR_AchievementsUpdate`; + + +CREATE TRIGGER `TR_AchievementsUpdate` + AFTER UPDATE + ON `Achievements` + FOR EACH ROW +BEGIN + INSERT INTO `AchievementsHistory` (`Id`, `Name`, `Description`, `Attribute`, `Operator`, `Value`, `ServerId`, + `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.Name, OLD.Description, OLD.Attribute, OLD.Operator, OLD.Value, OLD.ServerId, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END; + + +DROP TRIGGER IF EXISTS `TR_AchievementsDelete`; + + +CREATE TRIGGER `TR_AchievementsDelete` + AFTER DELETE + ON `Achievements` + FOR EACH ROW +BEGIN + INSERT INTO `AchievementsHistory` (`Id`, `Name`, `Description`, `Attribute`, `Operator`, `Value`, `ServerId`, + `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.Id, OLD.Name, OLD.Description, OLD.Attribute, OLD.Operator, OLD.Value, OLD.ServerId, TRUE, + OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END; + + diff --git a/bot/src/bot_data/scripts/1.1.0/2_Config_down.sql b/bot/src/bot_data/scripts/1.1.0/2_Config_down.sql new file mode 100644 index 00000000..d774b897 --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.0/2_Config_down.sql @@ -0,0 +1,24 @@ +DROP TABLE `CFG_ServerTeamRoleIds`; + +DROP TABLE `CFG_ServerTeamRoleIdsHistory`; + +DROP TABLE `CFG_ServerAFKChannelIds`; + +DROP TABLE `CFG_ServerAFKChannelIdsHistory`; + +DROP TABLE `CFG_Server`; + +DROP TABLE `CFG_ServerHistory`; + +DROP TABLE `CFG_TechnicianPingUrls`; + +DROP TABLE `CFG_TechnicianPingUrlsHistory`; + +DROP TABLE `CFG_TechnicianIds`; + +DROP TABLE `CFG_TechnicianIdsHistory`; + +DROP TABLE `CFG_Technician`; + +DROP TABLE `CFG_TechnicianHistory`; + diff --git a/bot/src/bot_data/scripts/1.1.0/2_Config_up.sql b/bot/src/bot_data/scripts/1.1.0/2_Config_up.sql new file mode 100644 index 00000000..d922bdb8 --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.0/2_Config_up.sql @@ -0,0 +1,452 @@ +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`) +); + + + +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`) +); + + + +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`) +); + + + +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`) +); + + + +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`) +); + + + +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`) +); + + +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;; + +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;; + +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;; + +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;; + +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;; + +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;; + diff --git a/bot/src/bot_data/scripts/1.1.0/3_ConfigFeatureFlags_down.sql b/bot/src/bot_data/scripts/1.1.0/3_ConfigFeatureFlags_down.sql new file mode 100644 index 00000000..9970595f --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.0/3_ConfigFeatureFlags_down.sql @@ -0,0 +1,4 @@ +ALTER TABLE CFG_Technician DROP COLUMN FeatureFlags; + +ALTER TABLE CFG_Server DROP COLUMN FeatureFlags; + diff --git a/bot/src/bot_data/scripts/1.1.0/3_ConfigFeatureFlags_up.sql b/bot/src/bot_data/scripts/1.1.0/3_ConfigFeatureFlags_up.sql new file mode 100644 index 00000000..8b81f4b4 --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.0/3_ConfigFeatureFlags_up.sql @@ -0,0 +1,6 @@ +ALTER TABLE CFG_Technician + ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER CacheMaxMessages; + +ALTER TABLE CFG_Server + ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId; + diff --git a/bot/src/bot_data/scripts/1.1.3/1_DefaultRole_down.sql b/bot/src/bot_data/scripts/1.1.3/1_DefaultRole_down.sql new file mode 100644 index 00000000..f465a5dc --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.3/1_DefaultRole_down.sql @@ -0,0 +1,4 @@ +ALTER TABLE CFG_Server + DROP COLUMN DefaultRoleId; + + diff --git a/bot/src/bot_data/scripts/1.1.3/1_DefaultRole_up.sql b/bot/src/bot_data/scripts/1.1.3/1_DefaultRole_up.sql new file mode 100644 index 00000000..97b1c1ec --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.3/1_DefaultRole_up.sql @@ -0,0 +1,4 @@ +ALTER TABLE CFG_Server + ADD DefaultRoleId BIGINT NULL AFTER LoginMessageChannelId; + + diff --git a/bot/src/bot_data/scripts/1.1.7/1_ShortRoleName_down.sql b/bot/src/bot_data/scripts/1.1.7/1_ShortRoleName_down.sql new file mode 100644 index 00000000..b15a3e0e --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.7/1_ShortRoleName_down.sql @@ -0,0 +1,4 @@ +DROP TABLE `ShortRoleNames`; + +DROP TABLE `ShortRoleNamesHistory`; + diff --git a/bot/src/bot_data/migration/db_history_scripts/short_rule_names.sql b/bot/src/bot_data/scripts/1.1.7/1_ShortRoleName_up.sql similarity index 65% rename from bot/src/bot_data/migration/db_history_scripts/short_rule_names.sql rename to bot/src/bot_data/scripts/1.1.7/1_ShortRoleName_up.sql index f4ff95c2..ee0f9ef4 100644 --- a/bot/src/bot_data/migration/db_history_scripts/short_rule_names.sql +++ b/bot/src/bot_data/scripts/1.1.7/1_ShortRoleName_up.sql @@ -1,3 +1,17 @@ +CREATE TABLE IF NOT EXISTS `ShortRoleNames` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `ShortName` VARCHAR(255) NOT NULL, + `DiscordRoleId` BIGINT NOT NULL, + `Position` ENUM ('before', 'after') NOT NULL, + `ServerId` BIGINT, + `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`) +); + + CREATE TABLE IF NOT EXISTS `ShortRoleNamesHistory` ( `Id` BIGINT(20) NOT NULL, @@ -8,9 +22,9 @@ CREATE TABLE IF NOT EXISTS `ShortRoleNamesHistory` `Deleted` BOOL DEFAULT FALSE, `DateFrom` DATETIME(6) NOT NULL, `DateTo` DATETIME(6) NOT NULL -); +);; -DROP TRIGGER IF EXISTS `TR_ShortRoleNamesUpdate`; +DROP TRIGGER IF EXISTS `TR_ShortRoleNamesUpdate`;; CREATE TRIGGER `TR_ShortRoleNamesUpdate` AFTER UPDATE @@ -21,9 +35,9 @@ BEGIN `DateTo`) VALUES (OLD.Id, OLD.ShortName, OLD.DiscordRoleId, OLD.Position, OLD.ServerId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); -END; +END;; -DROP TRIGGER IF EXISTS `TR_ShortRoleNamesDelete`; +DROP TRIGGER IF EXISTS `TR_ShortRoleNamesDelete`;; CREATE TRIGGER `TR_ShortRoleNamesDelete` AFTER DELETE @@ -35,4 +49,5 @@ BEGIN `DateTo`) VALUES (OLD.Id, OLD.ShortName, OLD.DiscordRoleId, OLD.Position, OLD.ServerId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); -END; \ No newline at end of file +END;; + diff --git a/bot/src/bot_data/scripts/1.1.7/2_FixUpdates_down.sql b/bot/src/bot_data/scripts/1.1.7/2_FixUpdates_down.sql new file mode 100644 index 00000000..6ddb34a4 --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.7/2_FixUpdates_down.sql @@ -0,0 +1,10 @@ +ALTER TABLE CFG_ServerHistory + DROP COLUMN DefaultRoleId; + + +ALTER TABLE CFG_TechnicianHistory + DROP COLUMN FeatureFlags; + +ALTER TABLE CFG_ServerHistory + DROP COLUMN FeatureFlags; + diff --git a/bot/src/bot_data/scripts/1.1.7/2_FixUpdates_up.sql b/bot/src/bot_data/scripts/1.1.7/2_FixUpdates_up.sql new file mode 100644 index 00000000..c2e3845d --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.7/2_FixUpdates_up.sql @@ -0,0 +1,171 @@ +ALTER TABLE CFG_ServerHistory + ADD DefaultRoleId BIGINT NULL AFTER LoginMessageChannelId; + + +ALTER TABLE CFG_TechnicianHistory + ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER CacheMaxMessages; + +ALTER TABLE CFG_ServerHistory + ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId; + +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`, + `DefaultRoleId`, + `FeatureFlags`, + `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.DefaultRoleId, + OLD.FeatureFlags, + 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`, + `DefaultRoleId`, + `ServerId`, + `FeatureFlags`, + `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.DefaultRoleId, + OLD.FeatureFlags, + OLD.ServerId, + TRUE, + OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +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, + `FeatureFlags` JSON NULL DEFAULT ('{}'), + `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`, + `FeatureFlags`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.FeatureFlags, + 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`, + `FeatureFlags`, + `Deleted`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.FeatureFlags, + TRUE, + OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + diff --git a/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_down.sql b/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_down.sql new file mode 100644 index 00000000..8ccceb05 --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_down.sql @@ -0,0 +1,9 @@ +ALTER TABLE CFG_Server + DROP COLUMN ShortRoleNameSetOnlyHighest; + + + +ALTER TABLE CFG_ServerHistory + DROP COLUMN ShortRoleNameSetOnlyHighest; + + diff --git a/bot/src/bot_data/migration/db_history_scripts/config/server.sql b/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql similarity index 72% rename from bot/src/bot_data/migration/db_history_scripts/config/server.sql rename to bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql index 02f1b841..e90f3006 100644 --- a/bot/src/bot_data/migration/db_history_scripts/config/server.sql +++ b/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql @@ -1,29 +1,12 @@ -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, - `DefaultRoleId` BIGINT NULL, - `ShortRoleNameSetOnlyHighest` BOOLEAN NOT NULL DEFAULT FALSE, - `FeatureFlags` JSON NULL DEFAULT ('{}'), - `ServerId` BIGINT NOT NULL, - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); +ALTER TABLE CFG_Server + ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId; -DROP TRIGGER IF EXISTS `TR_CFG_ServerUpdate`; + + +ALTER TABLE CFG_ServerHistory + ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId; + +DROP TRIGGER IF EXISTS `TR_CFG_ServerUpdate`;; CREATE TRIGGER `TR_CFG_ServerUpdate` AFTER UPDATE @@ -70,9 +53,9 @@ BEGIN OLD.ServerId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); -END; +END;; -DROP TRIGGER IF EXISTS `TR_CFG_ServerDelete`; +DROP TRIGGER IF EXISTS `TR_CFG_ServerDelete`;; CREATE TRIGGER `TR_CFG_ServerDelete` AFTER DELETE @@ -121,4 +104,5 @@ BEGIN TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); -END; \ No newline at end of file +END;; + diff --git a/bot/src/bot_data/scripts/1.2.0/1_FixUserHistory_down.sql b/bot/src/bot_data/scripts/1.2.0/1_FixUserHistory_down.sql new file mode 100644 index 00000000..f19ec313 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/1_FixUserHistory_down.sql @@ -0,0 +1,9 @@ +ALTER TABLE UsersHistory + DROP COLUMN MessageCount; + + + +ALTER TABLE UsersHistory + DROP COLUMN ReactionCount; + + diff --git a/bot/src/bot_data/scripts/1.2.0/1_FixUserHistory_up.sql b/bot/src/bot_data/scripts/1.2.0/1_FixUserHistory_up.sql new file mode 100644 index 00000000..a4997576 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/1_FixUserHistory_up.sql @@ -0,0 +1,32 @@ +ALTER TABLE `Users` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `Users` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +DROP TRIGGER IF EXISTS `TR_UsersUpdate`;; + +CREATE TRIGGER `TR_UsersUpdate` + AFTER UPDATE + ON `Users` + FOR EACH ROW +BEGIN + INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `ServerId`, + `DateFrom`, `DateTo`) + VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.ServerId, + OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_UsersDelete`;; + +CREATE TRIGGER `TR_UsersDelete` + AFTER DELETE + ON `Users` + FOR EACH ROW +BEGIN + INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `ServerId`, + `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.ServerId, TRUE, + OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + diff --git a/bot/src/bot_data/scripts/1.2.0/2_Birthday_down.sql b/bot/src/bot_data/scripts/1.2.0/2_Birthday_down.sql new file mode 100644 index 00000000..19fc9ae0 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/2_Birthday_down.sql @@ -0,0 +1,19 @@ +ALTER TABLE Users + DROP COLUMN Birthday; + + + +ALTER TABLE UsersHistory + DROP COLUMN Birthday; + + + +ALTER TABLE CFG_Server + DROP COLUMN XpForBirthday; + + + +ALTER TABLE CFG_ServerHistory + DROP COLUMN XpForBirthday; + + diff --git a/bot/src/bot_data/scripts/1.2.0/2_Birthday_up.sql b/bot/src/bot_data/scripts/1.2.0/2_Birthday_up.sql new file mode 100644 index 00000000..fa92e8e8 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/2_Birthday_up.sql @@ -0,0 +1,150 @@ +ALTER TABLE Users + ADD Birthday DATE NULL AFTER MessageCount; + + + +ALTER TABLE UsersHistory + ADD Birthday DATE NULL AFTER MessageCount; + + +ALTER TABLE `Users` + CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; + +ALTER TABLE `Users` + CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);; + +DROP TRIGGER IF EXISTS `TR_UsersUpdate`;; + +CREATE TRIGGER `TR_UsersUpdate` + AFTER UPDATE + ON `Users` + FOR EACH ROW +BEGIN + INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `Birthday`, `ServerId`, + `DateFrom`, `DateTo`) + VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.Birthday, OLD.ServerId, + OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_UsersDelete`;; + +CREATE TRIGGER `TR_UsersDelete` + AFTER DELETE + ON `Users` + FOR EACH ROW +BEGIN + INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `Birthday`, `ServerId`, + `Deleted`, `DateFrom`, `DateTo`) + VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.Birthday, OLD.ServerId, TRUE, + OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); +END;; + + +ALTER TABLE CFG_Server + ADD XpForBirthday BIGINT(20) NOT NULL DEFAULT 0 AFTER XpPerAchievement; + + + +ALTER TABLE CFG_ServerHistory + ADD XpForBirthday BIGINT(20) NOT NULL DEFAULT 0 AFTER XpPerAchievement; + +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`, + `DefaultRoleId`, + `ShortRoleNameSetOnlyHighest`, + `FeatureFlags`, + `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.DefaultRoleId, + OLD.ShortRoleNameSetOnlyHighest, + OLD.FeatureFlags, + 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`, + `DefaultRoleId`, + `ShortRoleNameSetOnlyHighest`, + `ServerId`, + `FeatureFlags`, + `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.DefaultRoleId, + OLD.ShortRoleNameSetOnlyHighest, + OLD.FeatureFlags, + OLD.ServerId, + TRUE, + OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + diff --git a/bot/src/bot_data/scripts/1.2.0/3_SteamSpecialOffer_down.sql b/bot/src/bot_data/scripts/1.2.0/3_SteamSpecialOffer_down.sql new file mode 100644 index 00000000..2cca3310 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/3_SteamSpecialOffer_down.sql @@ -0,0 +1,11 @@ +DROP TABLE `SteamSpecialOffers`; + + +ALTER TABLE CFG_Server + DROP COLUMN GameOfferNotificationChatId; + + +ALTER TABLE CFG_ServerHistory + DROP COLUMN GameOfferNotificationChatId; + + diff --git a/bot/src/bot_data/scripts/1.2.0/3_SteamSpecialOffer_up.sql b/bot/src/bot_data/scripts/1.2.0/3_SteamSpecialOffer_up.sql new file mode 100644 index 00000000..f395c825 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/3_SteamSpecialOffer_up.sql @@ -0,0 +1,23 @@ +CREATE TABLE IF NOT EXISTS `SteamSpecialOffers` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Game` VARCHAR(255) NOT NULL, + `OriginalPrice` FLOAT NOT NULL, + `DiscountPrice` FLOAT NOT NULL, + `DiscountPct` 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`) +); + + + +ALTER TABLE CFG_Server + ADD COLUMN GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest; + + + +ALTER TABLE CFG_ServerHistory + ADD COLUMN GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest; + + diff --git a/bot/src/bot_data/scripts/1.2.0/4_MaxSteamOfferCount_down.sql b/bot/src/bot_data/scripts/1.2.0/4_MaxSteamOfferCount_down.sql new file mode 100644 index 00000000..d4884917 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/4_MaxSteamOfferCount_down.sql @@ -0,0 +1,9 @@ +ALTER TABLE CFG_Technician + DROP COLUMN MaxSteamOfferCount; + + + +ALTER TABLE CFG_TechnicianHistory + DROP COLUMN MaxSteamOfferCount; + + diff --git a/bot/src/bot_data/scripts/1.2.0/4_MaxSteamOfferCount_up.sql b/bot/src/bot_data/scripts/1.2.0/4_MaxSteamOfferCount_up.sql new file mode 100644 index 00000000..f9f21398 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/4_MaxSteamOfferCount_up.sql @@ -0,0 +1,64 @@ +ALTER TABLE CFG_Technician + ADD MaxSteamOfferCount BIGINT NOT NULL DEFAULT 250 AFTER CacheMaxMessages; + + + +ALTER TABLE CFG_TechnicianHistory + ADD MaxSteamOfferCount BIGINT NOT NULL DEFAULT 250 AFTER CacheMaxMessages; + +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`, + `MaxSteamOfferCount`, + `FeatureFlags`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.MaxSteamOfferCount, + OLD.FeatureFlags, + 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`, + `MaxSteamOfferCount`, + `FeatureFlags`, + `Deleted`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.MaxSteamOfferCount, + OLD.FeatureFlags, + TRUE, + OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + diff --git a/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_down.sql b/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_down.sql new file mode 100644 index 00000000..a21475b6 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_down.sql @@ -0,0 +1,9 @@ +ALTER TABLE CFG_Technician + DROP COLUMN Maintenance; + + + +ALTER TABLE CFG_TechnicianHistory + DROP COLUMN Maintenance; + + diff --git a/bot/src/bot_data/migration/db_history_scripts/config/technician.sql b/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql similarity index 71% rename from bot/src/bot_data/migration/db_history_scripts/config/technician.sql rename to bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql index 3866f88f..a202bfaa 100644 --- a/bot/src/bot_data/migration/db_history_scripts/config/technician.sql +++ b/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql @@ -1,19 +1,10 @@ -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, - `MaxSteamOfferCount` BIGINT NOT NULL DEFAULT 250, - `Maintenance` BOOLEAN DEFAULT FALSE, - `FeatureFlags` JSON NULL DEFAULT ('{}'), - `Deleted` BOOL DEFAULT FALSE, - `DateFrom` DATETIME(6) NOT NULL, - `DateTo` DATETIME(6) NOT NULL -); +ALTER TABLE CFG_Technician + ADD Maintenance BOOLEAN DEFAULT FALSE AFTER MaxSteamOfferCount; -DROP TRIGGER IF EXISTS `TR_CFG_TechnicianUpdate`; +ALTER TABLE CFG_TechnicianHistory + ADD Maintenance BOOLEAN DEFAULT FALSE AFTER MaxSteamOfferCount; + +DROP TRIGGER IF EXISTS `TR_CFG_TechnicianUpdate`;; CREATE TRIGGER `TR_CFG_TechnicianUpdate` AFTER UPDATE @@ -40,9 +31,9 @@ BEGIN OLD.FeatureFlags, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); -END; +END;; -DROP TRIGGER IF EXISTS `TR_CFG_TechnicianDelete`; +DROP TRIGGER IF EXISTS `TR_CFG_TechnicianDelete`;; CREATE TRIGGER `TR_CFG_TechnicianDelete` AFTER DELETE @@ -71,4 +62,5 @@ BEGIN TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); -END; \ No newline at end of file +END;; + diff --git a/bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_down.sql b/bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_down.sql new file mode 100644 index 00000000..d055ec13 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_down.sql @@ -0,0 +1,3 @@ +DROP TABLE `ShortRoleNames`; + +DROP TABLE `ShortRoleNamesHistory`; \ No newline at end of file diff --git a/bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_up.sql b/bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_up.sql new file mode 100644 index 00000000..843c21fc --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_up.sql @@ -0,0 +1,83 @@ +CREATE TABLE IF NOT EXISTS `ScheduledEvents` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Interval` ENUM ('daily', 'weekly', 'monthly', 'yearly') NOT NULL, + `Name` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NULL, + `ChannelId` BIGINT NULL, + `StartTime` DATETIME(6) NOT NULL, + `EndTime` DATETIME(6) NULL, + `EntityType` ENUM ('1','2','3') NOT NULL, + `Location` VARCHAR(255) NULL, + `ServerId` BIGINT, + `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`) +); + +CREATE TABLE IF NOT EXISTS `ScheduledEventsHistory` +( + `Id` BIGINT(20) NOT NULL, + `Interval` ENUM ('daily', 'weekly', 'monthly', 'yearly') NOT NULL, + `Name` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NULL, + `ChannelId` BIGINT NULL, + `StartTime` DATETIME(6) NOT NULL, + `EndTime` DATETIME(6) NULL, + `EntityType` ENUM ('1','2','3') NOT NULL, + `Location` VARCHAR(255) NULL, + `ServerId` BIGINT(20) DEFAULT NULL, + `Deleted` BOOL DEFAULT FALSE, + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL +); + +DROP TRIGGER IF EXISTS `TR_ScheduledEventsUpdate`; + +CREATE TRIGGER `TR_ScheduledEventsUpdate` + AFTER UPDATE + ON `ScheduledEvents` + FOR EACH ROW +BEGIN + INSERT INTO `ScheduledEventsHistory` (`Id`, + `Interval`, + `Name`, + `Description`, + `ChannelId`, + `StartTime`, + `EndTime`, + `EntityType`, + `Location`, + `ServerId`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, OLD.Interval, OLD.Name, OLD.Description, OLD.ChannelId, OLD.StartTime, OLD.EndTime, OLD.EntityType, + OLD.Location, OLD.ServerId, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END; + +DROP TRIGGER IF EXISTS `TR_ScheduledEventsDelete`; + +CREATE TRIGGER `TR_ScheduledEventsDelete` + AFTER DELETE + ON `ScheduledEvents` + FOR EACH ROW +BEGIN + INSERT INTO `ScheduledEventsHistory` (`Id`, + `Interval`, + `Name`, + `Description`, + `ChannelId`, + `StartTime`, + `EndTime`, + `EntityType`, + `Location`, + `ServerId`, + `Deleted`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, OLD.Interval, OLD.Name, OLD.Description, OLD.ChannelId, OLD.StartTime, OLD.EndTime, OLD.EntityType, + OLD.Location, OLD.ServerId, TRUE, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END; \ No newline at end of file diff --git a/bot/src/bot_data/service/__init__.py b/bot/src/bot_data/service/__init__.py index 176cd53b..ac893727 100644 --- a/bot/src/bot_data/service/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_data/service/migration_service.py b/bot/src/bot_data/service/migration_service.py index ab347283..a8caeb75 100644 --- a/bot/src/bot_data/service/migration_service.py +++ b/bot/src/bot_data/service/migration_service.py @@ -1,9 +1,14 @@ +import glob +import os + from cpl_core.database.context import DatabaseContextABC from cpl_core.dependency_injection import ServiceProviderABC from cpl_query.extension import List +from packaging import version +import bot from bot_core.logging.database_logger import DatabaseLogger -from bot_data.abc.migration_abc import MigrationABC +from bot_data.model.migration import Migration from bot_data.model.migration_history import MigrationHistory @@ -20,14 +25,99 @@ class MigrationService: self._db = db self._cursor = db.cursor - self._migrations: List[MigrationABC] = ( - List(type, MigrationABC.__subclasses__()).order_by(lambda x: x.name.split("_")[0]).then_by(lambda x: x.prio) + def _get_migration_history(self) -> List[MigrationHistory]: + results = self._db.select( + """ + SELECT * FROM `MigrationHistory` + """ ) + applied_migrations = List(MigrationHistory) + for result in results: + applied_migrations.add(MigrationHistory(result[0], result[1])) - def migrate(self): - self._logger.info(__name__, f"Running Migrations") - for migration in self._migrations: - migration_id = migration.__name__ + return applied_migrations + + def _migration_migrations_to_old(self, migration: MigrationHistory): + if migration.migration_id.endswith("Migration"): + return + + self._logger.debug(__name__, f"Migrate new migration {migration.migration_id} to old method") + self._cursor.execute(migration.change_id_string(f"{migration.migration_id}Migration")) + self._db.save_changes() + + def _migration_migrations_to_new(self, migration: MigrationHistory): + if not migration.migration_id.endswith("Migration"): + return + + self._logger.debug(__name__, f"Migrate old migration {migration.migration_id} to new method") + self._cursor.execute(migration.change_id_string(migration.migration_id.replace("Migration", ""))) + self._db.save_changes() + + def _migrate_from_old_to_new(self): + self._cursor.execute("SHOW TABLES LIKE 'MigrationHistory'") + result = self._cursor.fetchone() + if not result: + return + + for migration in self._get_migration_history(): + if version.Version(bot.__version__) < version.Version("1.2.2"): + self._migration_migrations_to_old(migration) + else: + self._migration_migrations_to_new(migration) + + def _load_scripts(self, upgrade: bool = True) -> List[Migration]: + migrations = List(Migration) + path = "../bot_data/scripts" + + if not os.path.exists(path): + raise Exception("Migration path not found") + + folders = List(str, glob.glob(f"{path}/*")) + if upgrade: + folders = folders.order_by() + else: + folders = folders.order_by_descending() + + for folder in folders: + splitted = folder.split("/") + version_str = splitted[len(splitted) - 1] + + # upgrade do not run migrations from higher versions + if upgrade and version.Version(version_str) > version.Version(bot.__version__): + break + # downgrade run migrations from higher versions + if not upgrade and version.Version(version_str) <= version.Version(bot.__version__): + continue + + files = List(str, os.listdir(folder)).where(lambda x: x.endswith(f"_{'up' if upgrade else 'down'}.sql")) + if upgrade: + files = files.order_by() + else: + files = files.order_by_descending() + + for file in files.to_list(): + if not file.endswith(".sql"): + continue + + name = str(file.split(".sql")[0]) + if name.endswith("_up"): + name = name.replace("_up", "") + elif name.endswith("_down"): + name = name.replace("_down", "") + + name = name.split("_")[1] + + with open(f"{folder}/{file}", "r") as f: + script = f.read() + f.close() + + migrations.add(Migration(name, version_str, script)) + + return migrations + + def _execute(self, migrations: List[Migration], upgrade: bool = True): + for migration in migrations: + active_statement = "" try: # check if table exists self._cursor.execute("SHOW TABLES LIKE 'MigrationHistory'") @@ -36,17 +126,36 @@ class MigrationService: # there is a table named "tableName" self._logger.trace( __name__, - f"Running SQL Command: {MigrationHistory.get_select_by_id_string(migration_id)}", + f"Running SQL Command: {MigrationHistory.get_select_by_id_string(migration.name)}", ) - migration_from_db = self._db.select(MigrationHistory.get_select_by_id_string(migration_id)) - if migration_from_db is not None and len(migration_from_db) > 0: + migration_from_db = self._db.select(MigrationHistory.get_select_by_id_string(migration.name)) + if upgrade and migration_from_db is not None and len(migration_from_db) > 0: + continue + elif not upgrade and (migration_from_db is None or len(migration_from_db) == 0): continue - self._logger.debug(__name__, f"Running Migration {migration_id}") - migration_as_service: MigrationABC = self._services.get_service(migration) - migration_as_service.upgrade() - self._cursor.execute(MigrationHistory(migration_id).insert_string) - self._db.save_changes() + self._logger.debug( + __name__, f"Running {'upgrade' if upgrade else 'downgrade'} migration: {migration.name}" + ) + for statement in migration.script.split("\n\n"): + if statement in ["", "\n"]: + continue + active_statement = statement + self._cursor.execute(statement + ";") + + self._cursor.execute( + MigrationHistory(migration.name).insert_string + if upgrade + else MigrationHistory(migration.name).delete_string + ) + self._db.save_changes() except Exception as e: - self._logger.error(__name__, f"Cannot get migration with id {migration}", e) + self._logger.fatal( + __name__, f"Migration failed: {migration.version}-{migration.name}\n{active_statement}", e + ) + + def migrate(self): + self._migrate_from_old_to_new() + self._execute(self._load_scripts()) + self._execute(self._load_scripts(False), False) diff --git a/bot/src/bot_data/service/scheduled_event_repository_service.py b/bot/src/bot_data/service/scheduled_event_repository_service.py new file mode 100644 index 00000000..dc394fdf --- /dev/null +++ b/bot/src/bot_data/service/scheduled_event_repository_service.py @@ -0,0 +1,91 @@ +from typing import Optional + +from cpl_core.database.context import DatabaseContextABC +from cpl_query.extension import List +from discord import EntityType + +from bot_core.logging.database_logger import DatabaseLogger +from bot_data.abc.server_repository_abc import ServerRepositoryABC +from bot_data.abc.scheduled_event_repository_abc import ScheduledEventRepositoryABC +from bot_data.model.scheduled_event import ScheduledEvent +from bot_data.model.scheduled_event_interval_enum import ScheduledEventIntervalEnum + + +class ScheduledEventRepositoryService(ScheduledEventRepositoryABC): + def __init__( + self, + logger: DatabaseLogger, + db_context: DatabaseContextABC, + servers: ServerRepositoryABC, + ): + self._logger = logger + self._context = db_context + + self._servers = servers + + ScheduledEventRepositoryABC.__init__(self) + + @staticmethod + def _get_value_from_result(value: any) -> Optional[any]: + if isinstance(value, str) and "NULL" in value: + return None + + return value + + def _scheduled_event_from_result(self, sql_result: tuple) -> ScheduledEvent: + return ScheduledEvent( + self._get_value_from_result(ScheduledEventIntervalEnum(sql_result[1])), # interval + self._get_value_from_result(sql_result[2]), # name + self._get_value_from_result(sql_result[3]), # description + int(self._get_value_from_result(sql_result[4])), # channel_id + self._get_value_from_result(sql_result[5]), # start_time + self._get_value_from_result(sql_result[6]), # end_time + EntityType(int(self._get_value_from_result(sql_result[7]))), # entity_type + self._get_value_from_result(sql_result[8]), # location + self._servers.get_server_by_id((sql_result[9])), # server + self._get_value_from_result(sql_result[10]), # created_at + self._get_value_from_result(sql_result[11]), # modified_at + id=self._get_value_from_result(sql_result[0]), + ) + + def get_scheduled_events(self) -> List[ScheduledEvent]: + scheduled_events = List(ScheduledEvent) + self._logger.trace(__name__, f"Send SQL command: {ScheduledEvent.get_select_all_string()}") + results = self._context.select(ScheduledEvent.get_select_all_string()) + for result in results: + self._logger.trace(__name__, f"Get scheduled_event with id {result[0]}") + scheduled_events.append(self._scheduled_event_from_result(result)) + + return scheduled_events + + def get_scheduled_event_by_id(self, id: int) -> ScheduledEvent: + self._logger.trace(__name__, f"Send SQL command: {ScheduledEvent.get_select_by_id_string(id)}") + result = self._context.select(ScheduledEvent.get_select_by_id_string(id))[0] + + return self._scheduled_event_from_result(result) + + def get_scheduled_events_by_server_id(self, server_id: int) -> List[ScheduledEvent]: + scheduled_events = List(ScheduledEvent) + self._logger.trace( + __name__, + f"Send SQL command: {ScheduledEvent.get_select_by_server_id_string(server_id)}", + ) + results = self._context.select(ScheduledEvent.get_select_by_server_id_string(server_id)) + + for result in results: + self._logger.trace(__name__, f"Get scheduled_event with id {result[0]}") + scheduled_events.append(self._scheduled_event_from_result(result)) + + return scheduled_events + + def add_scheduled_event(self, scheduled_event: ScheduledEvent): + self._logger.trace(__name__, f"Send SQL command: {scheduled_event.insert_string}") + self._context.cursor.execute(scheduled_event.insert_string) + + def update_scheduled_event(self, scheduled_event: ScheduledEvent): + self._logger.trace(__name__, f"Send SQL command: {scheduled_event.udpate_string}") + self._context.cursor.execute(scheduled_event.udpate_string) + + def delete_scheduled_event(self, scheduled_event: ScheduledEvent): + self._logger.trace(__name__, f"Send SQL command: {scheduled_event.delete_string}") + self._context.cursor.execute(scheduled_event.delete_string) diff --git a/bot/src/bot_data/service/technician_config_seeder.py b/bot/src/bot_data/service/technician_config_seeder.py index 3107db0a..7b87dbbe 100644 --- a/bot/src/bot_data/service/technician_config_seeder.py +++ b/bot/src/bot_data/service/technician_config_seeder.py @@ -32,6 +32,8 @@ class TechnicianConfigSeeder(DataSeederABC): 8, 8, 1000000, + 100, + False, {}, List(int, [240160344557879316]), List( diff --git a/bot/src/bot_data/startup_migration_extension.py b/bot/src/bot_data/startup_migration_extension.py index 14a90938..58c6e083 100644 --- a/bot/src/bot_data/startup_migration_extension.py +++ b/bot/src/bot_data/startup_migration_extension.py @@ -3,39 +3,6 @@ from cpl_core.configuration import ConfigurationABC from cpl_core.dependency_injection import ServiceCollectionABC from cpl_core.environment import ApplicationEnvironmentABC -from bot_data.abc.migration_abc import MigrationABC -from bot_data.migration.achievements_migration import AchievementsMigration -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.birthday_migration import BirthdayMigration -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.default_role_migration import DefaultRoleMigration -from bot_data.migration.fix_updates_migration import FixUpdatesMigration -from bot_data.migration.fix_user_history_migration import FixUserHistoryMigration -from bot_data.migration.initial_migration import InitialMigration -from bot_data.migration.level_migration import LevelMigration -from bot_data.migration.maintenance_mode_migration import MaintenanceModeMigration -from bot_data.migration.max_steam_offer_count_migration import MaxSteamOfferCountMigration -from bot_data.migration.remove_stats_migration import RemoveStatsMigration -from bot_data.migration.short_role_name_migration import ShortRoleNameMigration -from bot_data.migration.short_role_name_only_highest_migration import ( - ShortRoleNameOnlyHighestMigration, -) -from bot_data.migration.stats_migration import StatsMigration -from bot_data.migration.steam_special_offer_migration import SteamSpecialOfferMigration -from bot_data.migration.user_joined_game_server_migration import ( - UserJoinedGameServerMigration, -) -from bot_data.migration.user_message_count_per_hour_migration import ( - UserMessageCountPerHourMigration, -) -from bot_data.migration.user_warning_migration import UserWarningMigration from bot_data.service.migration_service import MigrationService @@ -48,27 +15,3 @@ class StartupMigrationExtension(StartupExtensionABC): def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC): services.add_transient(MigrationService) - services.add_transient(MigrationABC, InitialMigration) - services.add_transient(MigrationABC, AutoRoleMigration) # 03.10.2022 #54 - 0.2.2 - services.add_transient(MigrationABC, ApiMigration) # 15.10.2022 #70 - 0.3.0 - services.add_transient(MigrationABC, LevelMigration) # 06.11.2022 #25 - 0.3.0 - services.add_transient(MigrationABC, StatsMigration) # 09.11.2022 #46 - 0.3.0 - services.add_transient(MigrationABC, AutoRoleFix1Migration) # 30.12.2022 #151 - 0.3.0 - services.add_transient(MigrationABC, UserMessageCountPerHourMigration) # 11.01.2023 #168 - 0.3.1 - services.add_transient(MigrationABC, ApiKeyMigration) # 09.02.2023 #162 - 1.0.0 - services.add_transient(MigrationABC, UserJoinedGameServerMigration) # 12.02.2023 #181 - 1.0.0 - services.add_transient(MigrationABC, RemoveStatsMigration) # 19.02.2023 #190 - 1.0.0 - 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 - services.add_transient(MigrationABC, DefaultRoleMigration) # 24.09.2023 #360 - 1.1.3 - services.add_transient(MigrationABC, ShortRoleNameMigration) # 28.09.2023 #378 - 1.1.7 - services.add_transient(MigrationABC, FixUpdatesMigration) # 28.09.2023 #378 - 1.1.7 - services.add_transient(MigrationABC, ShortRoleNameOnlyHighestMigration) # 02.10.2023 #391 - 1.1.9 - services.add_transient(MigrationABC, FixUserHistoryMigration) # 10.10.2023 #401 - 1.2.0 - services.add_transient(MigrationABC, BirthdayMigration) # 10.10.2023 #401 - 1.2.0 - services.add_transient(MigrationABC, SteamSpecialOfferMigration) # 10.10.2023 #188 - 1.2.0 - services.add_transient(MigrationABC, MaxSteamOfferCountMigration) # 04.11.2023 #188 - 1.2.0 - services.add_transient(MigrationABC, MaintenanceModeMigration) # 06.11.2023 #424 - 1.2.0 diff --git a/bot/src/bot_graphql/__init__.py b/bot/src/bot_graphql/__init__.py index f8a95b47..6ea1d53d 100644 --- a/bot/src/bot_graphql/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_graphql/abc/__init__.py b/bot/src/bot_graphql/abc/__init__.py index ec2093d8..a14102bf 100644 --- a/bot/src/bot_graphql/abc/__init__.py +++ b/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.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_graphql/abc/filter_abc.py b/bot/src/bot_graphql/abc/filter_abc.py index e0d5ff8d..3067b075 100644 --- a/bot/src/bot_graphql/abc/filter_abc.py +++ b/bot/src/bot_graphql/abc/filter_abc.py @@ -1,8 +1,10 @@ import functools from abc import ABC, abstractmethod from inspect import signature, Parameter +from typing import Callable from cpl_core.dependency_injection import ServiceProviderABC +from cpl_core.type import R, T from cpl_query.extension import List @@ -52,3 +54,18 @@ class FilterABC(ABC): return f(*args, **kwargs) return decorator + + def _get_attributes_from_dict(self, attrs: list[tuple[str, type]], values: dict): + for key_pair in attrs: + attr = key_pair[0] + attr_type = key_pair[1] + if attr in values: + self.__setattr__(f"_{attr}", attr_type(values[attr])) + + @staticmethod + def _filter_by_attributes(attrs: list[dict], values: List[T]) -> List[R]: + for attr in attrs: + if attr["attr"] is None: + continue + values = values.where(attr["func"]) + return values diff --git a/bot/src/bot_graphql/abc/query_abc.py b/bot/src/bot_graphql/abc/query_abc.py index 506428fc..882a420d 100644 --- a/bot/src/bot_graphql/abc/query_abc.py +++ b/bot/src/bot_graphql/abc/query_abc.py @@ -20,6 +20,7 @@ from bot_data.model.auto_role_rule import AutoRoleRule 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.scheduled_event import ScheduledEvent from bot_data.model.server import Server from bot_data.model.server_config import ServerConfig from bot_data.model.short_role_name import ShortRoleName @@ -213,6 +214,16 @@ class QueryABC(ObjectType): access = True break + elif type(element) == ScheduledEvent: + element: ScheduledEvent = 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.server.id: + 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 diff --git a/bot/src/bot_graphql/bot-graphql.json b/bot/src/bot_graphql/bot-graphql.json index 127d63f1..862bf950 100644 --- a/bot/src/bot_graphql/bot-graphql.json +++ b/bot/src/bot_graphql/bot-graphql.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/src/bot_graphql/filter/__init__.py b/bot/src/bot_graphql/filter/__init__.py index bf5d90f1..c05ec36e 100644 --- a/bot/src/bot_graphql/filter/__init__.py +++ b/bot/src/bot_graphql/filter/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.filter" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_graphql/filter/scheduled_event_filter.py b/bot/src/bot_graphql/filter/scheduled_event_filter.py new file mode 100644 index 00000000..e98be02b --- /dev/null +++ b/bot/src/bot_graphql/filter/scheduled_event_filter.py @@ -0,0 +1,71 @@ +from cpl_core.dependency_injection import ServiceProviderABC +from cpl_discord.service import DiscordBotServiceABC +from cpl_query.extension import List + +from bot_data.model.scheduled_event import ScheduledEvent +from bot_graphql.abc.filter_abc import FilterABC + + +class ScheduledEventFilter(FilterABC): + def __init__(self, bot: DiscordBotServiceABC, services: ServiceProviderABC): + FilterABC.__init__(self) + self._bot = bot + self._services = services + + self._id = None + self._interval = None + self._name = None + self._description = None + self._channel_id = None + self._start_time = None + self._end_time = None + self._entity_type = None + self._location = None + self._server = None + + def from_dict(self, values: dict): + self._get_attributes_from_dict( + [ + ("id", int), + ("interval", str), + ("name", str), + ("description", str), + ("channel_id", str), + ("start_time", str), + ("end_time", str), + ("entity_type", str), + ("location", str), + ], + values, + ) + + if "server" in values: + from bot_graphql.filter.server_filter import ServerFilter + + self._server: ServerFilter = self._services.get_service(ServerFilter) + self._server.from_dict(values["server"]) + + def filter(self, query: List[ScheduledEvent]) -> List[ScheduledEvent]: + if self._id is not None: + query = query.where(lambda x: x.id == self._id) + + query = self._filter_by_attributes( + [ + {"attr": self._id, "func": lambda x: x.id == self._id}, + {"attr": self._interval, "func": lambda x: x.interval == self._interval}, + {"attr": self._name, "func": lambda x: x.name == self._name}, + {"attr": self._description, "func": lambda x: x.description == self._description}, + {"attr": self._channel_id, "func": lambda x: x.channel_id == self._channel_id}, + {"attr": self._start_time, "func": lambda x: x.start_time == self._start_time}, + {"attr": self._end_time, "func": lambda x: x.end_time == self._end_time}, + {"attr": self._entity_type, "func": lambda x: x.entity_type == self._entity_type}, + {"attr": self._location, "func": lambda x: x.location == self._location}, + ], + query, + ) + + if self._server is not None: + servers = self._server.filter(query.select(lambda x: x.server)).select(lambda x: x.id) + query = query.where(lambda x: x.server.id in servers) + + return query diff --git a/bot/src/bot_graphql/filter/short_role_name_filter.py b/bot/src/bot_graphql/filter/short_role_name_filter.py index 426e3630..ea5a8bba 100644 --- a/bot/src/bot_graphql/filter/short_role_name_filter.py +++ b/bot/src/bot_graphql/filter/short_role_name_filter.py @@ -1,3 +1,4 @@ +from cpl_core.dependency_injection import ServiceProviderABC from cpl_discord.service import DiscordBotServiceABC from cpl_query.extension import List @@ -8,9 +9,10 @@ from bot_graphql.abc.filter_abc import FilterABC class ShortRoleNameFilter(FilterABC): - def __init__(self, bot: DiscordBotServiceABC): + def __init__(self, bot: DiscordBotServiceABC, services: ServiceProviderABC): FilterABC.__init__(self) self._bot = bot + self._services = services self._id = None self._short_name = None diff --git a/bot/src/bot_graphql/graphql/mutation.gql b/bot/src/bot_graphql/graphql/mutation.gql index 9578fde0..56d6374f 100644 --- a/bot/src/bot_graphql/graphql/mutation.gql +++ b/bot/src/bot_graphql/graphql/mutation.gql @@ -6,6 +6,7 @@ type Mutation { userJoinedGameServer: UserJoinedGameServerMutation achievement: AchievementMutation shortRoleName: ShortRoleNameMutation + scheduledEvent: ScheduledEventMutation technicianConfig: TechnicianConfigMutation serverConfig: ServerConfigMutation } \ No newline at end of file diff --git a/bot/src/bot_graphql/graphql/query.gql b/bot/src/bot_graphql/graphql/query.gql index ffa3c21f..cf1f4223 100644 --- a/bot/src/bot_graphql/graphql/query.gql +++ b/bot/src/bot_graphql/graphql/query.gql @@ -41,10 +41,15 @@ type Query { shortRoleNames(filter: ShortRoleNameFilter, page: Page, sort: Sort): [ShortRoleName] shortRoleNamePositions: [String] + scheduledEventCount: Int + scheduledEvents(filter: ScheduledEventFilter, page: Page, sort: Sort): [ScheduledEvent] + userWarningCount: Int userWarnings(filter: UserWarningFilter, page: Page, sort: Sort): [UserWarning] technicianConfig: TechnicianConfig possibleFeatureFlags: [String] discord: Discord + + hasFeatureFlag(flag: String): FeatureFlag } \ No newline at end of file diff --git a/bot/src/bot_graphql/graphql/scheduledEvent.gql b/bot/src/bot_graphql/graphql/scheduledEvent.gql new file mode 100644 index 00000000..586bbc92 --- /dev/null +++ b/bot/src/bot_graphql/graphql/scheduledEvent.gql @@ -0,0 +1,68 @@ +type ScheduledEvent implements TableWithHistoryQuery { + id: ID + interval: String + name: String + description: String + channelId: String + startTime: String + endTime: String + entityType: Int + location: String + + server: Server + + createdAt: String + modifiedAt: String + + history: [ScheduledEventHistory] +} + +type ScheduledEventHistory implements HistoryTableQuery { + id: ID + interval: String + name: String + description: String + channelId: String + startTime: String + endTime: String + entityType: Int + location: String + + server: ID + + deleted: Boolean + dateFrom: String + dateTo: String +} + +input ScheduledEventFilter { + id: ID + interval: String + name: String + description: String + channelId: String + startTime: String + endTime: String + entityType: Int + location: String + server: ServerFilter +} + +type ScheduledEventMutation { + createScheduledEvent(input: ScheduledEventInput!): ScheduledEvent + updateScheduledEvent(input: ScheduledEventInput!): ScheduledEvent + deleteScheduledEvent(id: ID): ScheduledEvent +} + +input ScheduledEventInput { + id: ID + interval: String + name: String + description: String + channelId: String + startTime: String + endTime: String + entityType: Int + location: String + serverId: ID +} \ No newline at end of file diff --git a/bot/src/bot_graphql/graphql/server.gql b/bot/src/bot_graphql/graphql/server.gql index be603f3a..4624ffca 100644 --- a/bot/src/bot_graphql/graphql/server.gql +++ b/bot/src/bot_graphql/graphql/server.gql @@ -35,6 +35,9 @@ type Server implements TableWithHistoryQuery { shortRoleNameCount: Int shortRoleNames(filter: ShortRoleNameFilter, page: Page, sort: Sort): [ShortRoleName] + scheduledEventCount: Int + scheduledEvents(filter: ScheduledEventFilter, page: Page, sort: Sort): [ScheduledEvent] + config: ServerConfig hasFeatureFlag(flag: String): FeatureFlag diff --git a/bot/src/bot_graphql/graphql_module.py b/bot/src/bot_graphql/graphql_module.py index 95d73f7b..21957e56 100644 --- a/bot/src/bot_graphql/graphql_module.py +++ b/bot/src/bot_graphql/graphql_module.py @@ -12,6 +12,7 @@ from bot_graphql.filter.auto_role_filter import AutoRoleFilter from bot_graphql.filter.auto_role_rule_filter import AutoRoleRuleFilter from bot_graphql.filter.client_filter import ClientFilter from bot_graphql.filter.level_filter import LevelFilter +from bot_graphql.filter.scheduled_event_filter import ScheduledEventFilter from bot_graphql.filter.server_filter import ServerFilter from bot_graphql.filter.short_role_name_filter import ShortRoleNameFilter from bot_graphql.filter.user_filter import UserFilter @@ -27,6 +28,7 @@ from bot_graphql.mutations.achievement_mutation import AchievementMutation from bot_graphql.mutations.auto_role_mutation import AutoRoleMutation from bot_graphql.mutations.auto_role_rule_mutation import AutoRoleRuleMutation from bot_graphql.mutations.level_mutation import LevelMutation +from bot_graphql.mutations.scheduled_event_mutation import ScheduledEventMutation from bot_graphql.mutations.server_config_mutation import ServerConfigMutation from bot_graphql.mutations.short_role_name_mutation import ShortRoleNameMutation from bot_graphql.mutations.technician_config_mutation import TechnicianConfigMutation @@ -54,6 +56,7 @@ from bot_graphql.queries.known_user_history_query import KnownUserHistoryQuery from bot_graphql.queries.known_user_query import KnownUserQuery from bot_graphql.queries.level_history_query import LevelHistoryQuery from bot_graphql.queries.level_query import LevelQuery +from bot_graphql.queries.scheduled_event_query import ScheduledEventQuery from bot_graphql.queries.server_config_query import ServerConfigQuery from bot_graphql.queries.server_history_query import ServerHistoryQuery from bot_graphql.queries.server_query import ServerQuery @@ -140,6 +143,7 @@ class GraphQLModule(ModuleABC): services.add_transient(QueryABC, UserWarningHistoryQuery) services.add_transient(QueryABC, UserWarningQuery) services.add_transient(QueryABC, ServerStatisticQuery) + services.add_transient(QueryABC, ScheduledEventQuery) services.add_transient(QueryABC, DiscordQuery) services.add_transient(QueryABC, GuildQuery) @@ -161,6 +165,7 @@ class GraphQLModule(ModuleABC): services.add_transient(FilterABC, UserJoinedGameServerFilter) services.add_transient(FilterABC, ShortRoleNameFilter) services.add_transient(FilterABC, UserWarningFilter) + services.add_transient(FilterABC, ScheduledEventFilter) # mutations services.add_transient(QueryABC, AutoRoleMutation) @@ -172,3 +177,4 @@ class GraphQLModule(ModuleABC): services.add_transient(QueryABC, UserJoinedGameServerMutation) services.add_transient(QueryABC, TechnicianConfigMutation) services.add_transient(QueryABC, ServerConfigMutation) + services.add_transient(QueryABC, ScheduledEventMutation) diff --git a/bot/src/bot_graphql/model/__init__.py b/bot/src/bot_graphql/model/__init__.py index 803f8367..acad138f 100644 --- a/bot/src/bot_graphql/model/__init__.py +++ b/bot/src/bot_graphql/model/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.model" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_graphql/mutation.py b/bot/src/bot_graphql/mutation.py index 39e38cc5..86b269d0 100644 --- a/bot/src/bot_graphql/mutation.py +++ b/bot/src/bot_graphql/mutation.py @@ -4,6 +4,7 @@ from bot_graphql.mutations.achievement_mutation import AchievementMutation from bot_graphql.mutations.auto_role_mutation import AutoRoleMutation from bot_graphql.mutations.auto_role_rule_mutation import AutoRoleRuleMutation from bot_graphql.mutations.level_mutation import LevelMutation +from bot_graphql.mutations.scheduled_event_mutation import ScheduledEventMutation from bot_graphql.mutations.server_config_mutation import ServerConfigMutation from bot_graphql.mutations.short_role_name_mutation import ShortRoleNameMutation from bot_graphql.mutations.technician_config_mutation import TechnicianConfigMutation @@ -23,6 +24,7 @@ class Mutation(MutationType): achievement_mutation: AchievementMutation, user_joined_game_server: UserJoinedGameServerMutation, technician_config: TechnicianConfigMutation, + scheduled_event: ScheduledEventMutation, server_config: ServerConfigMutation, short_role_name_mutation: ShortRoleNameMutation, ): @@ -36,4 +38,5 @@ class Mutation(MutationType): self.set_field("userJoinedGameServer", lambda *_: user_joined_game_server) self.set_field("shortRoleName", lambda *_: short_role_name_mutation) self.set_field("technicianConfig", lambda *_: technician_config) + self.set_field("scheduledEvent", lambda *_: scheduled_event) self.set_field("serverConfig", lambda *_: server_config) diff --git a/bot/src/bot_graphql/mutations/__init__.py b/bot/src/bot_graphql/mutations/__init__.py index 1a3c88a4..0c794ed7 100644 --- a/bot/src/bot_graphql/mutations/__init__.py +++ b/bot/src/bot_graphql/mutations/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.mutations" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_graphql/mutations/scheduled_event_mutation.py b/bot/src/bot_graphql/mutations/scheduled_event_mutation.py new file mode 100644 index 00000000..6544bb42 --- /dev/null +++ b/bot/src/bot_graphql/mutations/scheduled_event_mutation.py @@ -0,0 +1,107 @@ +from datetime import datetime + +from cpl_core.database.context import DatabaseContextABC +from cpl_discord.service import DiscordBotServiceABC +from discord import EntityType + +from bot_data.abc.server_repository_abc import ServerRepositoryABC +from bot_data.abc.scheduled_event_repository_abc import ScheduledEventRepositoryABC +from bot_data.model.scheduled_event import ScheduledEvent +from bot_data.model.scheduled_event_interval_enum import ScheduledEventIntervalEnum +from bot_data.model.user_role_enum import UserRoleEnum +from bot_graphql.abc.query_abc import QueryABC +from modules.permission.service.permission_service import PermissionService + + +class ScheduledEventMutation(QueryABC): + def __init__( + self, + servers: ServerRepositoryABC, + scheduled_events: ScheduledEventRepositoryABC, + bot: DiscordBotServiceABC, + db: DatabaseContextABC, + permissions: PermissionService, + ): + QueryABC.__init__(self, "ScheduledEventMutation") + + self._servers = servers + self._scheduled_events = scheduled_events + self._bot = bot + self._db = db + self._permissions = permissions + + self.set_field("createScheduledEvent", self.resolve_create_scheduled_event) + self.set_field("updateScheduledEvent", self.resolve_update_scheduled_event) + self.set_field("deleteScheduledEvent", self.resolve_delete_scheduled_event) + + def resolve_create_scheduled_event(self, *_, input: dict): + server = self._servers.get_server_by_id(input["serverId"]) + self._can_user_mutate_data(server, UserRoleEnum.moderator) + + scheduled_event = ScheduledEvent( + ScheduledEventIntervalEnum(input["interval"]), + input["name"], + input["description"] if "description" in input else None, + input["channelId"] if "channelId" in input else None, + datetime.strptime(input["startTime"], "%Y-%m-%dT%H:%M:%S.%fZ"), + datetime.strptime(input["endTime"], "%Y-%m-%dT%H:%M:%S.%fZ") if "endTime" in input else None, + EntityType(int(input["entityType"])), + input["location"] if "location" in input else None, + server, + ) + + self._scheduled_events.add_scheduled_event(scheduled_event) + self._db.save_changes() + + def get_new_scheduled_event(srn: ScheduledEvent): + return ( + srn.interval == scheduled_event.interval + and srn.name == scheduled_event.name + and srn.description == scheduled_event.description + ) + + return ( + self._scheduled_events.get_scheduled_events_by_server_id(scheduled_event.server.id) + .where(get_new_scheduled_event) + .last() + ) + + def resolve_update_scheduled_event(self, *_, input: dict): + scheduled_event = self._scheduled_events.get_scheduled_event_by_id(input["id"]) + self._can_user_mutate_data(scheduled_event.server, UserRoleEnum.moderator) + + scheduled_event.interval = ( + ScheduledEventIntervalEnum(input["interval"]) if "interval" in input else scheduled_event.interval + ) + scheduled_event.name = input["name"] if "name" in input else scheduled_event.name + scheduled_event.description = input["description"] if "description" in input else scheduled_event.description + scheduled_event.channel_id = input["channelId"] if "channelId" in input else scheduled_event.channel_id + scheduled_event.start_time = ( + datetime.strptime(input["startTime"], "%Y-%m-%dT%H:%M:%S.%fZ") + if "startTime" in input + else scheduled_event.start_time + ) + scheduled_event.end_time = ( + datetime.strptime(input["endTime"], "%Y-%m-%dT%H:%M:%S.%fZ") + if "endTime" in input + else scheduled_event.end_time + ) + scheduled_event.entity_type = ( + EntityType(int(input["entityType"])) if "entityType" in input else scheduled_event.entity_type + ) + scheduled_event.location = input["location"] if "location" in input else scheduled_event.location + + self._scheduled_events.update_scheduled_event(scheduled_event) + self._db.save_changes() + + scheduled_event = self._scheduled_events.get_scheduled_event_by_id(input["id"]) + return scheduled_event + + def resolve_delete_scheduled_event(self, *_, id: int): + scheduled_event = self._scheduled_events.get_scheduled_event_by_id(id) + self._can_user_mutate_data(scheduled_event.server, UserRoleEnum.admin) + + self._scheduled_events.delete_scheduled_event(scheduled_event) + self._db.save_changes() + + return scheduled_event diff --git a/bot/src/bot_graphql/queries/__init__.py b/bot/src/bot_graphql/queries/__init__.py index 4fe38bb3..b2d4b8c9 100644 --- a/bot/src/bot_graphql/queries/__init__.py +++ b/bot/src/bot_graphql/queries/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_graphql/queries/discord/__init__.py b/bot/src/bot_graphql/queries/discord/__init__.py index 960e29db..b7b4de75 100644 --- a/bot/src/bot_graphql/queries/discord/__init__.py +++ b/bot/src/bot_graphql/queries/discord/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries.discord" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_graphql/queries/scheduled_event_history_query.py b/bot/src/bot_graphql/queries/scheduled_event_history_query.py new file mode 100644 index 00000000..f8fe921a --- /dev/null +++ b/bot/src/bot_graphql/queries/scheduled_event_history_query.py @@ -0,0 +1,24 @@ +from cpl_core.database.context import DatabaseContextABC + +from bot_data.model.scheduled_event_history import ScheduledEventHistory +from bot_graphql.abc.data_query_with_history_abc import DataQueryWithHistoryABC + + +class ScheduledEventHistoryQuery(DataQueryWithHistoryABC): + def __init__( + self, + db: DatabaseContextABC, + ): + DataQueryWithHistoryABC.__init__(self, "ScheduledEvent", "ScheduledEventsHistory", ScheduledEventHistory, db) + + self.set_field("id", lambda x, *_: x.id) + self.set_field("id", lambda x, *_: x.id) + self.set_field("interval", lambda x, *_: x.interval.value) + self.set_field("name", lambda x, *_: x.name) + self.set_field("description", lambda x, *_: x.description) + self.set_field("channel_id", lambda x, *_: x.channel_id) + self.set_field("start_time", lambda x, *_: x.start_time) + self.set_field("end_time", lambda x, *_: x.end_time) + self.set_field("entity_type", lambda x, *_: x.entity_type) + self.set_field("location", lambda x, *_: x.location) + self.set_field("server", lambda x, *_: x.server) diff --git a/bot/src/bot_graphql/queries/scheduled_event_query.py b/bot/src/bot_graphql/queries/scheduled_event_query.py new file mode 100644 index 00000000..d7a986be --- /dev/null +++ b/bot/src/bot_graphql/queries/scheduled_event_query.py @@ -0,0 +1,23 @@ +from cpl_core.database.context import DatabaseContextABC + +from bot_data.model.scheduled_event_history import ScheduledEventHistory +from bot_graphql.abc.data_query_with_history_abc import DataQueryWithHistoryABC + + +class ScheduledEventQuery(DataQueryWithHistoryABC): + def __init__( + self, + db: DatabaseContextABC, + ): + DataQueryWithHistoryABC.__init__(self, "ScheduledEvent", "ScheduledEventsHistory", ScheduledEventHistory, db) + + self.set_field("id", lambda x, *_: x.id) + self.set_field("interval", lambda x, *_: x.interval.value) + self.set_field("name", lambda x, *_: x.name) + self.set_field("description", lambda x, *_: x.description) + self.set_field("channelId", lambda x, *_: x.channel_id) + self.set_field("startTime", lambda x, *_: x.start_time) + self.set_field("endTime", lambda x, *_: x.end_time) + self.set_field("entityType", lambda x, *_: x.entity_type.value) + self.set_field("location", lambda x, *_: x.location) + self.set_field("server", lambda x, *_: x.server) diff --git a/bot/src/bot_graphql/queries/server_query.py b/bot/src/bot_graphql/queries/server_query.py index 14033101..3760db07 100644 --- a/bot/src/bot_graphql/queries/server_query.py +++ b/bot/src/bot_graphql/queries/server_query.py @@ -9,6 +9,7 @@ from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC from bot_data.abc.client_repository_abc import ClientRepositoryABC from bot_data.abc.game_server_repository_abc import GameServerRepositoryABC from bot_data.abc.level_repository_abc import LevelRepositoryABC +from bot_data.abc.scheduled_event_repository_abc import ScheduledEventRepositoryABC from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC from bot_data.abc.short_role_name_repository_abc import ShortRoleNameRepositoryABC from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC @@ -24,6 +25,7 @@ from bot_graphql.filter.achievement_filter import AchievementFilter from bot_graphql.filter.auto_role_filter import AutoRoleFilter from bot_graphql.filter.client_filter import ClientFilter from bot_graphql.filter.level_filter import LevelFilter +from bot_graphql.filter.scheduled_event_filter import ScheduledEventFilter from bot_graphql.filter.short_role_name_filter import ShortRoleNameFilter from bot_graphql.filter.user_filter import UserFilter from bot_graphql.model.server_statistics import ServerStatistics @@ -44,6 +46,7 @@ class ServerQuery(DataQueryWithHistoryABC): ujvs: UserJoinedVoiceChannelRepositoryABC, achievements: AchievementRepositoryABC, short_role_names: ShortRoleNameRepositoryABC, + scheduled_events: ScheduledEventRepositoryABC, server_configs: ServerConfigRepositoryABC, ): DataQueryWithHistoryABC.__init__(self, "Server", "ServersHistory", ServerHistory, db) @@ -100,6 +103,11 @@ class ServerQuery(DataQueryWithHistoryABC): lambda server, *_: short_role_names.get_short_role_names_by_server_id(server.id), ShortRoleNameFilter, ) + self.add_collection( + "scheduledEvent", + lambda server, *_: scheduled_events.get_scheduled_events_by_server_id(server.id), + ScheduledEventFilter, + ) self.set_field( "config", lambda server, *_: server_configs.get_server_config_by_server(server.id), diff --git a/bot/src/bot_graphql/query.py b/bot/src/bot_graphql/query.py index 41dafdf0..aa3f56b6 100644 --- a/bot/src/bot_graphql/query.py +++ b/bot/src/bot_graphql/query.py @@ -1,13 +1,16 @@ +from cpl_core.configuration import ConfigurationABC from cpl_discord.service import DiscordBotServiceABC from cpl_query.extension import List from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum +from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings from bot_data.abc.achievement_repository_abc import AchievementRepositoryABC from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC from bot_data.abc.client_repository_abc import ClientRepositoryABC 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.scheduled_event_repository_abc import ScheduledEventRepositoryABC from bot_data.abc.server_repository_abc import ServerRepositoryABC from bot_data.abc.short_role_name_repository_abc import ShortRoleNameRepositoryABC from bot_data.abc.technician_config_repository_abc import TechnicianConfigRepositoryABC @@ -21,12 +24,14 @@ from bot_data.abc.user_joined_voice_channel_repository_abc import ( from bot_data.abc.user_repository_abc import UserRepositoryABC from bot_data.abc.user_warnings_repository_abc import UserWarningsRepositoryABC from bot_data.model.short_role_name_position_enum import ShortRoleNamePositionEnum +from bot_data.model.technician_config import TechnicianConfig from bot_graphql.abc.query_abc import QueryABC from bot_graphql.filter.achievement_filter import AchievementFilter from bot_graphql.filter.auto_role_filter import AutoRoleFilter from bot_graphql.filter.auto_role_rule_filter import AutoRoleRuleFilter from bot_graphql.filter.client_filter import ClientFilter from bot_graphql.filter.level_filter import LevelFilter +from bot_graphql.filter.scheduled_event_filter import ScheduledEventFilter from bot_graphql.filter.server_filter import ServerFilter from bot_graphql.filter.short_role_name_filter import ShortRoleNameFilter from bot_graphql.filter.user_filter import UserFilter @@ -43,6 +48,7 @@ from modules.achievements.achievement_service import AchievementService class Query(QueryABC): def __init__( self, + config: ConfigurationABC, bot: DiscordBotServiceABC, auto_roles: AutoRoleRepositoryABC, clients: ClientRepositoryABC, @@ -59,9 +65,12 @@ class Query(QueryABC): user_warnings: UserWarningsRepositoryABC, achievement_service: AchievementService, technician_config: TechnicianConfigRepositoryABC, + scheduled_events: ScheduledEventRepositoryABC, ): QueryABC.__init__(self, "Query") + self._config = config + self.add_collection("autoRole", lambda *_: auto_roles.get_auto_roles(), AutoRoleFilter) self.add_collection( "autoRoleRule", @@ -95,6 +104,11 @@ class Query(QueryABC): lambda *_: short_role_names.get_short_role_names(), ShortRoleNameFilter, ) + self.add_collection( + "scheduledEvent", + lambda server, *_: scheduled_events.get_scheduled_events_by_server_id(server.id), + ScheduledEventFilter, + ) self.add_collection( "userWarning", lambda *_: user_warnings.get_user_warnings(), @@ -112,3 +126,17 @@ class Query(QueryABC): self.set_field("possibleFeatureFlags", lambda *_: [e.value for e in FeatureFlagsEnum]) self.set_field("discord", lambda *_: Discord(bot.guilds, List(any).extend(bot.users))) + + self.set_field( + "hasFeatureFlag", + lambda *_, **kwargs: self._resolve_has_feature_flag(*_, **kwargs), + ) + + def _resolve_has_feature_flag(self, *_, **kwargs): + settings: TechnicianConfig = self._config.get_configuration(TechnicianConfig) + if "flag" not in kwargs: + return False + return { + "key": kwargs["flag"], + "value": FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum(kwargs["flag"])), + } diff --git a/bot/src/modules/achievements/__init__.py b/bot/src/modules/achievements/__init__.py index f578bc02..32980d3a 100644 --- a/bot/src/modules/achievements/__init__.py +++ b/bot/src/modules/achievements/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.achievements" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/achievements/achievements.json b/bot/src/modules/achievements/achievements.json index 7e33abca..911cf740 100644 --- a/bot/src/modules/achievements/achievements.json +++ b/bot/src/modules/achievements/achievements.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -16,10 +16,10 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core>=1.2.1" + "cpl-core>=1.2.dev410" ], "DevDependencies": [ - "cpl-cli>=1.2.1" + "cpl-cli>=1.2.dev410" ], "PythonVersion": ">=3.10.4", "PythonPath": {}, diff --git a/bot/src/modules/achievements/commands/__init__.py b/bot/src/modules/achievements/commands/__init__.py index 884a3111..0b5a21c5 100644 --- a/bot/src/modules/achievements/commands/__init__.py +++ b/bot/src/modules/achievements/commands/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.achievements.commands" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/achievements/events/__init__.py b/bot/src/modules/achievements/events/__init__.py index b4f96bee..bcf3de06 100644 --- a/bot/src/modules/achievements/events/__init__.py +++ b/bot/src/modules/achievements/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.achievements.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/achievements/model/__init__.py b/bot/src/modules/achievements/model/__init__.py index cdbeac0c..32469894 100644 --- a/bot/src/modules/achievements/model/__init__.py +++ b/bot/src/modules/achievements/model/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.achievements.model" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/auto_role/__init__.py b/bot/src/modules/auto_role/__init__.py index d11930e5..5a9f8582 100644 --- a/bot/src/modules/auto_role/__init__.py +++ b/bot/src/modules/auto_role/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.auto_role" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/auto_role/auto-role.json b/bot/src/modules/auto_role/auto-role.json index e4eddd07..b6a4ebf1 100644 --- a/bot/src/modules/auto_role/auto-role.json +++ b/bot/src/modules/auto_role/auto-role.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/modules/auto_role/command/__init__.py b/bot/src/modules/auto_role/command/__init__.py index 1fe315c6..760937ed 100644 --- a/bot/src/modules/auto_role/command/__init__.py +++ b/bot/src/modules/auto_role/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.auto_role.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/auto_role/events/__init__.py b/bot/src/modules/auto_role/events/__init__.py index d34b344f..b32c4f28 100644 --- a/bot/src/modules/auto_role/events/__init__.py +++ b/bot/src/modules/auto_role/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.auto_role.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/auto_role/helper/__init__.py b/bot/src/modules/auto_role/helper/__init__.py index 580db0e2..54c8fea8 100644 --- a/bot/src/modules/auto_role/helper/__init__.py +++ b/bot/src/modules/auto_role/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.auto_role.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/base/__init__.py b/bot/src/modules/base/__init__.py index c649efab..9b5d1e5b 100644 --- a/bot/src/modules/base/__init__.py +++ b/bot/src/modules/base/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/base/base.json b/bot/src/modules/base/base.json index 18ef4f37..d0f94e12 100644 --- a/bot/src/modules/base/base.json +++ b/bot/src/modules/base/base.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/modules/base/base_module.py b/bot/src/modules/base/base_module.py index fc04e55e..b0608515 100644 --- a/bot/src/modules/base/base_module.py +++ b/bot/src/modules/base/base_module.py @@ -7,7 +7,7 @@ from cpl_discord.service.discord_collection_abc import DiscordCollectionABC from bot_core.abc.module_abc import ModuleABC from bot_core.abc.task_abc import TaskABC from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum -from modules.base.birthday_watcher import BirthdayWatcher +from modules.base.tasks.birthday_watcher import BirthdayWatcher from modules.base.command.afk_command import AFKCommand from modules.base.command.game_server_group import GameServerGroup from modules.base.command.help_command import HelpCommand @@ -45,6 +45,7 @@ from modules.base.events.base_on_voice_state_update_event_scheduled_event_bonus from modules.base.forms.bug_report_form import BugReportForm from modules.base.forms.complaint_form import ComplaintForm from modules.base.helper.base_reaction_handler import BaseReactionHandler +from modules.base.tasks.scheduled_events_watcher import ScheduledEventsWatcher from modules.base.service.event_service import EventService from modules.base.service.user_warnings_service import UserWarningsService @@ -61,6 +62,7 @@ class BaseModule(ModuleABC): services.add_singleton(EventService) services.add_transient(UserWarningsService) services.add_singleton(TaskABC, BirthdayWatcher) + services.add_singleton(TaskABC, ScheduledEventsWatcher) # forms services.add_transient(BugReportForm) diff --git a/bot/src/modules/base/command/__init__.py b/bot/src/modules/base/command/__init__.py index 7a9c0a1b..9e8eaf78 100644 --- a/bot/src/modules/base/command/__init__.py +++ b/bot/src/modules/base/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/base/events/__init__.py b/bot/src/modules/base/events/__init__.py index 020ed3d9..c04095a7 100644 --- a/bot/src/modules/base/events/__init__.py +++ b/bot/src/modules/base/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/base/forms/__init__.py b/bot/src/modules/base/forms/__init__.py index 0a8781ff..375cae8d 100644 --- a/bot/src/modules/base/forms/__init__.py +++ b/bot/src/modules/base/forms/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.forms" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/base/helper/__init__.py b/bot/src/modules/base/helper/__init__.py index b59dd097..8faf1b90 100644 --- a/bot/src/modules/base/helper/__init__.py +++ b/bot/src/modules/base/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/base/model/__init__.py b/bot/src/modules/base/model/__init__.py index d6ac8c87..cd5ec210 100644 --- a/bot/src/modules/base/model/__init__.py +++ b/bot/src/modules/base/model/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.model" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/base/service/__init__.py b/bot/src/modules/base/service/__init__.py index 791482a7..e6a05ca8 100644 --- a/bot/src/modules/base/service/__init__.py +++ b/bot/src/modules/base/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/bot_data/migration/__init__.py b/bot/src/modules/base/tasks/__init__.py similarity index 76% rename from bot/src/bot_data/migration/__init__.py rename to bot/src/modules/base/tasks/__init__.py index c8b32e03..41959bff 100644 --- a/bot/src/bot_data/migration/__init__.py +++ b/bot/src/modules/base/tasks/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_data.migration" +__title__ = "modules.base.tasks" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" from collections import namedtuple -# imports +# imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/base/birthday_watcher.py b/bot/src/modules/base/tasks/birthday_watcher.py similarity index 100% rename from bot/src/modules/base/birthday_watcher.py rename to bot/src/modules/base/tasks/birthday_watcher.py diff --git a/bot/src/modules/base/tasks/scheduled_events_watcher.py b/bot/src/modules/base/tasks/scheduled_events_watcher.py new file mode 100644 index 00000000..0c6738cb --- /dev/null +++ b/bot/src/modules/base/tasks/scheduled_events_watcher.py @@ -0,0 +1,126 @@ +import calendar +from datetime import datetime, timedelta +from zoneinfo import ZoneInfo + +from cpl_core.configuration import ConfigurationABC +from cpl_core.database.context import DatabaseContextABC +from cpl_discord.service import DiscordBotServiceABC +from cpl_query.extension import List +from cpl_translation import TranslatePipe +from discord import Guild, PrivacyLevel +from discord.ext import tasks +from discord.scheduled_event import ScheduledEvent as DiscordEvent + +from bot_core.abc.task_abc import TaskABC +from bot_core.logging.task_logger import TaskLogger +from bot_core.service.message_service import MessageService +from bot_data.abc.scheduled_event_repository_abc import ScheduledEventRepositoryABC +from bot_data.abc.server_repository_abc import ServerRepositoryABC +from bot_data.model.scheduled_event import ScheduledEvent +from bot_data.model.scheduled_event_interval_enum import ScheduledEventIntervalEnum + + +class ScheduledEventsWatcher(TaskABC): + def __init__( + self, + config: ConfigurationABC, + logger: TaskLogger, + bot: DiscordBotServiceABC, + db: DatabaseContextABC, + servers: ServerRepositoryABC, + events: ScheduledEventRepositoryABC, + message_service: MessageService, + t: TranslatePipe, + ): + TaskABC.__init__(self) + + self._config = config + self._logger = logger + self._bot = bot + self._db = db + self._servers = servers + self._events = events + self._message_service = message_service + self._t = t + + if not self._is_maintenance(): + self.watch.start() + + def _append_interval(self, interval: ScheduledEventIntervalEnum, ts: datetime) -> datetime: + now = datetime.now() + if ts >= now: + return ts + + if interval == ScheduledEventIntervalEnum.daily: + ts = ts + timedelta(days=1) + + elif interval == ScheduledEventIntervalEnum.weekly: + ts = ts + timedelta(weeks=1) + + elif interval == ScheduledEventIntervalEnum.monthly: + days_in_month = calendar.monthrange(ts.year, ts.month + 1)[1] + ts = ts + timedelta(days=days_in_month) + + elif interval == ScheduledEventIntervalEnum.yearly: + ts = ts + timedelta(days=365) + + return ts + + @tasks.loop(hours=24) + async def watch(self): + self._logger.info(__name__, "Watching scheduled events") + try: + for guild in self._bot.guilds: + guild: Guild = guild + server = self._servers.get_server_by_discord_id(guild.id) + scheduled_events_from_guild = self._events.get_scheduled_events_by_server_id(server.id) + for scheduled_event in scheduled_events_from_guild: + scheduled_event: ScheduledEvent = scheduled_event + from_guild = List(DiscordEvent, guild.scheduled_events).where( + lambda x: x.name == scheduled_event.name + and x.description == scheduled_event.description + and x.entity_type == scheduled_event.entity_type + ) + if from_guild.count() != 0: + continue + + kwargs = {"name": scheduled_event.name, "description": scheduled_event.description} + + if scheduled_event.channel_id is not None: + kwargs["channel"] = guild.get_channel(scheduled_event.channel_id) + + if scheduled_event.start_time is not None: + scheduled_event.start_time = self._append_interval( + scheduled_event.interval, scheduled_event.start_time + ) + + start_time = scheduled_event.start_time.replace(tzinfo=ZoneInfo("Europe/Berlin")) + + kwargs["start_time"] = start_time + + if scheduled_event.end_time is not None: + scheduled_event.end_time = self._append_interval( + scheduled_event.interval, scheduled_event.end_time + ) + end_time = scheduled_event.end_time.replace(tzinfo=ZoneInfo("Europe/Berlin")) + kwargs["end_time"] = end_time + + kwargs["entity_type"] = scheduled_event.entity_type + if scheduled_event.location is not None: + kwargs["location"] = scheduled_event.location + + kwargs["privacy_level"] = PrivacyLevel.guild_only + + try: + self._logger.debug(__name__, f"Try to create scheduled event for guild {guild.name}") + await guild.create_scheduled_event(**kwargs) + self._events.update_scheduled_event(scheduled_event) + self._db.save_changes() + except Exception as e: + self._logger.error(__name__, f"Watching scheduled events failed", e) + except Exception as e: + self._logger.error(__name__, f"Watching scheduled events failed", e) + + @watch.before_loop + async def wait(self): + await self._wait_until_ready() diff --git a/bot/src/modules/base/thread/__init__.py b/bot/src/modules/base/thread/__init__.py index 2c6f2300..90932b6a 100644 --- a/bot/src/modules/base/thread/__init__.py +++ b/bot/src/modules/base/thread/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.thread" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/boot_log/__init__.py b/bot/src/modules/boot_log/__init__.py index c2d14ab6..62933abb 100644 --- a/bot/src/modules/boot_log/__init__.py +++ b/bot/src/modules/boot_log/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.boot_log" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/boot_log/boot-log.json b/bot/src/modules/boot_log/boot-log.json index 80ef02e0..840b75b5 100644 --- a/bot/src/modules/boot_log/boot-log.json +++ b/bot/src/modules/boot_log/boot-log.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/modules/config/__init__.py b/bot/src/modules/config/__init__.py index 9664fe8d..43967e28 100644 --- a/bot/src/modules/config/__init__.py +++ b/bot/src/modules/config/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.config" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/config/config.json b/bot/src/modules/config/config.json index 0d906dd7..6a80a8c4 100644 --- a/bot/src/modules/config/config.json +++ b/bot/src/modules/config/config.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "", "AuthorEmail": "", @@ -16,10 +16,10 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=1.2.1" + "cpl-core>=1.2.dev410" ], "DevDependencies": [ - "cpl-cli>=1.2.1" + "cpl-cli>=1.2.dev410" ], "PythonVersion": ">=3.10.4", "PythonPath": { diff --git a/bot/src/modules/config/events/__init__.py b/bot/src/modules/config/events/__init__.py index 37230170..8200e59f 100644 --- a/bot/src/modules/config/events/__init__.py +++ b/bot/src/modules/config/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.config.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/config/events/config_on_ready_event.py b/bot/src/modules/config/events/config_on_ready_event.py index 14ad229a..87d3ec20 100644 --- a/bot/src/modules/config/events/config_on_ready_event.py +++ b/bot/src/modules/config/events/config_on_ready_event.py @@ -4,6 +4,7 @@ from cpl_discord.events import OnReadyABC from cpl_discord.service import DiscordBotServiceABC from bot_core.service.config_service import ConfigService +from bot_core.service.data_integrity_service import DataIntegrityService from bot_data.abc.server_repository_abc import ServerRepositoryABC @@ -15,6 +16,7 @@ class ConfigOnReadyEvent(OnReadyABC): bot: DiscordBotServiceABC, servers: ServerRepositoryABC, config_service: ConfigService, + data_integrity_service: DataIntegrityService, ): OnReadyABC.__init__(self) @@ -23,7 +25,10 @@ class ConfigOnReadyEvent(OnReadyABC): self._bot = bot self._servers = servers self._config_service = config_service + self._data_integrity_service = data_integrity_service async def on_ready(self): + self._data_integrity_service.check_servers() + for guild in self._bot.guilds: await self._config_service.reload_server_config(self._servers.get_server_by_discord_id(guild.id)) diff --git a/bot/src/modules/config/service/__init__.py b/bot/src/modules/config/service/__init__.py index 9321e1f2..ca507f9b 100644 --- a/bot/src/modules/config/service/__init__.py +++ b/bot/src/modules/config/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.config.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/database/__init__.py b/bot/src/modules/database/__init__.py index 5e8236ae..566c8544 100644 --- a/bot/src/modules/database/__init__.py +++ b/bot/src/modules/database/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.database" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/database/database.json b/bot/src/modules/database/database.json index 69981814..f9305a00 100644 --- a/bot/src/modules/database/database.json +++ b/bot/src/modules/database/database.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/src/modules/level/__init__.py b/bot/src/modules/level/__init__.py index 6e872df3..6d26c52d 100644 --- a/bot/src/modules/level/__init__.py +++ b/bot/src/modules/level/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.level" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/level/command/__init__.py b/bot/src/modules/level/command/__init__.py index 590d9373..57257060 100644 --- a/bot/src/modules/level/command/__init__.py +++ b/bot/src/modules/level/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.level.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/level/configuration/__init__.py b/bot/src/modules/level/configuration/__init__.py index 3fa73004..3422722d 100644 --- a/bot/src/modules/level/configuration/__init__.py +++ b/bot/src/modules/level/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.level.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/level/events/__init__.py b/bot/src/modules/level/events/__init__.py index 60e6f1ae..b817fc78 100644 --- a/bot/src/modules/level/events/__init__.py +++ b/bot/src/modules/level/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.level.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/level/level.json b/bot/src/modules/level/level.json index 7b325033..bf6f5294 100644 --- a/bot/src/modules/level/level.json +++ b/bot/src/modules/level/level.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/modules/level/service/__init__.py b/bot/src/modules/level/service/__init__.py index a542a667..b25809dd 100644 --- a/bot/src/modules/level/service/__init__.py +++ b/bot/src/modules/level/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.level.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/permission/__init__.py b/bot/src/modules/permission/__init__.py index a674424a..264460c3 100644 --- a/bot/src/modules/permission/__init__.py +++ b/bot/src/modules/permission/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.permission" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/permission/abc/__init__.py b/bot/src/modules/permission/abc/__init__.py index 449399d1..ff1f315c 100644 --- a/bot/src/modules/permission/abc/__init__.py +++ b/bot/src/modules/permission/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.permission.abc" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/permission/permission.json b/bot/src/modules/permission/permission.json index 887ac6f8..443c982f 100644 --- a/bot/src/modules/permission/permission.json +++ b/bot/src/modules/permission/permission.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/modules/permission/service/__init__.py b/bot/src/modules/permission/service/__init__.py index b4ec2913..59ca5137 100644 --- a/bot/src/modules/permission/service/__init__.py +++ b/bot/src/modules/permission/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.permission.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/short_role_name/__init__.py b/bot/src/modules/short_role_name/__init__.py index bd18f91d..effc8194 100644 --- a/bot/src/modules/short_role_name/__init__.py +++ b/bot/src/modules/short_role_name/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.short_role_name" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/short_role_name/events/__init__.py b/bot/src/modules/short_role_name/events/__init__.py index 2ad2ae9f..3ba5c637 100644 --- a/bot/src/modules/short_role_name/events/__init__.py +++ b/bot/src/modules/short_role_name/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.short_role_name.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/short_role_name/service/__init__.py b/bot/src/modules/short_role_name/service/__init__.py index 8594d0c7..bbf1c082 100644 --- a/bot/src/modules/short_role_name/service/__init__.py +++ b/bot/src/modules/short_role_name/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.short_role_name.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/short_role_name/short-role-name.json b/bot/src/modules/short_role_name/short-role-name.json index 145c3767..23b81e41 100644 --- a/bot/src/modules/short_role_name/short-role-name.json +++ b/bot/src/modules/short_role_name/short-role-name.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "", "AuthorEmail": "", @@ -16,10 +16,10 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=1.2.1" + "cpl-core>=1.2.dev410" ], "DevDependencies": [ - "cpl-cli>=1.2.1" + "cpl-cli>=1.2.dev410" ], "PythonVersion": ">=3.10.4", "PythonPath": { diff --git a/bot/src/modules/special_offers/__init__.py b/bot/src/modules/special_offers/__init__.py index dc595cbf..f85a6ae2 100644 --- a/bot/src/modules/special_offers/__init__.py +++ b/bot/src/modules/special_offers/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.special_offers" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/special_offers/special-offers.json b/bot/src/modules/special_offers/special-offers.json index 67b5c4e0..cd6b44b1 100644 --- a/bot/src/modules/special_offers/special-offers.json +++ b/bot/src/modules/special_offers/special-offers.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "", "AuthorEmail": "", @@ -16,10 +16,10 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=1.2.1" + "cpl-core>=1.2.dev410" ], "DevDependencies": [ - "cpl-cli>=1.2.1" + "cpl-cli>=1.2.dev410" ], "PythonVersion": ">=3.10.4", "PythonPath": { diff --git a/bot/src/modules/technician/__init__.py b/bot/src/modules/technician/__init__.py index ebd9ac77..1ce4e3a9 100644 --- a/bot/src/modules/technician/__init__.py +++ b/bot/src/modules/technician/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.technician" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/technician/command/__init__.py b/bot/src/modules/technician/command/__init__.py index 06c38c29..52f7fb4f 100644 --- a/bot/src/modules/technician/command/__init__.py +++ b/bot/src/modules/technician/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.technician.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__version__ = "1.2.2" 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="2", micro="1") +version_info = VersionInfo(major="1", minor="2", micro="2") diff --git a/bot/src/modules/technician/technician.json b/bot/src/modules/technician/technician.json index 4d6cc0b4..d3607bec 100644 --- a/bot/src/modules/technician/technician.json +++ b/bot/src/modules/technician/technician.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "", "AuthorEmail": "", diff --git a/bot/tools/checks/checks.json b/bot/tools/checks/checks.json index 74e4eeec..c13f9018 100644 --- a/bot/tools/checks/checks.json +++ b/bot/tools/checks/checks.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/tools/get_version/get-version.json b/bot/tools/get_version/get-version.json index 1a3aaeed..85a0251c 100644 --- a/bot/tools/get_version/get-version.json +++ b/bot/tools/get_version/get-version.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/tools/migration_to_sql/__init__.py b/bot/tools/migration_to_sql/__init__.py new file mode 100644 index 00000000..425ab6c1 --- /dev/null +++ b/bot/tools/migration_to_sql/__init__.py @@ -0,0 +1 @@ +# imports diff --git a/bot/tools/migration_to_sql/application.py b/bot/tools/migration_to_sql/application.py new file mode 100644 index 00000000..b9215496 --- /dev/null +++ b/bot/tools/migration_to_sql/application.py @@ -0,0 +1,15 @@ +from cpl_core.application import ApplicationABC +from cpl_core.configuration import ConfigurationABC +from cpl_core.console import Console +from cpl_core.dependency_injection import ServiceProviderABC + + +class Application(ApplicationABC): + def __init__(self, config: ConfigurationABC, services: ServiceProviderABC): + ApplicationABC.__init__(self, config, services) + + async def configure(self): + pass + + async def main(self): + Console.write_line("Finished") diff --git a/bot/tools/migration_to_sql/appsettings.json b/bot/tools/migration_to_sql/appsettings.json new file mode 100644 index 00000000..2a5f9ac8 --- /dev/null +++ b/bot/tools/migration_to_sql/appsettings.json @@ -0,0 +1,22 @@ +{ + "TimeFormatSettings": { + "DateFormat": "%Y-%m-%d", + "TimeFormat": "%H:%M:%S", + "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", + "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" + }, + "LoggingSettings": { + "Path": "logs/", + "Filename": "log_$start_time.log", + "ConsoleLogLevel": "ERROR", + "FileLogLevel": "WARN" + }, + "BotLoggingSettings": { + "Database": { + "Path": "logs/$date_now/", + "Filename": "database.log", + "ConsoleLogLevel": "ERROR", + "FileLogLevel": "INFO" + } + } +} diff --git a/bot/tools/migration_to_sql/main.py b/bot/tools/migration_to_sql/main.py new file mode 100644 index 00000000..93d4edf6 --- /dev/null +++ b/bot/tools/migration_to_sql/main.py @@ -0,0 +1,26 @@ +import asyncio + +from cpl_core.application import ApplicationBuilder + +from bot_data.startup_migration_extension import StartupMigrationExtension +from migration_to_sql.application import Application +from migration_to_sql.mock.database_extension import DatabaseExtension +from migration_to_sql.startup import Startup +from migration_to_sql.startup_mock_extension import StartupMockExtension + + +async def main(): + app_builder = ( + ApplicationBuilder(Application) + .use_extension(StartupMockExtension) + .use_extension(StartupMigrationExtension) + .use_extension(DatabaseExtension) + .use_startup(Startup) + ) + + app: Application = await app_builder.build_async() + await app.run_async() + + +if __name__ == "__main__": + asyncio.run(main()) diff --git a/bot/tools/migration_to_sql/migration-to-sql.json b/bot/tools/migration_to_sql/migration-to-sql.json new file mode 100644 index 00000000..6be85895 --- /dev/null +++ b/bot/tools/migration_to_sql/migration-to-sql.json @@ -0,0 +1,46 @@ +{ + "ProjectSettings": { + "Name": "migration-to-sql", + "Version": { + "Major": "1", + "Minor": "2", + "Micro": "2" + }, + "Author": "", + "AuthorEmail": "", + "Description": "", + "LongDescription": "", + "URL": "", + "CopyrightDate": "", + "CopyrightName": "", + "LicenseName": "", + "LicenseDescription": "", + "Dependencies": [ + "cpl-core>=1.2.dev410" + ], + "DevDependencies": [ + "cpl-cli>=1.2.dev410" + ], + "PythonVersion": ">=3.10.4", + "PythonPath": { + "linux": "" + }, + "Classifiers": [] + }, + "BuildSettings": { + "ProjectType": "console", + "SourcePath": "", + "OutputPath": "../../dist", + "Main": "migration_to_sql.main", + "EntryPoint": "migration-to-sql", + "IncludePackageData": false, + "Included": [], + "Excluded": [ + "*/__pycache__", + "*/logs", + "*/tests" + ], + "PackageData": {}, + "ProjectReferences": [] + } +} \ No newline at end of file diff --git a/bot/tools/migration_to_sql/mock/__init__.py b/bot/tools/migration_to_sql/mock/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/bot/tools/migration_to_sql/mock/database_extension.py b/bot/tools/migration_to_sql/mock/database_extension.py new file mode 100644 index 00000000..ca49d8b3 --- /dev/null +++ b/bot/tools/migration_to_sql/mock/database_extension.py @@ -0,0 +1,17 @@ +from datetime import datetime + +from cpl_core.application.application_extension_abc import ApplicationExtensionABC +from cpl_core.configuration import ConfigurationABC +from cpl_core.dependency_injection import ServiceProviderABC + +from migration_to_sql.mock.migration_service import MigrationService + + +class DatabaseExtension(ApplicationExtensionABC): + def __init__(self): + pass + + async def run(self, config: ConfigurationABC, services: ServiceProviderABC): + config.add_configuration("Database_StartTime", str(datetime.now())) + migrations: MigrationService = services.get_service(MigrationService) + migrations.migrate() diff --git a/bot/tools/migration_to_sql/mock/migration_service.py b/bot/tools/migration_to_sql/mock/migration_service.py new file mode 100644 index 00000000..84d6d7e6 --- /dev/null +++ b/bot/tools/migration_to_sql/mock/migration_service.py @@ -0,0 +1,53 @@ +import os +import shutil + +from cpl_core.console import Console +from cpl_core.dependency_injection import ServiceProviderABC +from cpl_query.extension import List + +from bot_data.abc.migration_abc import MigrationABC +from bot_data.model.migration_history import MigrationHistory +from migration_to_sql.mock.mock_db_context import MockDBContext + + +class MigrationService: + def __init__( + self, + services: ServiceProviderABC, + db: MockDBContext, + ): + self._services = services + + self._db = db + self._cursor = db.cursor + + # self._migrations: List[MigrationABC] = ( + # List(type, MigrationABC.__subclasses__()).order_by(lambda x: x.name.split("_")[0]).then_by(lambda x: x.prio) + # ) + + def migrate(self): + path = f"../../src/bot_data/scripts" + if not os.path.exists(path): + os.makedirs(path) + else: + shutil.rmtree(path) + os.makedirs(path) + + for migration in self._services.get_services(MigrationABC): + migration_id = type(migration).__name__ + try: + # migration_as_service: MigrationABC = self._services.get_service(migration) + # save upgrade scripts + self._db.set_migration(migration.name, True) + migration.upgrade() + self._cursor.execute(MigrationHistory(migration_id).insert_string) + self._db.save_changes() + + # save downgrade scripts + self._db.set_migration(migration.name) + migration.downgrade() + self._cursor.execute(MigrationHistory(migration_id).insert_string) + self._db.save_changes() + + except Exception as e: + Console.error(e) diff --git a/bot/tools/migration_to_sql/mock/mock_cursor.py b/bot/tools/migration_to_sql/mock/mock_cursor.py new file mode 100644 index 00000000..2f106ec3 --- /dev/null +++ b/bot/tools/migration_to_sql/mock/mock_cursor.py @@ -0,0 +1,9 @@ +from mysql.connector.cursor import MySQLCursorBuffered + + +class MockCursor(MySQLCursorBuffered): + def __init__(self): + MySQLCursorBuffered.__init__(self) + + def fetchone(self, *args, **kwargs): + pass diff --git a/bot/tools/migration_to_sql/mock/mock_db_context.py b/bot/tools/migration_to_sql/mock/mock_db_context.py new file mode 100644 index 00000000..c7f7c94e --- /dev/null +++ b/bot/tools/migration_to_sql/mock/mock_db_context.py @@ -0,0 +1,72 @@ +import os +import textwrap +from typing import Optional + +from cpl_core.database import DatabaseSettings +from cpl_core.database.context import DatabaseContextABC + +from migration_to_sql.mock.mock_cursor import MockCursor + + +class MockDBContext(DatabaseContextABC): + def __init__(self): + DatabaseContextABC.__init__(self) + self._migration_version: Optional[str] = None + self._migration_name: Optional[str] = None + self._migration_script: Optional[str] = None + + self._old_version: Optional[str] = None + self._old_name: Optional[str] = None + + self._index: int = 0 + + @property + def cursor(self) -> MockCursor: + cursor = MockCursor() + cursor.execute = self.execute + return cursor + + def set_migration(self, name: str, upgrade: bool = False): + self._migration_name = f'{name.split("_")[1].replace("Migration", "")}_{"up" if upgrade else "down"}' + self._migration_version = name.split("_")[0] + self._migration_script = "" + + def connect(self, database_settings: DatabaseSettings): + pass + + def select(self, statement: str) -> list[tuple]: + pass + + def execute(self, query: str, *args, **kwargs): + if "MigrationHistory" in query: + return None + else: + self._migration_script += f"{textwrap.dedent(query)}\n\n" + + def save_changes(self): + path = f"../../src/bot_data/scripts/{self._migration_version}" + if not os.path.exists(path): + os.makedirs(path) + + if ( + self._old_name is not None + and self._migration_name is not None + and self._old_name.split("_")[0] == self._migration_name.split("_")[0] + ): + pass + elif self._old_version == self._migration_version: + self._index += 1 + else: + self._index = 1 + + script = textwrap.dedent(self._migration_script) + with open(f"{path}/{self._index}_{self._migration_name}.sql", "w+") as f: + f.write(script) + f.close() + + self._old_version = self._migration_version + self._old_name = self._migration_name + + self._migration_name = None + self._migration_version = None + self._migration_script = None diff --git a/bot/tools/migration_to_sql/startup.py b/bot/tools/migration_to_sql/startup.py new file mode 100644 index 00000000..b63480db --- /dev/null +++ b/bot/tools/migration_to_sql/startup.py @@ -0,0 +1,47 @@ +from typing import Optional, Type, Callable + +from cpl_core.application import StartupABC +from cpl_core.configuration import ConfigurationABC +from cpl_core.dependency_injection import ServiceCollectionABC +from cpl_core.dependency_injection import ServiceProviderABC +from cpl_core.environment import ApplicationEnvironment + +from bot_core.abc.custom_file_logger_abc import CustomFileLoggerABC +from bot_core.configuration.bot_logging_settings import BotLoggingSettings +from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings +from bot_core.logging.database_logger import DatabaseLogger +from migration_to_sql.mock.migration_service import MigrationService + + +class Startup(StartupABC): + def __init__(self): + StartupABC.__init__(self) + + def configure_configuration( + self, configuration: ConfigurationABC, environment: ApplicationEnvironment + ) -> ConfigurationABC: + configuration.add_json_file("appsettings.json") + configuration.add_configuration(FeatureFlagsSettings, FeatureFlagsSettings()) + self._configure_settings_with_sub_settings( + configuration, BotLoggingSettings, lambda x: x.files, lambda x: x.key + ) + return configuration + + def configure_services( + self, services: ServiceCollectionABC, environment: ApplicationEnvironment + ) -> ServiceProviderABC: + services.add_logging() + services.add_singleton(CustomFileLoggerABC, DatabaseLogger) + services.add_transient(MigrationService) + return services.build_service_provider() + + @staticmethod + def _configure_settings_with_sub_settings( + config: ConfigurationABC, settings_type: Type, list_atr: Callable, atr: Callable + ): + settings: Optional[settings_type] = config.get_configuration(settings_type) + if settings is None: + return + + for sub_settings in list_atr(settings): + config.add_configuration(f"{type(sub_settings).__name__}_{atr(sub_settings)}", sub_settings) diff --git a/bot/tools/migration_to_sql/startup_mock_extension.py b/bot/tools/migration_to_sql/startup_mock_extension.py new file mode 100644 index 00000000..0d5a4c31 --- /dev/null +++ b/bot/tools/migration_to_sql/startup_mock_extension.py @@ -0,0 +1,20 @@ +from cpl_core.application import StartupExtensionABC +from cpl_core.configuration import ConfigurationABC +from cpl_core.database import DatabaseSettings +from cpl_core.database.context import DatabaseContextABC +from cpl_core.dependency_injection import ServiceCollectionABC +from cpl_core.environment import ApplicationEnvironmentABC + +from migration_to_sql.mock.mock_db_context import MockDBContext + + +class StartupMockExtension(StartupExtensionABC): + def __init__(self): + pass + + def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC): + pass + + def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC): + services.add_db_context(MockDBContext, DatabaseSettings()) + services.add_transient(DatabaseContextABC, MockDBContext) diff --git a/bot/tools/post_build/post-build.json b/bot/tools/post_build/post-build.json index 4f8a7613..6ca832ce 100644 --- a/bot/tools/post_build/post-build.json +++ b/bot/tools/post_build/post-build.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/tools/post_build/post_build_settings.py b/bot/tools/post_build/post_build_settings.py index 3c8a789e..913196f4 100644 --- a/bot/tools/post_build/post_build_settings.py +++ b/bot/tools/post_build/post_build_settings.py @@ -1,15 +1,12 @@ -import traceback - from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC -from cpl_core.console import Console class PostBuildSettings(ConfigurationModelABC): - def __init__(self): + def __init__(self, keep_configs: list = [], config_paths: list = []): ConfigurationModelABC.__init__(self) - self._keep_config = [] - self._config_paths = [] + self._keep_config = keep_configs + self._config_paths = config_paths @property def keep_config(self) -> list[str]: @@ -18,11 +15,3 @@ class PostBuildSettings(ConfigurationModelABC): @property def config_paths(self) -> list[str]: return self._config_paths - - def from_dict(self, settings: dict): - try: - self._keep_config = settings["KeepConfigs"] - self._config_paths = settings["ConfigPaths"] - 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()}") diff --git a/bot/tools/set_version/set-version.json b/bot/tools/set_version/set-version.json index d60391ab..4919b58a 100644 --- a/bot/tools/set_version/set-version.json +++ b/bot/tools/set_version/set-version.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/web/package.json b/web/package.json index 79ef61b9..3255abc5 100644 --- a/web/package.json +++ b/web/package.json @@ -1,56 +1,56 @@ { - "name": "web", - "version": "1.2.1", - "scripts": { - "ng": "ng", - "update-version": "ts-node update-version.ts", - "prestart": "npm run update-version", - "start": "ng serve", - "prebuild": "npm run update-version", - "build": "ng build", - "watch": "ng build --watch --configuration development", - "test": "ng test", - "gv": "echo $npm_package_version", - "predocker-build": "npm run update-version", - "docker-build": "export VERSION=$npm_package_version; ng build; docker build -t sh-edraft.de/sdb-web:$VERSION .", - "docker-build-dev": "export VERSION=$npm_package_version; ng build --configuration development; docker build -t sh-edraft.de/sdb-web:$VERSION .", - "docker-build-stage": "export VERSION=$npm_package_version; ng build --configuration staging; docker build -t sh-edraft.de/sdb-web:$VERSION ." - }, - "private": true, - "dependencies": { - "@angular/animations": "^15.1.4", - "@angular/common": "^15.1.4", - "@angular/compiler": "^15.1.4", - "@angular/core": "^15.1.4", - "@angular/forms": "^15.1.4", - "@angular/platform-browser": "^15.1.4", - "@angular/platform-browser-dynamic": "^15.1.4", - "@angular/router": "^15.1.4", - "@auth0/angular-jwt": "^5.1.0", - "@microsoft/signalr": "^6.0.9", - "@ngx-translate/core": "^14.0.0", - "@ngx-translate/http-loader": "^7.0.0", - "@types/socket.io-client": "^3.0.0", - "moment": "^2.29.4", - "primeicons": "^6.0.1", - "primeng": "^15.2.0", - "rxjs": "~7.5.0", - "socket.io-client": "^4.5.3", - "zone.js": "~0.11.4" - }, - "devDependencies": { - "@angular-devkit/build-angular": "^15.1.5", - "@angular/cli": "~15.1.5", - "@angular/compiler-cli": "^15.1.4", - "@types/jasmine": "~4.0.0", - "@types/node": "^18.11.9", - "jasmine-core": "~4.1.0", - "karma": "~6.3.0", - "karma-chrome-launcher": "~3.1.0", - "karma-coverage": "~2.2.0", - "karma-jasmine": "~5.0.0", - "karma-jasmine-html-reporter": "~1.7.0", - "tslib": "^2.4.1", - "typescript": "~4.9.5" - } + "name": "web", + "version": "1.2.2", + "scripts": { + "ng": "ng", + "update-version": "ts-node update-version.ts", + "prestart": "npm run update-version", + "start": "ng serve", + "prebuild": "npm run update-version", + "build": "ng build", + "watch": "ng build --watch --configuration development", + "test": "ng test", + "gv": "echo $npm_package_version", + "predocker-build": "npm run update-version", + "docker-build": "export VERSION=$npm_package_version; ng build; docker build -t sh-edraft.de/sdb-web:$VERSION .", + "docker-build-dev": "export VERSION=$npm_package_version; ng build --configuration development; docker build -t sh-edraft.de/sdb-web:$VERSION .", + "docker-build-stage": "export VERSION=$npm_package_version; ng build --configuration staging; docker build -t sh-edraft.de/sdb-web:$VERSION ." + }, + "private": true, + "dependencies": { + "@angular/animations": "^15.1.4", + "@angular/common": "^15.1.4", + "@angular/compiler": "^15.1.4", + "@angular/core": "^15.1.4", + "@angular/forms": "^15.1.4", + "@angular/platform-browser": "^15.1.4", + "@angular/platform-browser-dynamic": "^15.1.4", + "@angular/router": "^15.1.4", + "@auth0/angular-jwt": "^5.1.0", + "@microsoft/signalr": "^6.0.9", + "@ngx-translate/core": "^14.0.0", + "@ngx-translate/http-loader": "^7.0.0", + "@types/socket.io-client": "^3.0.0", + "moment": "^2.29.4", + "primeicons": "^6.0.1", + "primeng": "^15.2.0", + "rxjs": "~7.5.0", + "socket.io-client": "^4.5.3", + "zone.js": "~0.11.4" + }, + "devDependencies": { + "@angular-devkit/build-angular": "^15.1.5", + "@angular/cli": "~15.1.5", + "@angular/compiler-cli": "^15.1.4", + "@types/jasmine": "~4.0.0", + "@types/node": "^18.11.9", + "jasmine-core": "~4.1.0", + "karma": "~6.3.0", + "karma-chrome-launcher": "~3.1.0", + "karma-coverage": "~2.2.0", + "karma-jasmine": "~5.0.0", + "karma-jasmine-html-reporter": "~1.7.0", + "tslib": "^2.4.1", + "typescript": "~4.9.5" + } } diff --git a/web/src/app/models/data/discord.model.ts b/web/src/app/models/data/discord.model.ts index 6e640052..a77de21e 100644 --- a/web/src/app/models/data/discord.model.ts +++ b/web/src/app/models/data/discord.model.ts @@ -1,4 +1,4 @@ -export interface Discord { +export interface Discord { guilds?: Guild[]; users?: DiscordUser[]; } @@ -21,7 +21,8 @@ export interface Channel { export enum ChannelType { category = "CategoryChannel", text = "TextChannel", - voice = "VoiceChannel" + voice = "VoiceChannel", + stage = "StageChannel" } export interface Role { diff --git a/web/src/app/models/data/scheduled_events.model.ts b/web/src/app/models/data/scheduled_events.model.ts new file mode 100644 index 00000000..e94db4b5 --- /dev/null +++ b/web/src/app/models/data/scheduled_events.model.ts @@ -0,0 +1,43 @@ +import { DataWithHistory } from "./data.model"; +import { Server, ServerFilter } from "./server.model"; + +export enum EventType { + stageInstance = 1, + voice = 2, + external = 3, +} + +export interface ScheduledEvent extends DataWithHistory { + id?: number; + interval?: ScheduledEventInterval; + name?: string; + description?: string; + channelId?: string; + startTime?: Date; + endTime?: Date; + entityType?: EventType; + location?: string; + server?: Server; +} + +export interface ScheduledEventFilter { + id?: number; + interval?: string; + name?: string; + description?: string; + channelId?: string; + startTime?: string; + endTime?: string; + entityType?: number; + location?: string; + server?: ServerFilter; +} + +// export enum ScheduledEventInterval { +// daily = "daily", +// weekly = "weekly", +// monthly = "monthly", +// yearly = "yearly" +// } + +export type ScheduledEventInterval = "daily" | "weekly" | "monthly" | "month" diff --git a/web/src/app/models/graphql/mutations.model.ts b/web/src/app/models/graphql/mutations.model.ts index 4f52fa01..bdac7b0c 100644 --- a/web/src/app/models/graphql/mutations.model.ts +++ b/web/src/app/models/graphql/mutations.model.ts @@ -173,6 +173,78 @@ export class Mutations { } `; + static createScheduledEvent = ` + mutation createScheduledEvent($interval: String,$name: String,$description: String,$channelId: String,$startTime: String, $endTime: String,$entityType: Int,$location: String, $serverId: ID) { + scheduledEvent { + createScheduledEvent(input: { + interval: $interval, + name: $name, + description: $description, + channelId: $channelId, + startTime: $startTime, + endTime: $endTime, + entityType: $entityType, + location: $location, + serverId: $serverId + }) { + interval + name + description + channelId + startTime + endTime + entityType + location + server { + id + } + } + } + } + `; + + static updateScheduledEvent = ` + mutation updateScheduledEvent($id: ID, $interval: String,$name: String,$description: String,$channelId: String,$startTime: String, $endTime: String,$entityType: Int,$location: String, $serverId: ID) { + scheduledEvent { + updateScheduledEvent(input: { + id: $id, + interval: $interval, + name: $name, + description: $description, + channelId: $channelId, + startTime: $startTime, + endTime: $endTime, + entityType: $entityType, + location: $location, + serverId: $serverId} + ) { + interval + name + description + channelId + startTime + endTime + entityType + location + server { + id + } + } + } + } + `; + + static deleteScheduledEvent = ` + mutation deleteScheduledEvent($id: ID) { + scheduledEvent { + deleteScheduledEvent(id: $id) { + id + name + } + } + } + `; + static createShortRoleName = ` mutation createShortRoleName($shortName: String, $roleId: String, $position: String, $serverId: ID) { shortRoleName { @@ -333,7 +405,6 @@ export class Mutations { `; - static createUserWarning = ` mutation createUserWarning($name: String, $description: String, $attribute: String, $operator: String, $value: String, $serverId: ID) { userWarning { diff --git a/web/src/app/models/graphql/queries.model.ts b/web/src/app/models/graphql/queries.model.ts index e44e3aab..402d9f09 100644 --- a/web/src/app/models/graphql/queries.model.ts +++ b/web/src/app/models/graphql/queries.model.ts @@ -108,6 +108,15 @@ export class Queries { } `; + static hasFeatureFlag = ` + query HasFeatureFlag($flag: String) { + hasFeatureFlag(flag: $flag) { + key + value + } + } + `; + static hasServerFeatureFlag = ` query HasServerFeatureFlag($filter: ServerFilter, $flag: String) { servers(filter: $filter) { @@ -229,6 +238,58 @@ export class Queries { } `; + static scheduledEventQuery = ` + query ScheduledEventList($serverId: ID, $filter: ScheduledEventFilter, $page: Page, $sort: Sort) { + servers(filter: {id: $serverId}) { + scheduledEventCount + scheduledEvents(filter: $filter, page: $page, sort: $sort) { + id + interval + name + description + channelId + startTime + endTime + entityType + location + server { + id + name + } + createdAt + modifiedAt + } + } + } + `; + + static scheduledEventWithHistoryQuery = ` + query ScheduledEventHistory($serverId: ID, $id: ID) { + servers(filter: {id: $serverId}) { + scheduledEventCount + scheduledEvents(filter: {id: $id}) { + id + + history { + id + interval + name + description + channelId + startTime + endTime + entityType + location + server + deleted + dateFrom + dateTo + } + } + } + } + `; + static shortRoleNamePositionsQuery = ` query { diff --git a/web/src/app/models/graphql/query.model.ts b/web/src/app/models/graphql/query.model.ts index f98f9a4a..b7da6553 100644 --- a/web/src/app/models/graphql/query.model.ts +++ b/web/src/app/models/graphql/query.model.ts @@ -9,6 +9,7 @@ import { ServerConfig } from "../config/server-config.model"; import { ShortRoleName } from "../data/short_role_name.model"; import { FeatureFlag } from "../config/feature-flags.model"; import { UserWarning } from "../data/user_warning.model"; +import { ScheduledEvent } from "../data/scheduled_events.model"; export interface Query { serverCount: number; @@ -57,6 +58,11 @@ export interface AchievementListQuery { achievements: Achievement[]; } +export interface ScheduledEventListQuery { + scheduledEventCount: number; + scheduledEvents: ScheduledEvent[]; +} + export interface AutoRoleQuery { autoRoleCount: number; autoRoles: AutoRole[]; diff --git a/web/src/app/models/graphql/result.model.ts b/web/src/app/models/graphql/result.model.ts index 411d6f1d..2b9844a7 100644 --- a/web/src/app/models/graphql/result.model.ts +++ b/web/src/app/models/graphql/result.model.ts @@ -7,6 +7,7 @@ import { TechnicianConfig } from "../config/technician-config.model"; import { ServerConfig } from "../config/server-config.model"; import { ShortRoleName } from "../data/short_role_name.model"; import { UserWarning } from "../data/user_warning.model"; +import { ScheduledEvent } from "../data/scheduled_events.model"; export interface GraphQLResult { data: { @@ -71,6 +72,14 @@ export interface AchievementMutationResult { }; } +export interface ScheduledEventMutationResult { + scheduledEvent: { + createScheduledEvent?: ScheduledEvent + updateScheduledEvent?: ScheduledEvent + deleteScheduledEvent?: ScheduledEvent + }; +} + export interface ShortRoleNameMutationResult { shortRoleName: { createShortRoleName?: ShortRoleName diff --git a/web/src/app/modules/auth/components/login/login.component.html b/web/src/app/modules/auth/components/login/login.component.html index f9809db0..2447b714 100644 --- a/web/src/app/modules/auth/components/login/login.component.html +++ b/web/src/app/modules/auth/components/login/login.component.html @@ -4,7 +4,9 @@

{{'auth.header' | translate}}

- -