From 666b20d3a9608d91666154a18e1525c36cf250b2 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 11:57:54 +0100 Subject: [PATCH 01/37] Added mock db base #428 --- bot/cpl-workspace.json | 3 +- .../modules/database/database_extension.py | 1 + bot/tools/migration_to_sql/__init__.py | 1 + bot/tools/migration_to_sql/application.py | 15 ++++++ bot/tools/migration_to_sql/appsettings.json | 22 +++++++++ bot/tools/migration_to_sql/main.py | 26 +++++++++++ .../migration_to_sql/migration-to-sql.json | 46 +++++++++++++++++++ bot/tools/migration_to_sql/mock/__init__.py | 0 .../migration_to_sql/mock/mock_cursor.py | 15 ++++++ .../migration_to_sql/mock/mock_db_context.py | 23 ++++++++++ bot/tools/migration_to_sql/startup.py | 45 ++++++++++++++++++ .../startup_mock_extension.py | 20 ++++++++ 12 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 bot/tools/migration_to_sql/__init__.py create mode 100644 bot/tools/migration_to_sql/application.py create mode 100644 bot/tools/migration_to_sql/appsettings.json create mode 100644 bot/tools/migration_to_sql/main.py create mode 100644 bot/tools/migration_to_sql/migration-to-sql.json create mode 100644 bot/tools/migration_to_sql/mock/__init__.py create mode 100644 bot/tools/migration_to_sql/mock/mock_cursor.py create mode 100644 bot/tools/migration_to_sql/mock/mock_db_context.py create mode 100644 bot/tools/migration_to_sql/startup.py create mode 100644 bot/tools/migration_to_sql/startup_mock_extension.py diff --git a/bot/cpl-workspace.json b/bot/cpl-workspace.json index d08ceb87..060dd42b 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/tools/migration-to-sql.json" }, "Scripts": { "format": "black ./", diff --git a/bot/src/modules/database/database_extension.py b/bot/src/modules/database/database_extension.py index cdfe28fa..9bb71f64 100644 --- a/bot/src/modules/database/database_extension.py +++ b/bot/src/modules/database/database_extension.py @@ -3,6 +3,7 @@ from datetime import datetime from cpl_core.application.application_extension_abc import ApplicationExtensionABC from cpl_core.configuration import ConfigurationABC +from cpl_core.database.context import DatabaseContextABC from cpl_core.dependency_injection import ServiceProviderABC from cpl_core.logging import LoggerABC 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..b8831dd6 --- /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("Hello World") 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..ae4fa735 --- /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.startup import Startup +from migration_to_sql.startup_mock_extension import StartupMockExtension +from modules.database.database_extension import DatabaseExtension + + +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..5e4a62f8 --- /dev/null +++ b/bot/tools/migration_to_sql/migration-to-sql.json @@ -0,0 +1,46 @@ +{ + "ProjectSettings": { + "Name": "migration-to-sql", + "Version": { + "Major": "0", + "Minor": "0", + "Micro": "0" + }, + "Author": "", + "AuthorEmail": "", + "Description": "", + "LongDescription": "", + "URL": "", + "CopyrightDate": "", + "CopyrightName": "", + "LicenseName": "", + "LicenseDescription": "", + "Dependencies": [ + "cpl-core>=2023.10.0" + ], + "DevDependencies": [ + "cpl-cli>=2023.4.0.post3" + ], + "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/mock_cursor.py b/bot/tools/migration_to_sql/mock/mock_cursor.py new file mode 100644 index 00000000..f201d33e --- /dev/null +++ b/bot/tools/migration_to_sql/mock/mock_cursor.py @@ -0,0 +1,15 @@ +from mysql.connector.cursor import MySQLCursorBuffered + + +class MockCursor(MySQLCursorBuffered): + def __init__(self): + MySQLCursorBuffered.__init__(self) + + def fetchone(self, *args, **kwargs): + pass + + def execute(self, query: str, *args, **kwargs): + if "MigrationHistory" in query: + return None + else: + 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..4f7a7fa0 --- /dev/null +++ b/bot/tools/migration_to_sql/mock/mock_db_context.py @@ -0,0 +1,23 @@ +from cpl_core.database import DatabaseSettings +from cpl_core.database.context import DatabaseContextABC + +from bot_core.logging.database_logger import DatabaseLogger +from migration_to_sql.mock.mock_cursor import MockCursor + + +class MockDBContext(DatabaseContextABC): + def __init__(self): + DatabaseContextABC.__init__(self) + + @property + def cursor(self) -> MockCursor: + return MockCursor() + + def connect(self, database_settings: DatabaseSettings): + pass + + def save_changes(self): + pass + + def select(self, statement: str) -> list[tuple]: + pass diff --git a/bot/tools/migration_to_sql/startup.py b/bot/tools/migration_to_sql/startup.py new file mode 100644 index 00000000..095b28db --- /dev/null +++ b/bot/tools/migration_to_sql/startup.py @@ -0,0 +1,45 @@ +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 + + +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) + 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) -- 2.45.2 From 1f2fbc362f316b8f9065ebb8407756c9bf5dcb3b Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 12:56:02 +0100 Subject: [PATCH 02/37] Improved sql migration to script migration tool #428 --- .../modules/database/database_extension.py | 1 - bot/tools/migration_to_sql/application.py | 2 +- bot/tools/migration_to_sql/main.py | 2 +- .../mock/database_extension.py | 17 ++++++++ .../mock/migration_service.py | 36 +++++++++++++++++ .../migration_to_sql/mock/mock_cursor.py | 6 --- .../migration_to_sql/mock/mock_db_context.py | 40 ++++++++++++++++--- bot/tools/migration_to_sql/startup.py | 2 + 8 files changed, 92 insertions(+), 14 deletions(-) create mode 100644 bot/tools/migration_to_sql/mock/database_extension.py create mode 100644 bot/tools/migration_to_sql/mock/migration_service.py diff --git a/bot/src/modules/database/database_extension.py b/bot/src/modules/database/database_extension.py index 9bb71f64..cdfe28fa 100644 --- a/bot/src/modules/database/database_extension.py +++ b/bot/src/modules/database/database_extension.py @@ -3,7 +3,6 @@ from datetime import datetime from cpl_core.application.application_extension_abc import ApplicationExtensionABC from cpl_core.configuration import ConfigurationABC -from cpl_core.database.context import DatabaseContextABC from cpl_core.dependency_injection import ServiceProviderABC from cpl_core.logging import LoggerABC diff --git a/bot/tools/migration_to_sql/application.py b/bot/tools/migration_to_sql/application.py index b8831dd6..b9215496 100644 --- a/bot/tools/migration_to_sql/application.py +++ b/bot/tools/migration_to_sql/application.py @@ -12,4 +12,4 @@ class Application(ApplicationABC): pass async def main(self): - Console.write_line("Hello World") + Console.write_line("Finished") diff --git a/bot/tools/migration_to_sql/main.py b/bot/tools/migration_to_sql/main.py index ae4fa735..93d4edf6 100644 --- a/bot/tools/migration_to_sql/main.py +++ b/bot/tools/migration_to_sql/main.py @@ -4,9 +4,9 @@ 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 -from modules.database.database_extension import DatabaseExtension async def main(): 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..5137e4b7 --- /dev/null +++ b/bot/tools/migration_to_sql/mock/migration_service.py @@ -0,0 +1,36 @@ +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): + for migration in self._migrations: + migration_id = migration.__name__ + try: + migration_as_service: MigrationABC = self._services.get_service(migration) + self._db.set_migration(migration_as_service.name) + migration_as_service.upgrade() + 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 index f201d33e..2f106ec3 100644 --- a/bot/tools/migration_to_sql/mock/mock_cursor.py +++ b/bot/tools/migration_to_sql/mock/mock_cursor.py @@ -7,9 +7,3 @@ class MockCursor(MySQLCursorBuffered): def fetchone(self, *args, **kwargs): pass - - def execute(self, query: str, *args, **kwargs): - if "MigrationHistory" in query: - return None - else: - 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 index 4f7a7fa0..25f38c15 100644 --- a/bot/tools/migration_to_sql/mock/mock_db_context.py +++ b/bot/tools/migration_to_sql/mock/mock_db_context.py @@ -1,23 +1,53 @@ +import os +import textwrap +from typing import Optional + from cpl_core.database import DatabaseSettings from cpl_core.database.context import DatabaseContextABC -from bot_core.logging.database_logger import DatabaseLogger 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 @property def cursor(self) -> MockCursor: - return MockCursor() + cursor = MockCursor() + cursor.execute = self.execute + return cursor + + def set_migration(self, name: str): + self._migration_name = name.split("_")[1].replace("Migration", "") + self._migration_version = name.split("_")[0] + self._migration_script = "" def connect(self, database_settings: DatabaseSettings): pass - def save_changes(self): - 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) + + script = textwrap.dedent(self._migration_script) + with open(f"{path}/{self._migration_name}.sql", "w+") as f: + f.write(script) + f.close() + + 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 index 095b28db..b63480db 100644 --- a/bot/tools/migration_to_sql/startup.py +++ b/bot/tools/migration_to_sql/startup.py @@ -10,6 +10,7 @@ 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): @@ -31,6 +32,7 @@ class Startup(StartupABC): ) -> ServiceProviderABC: services.add_logging() services.add_singleton(CustomFileLoggerABC, DatabaseLogger) + services.add_transient(MigrationService) return services.build_service_provider() @staticmethod -- 2.45.2 From 4628f319932bd299050f5455282664912677cfba Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 13:19:23 +0100 Subject: [PATCH 03/37] Added logic to handle down and upgrades #428 --- bot/tools/migration_to_sql/mock/migration_service.py | 9 ++++++++- bot/tools/migration_to_sql/mock/mock_db_context.py | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bot/tools/migration_to_sql/mock/migration_service.py b/bot/tools/migration_to_sql/mock/migration_service.py index 5137e4b7..9843f15e 100644 --- a/bot/tools/migration_to_sql/mock/migration_service.py +++ b/bot/tools/migration_to_sql/mock/migration_service.py @@ -27,10 +27,17 @@ class MigrationService: migration_id = migration.__name__ try: migration_as_service: MigrationABC = self._services.get_service(migration) - self._db.set_migration(migration_as_service.name) + # save upgrade scripts + self._db.set_migration(migration_as_service.name, True) migration_as_service.upgrade() self._cursor.execute(MigrationHistory(migration_id).insert_string) self._db.save_changes() + # save downgrade scripts + self._db.set_migration(migration_as_service.name) + migration_as_service.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_db_context.py b/bot/tools/migration_to_sql/mock/mock_db_context.py index 25f38c15..aa898700 100644 --- a/bot/tools/migration_to_sql/mock/mock_db_context.py +++ b/bot/tools/migration_to_sql/mock/mock_db_context.py @@ -21,8 +21,8 @@ class MockDBContext(DatabaseContextABC): cursor.execute = self.execute return cursor - def set_migration(self, name: str): - self._migration_name = name.split("_")[1].replace("Migration", "") + 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 = "" -- 2.45.2 From 407ec0846375ce6b1ffb01a3912fdd0f2af682fc Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 13:20:33 +0100 Subject: [PATCH 04/37] Added 0.1 migration scripts #428 --- bot/src/bot_data/scripts/0.1/Initial_down.sql | 12 ++++ bot/src/bot_data/scripts/0.1/Initial_up.sql | 70 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 bot/src/bot_data/scripts/0.1/Initial_down.sql create mode 100644 bot/src/bot_data/scripts/0.1/Initial_up.sql diff --git a/bot/src/bot_data/scripts/0.1/Initial_down.sql b/bot/src/bot_data/scripts/0.1/Initial_down.sql new file mode 100644 index 00000000..c1c80bab --- /dev/null +++ b/bot/src/bot_data/scripts/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/Initial_up.sql b/bot/src/bot_data/scripts/0.1/Initial_up.sql new file mode 100644 index 00000000..7c5b0be2 --- /dev/null +++ b/bot/src/bot_data/scripts/0.1/Initial_up.sql @@ -0,0 +1,70 @@ +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`) +); -- 2.45.2 From aec7dac4c7e707c9dda139ceb965983965f2a747 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 13:22:36 +0100 Subject: [PATCH 05/37] Added 0.2.2 migration scripts #428 --- .../bot_data/migration/auto_role_migration.py | 2 +- .../bot_data/scripts/0.2.2/AutoRole_down.sql | 4 ++++ .../bot_data/scripts/0.2.2/AutoRole_up.sql | 24 +++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 bot/src/bot_data/scripts/0.2.2/AutoRole_down.sql create mode 100644 bot/src/bot_data/scripts/0.2.2/AutoRole_up.sql diff --git a/bot/src/bot_data/migration/auto_role_migration.py b/bot/src/bot_data/migration/auto_role_migration.py index 4b8e0090..b911e656 100644 --- a/bot/src/bot_data/migration/auto_role_migration.py +++ b/bot/src/bot_data/migration/auto_role_migration.py @@ -4,7 +4,7 @@ from bot_data.db_context import DBContext class AutoRoleMigration(MigrationABC): - name = "0.2.1_AutoRoleMigration" + name = "0.2.2_AutoRoleMigration" def __init__(self, logger: DatabaseLogger, db: DBContext): MigrationABC.__init__(self) diff --git a/bot/src/bot_data/scripts/0.2.2/AutoRole_down.sql b/bot/src/bot_data/scripts/0.2.2/AutoRole_down.sql new file mode 100644 index 00000000..c211f43c --- /dev/null +++ b/bot/src/bot_data/scripts/0.2.2/AutoRole_down.sql @@ -0,0 +1,4 @@ +DROP TABLE `AutoRoles`; + +DROP TABLE `AutoRoleRules`; + diff --git a/bot/src/bot_data/scripts/0.2.2/AutoRole_up.sql b/bot/src/bot_data/scripts/0.2.2/AutoRole_up.sql new file mode 100644 index 00000000..4f132be9 --- /dev/null +++ b/bot/src/bot_data/scripts/0.2.2/AutoRole_up.sql @@ -0,0 +1,24 @@ +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`) +); + + -- 2.45.2 From d93c3ad6c7a65a819c55275fb9952334bb91f6d8 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 13:23:23 +0100 Subject: [PATCH 06/37] Added 0.3 migration scripts #428 --- bot/src/bot_data/scripts/0.3/Api_down.sql | 4 +++ bot/src/bot_data/scripts/0.3/Api_up.sql | 31 +++++++++++++++++++++ bot/src/bot_data/scripts/0.3/Level_down.sql | 2 ++ bot/src/bot_data/scripts/0.3/Level_up.sql | 14 ++++++++++ bot/src/bot_data/scripts/0.3/Stats_down.sql | 2 ++ bot/src/bot_data/scripts/0.3/Stats_up.sql | 13 +++++++++ 6 files changed, 66 insertions(+) create mode 100644 bot/src/bot_data/scripts/0.3/Api_down.sql create mode 100644 bot/src/bot_data/scripts/0.3/Api_up.sql create mode 100644 bot/src/bot_data/scripts/0.3/Level_down.sql create mode 100644 bot/src/bot_data/scripts/0.3/Level_up.sql create mode 100644 bot/src/bot_data/scripts/0.3/Stats_down.sql create mode 100644 bot/src/bot_data/scripts/0.3/Stats_up.sql diff --git a/bot/src/bot_data/scripts/0.3/Api_down.sql b/bot/src/bot_data/scripts/0.3/Api_down.sql new file mode 100644 index 00000000..49473912 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3/Api_down.sql @@ -0,0 +1,4 @@ +DROP TABLE `AuthUsers`; + +DROP TABLE `AuthUserUsersRelations`; + diff --git a/bot/src/bot_data/scripts/0.3/Api_up.sql b/bot/src/bot_data/scripts/0.3/Api_up.sql new file mode 100644 index 00000000..20708881 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3/Api_up.sql @@ -0,0 +1,31 @@ + +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/Level_down.sql b/bot/src/bot_data/scripts/0.3/Level_down.sql new file mode 100644 index 00000000..301478b2 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3/Level_down.sql @@ -0,0 +1,2 @@ +DROP TABLE `Levels`; + diff --git a/bot/src/bot_data/scripts/0.3/Level_up.sql b/bot/src/bot_data/scripts/0.3/Level_up.sql new file mode 100644 index 00000000..e982e7b3 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3/Level_up.sql @@ -0,0 +1,14 @@ +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/Stats_down.sql b/bot/src/bot_data/scripts/0.3/Stats_down.sql new file mode 100644 index 00000000..36efa156 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3/Stats_down.sql @@ -0,0 +1,2 @@ +DROP TABLE `Statistics`; + diff --git a/bot/src/bot_data/scripts/0.3/Stats_up.sql b/bot/src/bot_data/scripts/0.3/Stats_up.sql new file mode 100644 index 00000000..5f3bafa7 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3/Stats_up.sql @@ -0,0 +1,13 @@ +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`) +); + + -- 2.45.2 From 5461a6d8dc5b903cbc94613147353ffe196b8c68 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 13:25:28 +0100 Subject: [PATCH 07/37] Added 0.3.1 migration scripts #428 --- bot/src/bot_data/scripts/0.3.0/AutoRoleFix_down.sql | 4 ++++ bot/src/bot_data/scripts/0.3.0/AutoRoleFix_up.sql | 4 ++++ .../scripts/0.3.1/UserMessageCountPerHour_down.sql | 2 ++ .../scripts/0.3.1/UserMessageCountPerHour_up.sql | 13 +++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 bot/src/bot_data/scripts/0.3.0/AutoRoleFix_down.sql create mode 100644 bot/src/bot_data/scripts/0.3.0/AutoRoleFix_up.sql create mode 100644 bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_down.sql create mode 100644 bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_up.sql diff --git a/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_down.sql b/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_down.sql new file mode 100644 index 00000000..60e77292 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_down.sql @@ -0,0 +1,4 @@ + +ALTER TABLE AutoRoles DROP COLUMN DiscordChannelId; + + diff --git a/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_up.sql b/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_up.sql new file mode 100644 index 00000000..f025af10 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_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/UserMessageCountPerHour_down.sql b/bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_down.sql new file mode 100644 index 00000000..3de96768 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_down.sql @@ -0,0 +1,2 @@ +DROP TABLE `UserMessageCountPerHour`; + diff --git a/bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_up.sql b/bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_up.sql new file mode 100644 index 00000000..024bed4b --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_up.sql @@ -0,0 +1,13 @@ +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`) +); + + -- 2.45.2 From 2801c617f6d225a6bc9c42b2e9277baad57a1d20 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 13:27:58 +0100 Subject: [PATCH 08/37] Fixed migrations #428 --- bot/src/bot_data/migration/api_migration.py | 2 +- bot/src/bot_data/migration/initial_migration.py | 2 +- bot/src/bot_data/migration/level_migration.py | 2 +- bot/src/bot_data/migration/stats_migration.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bot/src/bot_data/migration/api_migration.py b/bot/src/bot_data/migration/api_migration.py index e67eb53f..0aa4a5c3 100644 --- a/bot/src/bot_data/migration/api_migration.py +++ b/bot/src/bot_data/migration/api_migration.py @@ -4,7 +4,7 @@ from bot_data.db_context import DBContext class ApiMigration(MigrationABC): - name = "0.3_ApiMigration" + name = "0.3.0_ApiMigration" def __init__(self, logger: DatabaseLogger, db: DBContext): MigrationABC.__init__(self) diff --git a/bot/src/bot_data/migration/initial_migration.py b/bot/src/bot_data/migration/initial_migration.py index 48551dbd..8eb0611a 100644 --- a/bot/src/bot_data/migration/initial_migration.py +++ b/bot/src/bot_data/migration/initial_migration.py @@ -4,7 +4,7 @@ from bot_data.db_context import DBContext class InitialMigration(MigrationABC): - name = "0.1_InitialMigration" + name = "0.1.0_InitialMigration" def __init__(self, logger: DatabaseLogger, db: DBContext): MigrationABC.__init__(self) diff --git a/bot/src/bot_data/migration/level_migration.py b/bot/src/bot_data/migration/level_migration.py index 20ad3c7b..bf80d472 100644 --- a/bot/src/bot_data/migration/level_migration.py +++ b/bot/src/bot_data/migration/level_migration.py @@ -4,7 +4,7 @@ from bot_data.db_context import DBContext class LevelMigration(MigrationABC): - name = "0.3_LevelMigration" + name = "0.3.0_LevelMigration" def __init__(self, logger: DatabaseLogger, db: DBContext): MigrationABC.__init__(self) diff --git a/bot/src/bot_data/migration/stats_migration.py b/bot/src/bot_data/migration/stats_migration.py index c28eeda9..2fb4c461 100644 --- a/bot/src/bot_data/migration/stats_migration.py +++ b/bot/src/bot_data/migration/stats_migration.py @@ -4,7 +4,7 @@ from bot_data.db_context import DBContext class StatsMigration(MigrationABC): - name = "0.3_StatsMigration" + name = "0.3.0_StatsMigration" def __init__(self, logger: DatabaseLogger, db: DBContext): MigrationABC.__init__(self) -- 2.45.2 From 39b9def76c93cb33c439d0bae9b968036cec2fa4 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 13:28:54 +0100 Subject: [PATCH 09/37] Fixed versions #428 --- bot/src/bot_data/scripts/{0.1 => 0.1.0}/Initial_down.sql | 0 bot/src/bot_data/scripts/{0.1 => 0.1.0}/Initial_up.sql | 0 bot/src/bot_data/scripts/{0.3 => 0.3.0}/Api_down.sql | 0 bot/src/bot_data/scripts/{0.3 => 0.3.0}/Api_up.sql | 0 bot/src/bot_data/scripts/{0.3 => 0.3.0}/Level_down.sql | 0 bot/src/bot_data/scripts/{0.3 => 0.3.0}/Level_up.sql | 0 bot/src/bot_data/scripts/{0.3 => 0.3.0}/Stats_down.sql | 0 bot/src/bot_data/scripts/{0.3 => 0.3.0}/Stats_up.sql | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename bot/src/bot_data/scripts/{0.1 => 0.1.0}/Initial_down.sql (100%) rename bot/src/bot_data/scripts/{0.1 => 0.1.0}/Initial_up.sql (100%) rename bot/src/bot_data/scripts/{0.3 => 0.3.0}/Api_down.sql (100%) rename bot/src/bot_data/scripts/{0.3 => 0.3.0}/Api_up.sql (100%) rename bot/src/bot_data/scripts/{0.3 => 0.3.0}/Level_down.sql (100%) rename bot/src/bot_data/scripts/{0.3 => 0.3.0}/Level_up.sql (100%) rename bot/src/bot_data/scripts/{0.3 => 0.3.0}/Stats_down.sql (100%) rename bot/src/bot_data/scripts/{0.3 => 0.3.0}/Stats_up.sql (100%) diff --git a/bot/src/bot_data/scripts/0.1/Initial_down.sql b/bot/src/bot_data/scripts/0.1.0/Initial_down.sql similarity index 100% rename from bot/src/bot_data/scripts/0.1/Initial_down.sql rename to bot/src/bot_data/scripts/0.1.0/Initial_down.sql diff --git a/bot/src/bot_data/scripts/0.1/Initial_up.sql b/bot/src/bot_data/scripts/0.1.0/Initial_up.sql similarity index 100% rename from bot/src/bot_data/scripts/0.1/Initial_up.sql rename to bot/src/bot_data/scripts/0.1.0/Initial_up.sql diff --git a/bot/src/bot_data/scripts/0.3/Api_down.sql b/bot/src/bot_data/scripts/0.3.0/Api_down.sql similarity index 100% rename from bot/src/bot_data/scripts/0.3/Api_down.sql rename to bot/src/bot_data/scripts/0.3.0/Api_down.sql diff --git a/bot/src/bot_data/scripts/0.3/Api_up.sql b/bot/src/bot_data/scripts/0.3.0/Api_up.sql similarity index 100% rename from bot/src/bot_data/scripts/0.3/Api_up.sql rename to bot/src/bot_data/scripts/0.3.0/Api_up.sql diff --git a/bot/src/bot_data/scripts/0.3/Level_down.sql b/bot/src/bot_data/scripts/0.3.0/Level_down.sql similarity index 100% rename from bot/src/bot_data/scripts/0.3/Level_down.sql rename to bot/src/bot_data/scripts/0.3.0/Level_down.sql diff --git a/bot/src/bot_data/scripts/0.3/Level_up.sql b/bot/src/bot_data/scripts/0.3.0/Level_up.sql similarity index 100% rename from bot/src/bot_data/scripts/0.3/Level_up.sql rename to bot/src/bot_data/scripts/0.3.0/Level_up.sql diff --git a/bot/src/bot_data/scripts/0.3/Stats_down.sql b/bot/src/bot_data/scripts/0.3.0/Stats_down.sql similarity index 100% rename from bot/src/bot_data/scripts/0.3/Stats_down.sql rename to bot/src/bot_data/scripts/0.3.0/Stats_down.sql diff --git a/bot/src/bot_data/scripts/0.3/Stats_up.sql b/bot/src/bot_data/scripts/0.3.0/Stats_up.sql similarity index 100% rename from bot/src/bot_data/scripts/0.3/Stats_up.sql rename to bot/src/bot_data/scripts/0.3.0/Stats_up.sql -- 2.45.2 From e018fdcbdf4bafafe2af8712726c122d56b4e94f Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 23:34:07 +0100 Subject: [PATCH 10/37] Updated and added script order #428 --- .../bot_data/scripts/0.1.0/Initial_down.sql | 12 ---- bot/src/bot_data/scripts/0.1.0/Initial_up.sql | 70 ------------------- .../bot_data/scripts/0.2.2/AutoRole_down.sql | 4 -- .../bot_data/scripts/0.2.2/AutoRole_up.sql | 24 ------- bot/src/bot_data/scripts/0.3.0/Api_down.sql | 4 -- bot/src/bot_data/scripts/0.3.0/Api_up.sql | 31 -------- .../scripts/0.3.0/AutoRoleFix_down.sql | 4 -- .../bot_data/scripts/0.3.0/AutoRoleFix_up.sql | 4 -- bot/src/bot_data/scripts/0.3.0/Level_down.sql | 2 - bot/src/bot_data/scripts/0.3.0/Level_up.sql | 14 ---- bot/src/bot_data/scripts/0.3.0/Stats_down.sql | 2 - bot/src/bot_data/scripts/0.3.0/Stats_up.sql | 13 ---- .../0.3.1/UserMessageCountPerHour_down.sql | 2 - .../0.3.1/UserMessageCountPerHour_up.sql | 13 ---- .../mock/migration_service.py | 30 +++++--- .../migration_to_sql/mock/mock_db_context.py | 21 +++++- 16 files changed, 40 insertions(+), 210 deletions(-) delete mode 100644 bot/src/bot_data/scripts/0.1.0/Initial_down.sql delete mode 100644 bot/src/bot_data/scripts/0.1.0/Initial_up.sql delete mode 100644 bot/src/bot_data/scripts/0.2.2/AutoRole_down.sql delete mode 100644 bot/src/bot_data/scripts/0.2.2/AutoRole_up.sql delete mode 100644 bot/src/bot_data/scripts/0.3.0/Api_down.sql delete mode 100644 bot/src/bot_data/scripts/0.3.0/Api_up.sql delete mode 100644 bot/src/bot_data/scripts/0.3.0/AutoRoleFix_down.sql delete mode 100644 bot/src/bot_data/scripts/0.3.0/AutoRoleFix_up.sql delete mode 100644 bot/src/bot_data/scripts/0.3.0/Level_down.sql delete mode 100644 bot/src/bot_data/scripts/0.3.0/Level_up.sql delete mode 100644 bot/src/bot_data/scripts/0.3.0/Stats_down.sql delete mode 100644 bot/src/bot_data/scripts/0.3.0/Stats_up.sql delete mode 100644 bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_down.sql delete mode 100644 bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_up.sql diff --git a/bot/src/bot_data/scripts/0.1.0/Initial_down.sql b/bot/src/bot_data/scripts/0.1.0/Initial_down.sql deleted file mode 100644 index c1c80bab..00000000 --- a/bot/src/bot_data/scripts/0.1.0/Initial_down.sql +++ /dev/null @@ -1,12 +0,0 @@ -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/Initial_up.sql b/bot/src/bot_data/scripts/0.1.0/Initial_up.sql deleted file mode 100644 index 7c5b0be2..00000000 --- a/bot/src/bot_data/scripts/0.1.0/Initial_up.sql +++ /dev/null @@ -1,70 +0,0 @@ -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/AutoRole_down.sql b/bot/src/bot_data/scripts/0.2.2/AutoRole_down.sql deleted file mode 100644 index c211f43c..00000000 --- a/bot/src/bot_data/scripts/0.2.2/AutoRole_down.sql +++ /dev/null @@ -1,4 +0,0 @@ -DROP TABLE `AutoRoles`; - -DROP TABLE `AutoRoleRules`; - diff --git a/bot/src/bot_data/scripts/0.2.2/AutoRole_up.sql b/bot/src/bot_data/scripts/0.2.2/AutoRole_up.sql deleted file mode 100644 index 4f132be9..00000000 --- a/bot/src/bot_data/scripts/0.2.2/AutoRole_up.sql +++ /dev/null @@ -1,24 +0,0 @@ -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/Api_down.sql b/bot/src/bot_data/scripts/0.3.0/Api_down.sql deleted file mode 100644 index 49473912..00000000 --- a/bot/src/bot_data/scripts/0.3.0/Api_down.sql +++ /dev/null @@ -1,4 +0,0 @@ -DROP TABLE `AuthUsers`; - -DROP TABLE `AuthUserUsersRelations`; - diff --git a/bot/src/bot_data/scripts/0.3.0/Api_up.sql b/bot/src/bot_data/scripts/0.3.0/Api_up.sql deleted file mode 100644 index 20708881..00000000 --- a/bot/src/bot_data/scripts/0.3.0/Api_up.sql +++ /dev/null @@ -1,31 +0,0 @@ - -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/AutoRoleFix_down.sql b/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_down.sql deleted file mode 100644 index 60e77292..00000000 --- a/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_down.sql +++ /dev/null @@ -1,4 +0,0 @@ - -ALTER TABLE AutoRoles DROP COLUMN DiscordChannelId; - - diff --git a/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_up.sql b/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_up.sql deleted file mode 100644 index f025af10..00000000 --- a/bot/src/bot_data/scripts/0.3.0/AutoRoleFix_up.sql +++ /dev/null @@ -1,4 +0,0 @@ - -ALTER TABLE AutoRoles ADD DiscordChannelId BIGINT NOT NULL AFTER ServerId; - - diff --git a/bot/src/bot_data/scripts/0.3.0/Level_down.sql b/bot/src/bot_data/scripts/0.3.0/Level_down.sql deleted file mode 100644 index 301478b2..00000000 --- a/bot/src/bot_data/scripts/0.3.0/Level_down.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP TABLE `Levels`; - diff --git a/bot/src/bot_data/scripts/0.3.0/Level_up.sql b/bot/src/bot_data/scripts/0.3.0/Level_up.sql deleted file mode 100644 index e982e7b3..00000000 --- a/bot/src/bot_data/scripts/0.3.0/Level_up.sql +++ /dev/null @@ -1,14 +0,0 @@ -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/Stats_down.sql b/bot/src/bot_data/scripts/0.3.0/Stats_down.sql deleted file mode 100644 index 36efa156..00000000 --- a/bot/src/bot_data/scripts/0.3.0/Stats_down.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP TABLE `Statistics`; - diff --git a/bot/src/bot_data/scripts/0.3.0/Stats_up.sql b/bot/src/bot_data/scripts/0.3.0/Stats_up.sql deleted file mode 100644 index 5f3bafa7..00000000 --- a/bot/src/bot_data/scripts/0.3.0/Stats_up.sql +++ /dev/null @@ -1,13 +0,0 @@ -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.1/UserMessageCountPerHour_down.sql b/bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_down.sql deleted file mode 100644 index 3de96768..00000000 --- a/bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_down.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP TABLE `UserMessageCountPerHour`; - diff --git a/bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_up.sql b/bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_up.sql deleted file mode 100644 index 024bed4b..00000000 --- a/bot/src/bot_data/scripts/0.3.1/UserMessageCountPerHour_up.sql +++ /dev/null @@ -1,13 +0,0 @@ -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/tools/migration_to_sql/mock/migration_service.py b/bot/tools/migration_to_sql/mock/migration_service.py index 9843f15e..84d6d7e6 100644 --- a/bot/tools/migration_to_sql/mock/migration_service.py +++ b/bot/tools/migration_to_sql/mock/migration_service.py @@ -1,3 +1,6 @@ +import os +import shutil + from cpl_core.console import Console from cpl_core.dependency_injection import ServiceProviderABC from cpl_query.extension import List @@ -18,24 +21,31 @@ 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) - ) + # 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): - for migration in self._migrations: - migration_id = migration.__name__ + 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) + # migration_as_service: MigrationABC = self._services.get_service(migration) # save upgrade scripts - self._db.set_migration(migration_as_service.name, True) - migration_as_service.upgrade() + 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_as_service.name) - migration_as_service.downgrade() + self._db.set_migration(migration.name) + migration.downgrade() self._cursor.execute(MigrationHistory(migration_id).insert_string) self._db.save_changes() diff --git a/bot/tools/migration_to_sql/mock/mock_db_context.py b/bot/tools/migration_to_sql/mock/mock_db_context.py index aa898700..c7f7c94e 100644 --- a/bot/tools/migration_to_sql/mock/mock_db_context.py +++ b/bot/tools/migration_to_sql/mock/mock_db_context.py @@ -15,6 +15,11 @@ class MockDBContext(DatabaseContextABC): 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() @@ -43,11 +48,25 @@ class MockDBContext(DatabaseContextABC): 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._migration_name}.sql", "w+") as f: + 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 -- 2.45.2 From 5c8feed8aac5e55b94b09185e702102c16f4f9e8 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 23:35:56 +0100 Subject: [PATCH 11/37] Readded known scripts & added formatting #428 --- .../bot_data/scripts/0.1.0/1_Initial_down.sql | 12 ++++ .../bot_data/scripts/0.1.0/1_Initial_up.sql | 72 +++++++++++++++++++ .../scripts/0.2.2/1_AutoRole_down.sql | 4 ++ .../bot_data/scripts/0.2.2/1_AutoRole_up.sql | 26 +++++++ bot/src/bot_data/scripts/0.3.0/1_Api_down.sql | 4 ++ bot/src/bot_data/scripts/0.3.0/1_Api_up.sql | 34 +++++++++ .../bot_data/scripts/0.3.0/2_Level_down.sql | 2 + bot/src/bot_data/scripts/0.3.0/2_Level_up.sql | 15 ++++ .../bot_data/scripts/0.3.0/3_Stats_down.sql | 2 + bot/src/bot_data/scripts/0.3.0/3_Stats_up.sql | 14 ++++ .../scripts/0.3.0/4_AutoRoleFix_down.sql | 4 ++ .../scripts/0.3.0/4_AutoRoleFix_up.sql | 4 ++ .../0.3.1/1_UserMessageCountPerHour_down.sql | 2 + .../0.3.1/1_UserMessageCountPerHour_up.sql | 14 ++++ 14 files changed, 209 insertions(+) create mode 100644 bot/src/bot_data/scripts/0.1.0/1_Initial_down.sql create mode 100644 bot/src/bot_data/scripts/0.1.0/1_Initial_up.sql create mode 100644 bot/src/bot_data/scripts/0.2.2/1_AutoRole_down.sql create mode 100644 bot/src/bot_data/scripts/0.2.2/1_AutoRole_up.sql create mode 100644 bot/src/bot_data/scripts/0.3.0/1_Api_down.sql create mode 100644 bot/src/bot_data/scripts/0.3.0/1_Api_up.sql create mode 100644 bot/src/bot_data/scripts/0.3.0/2_Level_down.sql create mode 100644 bot/src/bot_data/scripts/0.3.0/2_Level_up.sql create mode 100644 bot/src/bot_data/scripts/0.3.0/3_Stats_down.sql create mode 100644 bot/src/bot_data/scripts/0.3.0/3_Stats_up.sql create mode 100644 bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_down.sql create mode 100644 bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_up.sql create mode 100644 bot/src/bot_data/scripts/0.3.1/1_UserMessageCountPerHour_down.sql create mode 100644 bot/src/bot_data/scripts/0.3.1/1_UserMessageCountPerHour_up.sql 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..344dc03b --- /dev/null +++ b/bot/src/bot_data/scripts/0.1.0/1_Initial_up.sql @@ -0,0 +1,72 @@ +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..c6caf074 --- /dev/null +++ b/bot/src/bot_data/scripts/0.2.2/1_AutoRole_down.sql @@ -0,0 +1,4 @@ +DROP TABLE `AutoRole`; + +DROP TABLE `AutoRoleRules`; + 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..49473912 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/1_Api_down.sql @@ -0,0 +1,4 @@ +DROP TABLE `AuthUsers`; + +DROP TABLE `AuthUserUsersRelations`; + 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_AutoRoleFix_down.sql b/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_down.sql new file mode 100644 index 00000000..bdf0e058 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_down.sql @@ -0,0 +1,4 @@ +ALTER TABLE AutoRoles + DROP COLUMN DiscordChannelId; + + diff --git a/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_up.sql b/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_up.sql new file mode 100644 index 00000000..60745b41 --- /dev/null +++ b/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_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`) +); + + -- 2.45.2 From 35a8b8f592140c5e16f28e3a44efa95aa5ef8637 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 23:36:32 +0100 Subject: [PATCH 12/37] Added 1.0.0 scripts #428 --- .../bot_data/scripts/1.0.0/1_ApiKey_down.sql | 2 + .../bot_data/scripts/1.0.0/1_ApiKey_up.sql | 15 + .../1.0.0/2_UserJoinedGameServer_down.sql | 6 + .../1.0.0/2_UserJoinedGameServer_up.sql | 46 ++ .../scripts/1.0.0/3_RemoveStats_down.sql | 14 + .../scripts/1.0.0/3_RemoveStats_up.sql | 3 + .../scripts/1.0.0/4_UserWarning_down.sql | 2 + .../scripts/1.0.0/4_UserWarning_up.sql | 14 + .../scripts/1.0.0/5_DBHistory_down.sql | 34 + .../bot_data/scripts/1.0.0/5_DBHistory_up.sql | 714 ++++++++++++++++++ 10 files changed, 850 insertions(+) create mode 100644 bot/src/bot_data/scripts/1.0.0/1_ApiKey_down.sql create mode 100644 bot/src/bot_data/scripts/1.0.0/1_ApiKey_up.sql create mode 100644 bot/src/bot_data/scripts/1.0.0/2_UserJoinedGameServer_down.sql create mode 100644 bot/src/bot_data/scripts/1.0.0/2_UserJoinedGameServer_up.sql create mode 100644 bot/src/bot_data/scripts/1.0.0/3_RemoveStats_down.sql create mode 100644 bot/src/bot_data/scripts/1.0.0/3_RemoveStats_up.sql create mode 100644 bot/src/bot_data/scripts/1.0.0/4_UserWarning_down.sql create mode 100644 bot/src/bot_data/scripts/1.0.0/4_UserWarning_up.sql create mode 100644 bot/src/bot_data/scripts/1.0.0/5_DBHistory_down.sql create mode 100644 bot/src/bot_data/scripts/1.0.0/5_DBHistory_up.sql 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..2b885152 --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/2_UserJoinedGameServer_down.sql @@ -0,0 +1,6 @@ +DROP TABLE `GameServers`; + +DROP TABLE `UserJoinedGameServer`; + +DROP TABLE `UserGameIdents`; + 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..c17b16bf --- /dev/null +++ b/bot/src/bot_data/scripts/1.0.0/5_DBHistory_up.sql @@ -0,0 +1,714 @@ +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, + `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;; + +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;; + -- 2.45.2 From 4e12ba5ffe7d4cde73c26da31eff3185eab2c205 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 10 Nov 2023 23:39:21 +0100 Subject: [PATCH 13/37] Added other scripts #428 --- .../scripts/1.1.0/1_Achievements_down.sql | 6 + .../scripts/1.1.0/1_Achievements_up.sql | 88 ++++ .../bot_data/scripts/1.1.0/2_Config_down.sql | 8 + .../bot_data/scripts/1.1.0/2_Config_up.sql | 482 ++++++++++++++++++ .../1.1.0/3_ConfigFeatureFlags_down.sql | 4 + .../scripts/1.1.0/3_ConfigFeatureFlags_up.sql | 6 + .../scripts/1.1.3/1_DefaultRole_down.sql | 4 + .../scripts/1.1.3/1_DefaultRole_up.sql | 4 + .../scripts/1.1.7/1_ShortRoleName_down.sql | 4 + .../scripts/1.1.7/1_ShortRoleName_up.sql | 53 ++ .../scripts/1.1.7/2_FixUpdates_down.sql | 10 + .../scripts/1.1.7/2_FixUpdates_up.sql | 210 ++++++++ .../1.1.9/1_ShortRoleNameOnlyHighest_down.sql | 9 + .../1.1.9/1_ShortRoleNameOnlyHighest_up.sql | 134 +++++ .../scripts/1.2.0/1_FixUserHistory_down.sql | 9 + .../scripts/1.2.0/1_FixUserHistory_up.sql | 52 ++ .../scripts/1.2.0/2_Birthday_down.sql | 19 + .../bot_data/scripts/1.2.0/2_Birthday_up.sql | 190 +++++++ .../1.2.0/3_SteamSpecialOffer_down.sql | 12 + .../scripts/1.2.0/3_SteamSpecialOffer_up.sql | 23 + .../1.2.0/4_MaxSteamOfferCount_down.sql | 9 + .../scripts/1.2.0/4_MaxSteamOfferCount_up.sql | 84 +++ .../scripts/1.2.0/5_MaintenanceMode_down.sql | 9 + .../scripts/1.2.0/5_MaintenanceMode_up.sql | 84 +++ 24 files changed, 1513 insertions(+) create mode 100644 bot/src/bot_data/scripts/1.1.0/1_Achievements_down.sql create mode 100644 bot/src/bot_data/scripts/1.1.0/1_Achievements_up.sql create mode 100644 bot/src/bot_data/scripts/1.1.0/2_Config_down.sql create mode 100644 bot/src/bot_data/scripts/1.1.0/2_Config_up.sql create mode 100644 bot/src/bot_data/scripts/1.1.0/3_ConfigFeatureFlags_down.sql create mode 100644 bot/src/bot_data/scripts/1.1.0/3_ConfigFeatureFlags_up.sql create mode 100644 bot/src/bot_data/scripts/1.1.3/1_DefaultRole_down.sql create mode 100644 bot/src/bot_data/scripts/1.1.3/1_DefaultRole_up.sql create mode 100644 bot/src/bot_data/scripts/1.1.7/1_ShortRoleName_down.sql create mode 100644 bot/src/bot_data/scripts/1.1.7/1_ShortRoleName_up.sql create mode 100644 bot/src/bot_data/scripts/1.1.7/2_FixUpdates_down.sql create mode 100644 bot/src/bot_data/scripts/1.1.7/2_FixUpdates_up.sql create mode 100644 bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_down.sql create mode 100644 bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql create mode 100644 bot/src/bot_data/scripts/1.2.0/1_FixUserHistory_down.sql create mode 100644 bot/src/bot_data/scripts/1.2.0/1_FixUserHistory_up.sql create mode 100644 bot/src/bot_data/scripts/1.2.0/2_Birthday_down.sql create mode 100644 bot/src/bot_data/scripts/1.2.0/2_Birthday_up.sql create mode 100644 bot/src/bot_data/scripts/1.2.0/3_SteamSpecialOffer_down.sql create mode 100644 bot/src/bot_data/scripts/1.2.0/3_SteamSpecialOffer_up.sql create mode 100644 bot/src/bot_data/scripts/1.2.0/4_MaxSteamOfferCount_down.sql create mode 100644 bot/src/bot_data/scripts/1.2.0/4_MaxSteamOfferCount_up.sql create mode 100644 bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_down.sql create mode 100644 bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql 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..186492f9 --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.0/1_Achievements_down.sql @@ -0,0 +1,6 @@ +DROP TABLE `Achievements`; + +ALTER TABLE Users DROP COLUMN MessageCount; + +ALTER TABLE Users DROP COLUMN ReactionCount; + 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..54ec30b8 --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.0/2_Config_down.sql @@ -0,0 +1,8 @@ +DROP TABLE `CFG_Server`; + +DROP TABLE `CFG_Technician`; + +DROP TABLE `CFG_TechnicianPingUrls`; + +DROP TABLE `CFG_TechnicianIds`; + 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..28fa6f2d --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.0/2_Config_up.sql @@ -0,0 +1,482 @@ +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, + `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 +);; + +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;; + +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, + `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 +);; + +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`, + `Maintenance`, + `FeatureFlags`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.MaxSteamOfferCount, + OLD.Maintenance, + 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`, + `Maintenance`, + `FeatureFlags`, + `Deleted`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.MaxSteamOfferCount, + OLD.Maintenance, + OLD.FeatureFlags, + 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/scripts/1.1.7/1_ShortRoleName_up.sql b/bot/src/bot_data/scripts/1.1.7/1_ShortRoleName_up.sql new file mode 100644 index 00000000..ee0f9ef4 --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.7/1_ShortRoleName_up.sql @@ -0,0 +1,53 @@ +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, + `ShortName` VARCHAR(64) DEFAULT NULL, + `DiscordRoleId` BIGINT(20) NOT NULL, + `Position` ENUM ('Before', 'After') 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_ShortRoleNamesUpdate`;; + +CREATE TRIGGER `TR_ShortRoleNamesUpdate` + AFTER UPDATE + ON `ShortRoleNames` + FOR EACH ROW +BEGIN + INSERT INTO `ShortRoleNamesHistory` (`Id`, `ShortName`, `DiscordRoleId`, `Position`, `ServerId`, `DateFrom`, + `DateTo`) + VALUES (OLD.Id, OLD.ShortName, OLD.DiscordRoleId, OLD.Position, OLD.ServerId, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + +DROP TRIGGER IF EXISTS `TR_ShortRoleNamesDelete`;; + +CREATE TRIGGER `TR_ShortRoleNamesDelete` + AFTER DELETE + ON `ShortRoleNames` + FOR EACH ROW +BEGIN + INSERT INTO `ShortRoleNamesHistory` (`Id`, `ShortName`, `DiscordRoleId`, `Position`, `ServerId`, `Deleted`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, OLD.ShortName, OLD.DiscordRoleId, OLD.Position, OLD.ServerId, TRUE, OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +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..463b9b69 --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.7/2_FixUpdates_up.sql @@ -0,0 +1,210 @@ +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; + +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 +);; + +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;; + +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 +);; + +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`, + `Maintenance`, + `FeatureFlags`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.MaxSteamOfferCount, + OLD.Maintenance, + 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`, + `Maintenance`, + `FeatureFlags`, + `Deleted`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.MaxSteamOfferCount, + OLD.Maintenance, + 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/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql b/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql new file mode 100644 index 00000000..4ef565fa --- /dev/null +++ b/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql @@ -0,0 +1,134 @@ +ALTER TABLE CFG_Server + ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId; + + + +ALTER TABLE CFG_ServerHistory + ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId; + + +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 +);; + +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/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..5c600044 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/1_FixUserHistory_up.sql @@ -0,0 +1,52 @@ +ALTER TABLE UsersHistory + ADD COLUMN ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP; + +ALTER TABLE UsersHistory + ADD COLUMN MessageCount BIGINT NOT NULL DEFAULT 0 AFTER ReactionCount; + +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;; + 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..8bde9a87 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/2_Birthday_up.sql @@ -0,0 +1,190 @@ +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);; + +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;; + + +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; + + +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 +);; + +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..e2e1ae6c --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/3_SteamSpecialOffer_down.sql @@ -0,0 +1,12 @@ +DROP TABLE `SteamSpecialOffers`; + + +ALTER TABLE CFG_Server + DROP COLUMN ShortRoleNameSetOnlyHighest; + + + +ALTER TABLE CFG_ServerHistory + DROP COLUMN ShortRoleNameSetOnlyHighest; + + 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..090a5753 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/4_MaxSteamOfferCount_up.sql @@ -0,0 +1,84 @@ +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; + + +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 +);; + +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`, + `Maintenance`, + `FeatureFlags`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.MaxSteamOfferCount, + OLD.Maintenance, + 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`, + `Maintenance`, + `FeatureFlags`, + `Deleted`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.MaxSteamOfferCount, + OLD.Maintenance, + 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/scripts/1.2.0/5_MaintenanceMode_up.sql b/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql new file mode 100644 index 00000000..fb709e98 --- /dev/null +++ b/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql @@ -0,0 +1,84 @@ +ALTER TABLE CFG_Technician + ADD Maintenance BOOLEAN DEFAULT FALSE AFTER MaxSteamOfferCount; + + + +ALTER TABLE CFG_TechnicianHistory + ADD Maintenance BOOLEAN DEFAULT FALSE AFTER MaxSteamOfferCount; + + +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 +);; + +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`, + `Maintenance`, + `FeatureFlags`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.MaxSteamOfferCount, + OLD.Maintenance, + 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`, + `Maintenance`, + `FeatureFlags`, + `Deleted`, + `DateFrom`, + `DateTo`) + VALUES (OLD.Id, + OLD.HelpCommandReferenceUrl, + OLD.WaitForRestart, + OLD.WaitForShutdown, + OLD.CacheMaxMessages, + OLD.MaxSteamOfferCount, + OLD.Maintenance, + OLD.FeatureFlags, + TRUE, + OLD.LastModifiedAt, + CURRENT_TIMESTAMP(6)); +END;; + -- 2.45.2 From dd3bfa68c66105db85c10e21aff54f4afb8cb3cb Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 13 Nov 2023 22:54:47 +0100 Subject: [PATCH 14/37] Finished script migration #428 --- .../service/data_integrity_service.py | 4 +- bot/src/bot_data/model/migration.py | 17 +++ bot/src/bot_data/model/migration_history.py | 16 ++- .../bot_data/scripts/0.1.0/1_Initial_up.sql | 8 ++ ...leFix_down.sql => 4_AutoRoleFix1_down.sql} | 0 ...toRoleFix_up.sql => 4_AutoRoleFix1_up.sql} | 0 .../bot_data/scripts/1.0.0/5_DBHistory_up.sql | 11 +- .../bot_data/scripts/1.1.0/2_Config_up.sql | 30 ----- .../scripts/1.1.7/2_FixUpdates_up.sql | 15 --- .../scripts/1.2.0/1_FixUserHistory_up.sql | 15 +-- .../scripts/1.2.0/4_MaxSteamOfferCount_up.sql | 5 - bot/src/bot_data/service/migration_service.py | 120 +++++++++++++++--- .../service/technician_config_seeder.py | 2 + .../config/events/config_on_ready_event.py | 5 + 14 files changed, 160 insertions(+), 88 deletions(-) create mode 100644 bot/src/bot_data/model/migration.py rename bot/src/bot_data/scripts/0.3.0/{4_AutoRoleFix_down.sql => 4_AutoRoleFix1_down.sql} (100%) rename bot/src/bot_data/scripts/0.3.0/{4_AutoRoleFix_up.sql => 4_AutoRoleFix1_up.sql} (100%) 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/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/scripts/0.1.0/1_Initial_up.sql b/bot/src/bot_data/scripts/0.1.0/1_Initial_up.sql index 344dc03b..64575fdc 100644 --- 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 @@ -1,3 +1,11 @@ +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, diff --git a/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_down.sql b/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix1_down.sql similarity index 100% rename from bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_down.sql rename to bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix1_down.sql diff --git a/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_up.sql b/bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix1_up.sql similarity index 100% rename from bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix_up.sql rename to bot/src/bot_data/scripts/0.3.0/4_AutoRoleFix1_up.sql 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 index c17b16bf..76087c03 100644 --- 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 @@ -638,9 +638,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, @@ -654,9 +651,9 @@ CREATE TRIGGER `TR_UsersUpdate` ON `Users` FOR EACH ROW BEGIN - INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `Birthday`, `ServerId`, + INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ServerId`, `DateFrom`, `DateTo`) - VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.Birthday, OLD.ServerId, + VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ServerId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); END;; @@ -667,9 +664,9 @@ CREATE TRIGGER `TR_UsersDelete` ON `Users` FOR EACH ROW BEGIN - INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `Birthday`, `ServerId`, + INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ServerId`, `Deleted`, `DateFrom`, `DateTo`) - VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.Birthday, OLD.ServerId, TRUE, + VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ServerId, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); END;; 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 index 28fa6f2d..d922bdb8 100644 --- 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 @@ -101,9 +101,6 @@ CREATE TABLE IF NOT EXISTS `CFG_ServerHistory` `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, @@ -131,9 +128,6 @@ BEGIN `HelpVoiceChannelId`, `TeamChannelId`, `LoginMessageChannelId`, - `DefaultRoleId`, - `ShortRoleNameSetOnlyHighest`, - `FeatureFlags`, `ServerId`, `DateFrom`, `DateTo`) @@ -151,9 +145,6 @@ BEGIN OLD.HelpVoiceChannelId, OLD.TeamChannelId, OLD.LoginMessageChannelId, - OLD.DefaultRoleId, - OLD.ShortRoleNameSetOnlyHighest, - OLD.FeatureFlags, OLD.ServerId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); @@ -180,10 +171,7 @@ BEGIN `HelpVoiceChannelId`, `TeamChannelId`, `LoginMessageChannelId`, - `DefaultRoleId`, - `ShortRoleNameSetOnlyHighest`, `ServerId`, - `FeatureFlags`, `Deleted`, `DateFrom`, `DateTo`) @@ -201,9 +189,6 @@ BEGIN OLD.HelpVoiceChannelId, OLD.TeamChannelId, OLD.LoginMessageChannelId, - OLD.DefaultRoleId, - OLD.ShortRoleNameSetOnlyHighest, - OLD.FeatureFlags, OLD.ServerId, TRUE, OLD.LastModifiedAt, @@ -322,9 +307,6 @@ CREATE TABLE IF NOT EXISTS `CFG_TechnicianHistory` `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 @@ -342,9 +324,6 @@ BEGIN `WaitForRestart`, `WaitForShutdown`, `CacheMaxMessages`, - `MaxSteamOfferCount`, - `Maintenance`, - `FeatureFlags`, `DateFrom`, `DateTo`) VALUES (OLD.Id, @@ -352,9 +331,6 @@ BEGIN OLD.WaitForRestart, OLD.WaitForShutdown, OLD.CacheMaxMessages, - OLD.MaxSteamOfferCount, - OLD.Maintenance, - OLD.FeatureFlags, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); END;; @@ -371,9 +347,6 @@ BEGIN `WaitForRestart`, `WaitForShutdown`, `CacheMaxMessages`, - `MaxSteamOfferCount`, - `Maintenance`, - `FeatureFlags`, `Deleted`, `DateFrom`, `DateTo`) @@ -382,9 +355,6 @@ BEGIN OLD.WaitForRestart, OLD.WaitForShutdown, OLD.CacheMaxMessages, - OLD.MaxSteamOfferCount, - OLD.Maintenance, - OLD.FeatureFlags, TRUE, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); 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 index 463b9b69..d4b289b4 100644 --- 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 @@ -25,7 +25,6 @@ CREATE TABLE IF NOT EXISTS `CFG_ServerHistory` `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, @@ -55,7 +54,6 @@ BEGIN `TeamChannelId`, `LoginMessageChannelId`, `DefaultRoleId`, - `ShortRoleNameSetOnlyHighest`, `FeatureFlags`, `ServerId`, `DateFrom`, @@ -75,7 +73,6 @@ BEGIN OLD.TeamChannelId, OLD.LoginMessageChannelId, OLD.DefaultRoleId, - OLD.ShortRoleNameSetOnlyHighest, OLD.FeatureFlags, OLD.ServerId, OLD.LastModifiedAt, @@ -104,7 +101,6 @@ BEGIN `TeamChannelId`, `LoginMessageChannelId`, `DefaultRoleId`, - `ShortRoleNameSetOnlyHighest`, `ServerId`, `FeatureFlags`, `Deleted`, @@ -125,7 +121,6 @@ BEGIN OLD.TeamChannelId, OLD.LoginMessageChannelId, OLD.DefaultRoleId, - OLD.ShortRoleNameSetOnlyHighest, OLD.FeatureFlags, OLD.ServerId, TRUE, @@ -140,8 +135,6 @@ CREATE TABLE IF NOT EXISTS `CFG_TechnicianHistory` `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, @@ -160,8 +153,6 @@ BEGIN `WaitForRestart`, `WaitForShutdown`, `CacheMaxMessages`, - `MaxSteamOfferCount`, - `Maintenance`, `FeatureFlags`, `DateFrom`, `DateTo`) @@ -170,8 +161,6 @@ BEGIN OLD.WaitForRestart, OLD.WaitForShutdown, OLD.CacheMaxMessages, - OLD.MaxSteamOfferCount, - OLD.Maintenance, OLD.FeatureFlags, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); @@ -189,8 +178,6 @@ BEGIN `WaitForRestart`, `WaitForShutdown`, `CacheMaxMessages`, - `MaxSteamOfferCount`, - `Maintenance`, `FeatureFlags`, `Deleted`, `DateFrom`, @@ -200,8 +187,6 @@ BEGIN OLD.WaitForRestart, OLD.WaitForShutdown, OLD.CacheMaxMessages, - OLD.MaxSteamOfferCount, - OLD.Maintenance, OLD.FeatureFlags, TRUE, OLD.LastModifiedAt, 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 index 5c600044..404c035f 100644 --- 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 @@ -1,9 +1,3 @@ -ALTER TABLE UsersHistory - ADD COLUMN ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP; - -ALTER TABLE UsersHistory - ADD COLUMN MessageCount BIGINT NOT NULL DEFAULT 0 AFTER ReactionCount; - ALTER TABLE `Users` CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);; @@ -17,7 +11,6 @@ CREATE TABLE IF NOT EXISTS `UsersHistory` `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, @@ -31,9 +24,9 @@ CREATE TRIGGER `TR_UsersUpdate` ON `Users` FOR EACH ROW BEGIN - INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `Birthday`, `ServerId`, + INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `ServerId`, `DateFrom`, `DateTo`) - VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.Birthday, OLD.ServerId, + VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.ServerId, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); END;; @@ -44,9 +37,9 @@ CREATE TRIGGER `TR_UsersDelete` ON `Users` FOR EACH ROW BEGIN - INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `Birthday`, `ServerId`, + INSERT INTO `UsersHistory` (`Id`, `DiscordId`, `XP`, `ReactionCount`, `MessageCount`, `ServerId`, `Deleted`, `DateFrom`, `DateTo`) - VALUES (OLD.UserId, OLD.DiscordId, OLD.XP, OLD.ReactionCount, OLD.MessageCount, OLD.Birthday, OLD.ServerId, TRUE, + 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/4_MaxSteamOfferCount_up.sql b/bot/src/bot_data/scripts/1.2.0/4_MaxSteamOfferCount_up.sql index 090a5753..65289d0a 100644 --- 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 @@ -15,7 +15,6 @@ CREATE TABLE IF NOT EXISTS `CFG_TechnicianHistory` `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, @@ -35,7 +34,6 @@ BEGIN `WaitForShutdown`, `CacheMaxMessages`, `MaxSteamOfferCount`, - `Maintenance`, `FeatureFlags`, `DateFrom`, `DateTo`) @@ -45,7 +43,6 @@ BEGIN OLD.WaitForShutdown, OLD.CacheMaxMessages, OLD.MaxSteamOfferCount, - OLD.Maintenance, OLD.FeatureFlags, OLD.LastModifiedAt, CURRENT_TIMESTAMP(6)); @@ -64,7 +61,6 @@ BEGIN `WaitForShutdown`, `CacheMaxMessages`, `MaxSteamOfferCount`, - `Maintenance`, `FeatureFlags`, `Deleted`, `DateFrom`, @@ -75,7 +71,6 @@ BEGIN OLD.WaitForShutdown, OLD.CacheMaxMessages, OLD.MaxSteamOfferCount, - OLD.Maintenance, OLD.FeatureFlags, TRUE, OLD.LastModifiedAt, diff --git a/bot/src/bot_data/service/migration_service.py b/bot/src/bot_data/service/migration_service.py index ab347283..b59a9a7d 100644 --- a/bot/src/bot_data/service/migration_service.py +++ b/bot/src/bot_data/service/migration_service.py @@ -1,9 +1,12 @@ +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 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 +23,64 @@ 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) - ) + # 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): - self._logger.info(__name__, f"Running Migrations") - for migration in self._migrations: - migration_id = migration.__name__ + def _migrate_from_old_to_new(self): + results = self._db.select( + """ + SELECT * FROM `MigrationHistory` + """ + ) + applied_migrations = List(MigrationHistory) + for result in results: + applied_migrations.add(MigrationHistory(result[0], result[1])) + + for migration in applied_migrations: + if not migration.migration_id.endswith("Migration"): + continue + + 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 _load_up_scripts(self) -> List[Migration]: + migrations = List(Migration) + path = "../../src/bot_data/scripts" + + if not os.path.exists(path): + raise Exception("Migration path not found") + + folders = List(str, glob.glob(f"{path}/*")).order_by() + + for folder in folders: + splitted = folder.split("/") + version = splitted[len(splitted) - 1] + + for file in List(str, os.listdir(folder)).where(lambda x: x.endswith("_up.sql")).order_by().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, script)) + + return migrations + + def _execute(self, migrations: List[Migration]): + for migration in migrations: + active_statement = "" try: # check if table exists self._cursor.execute("SHOW TABLES LIKE 'MigrationHistory'") @@ -36,17 +89,52 @@ 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)) + migration_from_db = self._db.select(MigrationHistory.get_select_by_id_string(migration.name)) if migration_from_db is not None and 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 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) + 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.name}\n{active_statement}", e) + + def migrate(self): + self._migrate_from_old_to_new() + self._execute(self._load_up_scripts()) + + # def migrate(self): + # self._logger.info(__name__, f"Running Migrations") + # for migration in self._migrations: + # migration_id = migration.__name__ + # try: + # # check if table exists + # self._cursor.execute("SHOW TABLES LIKE 'MigrationHistory'") + # result = self._cursor.fetchone() + # if result: + # # there is a table named "tableName" + # self._logger.trace( + # __name__, + # f"Running SQL Command: {MigrationHistory.get_select_by_id_string(migration_id)}", + # ) + # 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: + # 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() + # + # except Exception as e: + # self._logger.error(__name__, f"Cannot get migration with id {migration}", e) 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/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)) -- 2.45.2 From d2d59bdad70d7c22a89a909482dedf1e2f1b9aff Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 13 Nov 2023 22:55:35 +0100 Subject: [PATCH 15/37] Removed old scripts #428 --- bot/src/bot_data/migration/__init__.py | 26 ---- .../migration/achievements_migration.py | 127 --------------- .../bot_data/migration/api_key_migration.py | 38 ----- bot/src/bot_data/migration/api_migration.py | 61 -------- .../migration/auto_role_fix1_migration.py | 33 ---- .../bot_data/migration/auto_role_migration.py | 53 ------- .../bot_data/migration/birthday_migration.py | 84 ---------- .../config_feature_flags_migration.py | 29 ---- .../bot_data/migration/config_migration.py | 145 ------------------ .../migration/db_history_migration.py | 56 ------- .../migration/db_history_scripts/api_keys.sql | 46 ------ .../auth_user_users_relation.sql | 46 ------ .../db_history_scripts/auth_users.sql | 62 -------- .../db_history_scripts/auto_role_rules.sql | 46 ------ .../db_history_scripts/auto_roles.sql | 48 ------ .../migration/db_history_scripts/clients.sql | 54 ------- .../db_history_scripts/config/server.sql | 124 --------------- .../config/server_afk_channels.sql | 57 ------- .../config/server_team_roles.sql | 62 -------- .../db_history_scripts/config/technician.sql | 74 --------- .../config/technician_ids.sql | 52 ------- .../config/technician_ping_urls.sql | 52 ------- .../db_history_scripts/game_servers.sql | 46 ------ .../db_history_scripts/known_users.sql | 44 ------ .../migration/db_history_scripts/levels.sql | 50 ------ .../migration/db_history_scripts/servers.sql | 44 ------ .../db_history_scripts/short_rule_names.sql | 38 ----- .../db_history_scripts/user_game_idents.sql | 46 ------ .../user_joined_game_servers.sql | 47 ------ .../user_joined_servers.sql | 46 ------ .../user_joined_voice_channel.sql | 49 ------ .../user_message_count_per_hour.sql | 47 ------ .../db_history_scripts/user_warnings.sql | 46 ------ .../migration/db_history_scripts/users.sql | 45 ------ .../migration/default_role_migration.py | 34 ---- .../migration/fix_updates_migration.py | 51 ------ .../migration/fix_user_history_migration.py | 41 ----- .../bot_data/migration/initial_migration.py | 138 ----------------- bot/src/bot_data/migration/level_migration.py | 38 ----- .../migration/maintenance_mode_migration.py | 51 ------ .../max_steam_offer_count_migration.py | 51 ------ .../migration/remove_stats_migration.py | 43 ------ .../migration/short_role_name_migration.py | 40 ----- .../short_role_name_only_highest_migration.py | 51 ------ bot/src/bot_data/migration/stats_migration.py | 37 ----- .../steam_special_offer_migration.py | 68 -------- .../user_joined_game_server_migration.py | 77 ---------- .../user_message_count_per_hour_migration.py | 37 ----- .../migration/user_warning_migration.py | 37 ----- .../bot_data/startup_migration_extension.py | 57 ------- 50 files changed, 2774 deletions(-) delete mode 100644 bot/src/bot_data/migration/__init__.py delete mode 100644 bot/src/bot_data/migration/achievements_migration.py delete mode 100644 bot/src/bot_data/migration/api_key_migration.py delete mode 100644 bot/src/bot_data/migration/api_migration.py delete mode 100644 bot/src/bot_data/migration/auto_role_fix1_migration.py delete mode 100644 bot/src/bot_data/migration/auto_role_migration.py delete mode 100644 bot/src/bot_data/migration/birthday_migration.py delete mode 100644 bot/src/bot_data/migration/config_feature_flags_migration.py delete mode 100644 bot/src/bot_data/migration/config_migration.py delete mode 100644 bot/src/bot_data/migration/db_history_migration.py delete mode 100644 bot/src/bot_data/migration/db_history_scripts/api_keys.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/auth_user_users_relation.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/auth_users.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/auto_role_rules.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/auto_roles.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/clients.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/config/server.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/config/server_afk_channels.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/config/server_team_roles.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/config/technician.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/config/technician_ids.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/config/technician_ping_urls.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/game_servers.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/known_users.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/levels.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/servers.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/short_rule_names.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/user_game_idents.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/user_joined_game_servers.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/user_joined_servers.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/user_joined_voice_channel.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/user_message_count_per_hour.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/user_warnings.sql delete mode 100644 bot/src/bot_data/migration/db_history_scripts/users.sql delete mode 100644 bot/src/bot_data/migration/default_role_migration.py delete mode 100644 bot/src/bot_data/migration/fix_updates_migration.py delete mode 100644 bot/src/bot_data/migration/fix_user_history_migration.py delete mode 100644 bot/src/bot_data/migration/initial_migration.py delete mode 100644 bot/src/bot_data/migration/level_migration.py delete mode 100644 bot/src/bot_data/migration/maintenance_mode_migration.py delete mode 100644 bot/src/bot_data/migration/max_steam_offer_count_migration.py delete mode 100644 bot/src/bot_data/migration/remove_stats_migration.py delete mode 100644 bot/src/bot_data/migration/short_role_name_migration.py delete mode 100644 bot/src/bot_data/migration/short_role_name_only_highest_migration.py delete mode 100644 bot/src/bot_data/migration/stats_migration.py delete mode 100644 bot/src/bot_data/migration/steam_special_offer_migration.py delete mode 100644 bot/src/bot_data/migration/user_joined_game_server_migration.py delete mode 100644 bot/src/bot_data/migration/user_message_count_per_hour_migration.py delete mode 100644 bot/src/bot_data/migration/user_warning_migration.py diff --git a/bot/src/bot_data/migration/__init__.py b/bot/src/bot_data/migration/__init__.py deleted file mode 100644 index c8b32e03..00000000 --- a/bot/src/bot_data/migration/__init__.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -bot sh-edraft.de Discord bot -~~~~~~~~~~~~~~~~~~~ - -Discord bot for customers of sh-edraft.de - -:copyright: (c) 2022 - 2023 sh-edraft.de -:license: MIT, see LICENSE for more details. - -""" - -__title__ = "bot_data.migration" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" - -from collections import namedtuple - - -# imports - -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") 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 0aa4a5c3..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.0_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 b911e656..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.2_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.sql b/bot/src/bot_data/migration/db_history_scripts/config/server.sql deleted file mode 100644 index 02f1b841..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/config/server.sql +++ /dev/null @@ -1,124 +0,0 @@ -CREATE TABLE IF NOT EXISTS `CFG_ServerHistory` -( - `Id` BIGINT(20) NOT NULL, - `MessageDeleteTimer` BIGINT NOT NULL DEFAULT 6, - `NotificationChatId` BIGINT NOT NULL, - `MaxVoiceStateHours` BIGINT NOT NULL DEFAULT 6, - `XpPerMessage` BIGINT NOT NULL DEFAULT 1, - `XpPerReaction` BIGINT NOT NULL DEFAULT 1, - `MaxMessageXpPerHour` BIGINT NOT NULL DEFAULT 20, - `XpPerOntimeHour` BIGINT NOT NULL DEFAULT 10, - `XpPerEventParticipation` BIGINT NOT NULL DEFAULT 10, - `XpPerAchievement` BIGINT NOT NULL DEFAULT 10, - `AFKCommandChannelId` BIGINT NOT NULL, - `HelpVoiceChannelId` BIGINT NOT NULL, - `TeamChannelId` BIGINT NOT NULL, - `LoginMessageChannelId` BIGINT NOT NULL, - `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 -); - -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; \ 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.sql b/bot/src/bot_data/migration/db_history_scripts/config/technician.sql deleted file mode 100644 index 3866f88f..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/config/technician.sql +++ /dev/null @@ -1,74 +0,0 @@ -CREATE TABLE IF NOT EXISTS `CFG_TechnicianHistory` -( - `Id` BIGINT(20) NOT NULL, - `HelpCommandReferenceUrl` VARCHAR(255) NOT NULL, - `WaitForRestart` BIGINT NOT NULL DEFAULT 8, - `WaitForShutdown` BIGINT NOT NULL DEFAULT 8, - `CacheMaxMessages` BIGINT NOT NULL DEFAULT 1000000, - `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 -); - -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`, - `Maintenance`, - `FeatureFlags`, - `DateFrom`, - `DateTo`) - VALUES (OLD.Id, - OLD.HelpCommandReferenceUrl, - OLD.WaitForRestart, - OLD.WaitForShutdown, - OLD.CacheMaxMessages, - OLD.MaxSteamOfferCount, - OLD.Maintenance, - 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`, - `Maintenance`, - `FeatureFlags`, - `Deleted`, - `DateFrom`, - `DateTo`) - VALUES (OLD.Id, - OLD.HelpCommandReferenceUrl, - OLD.WaitForRestart, - OLD.WaitForShutdown, - OLD.CacheMaxMessages, - OLD.MaxSteamOfferCount, - OLD.Maintenance, - OLD.FeatureFlags, - 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/short_rule_names.sql b/bot/src/bot_data/migration/db_history_scripts/short_rule_names.sql deleted file mode 100644 index f4ff95c2..00000000 --- a/bot/src/bot_data/migration/db_history_scripts/short_rule_names.sql +++ /dev/null @@ -1,38 +0,0 @@ -CREATE TABLE IF NOT EXISTS `ShortRoleNamesHistory` -( - `Id` BIGINT(20) NOT NULL, - `ShortName` VARCHAR(64) DEFAULT NULL, - `DiscordRoleId` BIGINT(20) NOT NULL, - `Position` ENUM ('Before', 'After') 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_ShortRoleNamesUpdate`; - -CREATE TRIGGER `TR_ShortRoleNamesUpdate` - AFTER UPDATE - ON `ShortRoleNames` - FOR EACH ROW -BEGIN - INSERT INTO `ShortRoleNamesHistory` (`Id`, `ShortName`, `DiscordRoleId`, `Position`, `ServerId`, `DateFrom`, - `DateTo`) - VALUES (OLD.Id, OLD.ShortName, OLD.DiscordRoleId, OLD.Position, OLD.ServerId, OLD.LastModifiedAt, - CURRENT_TIMESTAMP(6)); -END; - -DROP TRIGGER IF EXISTS `TR_ShortRoleNamesDelete`; - -CREATE TRIGGER `TR_ShortRoleNamesDelete` - AFTER DELETE - ON `ShortRoleNames` - FOR EACH ROW -BEGIN - INSERT INTO `ShortRoleNamesHistory` (`Id`, `ShortName`, `DiscordRoleId`, `Position`, `ServerId`, `Deleted`, - `DateFrom`, - `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 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 8eb0611a..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.0_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 bf80d472..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.0_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 2fb4c461..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.0_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/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 -- 2.45.2 From e01c738cf0115d4570adac4ab123fd1293732ff6 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 13 Nov 2023 22:57:17 +0100 Subject: [PATCH 16/37] Removed old logic #428 --- bot/src/bot_data/service/migration_service.py | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/bot/src/bot_data/service/migration_service.py b/bot/src/bot_data/service/migration_service.py index b59a9a7d..4754e2cb 100644 --- a/bot/src/bot_data/service/migration_service.py +++ b/bot/src/bot_data/service/migration_service.py @@ -23,10 +23,6 @@ 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 _migrate_from_old_to_new(self): results = self._db.select( """ @@ -111,30 +107,3 @@ class MigrationService: def migrate(self): self._migrate_from_old_to_new() self._execute(self._load_up_scripts()) - - # def migrate(self): - # self._logger.info(__name__, f"Running Migrations") - # for migration in self._migrations: - # migration_id = migration.__name__ - # try: - # # check if table exists - # self._cursor.execute("SHOW TABLES LIKE 'MigrationHistory'") - # result = self._cursor.fetchone() - # if result: - # # there is a table named "tableName" - # self._logger.trace( - # __name__, - # f"Running SQL Command: {MigrationHistory.get_select_by_id_string(migration_id)}", - # ) - # 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: - # 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() - # - # except Exception as e: - # self._logger.error(__name__, f"Cannot get migration with id {migration}", e) -- 2.45.2 From fe5b0207c0ed9827ebdcd9448262e7a312e0b26b Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 13 Nov 2023 23:38:04 +0100 Subject: [PATCH 17/37] Added version logic & fixed downgrade scripts #428 --- .../scripts/0.2.2/1_AutoRole_down.sql | 4 +- bot/src/bot_data/scripts/0.3.0/1_Api_down.sql | 4 +- .../1.0.0/2_UserJoinedGameServer_down.sql | 6 +- .../scripts/1.1.0/1_Achievements_down.sql | 4 ++ .../bot_data/scripts/1.1.0/2_Config_down.sql | 18 +++++- .../1.2.0/3_SteamSpecialOffer_down.sql | 5 +- bot/src/bot_data/service/migration_service.py | 64 +++++++++++++++---- 7 files changed, 82 insertions(+), 23 deletions(-) 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 index c6caf074..6e92bfe4 100644 --- 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 @@ -1,4 +1,4 @@ -DROP TABLE `AutoRole`; - DROP TABLE `AutoRoleRules`; + +DROP TABLE `AutoRoles`; 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 index 49473912..46021597 100644 --- 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 @@ -1,4 +1,4 @@ -DROP TABLE `AuthUsers`; - DROP TABLE `AuthUserUsersRelations`; + +DROP TABLE `AuthUsers`; \ No newline at end of file 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 index 2b885152..e630662a 100644 --- 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 @@ -1,6 +1,8 @@ -DROP TABLE `GameServers`; - DROP TABLE `UserJoinedGameServer`; + DROP TABLE `UserGameIdents`; + +DROP TABLE `GameServers`; + 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 index 186492f9..ffdb52a3 100644 --- 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 @@ -1,6 +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/2_Config_down.sql b/bot/src/bot_data/scripts/1.1.0/2_Config_down.sql index 54ec30b8..d774b897 100644 --- 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 @@ -1,8 +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_Technician`; +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.2.0/3_SteamSpecialOffer_down.sql b/bot/src/bot_data/scripts/1.2.0/3_SteamSpecialOffer_down.sql index e2e1ae6c..2cca3310 100644 --- 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 @@ -2,11 +2,10 @@ DROP TABLE `SteamSpecialOffers`; ALTER TABLE CFG_Server - DROP COLUMN ShortRoleNameSetOnlyHighest; - + DROP COLUMN GameOfferNotificationChatId; ALTER TABLE CFG_ServerHistory - DROP COLUMN ShortRoleNameSetOnlyHighest; + DROP COLUMN GameOfferNotificationChatId; diff --git a/bot/src/bot_data/service/migration_service.py b/bot/src/bot_data/service/migration_service.py index 4754e2cb..e9d2e327 100644 --- a/bot/src/bot_data/service/migration_service.py +++ b/bot/src/bot_data/service/migration_service.py @@ -4,7 +4,9 @@ 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.model.migration import Migration from bot_data.model.migration_history import MigrationHistory @@ -23,7 +25,7 @@ class MigrationService: self._db = db self._cursor = db.cursor - def _migrate_from_old_to_new(self): + def _get_migration_history(self) -> List[MigrationHistory]: results = self._db.select( """ SELECT * FROM `MigrationHistory` @@ -33,7 +35,15 @@ class MigrationService: for result in results: applied_migrations.add(MigrationHistory(result[0], result[1])) - for migration in applied_migrations: + return applied_migrations + + 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 not migration.migration_id.endswith("Migration"): continue @@ -41,20 +51,37 @@ class MigrationService: self._cursor.execute(migration.change_id_string(migration.migration_id.replace("Migration", ""))) self._db.save_changes() - def _load_up_scripts(self) -> List[Migration]: + def _load_scripts(self, upgrade: bool = True) -> List[Migration]: migrations = List(Migration) path = "../../src/bot_data/scripts" if not os.path.exists(path): raise Exception("Migration path not found") - folders = List(str, glob.glob(f"{path}/*")).order_by() + 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 = splitted[len(splitted) - 1] + version_str = splitted[len(splitted) - 1] - for file in List(str, os.listdir(folder)).where(lambda x: x.endswith("_up.sql")).order_by().to_list(): + # 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 @@ -70,11 +97,11 @@ class MigrationService: script = f.read() f.close() - migrations.add(Migration(name, version, script)) + migrations.add(Migration(name, version_str, script)) return migrations - def _execute(self, migrations: List[Migration]): + def _execute(self, migrations: List[Migration], upgrade: bool = True): for migration in migrations: active_statement = "" try: @@ -88,10 +115,14 @@ class MigrationService: 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.name)) - if migration_from_db is not None and len(migration_from_db) > 0: + 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.name}") + 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"]: @@ -99,11 +130,18 @@ class MigrationService: active_statement = statement self._cursor.execute(statement + ";") - self._cursor.execute(MigrationHistory(migration.name).insert_string) + 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.fatal(__name__, f"Migration failed: {migration.name}\n{active_statement}", 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_up_scripts()) + self._execute(self._load_scripts()) + self._execute(self._load_scripts(False), False) -- 2.45.2 From 06a0eba5c5b92e4008eff4ce6feff54fed530561 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 14 Nov 2023 23:50:05 +0100 Subject: [PATCH 18/37] Added migration to old naming safety #428 --- bot/src/bot_data/service/migration_service.py | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/bot/src/bot_data/service/migration_service.py b/bot/src/bot_data/service/migration_service.py index e9d2e327..76aae60d 100644 --- a/bot/src/bot_data/service/migration_service.py +++ b/bot/src/bot_data/service/migration_service.py @@ -37,6 +37,22 @@ class MigrationService: return applied_migrations + def _migration_migrations_to_old(self, migration: MigrationHistory): + if 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(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() @@ -44,12 +60,10 @@ class MigrationService: return for migration in self._get_migration_history(): - if not migration.migration_id.endswith("Migration"): - continue - - 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() + 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) -- 2.45.2 From 4ba40b826a7989fd0445bee8144d6be38f3e834e Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 15 Nov 2023 16:56:08 +0100 Subject: [PATCH 19/37] Fixed scripts #428 --- .../scripts/1.1.7/2_FixUpdates_up.sql | 24 ----------- .../1.1.9/1_ShortRoleNameOnlyHighest_up.sql | 26 ------------ .../scripts/1.2.0/1_FixUserHistory_up.sql | 13 ------ .../bot_data/scripts/1.2.0/2_Birthday_up.sql | 40 ------------------- .../scripts/1.2.0/4_MaxSteamOfferCount_up.sql | 15 ------- .../scripts/1.2.0/5_MaintenanceMode_up.sql | 16 -------- bot/src/bot_data/service/migration_service.py | 2 +- 7 files changed, 1 insertion(+), 135 deletions(-) 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 index d4b289b4..c2e3845d 100644 --- 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 @@ -8,30 +8,6 @@ ALTER TABLE CFG_TechnicianHistory ALTER TABLE CFG_ServerHistory ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId; -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, - `FeatureFlags` JSON NULL DEFAULT ('{}'), - `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` diff --git a/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql b/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql index 4ef565fa..e90f3006 100644 --- a/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql +++ b/bot/src/bot_data/scripts/1.1.9/1_ShortRoleNameOnlyHighest_up.sql @@ -6,32 +6,6 @@ ALTER TABLE CFG_Server ALTER TABLE CFG_ServerHistory ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId; - -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 -);; - DROP TRIGGER IF EXISTS `TR_CFG_ServerUpdate`;; CREATE TRIGGER `TR_CFG_ServerUpdate` 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 index 404c035f..a4997576 100644 --- 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 @@ -4,19 +4,6 @@ ALTER TABLE `Users` 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, - `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` 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 index 8bde9a87..fa92e8e8 100644 --- 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 @@ -13,20 +13,6 @@ ALTER TABLE `Users` 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` @@ -62,32 +48,6 @@ ALTER TABLE CFG_Server ALTER TABLE CFG_ServerHistory ADD XpForBirthday BIGINT(20) NOT NULL DEFAULT 0 AFTER XpPerAchievement; - -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 -);; - DROP TRIGGER IF EXISTS `TR_CFG_ServerUpdate`;; CREATE TRIGGER `TR_CFG_ServerUpdate` 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 index 65289d0a..f9f21398 100644 --- 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 @@ -6,21 +6,6 @@ ALTER TABLE CFG_Technician ALTER TABLE CFG_TechnicianHistory ADD MaxSteamOfferCount BIGINT NOT NULL DEFAULT 250 AFTER CacheMaxMessages; - -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, - `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` diff --git a/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql b/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql index fb709e98..895e24ad 100644 --- a/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql +++ b/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql @@ -6,22 +6,6 @@ ALTER TABLE CFG_Technician ALTER TABLE CFG_TechnicianHistory ADD Maintenance BOOLEAN DEFAULT FALSE AFTER MaxSteamOfferCount; - -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 -);; - DROP TRIGGER IF EXISTS `TR_CFG_TechnicianUpdate`;; CREATE TRIGGER `TR_CFG_TechnicianUpdate` diff --git a/bot/src/bot_data/service/migration_service.py b/bot/src/bot_data/service/migration_service.py index 76aae60d..b2356eaa 100644 --- a/bot/src/bot_data/service/migration_service.py +++ b/bot/src/bot_data/service/migration_service.py @@ -41,7 +41,7 @@ class MigrationService: if migration.migration_id.endswith("Migration"): return - self._logger.debug(__name__, f"Migrate old migration {migration.migration_id} to new method") + 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() -- 2.45.2 From bbad4100dc5ea35925f57f33a547f97a1b3b6add Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 15 Nov 2023 17:36:30 +0100 Subject: [PATCH 20/37] Fixed workspace #428 --- bot/cpl-workspace.json | 2 +- bot/src/bot/bot.json | 3 ++- bot/src/bot_api/abc/__init__.py | 14 +++++++------- bot/src/bot_api/controller/__init__.py | 14 +++++++------- bot/src/bot_api/event/__init__.py | 14 +++++++------- bot/src/bot_api/exception/__init__.py | 14 +++++++------- bot/src/bot_api/filter/__init__.py | 14 +++++++------- bot/src/bot_api/filter/discord/__init__.py | 14 +++++++------- bot/src/bot_api/logging/__init__.py | 14 +++++++------- bot/src/bot_api/model/__init__.py | 14 +++++++------- bot/src/bot_api/model/discord/__init__.py | 14 +++++++------- bot/src/bot_api/route/__init__.py | 14 +++++++------- bot/src/bot_api/service/__init__.py | 14 +++++++------- bot/src/bot_api/transformer/__init__.py | 14 +++++++------- bot/src/bot_core/__init__.py | 14 +++++++------- bot/src/bot_core/abc/__init__.py | 14 +++++++------- bot/src/bot_core/configuration/__init__.py | 14 +++++++------- bot/src/bot_core/core_extension/__init__.py | 14 +++++++------- bot/src/bot_core/events/__init__.py | 14 +++++++------- bot/src/bot_core/exception/__init__.py | 14 +++++++------- bot/src/bot_core/helper/__init__.py | 14 +++++++------- bot/src/bot_core/logging/__init__.py | 14 +++++++------- bot/src/bot_core/pipes/__init__.py | 14 +++++++------- bot/src/bot_core/service/__init__.py | 14 +++++++------- bot/src/bot_data/__init__.py | 14 +++++++------- bot/src/bot_data/abc/__init__.py | 14 +++++++------- bot/src/bot_data/model/__init__.py | 14 +++++++------- bot/src/bot_graphql/__init__.py | 14 +++++++------- bot/src/bot_graphql/abc/__init__.py | 14 +++++++------- bot/src/bot_graphql/filter/__init__.py | 14 +++++++------- bot/src/bot_graphql/model/__init__.py | 14 +++++++------- bot/src/bot_graphql/mutations/__init__.py | 14 +++++++------- bot/src/bot_graphql/queries/__init__.py | 14 +++++++------- bot/src/bot_graphql/queries/discord/__init__.py | 14 +++++++------- bot/src/modules/achievements/__init__.py | 14 +++++++------- .../modules/achievements/commands/__init__.py | 14 +++++++------- bot/src/modules/achievements/events/__init__.py | 14 +++++++------- bot/src/modules/achievements/model/__init__.py | 14 +++++++------- bot/src/modules/auto_role/__init__.py | 14 +++++++------- bot/src/modules/auto_role/command/__init__.py | 14 +++++++------- bot/src/modules/auto_role/events/__init__.py | 14 +++++++------- bot/src/modules/auto_role/helper/__init__.py | 14 +++++++------- bot/src/modules/base/__init__.py | 14 +++++++------- bot/src/modules/base/command/__init__.py | 14 +++++++------- bot/src/modules/base/events/__init__.py | 14 +++++++------- bot/src/modules/base/forms/__init__.py | 14 +++++++------- bot/src/modules/base/helper/__init__.py | 14 +++++++------- bot/src/modules/base/model/__init__.py | 14 +++++++------- bot/src/modules/base/service/__init__.py | 14 +++++++------- bot/src/modules/base/thread/__init__.py | 14 +++++++------- bot/src/modules/boot_log/__init__.py | 14 +++++++------- bot/src/modules/config/__init__.py | 14 +++++++------- bot/src/modules/config/events/__init__.py | 14 +++++++------- bot/src/modules/config/service/__init__.py | 14 +++++++------- bot/src/modules/database/__init__.py | 14 +++++++------- bot/src/modules/level/__init__.py | 14 +++++++------- bot/src/modules/level/command/__init__.py | 14 +++++++------- bot/src/modules/level/configuration/__init__.py | 14 +++++++------- bot/src/modules/level/events/__init__.py | 14 +++++++------- bot/src/modules/level/service/__init__.py | 14 +++++++------- bot/src/modules/permission/__init__.py | 14 +++++++------- bot/src/modules/permission/service/__init__.py | 14 +++++++------- bot/src/modules/short_role_name/__init__.py | 14 +++++++------- .../modules/short_role_name/events/__init__.py | 14 +++++++------- .../modules/short_role_name/service/__init__.py | 14 +++++++------- bot/src/modules/special_offers/__init__.py | 14 +++++++------- bot/src/modules/technician/__init__.py | 14 +++++++------- bot/src/modules/technician/command/__init__.py | 14 +++++++------- bot/tools/post_build/post_build_settings.py | 17 +++-------------- 69 files changed, 468 insertions(+), 478 deletions(-) diff --git a/bot/cpl-workspace.json b/bot/cpl-workspace.json index 060dd42b..74d016e7 100644 --- a/bot/cpl-workspace.json +++ b/bot/cpl-workspace.json @@ -22,7 +22,7 @@ "get-version": "tools/get_version/get-version.json", "post-build": "tools/post_build/post-build.json", "set-version": "tools/set_version/set-version.json", - "migration-to-sql": "tools/migration_to_sql/tools/migration-to-sql.json" + "migration-to-sql": "tools/migration_to_sql/migration-to-sql.json" }, "Scripts": { "format": "black ./", diff --git a/bot/src/bot/bot.json b/bot/src/bot/bot.json index fc54fc03..68e20ef9 100644 --- a/bot/src/bot/bot.json +++ b/bot/src/bot/bot.json @@ -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_api/abc/__init__.py b/bot/src/bot_api/abc/__init__.py index 3a5ba57d..1c2f4e9d 100644 --- a/bot/src/bot_api/abc/__init__.py +++ b/bot/src/bot_api/abc/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.abc" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.abc' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/controller/__init__.py b/bot/src/bot_api/controller/__init__.py index edcd5576..23380f4e 100644 --- a/bot/src/bot_api/controller/__init__.py +++ b/bot/src/bot_api/controller/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.controller" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.controller' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/event/__init__.py b/bot/src/bot_api/event/__init__.py index 32143bf9..a124918b 100644 --- a/bot/src/bot_api/event/__init__.py +++ b/bot/src/bot_api/event/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.event" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.event' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/exception/__init__.py b/bot/src/bot_api/exception/__init__.py index 8417333d..6d07a1c1 100644 --- a/bot/src/bot_api/exception/__init__.py +++ b/bot/src/bot_api/exception/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.exception" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.exception' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/filter/__init__.py b/bot/src/bot_api/filter/__init__.py index 4872be0f..c9bd47e6 100644 --- a/bot/src/bot_api/filter/__init__.py +++ b/bot/src/bot_api/filter/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.filter" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.filter' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/filter/discord/__init__.py b/bot/src/bot_api/filter/discord/__init__.py index e021de24..e2f221d2 100644 --- a/bot/src/bot_api/filter/discord/__init__.py +++ b/bot/src/bot_api/filter/discord/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.filter.discord" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.filter.discord' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/logging/__init__.py b/bot/src/bot_api/logging/__init__.py index 8a9a8373..238ba2c8 100644 --- a/bot/src/bot_api/logging/__init__.py +++ b/bot/src/bot_api/logging/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.logging" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.logging' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/model/__init__.py b/bot/src/bot_api/model/__init__.py index 7f0d1116..3ee218e4 100644 --- a/bot/src/bot_api/model/__init__.py +++ b/bot/src/bot_api/model/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.model" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.model' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/model/discord/__init__.py b/bot/src/bot_api/model/discord/__init__.py index 7916a455..870b2bf5 100644 --- a/bot/src/bot_api/model/discord/__init__.py +++ b/bot/src/bot_api/model/discord/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.model.discord" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.model.discord' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/route/__init__.py b/bot/src/bot_api/route/__init__.py index e7485a60..3ca9d7b6 100644 --- a/bot/src/bot_api/route/__init__.py +++ b/bot/src/bot_api/route/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.route" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.route' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/service/__init__.py b/bot/src/bot_api/service/__init__.py index 0a5bb2c5..175a6b45 100644 --- a/bot/src/bot_api/service/__init__.py +++ b/bot/src/bot_api/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.service" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.service' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_api/transformer/__init__.py b/bot/src/bot_api/transformer/__init__.py index 934740e5..5b7df0a9 100644 --- a/bot/src/bot_api/transformer/__init__.py +++ b/bot/src/bot_api/transformer/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_api.transformer" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_api.transformer' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_core/__init__.py b/bot/src/bot_core/__init__.py index 9697a829..f16f66a2 100644 --- a/bot/src/bot_core/__init__.py +++ b/bot/src/bot_core/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_core" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_core' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_core/abc/__init__.py b/bot/src/bot_core/abc/__init__.py index b5bb27ab..48fec4f0 100644 --- a/bot/src/bot_core/abc/__init__.py +++ b/bot/src/bot_core/abc/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_core.abc" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_core.abc' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_core/configuration/__init__.py b/bot/src/bot_core/configuration/__init__.py index 69f1cb6c..35eea779 100644 --- a/bot/src/bot_core/configuration/__init__.py +++ b/bot/src/bot_core/configuration/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_core.configuration" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_core.configuration' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_core/core_extension/__init__.py b/bot/src/bot_core/core_extension/__init__.py index c995ae74..aec56c05 100644 --- a/bot/src/bot_core/core_extension/__init__.py +++ b/bot/src/bot_core/core_extension/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_core.core_extension" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_core.core_extension' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_core/events/__init__.py b/bot/src/bot_core/events/__init__.py index 1924190f..555f83bb 100644 --- a/bot/src/bot_core/events/__init__.py +++ b/bot/src/bot_core/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_core.events" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_core.events' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_core/exception/__init__.py b/bot/src/bot_core/exception/__init__.py index fe85c817..6efcd359 100644 --- a/bot/src/bot_core/exception/__init__.py +++ b/bot/src/bot_core/exception/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_core.exception" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_core.exception' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_core/helper/__init__.py b/bot/src/bot_core/helper/__init__.py index 99171d59..846166d5 100644 --- a/bot/src/bot_core/helper/__init__.py +++ b/bot/src/bot_core/helper/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_core.helper" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_core.helper' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_core/logging/__init__.py b/bot/src/bot_core/logging/__init__.py index c1b4c53e..17046982 100644 --- a/bot/src/bot_core/logging/__init__.py +++ b/bot/src/bot_core/logging/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_core.logging" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_core.logging' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_core/pipes/__init__.py b/bot/src/bot_core/pipes/__init__.py index bd5f25f4..8373b654 100644 --- a/bot/src/bot_core/pipes/__init__.py +++ b/bot/src/bot_core/pipes/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_core.pipes" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_core.pipes' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_core/service/__init__.py b/bot/src/bot_core/service/__init__.py index 7a69b0e2..a787d3c8 100644 --- a/bot/src/bot_core/service/__init__.py +++ b/bot/src/bot_core/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_core.service" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_core.service' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_data/__init__.py b/bot/src/bot_data/__init__.py index f731036c..1a21f7c6 100644 --- a/bot/src/bot_data/__init__.py +++ b/bot/src/bot_data/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_data" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_data' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_data/abc/__init__.py b/bot/src/bot_data/abc/__init__.py index 5aeb87ae..26b8d9e0 100644 --- a/bot/src/bot_data/abc/__init__.py +++ b/bot/src/bot_data/abc/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_data.abc" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_data.abc' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_data/model/__init__.py b/bot/src/bot_data/model/__init__.py index 71aedfc0..a4fedc58 100644 --- a/bot/src/bot_data/model/__init__.py +++ b/bot/src/bot_data/model/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_data.model" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_data.model' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_graphql/__init__.py b/bot/src/bot_graphql/__init__.py index f8a95b47..bc2b6bd5 100644 --- a/bot/src/bot_graphql/__init__.py +++ b/bot/src/bot_graphql/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_graphql" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_graphql' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_graphql/abc/__init__.py b/bot/src/bot_graphql/abc/__init__.py index ec2093d8..bfd2fbb1 100644 --- a/bot/src/bot_graphql/abc/__init__.py +++ b/bot/src/bot_graphql/abc/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_graphql.abc" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_graphql.abc' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_graphql/filter/__init__.py b/bot/src/bot_graphql/filter/__init__.py index bf5d90f1..daed6ba7 100644 --- a/bot/src/bot_graphql/filter/__init__.py +++ b/bot/src/bot_graphql/filter/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_graphql.filter" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_graphql.filter' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_graphql/model/__init__.py b/bot/src/bot_graphql/model/__init__.py index 803f8367..3a015f9d 100644 --- a/bot/src/bot_graphql/model/__init__.py +++ b/bot/src/bot_graphql/model/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_graphql.model" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_graphql.model' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_graphql/mutations/__init__.py b/bot/src/bot_graphql/mutations/__init__.py index 1a3c88a4..022bc066 100644 --- a/bot/src/bot_graphql/mutations/__init__.py +++ b/bot/src/bot_graphql/mutations/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_graphql.mutations" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_graphql.mutations' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_graphql/queries/__init__.py b/bot/src/bot_graphql/queries/__init__.py index 4fe38bb3..c0a95802 100644 --- a/bot/src/bot_graphql/queries/__init__.py +++ b/bot/src/bot_graphql/queries/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_graphql.queries" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_graphql.queries' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/bot_graphql/queries/discord/__init__.py b/bot/src/bot_graphql/queries/discord/__init__.py index 960e29db..69a08069 100644 --- a/bot/src/bot_graphql/queries/discord/__init__.py +++ b/bot/src/bot_graphql/queries/discord/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "bot_graphql.queries.discord" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'bot_graphql.queries.discord' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/achievements/__init__.py b/bot/src/modules/achievements/__init__.py index f578bc02..4b817090 100644 --- a/bot/src/modules/achievements/__init__.py +++ b/bot/src/modules/achievements/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.achievements" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.achievements' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/achievements/commands/__init__.py b/bot/src/modules/achievements/commands/__init__.py index 884a3111..9aec2084 100644 --- a/bot/src/modules/achievements/commands/__init__.py +++ b/bot/src/modules/achievements/commands/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.achievements.commands" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.achievements.commands' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/achievements/events/__init__.py b/bot/src/modules/achievements/events/__init__.py index b4f96bee..a12a33e1 100644 --- a/bot/src/modules/achievements/events/__init__.py +++ b/bot/src/modules/achievements/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.achievements.events" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.achievements.events' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/achievements/model/__init__.py b/bot/src/modules/achievements/model/__init__.py index cdbeac0c..7a3e83f6 100644 --- a/bot/src/modules/achievements/model/__init__.py +++ b/bot/src/modules/achievements/model/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.achievements.model" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.achievements.model' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/auto_role/__init__.py b/bot/src/modules/auto_role/__init__.py index d11930e5..f364816c 100644 --- a/bot/src/modules/auto_role/__init__.py +++ b/bot/src/modules/auto_role/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.auto_role" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.auto_role' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/auto_role/command/__init__.py b/bot/src/modules/auto_role/command/__init__.py index 1fe315c6..bf535eab 100644 --- a/bot/src/modules/auto_role/command/__init__.py +++ b/bot/src/modules/auto_role/command/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.auto_role.command" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.auto_role.command' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/auto_role/events/__init__.py b/bot/src/modules/auto_role/events/__init__.py index d34b344f..47984752 100644 --- a/bot/src/modules/auto_role/events/__init__.py +++ b/bot/src/modules/auto_role/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.auto_role.events" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.auto_role.events' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/auto_role/helper/__init__.py b/bot/src/modules/auto_role/helper/__init__.py index 580db0e2..7670a677 100644 --- a/bot/src/modules/auto_role/helper/__init__.py +++ b/bot/src/modules/auto_role/helper/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.auto_role.helper" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.auto_role.helper' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/base/__init__.py b/bot/src/modules/base/__init__.py index c649efab..7c7598e7 100644 --- a/bot/src/modules/base/__init__.py +++ b/bot/src/modules/base/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.base" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.base' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/base/command/__init__.py b/bot/src/modules/base/command/__init__.py index 7a9c0a1b..343cd5b8 100644 --- a/bot/src/modules/base/command/__init__.py +++ b/bot/src/modules/base/command/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.base.command" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.base.command' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/base/events/__init__.py b/bot/src/modules/base/events/__init__.py index 020ed3d9..325b42a7 100644 --- a/bot/src/modules/base/events/__init__.py +++ b/bot/src/modules/base/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.base.events" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.base.events' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/base/forms/__init__.py b/bot/src/modules/base/forms/__init__.py index 0a8781ff..e50c033c 100644 --- a/bot/src/modules/base/forms/__init__.py +++ b/bot/src/modules/base/forms/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.base.forms" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.base.forms' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/base/helper/__init__.py b/bot/src/modules/base/helper/__init__.py index b59dd097..33f50cb7 100644 --- a/bot/src/modules/base/helper/__init__.py +++ b/bot/src/modules/base/helper/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.base.helper" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.base.helper' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/base/model/__init__.py b/bot/src/modules/base/model/__init__.py index d6ac8c87..4b10ef11 100644 --- a/bot/src/modules/base/model/__init__.py +++ b/bot/src/modules/base/model/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.base.model" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.base.model' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/base/service/__init__.py b/bot/src/modules/base/service/__init__.py index 791482a7..90db77f3 100644 --- a/bot/src/modules/base/service/__init__.py +++ b/bot/src/modules/base/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.base.service" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.base.service' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/base/thread/__init__.py b/bot/src/modules/base/thread/__init__.py index 2c6f2300..6b5569bd 100644 --- a/bot/src/modules/base/thread/__init__.py +++ b/bot/src/modules/base/thread/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.base.thread" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.base.thread' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/boot_log/__init__.py b/bot/src/modules/boot_log/__init__.py index c2d14ab6..9b3b1366 100644 --- a/bot/src/modules/boot_log/__init__.py +++ b/bot/src/modules/boot_log/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.boot_log" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.boot_log' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/config/__init__.py b/bot/src/modules/config/__init__.py index 9664fe8d..50528bba 100644 --- a/bot/src/modules/config/__init__.py +++ b/bot/src/modules/config/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.config" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.config' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/config/events/__init__.py b/bot/src/modules/config/events/__init__.py index 37230170..288a3b8c 100644 --- a/bot/src/modules/config/events/__init__.py +++ b/bot/src/modules/config/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.config.events" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.config.events' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/config/service/__init__.py b/bot/src/modules/config/service/__init__.py index 9321e1f2..110f4e5f 100644 --- a/bot/src/modules/config/service/__init__.py +++ b/bot/src/modules/config/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.config.service" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.config.service' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/database/__init__.py b/bot/src/modules/database/__init__.py index 5e8236ae..262c39bc 100644 --- a/bot/src/modules/database/__init__.py +++ b/bot/src/modules/database/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.database" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.database' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/level/__init__.py b/bot/src/modules/level/__init__.py index 6e872df3..f49bdf3e 100644 --- a/bot/src/modules/level/__init__.py +++ b/bot/src/modules/level/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.level" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.level' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/level/command/__init__.py b/bot/src/modules/level/command/__init__.py index 590d9373..f159ac47 100644 --- a/bot/src/modules/level/command/__init__.py +++ b/bot/src/modules/level/command/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.level.command" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.level.command' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/level/configuration/__init__.py b/bot/src/modules/level/configuration/__init__.py index 3fa73004..6e0a1dfc 100644 --- a/bot/src/modules/level/configuration/__init__.py +++ b/bot/src/modules/level/configuration/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.level.configuration" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.level.configuration' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/level/events/__init__.py b/bot/src/modules/level/events/__init__.py index 60e6f1ae..e72d8776 100644 --- a/bot/src/modules/level/events/__init__.py +++ b/bot/src/modules/level/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.level.events" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.level.events' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/level/service/__init__.py b/bot/src/modules/level/service/__init__.py index a542a667..978df32f 100644 --- a/bot/src/modules/level/service/__init__.py +++ b/bot/src/modules/level/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.level.service" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.level.service' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/permission/__init__.py b/bot/src/modules/permission/__init__.py index a674424a..f8620c09 100644 --- a/bot/src/modules/permission/__init__.py +++ b/bot/src/modules/permission/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.permission" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.permission' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/permission/service/__init__.py b/bot/src/modules/permission/service/__init__.py index b4ec2913..458302e1 100644 --- a/bot/src/modules/permission/service/__init__.py +++ b/bot/src/modules/permission/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.permission.service" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.permission.service' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/short_role_name/__init__.py b/bot/src/modules/short_role_name/__init__.py index bd18f91d..316019cc 100644 --- a/bot/src/modules/short_role_name/__init__.py +++ b/bot/src/modules/short_role_name/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.short_role_name" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.short_role_name' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/short_role_name/events/__init__.py b/bot/src/modules/short_role_name/events/__init__.py index 2ad2ae9f..7fd0e997 100644 --- a/bot/src/modules/short_role_name/events/__init__.py +++ b/bot/src/modules/short_role_name/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.short_role_name.events" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.short_role_name.events' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/short_role_name/service/__init__.py b/bot/src/modules/short_role_name/service/__init__.py index 8594d0c7..f38bec16 100644 --- a/bot/src/modules/short_role_name/service/__init__.py +++ b/bot/src/modules/short_role_name/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.short_role_name.service" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.short_role_name.service' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/special_offers/__init__.py b/bot/src/modules/special_offers/__init__.py index dc595cbf..bde92133 100644 --- a/bot/src/modules/special_offers/__init__.py +++ b/bot/src/modules/special_offers/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.special_offers" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.special_offers' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/technician/__init__.py b/bot/src/modules/technician/__init__.py index ebd9ac77..164abe5b 100644 --- a/bot/src/modules/technician/__init__.py +++ b/bot/src/modules/technician/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.technician" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.technician' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') diff --git a/bot/src/modules/technician/command/__init__.py b/bot/src/modules/technician/command/__init__.py index 06c38c29..67b22663 100644 --- a/bot/src/modules/technician/command/__init__.py +++ b/bot/src/modules/technician/command/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = "modules.technician.command" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.1" +__title__ = 'modules.technician.command' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '1.2.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='2', micro='1') 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()}") -- 2.45.2 From 7682b966a869a02c1fbf6bb212ad3fe0f5de2c2b Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 15 Nov 2023 18:05:36 +0100 Subject: [PATCH 21/37] Reformatted --- bot/src/bot_api/abc/__init__.py | 14 +++++++------- bot/src/bot_api/controller/__init__.py | 14 +++++++------- bot/src/bot_api/event/__init__.py | 14 +++++++------- bot/src/bot_api/exception/__init__.py | 14 +++++++------- bot/src/bot_api/filter/__init__.py | 14 +++++++------- bot/src/bot_api/filter/discord/__init__.py | 14 +++++++------- bot/src/bot_api/logging/__init__.py | 14 +++++++------- bot/src/bot_api/model/__init__.py | 14 +++++++------- bot/src/bot_api/model/discord/__init__.py | 14 +++++++------- bot/src/bot_api/route/__init__.py | 14 +++++++------- bot/src/bot_api/service/__init__.py | 14 +++++++------- bot/src/bot_api/transformer/__init__.py | 14 +++++++------- bot/src/bot_core/__init__.py | 14 +++++++------- bot/src/bot_core/abc/__init__.py | 14 +++++++------- bot/src/bot_core/configuration/__init__.py | 14 +++++++------- bot/src/bot_core/core_extension/__init__.py | 14 +++++++------- bot/src/bot_core/events/__init__.py | 14 +++++++------- bot/src/bot_core/exception/__init__.py | 14 +++++++------- bot/src/bot_core/helper/__init__.py | 14 +++++++------- bot/src/bot_core/logging/__init__.py | 14 +++++++------- bot/src/bot_core/pipes/__init__.py | 14 +++++++------- bot/src/bot_core/service/__init__.py | 14 +++++++------- bot/src/bot_data/__init__.py | 14 +++++++------- bot/src/bot_data/abc/__init__.py | 14 +++++++------- bot/src/bot_data/model/__init__.py | 14 +++++++------- bot/src/bot_graphql/__init__.py | 14 +++++++------- bot/src/bot_graphql/abc/__init__.py | 14 +++++++------- bot/src/bot_graphql/filter/__init__.py | 14 +++++++------- bot/src/bot_graphql/model/__init__.py | 14 +++++++------- bot/src/bot_graphql/mutations/__init__.py | 14 +++++++------- bot/src/bot_graphql/queries/__init__.py | 14 +++++++------- bot/src/bot_graphql/queries/discord/__init__.py | 14 +++++++------- bot/src/modules/achievements/__init__.py | 14 +++++++------- bot/src/modules/achievements/commands/__init__.py | 14 +++++++------- bot/src/modules/achievements/events/__init__.py | 14 +++++++------- bot/src/modules/achievements/model/__init__.py | 14 +++++++------- bot/src/modules/auto_role/__init__.py | 14 +++++++------- bot/src/modules/auto_role/command/__init__.py | 14 +++++++------- bot/src/modules/auto_role/events/__init__.py | 14 +++++++------- bot/src/modules/auto_role/helper/__init__.py | 14 +++++++------- bot/src/modules/base/__init__.py | 14 +++++++------- bot/src/modules/base/command/__init__.py | 14 +++++++------- bot/src/modules/base/events/__init__.py | 14 +++++++------- bot/src/modules/base/forms/__init__.py | 14 +++++++------- bot/src/modules/base/helper/__init__.py | 14 +++++++------- bot/src/modules/base/model/__init__.py | 14 +++++++------- bot/src/modules/base/service/__init__.py | 14 +++++++------- bot/src/modules/base/thread/__init__.py | 14 +++++++------- bot/src/modules/boot_log/__init__.py | 14 +++++++------- bot/src/modules/config/__init__.py | 14 +++++++------- bot/src/modules/config/events/__init__.py | 14 +++++++------- bot/src/modules/config/service/__init__.py | 14 +++++++------- bot/src/modules/database/__init__.py | 14 +++++++------- bot/src/modules/level/__init__.py | 14 +++++++------- bot/src/modules/level/command/__init__.py | 14 +++++++------- bot/src/modules/level/configuration/__init__.py | 14 +++++++------- bot/src/modules/level/events/__init__.py | 14 +++++++------- bot/src/modules/level/service/__init__.py | 14 +++++++------- bot/src/modules/permission/__init__.py | 14 +++++++------- bot/src/modules/permission/service/__init__.py | 14 +++++++------- bot/src/modules/short_role_name/__init__.py | 14 +++++++------- bot/src/modules/short_role_name/events/__init__.py | 14 +++++++------- .../modules/short_role_name/service/__init__.py | 14 +++++++------- bot/src/modules/special_offers/__init__.py | 14 +++++++------- bot/src/modules/technician/__init__.py | 14 +++++++------- bot/src/modules/technician/command/__init__.py | 14 +++++++------- 66 files changed, 462 insertions(+), 462 deletions(-) diff --git a/bot/src/bot_api/abc/__init__.py b/bot/src/bot_api/abc/__init__.py index 1c2f4e9d..3a5ba57d 100644 --- a/bot/src/bot_api/abc/__init__.py +++ b/bot/src/bot_api/abc/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.abc' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.abc" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/controller/__init__.py b/bot/src/bot_api/controller/__init__.py index 23380f4e..edcd5576 100644 --- a/bot/src/bot_api/controller/__init__.py +++ b/bot/src/bot_api/controller/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.controller' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.controller" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/event/__init__.py b/bot/src/bot_api/event/__init__.py index a124918b..32143bf9 100644 --- a/bot/src/bot_api/event/__init__.py +++ b/bot/src/bot_api/event/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.event' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.event" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/exception/__init__.py b/bot/src/bot_api/exception/__init__.py index 6d07a1c1..8417333d 100644 --- a/bot/src/bot_api/exception/__init__.py +++ b/bot/src/bot_api/exception/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.exception' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.exception" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/filter/__init__.py b/bot/src/bot_api/filter/__init__.py index c9bd47e6..4872be0f 100644 --- a/bot/src/bot_api/filter/__init__.py +++ b/bot/src/bot_api/filter/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.filter' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.filter" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/filter/discord/__init__.py b/bot/src/bot_api/filter/discord/__init__.py index e2f221d2..e021de24 100644 --- a/bot/src/bot_api/filter/discord/__init__.py +++ b/bot/src/bot_api/filter/discord/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.filter.discord' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.filter.discord" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/logging/__init__.py b/bot/src/bot_api/logging/__init__.py index 238ba2c8..8a9a8373 100644 --- a/bot/src/bot_api/logging/__init__.py +++ b/bot/src/bot_api/logging/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.logging' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.logging" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/model/__init__.py b/bot/src/bot_api/model/__init__.py index 3ee218e4..7f0d1116 100644 --- a/bot/src/bot_api/model/__init__.py +++ b/bot/src/bot_api/model/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.model' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.model" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/model/discord/__init__.py b/bot/src/bot_api/model/discord/__init__.py index 870b2bf5..7916a455 100644 --- a/bot/src/bot_api/model/discord/__init__.py +++ b/bot/src/bot_api/model/discord/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.model.discord' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.model.discord" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/route/__init__.py b/bot/src/bot_api/route/__init__.py index 3ca9d7b6..e7485a60 100644 --- a/bot/src/bot_api/route/__init__.py +++ b/bot/src/bot_api/route/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.route' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.route" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/service/__init__.py b/bot/src/bot_api/service/__init__.py index 175a6b45..0a5bb2c5 100644 --- a/bot/src/bot_api/service/__init__.py +++ b/bot/src/bot_api/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.service' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.service" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/transformer/__init__.py b/bot/src/bot_api/transformer/__init__.py index 5b7df0a9..934740e5 100644 --- a/bot/src/bot_api/transformer/__init__.py +++ b/bot/src/bot_api/transformer/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_api.transformer' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_api.transformer" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/__init__.py b/bot/src/bot_core/__init__.py index f16f66a2..9697a829 100644 --- a/bot/src/bot_core/__init__.py +++ b/bot/src/bot_core/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_core' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_core" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/abc/__init__.py b/bot/src/bot_core/abc/__init__.py index 48fec4f0..b5bb27ab 100644 --- a/bot/src/bot_core/abc/__init__.py +++ b/bot/src/bot_core/abc/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_core.abc' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_core.abc" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/configuration/__init__.py b/bot/src/bot_core/configuration/__init__.py index 35eea779..69f1cb6c 100644 --- a/bot/src/bot_core/configuration/__init__.py +++ b/bot/src/bot_core/configuration/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_core.configuration' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_core.configuration" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/core_extension/__init__.py b/bot/src/bot_core/core_extension/__init__.py index aec56c05..c995ae74 100644 --- a/bot/src/bot_core/core_extension/__init__.py +++ b/bot/src/bot_core/core_extension/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_core.core_extension' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_core.core_extension" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/events/__init__.py b/bot/src/bot_core/events/__init__.py index 555f83bb..1924190f 100644 --- a/bot/src/bot_core/events/__init__.py +++ b/bot/src/bot_core/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_core.events' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_core.events" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/exception/__init__.py b/bot/src/bot_core/exception/__init__.py index 6efcd359..fe85c817 100644 --- a/bot/src/bot_core/exception/__init__.py +++ b/bot/src/bot_core/exception/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_core.exception' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_core.exception" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/helper/__init__.py b/bot/src/bot_core/helper/__init__.py index 846166d5..99171d59 100644 --- a/bot/src/bot_core/helper/__init__.py +++ b/bot/src/bot_core/helper/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_core.helper' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_core.helper" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/logging/__init__.py b/bot/src/bot_core/logging/__init__.py index 17046982..c1b4c53e 100644 --- a/bot/src/bot_core/logging/__init__.py +++ b/bot/src/bot_core/logging/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_core.logging' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_core.logging" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/pipes/__init__.py b/bot/src/bot_core/pipes/__init__.py index 8373b654..bd5f25f4 100644 --- a/bot/src/bot_core/pipes/__init__.py +++ b/bot/src/bot_core/pipes/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_core.pipes' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_core.pipes" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/service/__init__.py b/bot/src/bot_core/service/__init__.py index a787d3c8..7a69b0e2 100644 --- a/bot/src/bot_core/service/__init__.py +++ b/bot/src/bot_core/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_core.service' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_core.service" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_data/__init__.py b/bot/src/bot_data/__init__.py index 1a21f7c6..f731036c 100644 --- a/bot/src/bot_data/__init__.py +++ b/bot/src/bot_data/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_data' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_data" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_data/abc/__init__.py b/bot/src/bot_data/abc/__init__.py index 26b8d9e0..5aeb87ae 100644 --- a/bot/src/bot_data/abc/__init__.py +++ b/bot/src/bot_data/abc/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_data.abc' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_data.abc" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_data/model/__init__.py b/bot/src/bot_data/model/__init__.py index a4fedc58..71aedfc0 100644 --- a/bot/src/bot_data/model/__init__.py +++ b/bot/src/bot_data/model/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_data.model' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_data.model" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/__init__.py b/bot/src/bot_graphql/__init__.py index bc2b6bd5..f8a95b47 100644 --- a/bot/src/bot_graphql/__init__.py +++ b/bot/src/bot_graphql/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_graphql' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_graphql" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/abc/__init__.py b/bot/src/bot_graphql/abc/__init__.py index bfd2fbb1..ec2093d8 100644 --- a/bot/src/bot_graphql/abc/__init__.py +++ b/bot/src/bot_graphql/abc/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_graphql.abc' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_graphql.abc" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/filter/__init__.py b/bot/src/bot_graphql/filter/__init__.py index daed6ba7..bf5d90f1 100644 --- a/bot/src/bot_graphql/filter/__init__.py +++ b/bot/src/bot_graphql/filter/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_graphql.filter' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_graphql.filter" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/model/__init__.py b/bot/src/bot_graphql/model/__init__.py index 3a015f9d..803f8367 100644 --- a/bot/src/bot_graphql/model/__init__.py +++ b/bot/src/bot_graphql/model/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_graphql.model' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_graphql.model" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/mutations/__init__.py b/bot/src/bot_graphql/mutations/__init__.py index 022bc066..1a3c88a4 100644 --- a/bot/src/bot_graphql/mutations/__init__.py +++ b/bot/src/bot_graphql/mutations/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_graphql.mutations' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_graphql.mutations" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/queries/__init__.py b/bot/src/bot_graphql/queries/__init__.py index c0a95802..4fe38bb3 100644 --- a/bot/src/bot_graphql/queries/__init__.py +++ b/bot/src/bot_graphql/queries/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_graphql.queries' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_graphql.queries" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/queries/discord/__init__.py b/bot/src/bot_graphql/queries/discord/__init__.py index 69a08069..960e29db 100644 --- a/bot/src/bot_graphql/queries/discord/__init__.py +++ b/bot/src/bot_graphql/queries/discord/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'bot_graphql.queries.discord' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "bot_graphql.queries.discord" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/achievements/__init__.py b/bot/src/modules/achievements/__init__.py index 4b817090..f578bc02 100644 --- a/bot/src/modules/achievements/__init__.py +++ b/bot/src/modules/achievements/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.achievements' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.achievements" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/achievements/commands/__init__.py b/bot/src/modules/achievements/commands/__init__.py index 9aec2084..884a3111 100644 --- a/bot/src/modules/achievements/commands/__init__.py +++ b/bot/src/modules/achievements/commands/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.achievements.commands' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.achievements.commands" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/achievements/events/__init__.py b/bot/src/modules/achievements/events/__init__.py index a12a33e1..b4f96bee 100644 --- a/bot/src/modules/achievements/events/__init__.py +++ b/bot/src/modules/achievements/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.achievements.events' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.achievements.events" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/achievements/model/__init__.py b/bot/src/modules/achievements/model/__init__.py index 7a3e83f6..cdbeac0c 100644 --- a/bot/src/modules/achievements/model/__init__.py +++ b/bot/src/modules/achievements/model/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.achievements.model' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.achievements.model" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/auto_role/__init__.py b/bot/src/modules/auto_role/__init__.py index f364816c..d11930e5 100644 --- a/bot/src/modules/auto_role/__init__.py +++ b/bot/src/modules/auto_role/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.auto_role' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.auto_role" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/auto_role/command/__init__.py b/bot/src/modules/auto_role/command/__init__.py index bf535eab..1fe315c6 100644 --- a/bot/src/modules/auto_role/command/__init__.py +++ b/bot/src/modules/auto_role/command/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.auto_role.command' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.auto_role.command" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/auto_role/events/__init__.py b/bot/src/modules/auto_role/events/__init__.py index 47984752..d34b344f 100644 --- a/bot/src/modules/auto_role/events/__init__.py +++ b/bot/src/modules/auto_role/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.auto_role.events' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.auto_role.events" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/auto_role/helper/__init__.py b/bot/src/modules/auto_role/helper/__init__.py index 7670a677..580db0e2 100644 --- a/bot/src/modules/auto_role/helper/__init__.py +++ b/bot/src/modules/auto_role/helper/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.auto_role.helper' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.auto_role.helper" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/__init__.py b/bot/src/modules/base/__init__.py index 7c7598e7..c649efab 100644 --- a/bot/src/modules/base/__init__.py +++ b/bot/src/modules/base/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.base' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.base" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/command/__init__.py b/bot/src/modules/base/command/__init__.py index 343cd5b8..7a9c0a1b 100644 --- a/bot/src/modules/base/command/__init__.py +++ b/bot/src/modules/base/command/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.base.command' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.base.command" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/events/__init__.py b/bot/src/modules/base/events/__init__.py index 325b42a7..020ed3d9 100644 --- a/bot/src/modules/base/events/__init__.py +++ b/bot/src/modules/base/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.base.events' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.base.events" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/forms/__init__.py b/bot/src/modules/base/forms/__init__.py index e50c033c..0a8781ff 100644 --- a/bot/src/modules/base/forms/__init__.py +++ b/bot/src/modules/base/forms/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.base.forms' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.base.forms" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/helper/__init__.py b/bot/src/modules/base/helper/__init__.py index 33f50cb7..b59dd097 100644 --- a/bot/src/modules/base/helper/__init__.py +++ b/bot/src/modules/base/helper/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.base.helper' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.base.helper" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/model/__init__.py b/bot/src/modules/base/model/__init__.py index 4b10ef11..d6ac8c87 100644 --- a/bot/src/modules/base/model/__init__.py +++ b/bot/src/modules/base/model/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.base.model' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.base.model" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/service/__init__.py b/bot/src/modules/base/service/__init__.py index 90db77f3..791482a7 100644 --- a/bot/src/modules/base/service/__init__.py +++ b/bot/src/modules/base/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.base.service' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.base.service" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/thread/__init__.py b/bot/src/modules/base/thread/__init__.py index 6b5569bd..2c6f2300 100644 --- a/bot/src/modules/base/thread/__init__.py +++ b/bot/src/modules/base/thread/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.base.thread' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.base.thread" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/boot_log/__init__.py b/bot/src/modules/boot_log/__init__.py index 9b3b1366..c2d14ab6 100644 --- a/bot/src/modules/boot_log/__init__.py +++ b/bot/src/modules/boot_log/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.boot_log' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.boot_log" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/config/__init__.py b/bot/src/modules/config/__init__.py index 50528bba..9664fe8d 100644 --- a/bot/src/modules/config/__init__.py +++ b/bot/src/modules/config/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.config' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.config" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/config/events/__init__.py b/bot/src/modules/config/events/__init__.py index 288a3b8c..37230170 100644 --- a/bot/src/modules/config/events/__init__.py +++ b/bot/src/modules/config/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.config.events' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.config.events" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/config/service/__init__.py b/bot/src/modules/config/service/__init__.py index 110f4e5f..9321e1f2 100644 --- a/bot/src/modules/config/service/__init__.py +++ b/bot/src/modules/config/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.config.service' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.config.service" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/database/__init__.py b/bot/src/modules/database/__init__.py index 262c39bc..5e8236ae 100644 --- a/bot/src/modules/database/__init__.py +++ b/bot/src/modules/database/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.database' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.database" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/level/__init__.py b/bot/src/modules/level/__init__.py index f49bdf3e..6e872df3 100644 --- a/bot/src/modules/level/__init__.py +++ b/bot/src/modules/level/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.level' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.level" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/level/command/__init__.py b/bot/src/modules/level/command/__init__.py index f159ac47..590d9373 100644 --- a/bot/src/modules/level/command/__init__.py +++ b/bot/src/modules/level/command/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.level.command' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.level.command" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/level/configuration/__init__.py b/bot/src/modules/level/configuration/__init__.py index 6e0a1dfc..3fa73004 100644 --- a/bot/src/modules/level/configuration/__init__.py +++ b/bot/src/modules/level/configuration/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.level.configuration' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.level.configuration" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/level/events/__init__.py b/bot/src/modules/level/events/__init__.py index e72d8776..60e6f1ae 100644 --- a/bot/src/modules/level/events/__init__.py +++ b/bot/src/modules/level/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.level.events' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.level.events" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/level/service/__init__.py b/bot/src/modules/level/service/__init__.py index 978df32f..a542a667 100644 --- a/bot/src/modules/level/service/__init__.py +++ b/bot/src/modules/level/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.level.service' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.level.service" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/permission/__init__.py b/bot/src/modules/permission/__init__.py index f8620c09..a674424a 100644 --- a/bot/src/modules/permission/__init__.py +++ b/bot/src/modules/permission/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.permission' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.permission" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/permission/service/__init__.py b/bot/src/modules/permission/service/__init__.py index 458302e1..b4ec2913 100644 --- a/bot/src/modules/permission/service/__init__.py +++ b/bot/src/modules/permission/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.permission.service' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.permission.service" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/short_role_name/__init__.py b/bot/src/modules/short_role_name/__init__.py index 316019cc..bd18f91d 100644 --- a/bot/src/modules/short_role_name/__init__.py +++ b/bot/src/modules/short_role_name/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.short_role_name' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.short_role_name" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/short_role_name/events/__init__.py b/bot/src/modules/short_role_name/events/__init__.py index 7fd0e997..2ad2ae9f 100644 --- a/bot/src/modules/short_role_name/events/__init__.py +++ b/bot/src/modules/short_role_name/events/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.short_role_name.events' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.short_role_name.events" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/short_role_name/service/__init__.py b/bot/src/modules/short_role_name/service/__init__.py index f38bec16..8594d0c7 100644 --- a/bot/src/modules/short_role_name/service/__init__.py +++ b/bot/src/modules/short_role_name/service/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.short_role_name.service' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.short_role_name.service" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/special_offers/__init__.py b/bot/src/modules/special_offers/__init__.py index bde92133..dc595cbf 100644 --- a/bot/src/modules/special_offers/__init__.py +++ b/bot/src/modules/special_offers/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.special_offers' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.special_offers" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/technician/__init__.py b/bot/src/modules/technician/__init__.py index 164abe5b..ebd9ac77 100644 --- a/bot/src/modules/technician/__init__.py +++ b/bot/src/modules/technician/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.technician' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.technician" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/technician/command/__init__.py b/bot/src/modules/technician/command/__init__.py index 67b22663..06c38c29 100644 --- a/bot/src/modules/technician/command/__init__.py +++ b/bot/src/modules/technician/command/__init__.py @@ -11,16 +11,16 @@ Discord bot for customers of sh-edraft.de """ -__title__ = 'modules.technician.command' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' -__version__ = '1.2.1' +__title__ = "modules.technician.command" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" +__version__ = "1.2.1" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='2', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="1", minor="2", micro="1") -- 2.45.2 From 05f718f3ae9dfc8090a57e736fa186cbd559a4d3 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 15 Nov 2023 18:18:28 +0100 Subject: [PATCH 22/37] Set version 1.2.2 --- bot/src/bot/__init__.py | 4 +- bot/src/bot/bot | 0 bot/src/bot/bot.json | 2 +- bot/src/bot/extension/__init__.py | 4 +- bot/src/bot_api/__init__.py | 4 +- bot/src/bot_api/abc/__init__.py | 4 +- bot/src/bot_api/bot-api.json | 2 +- bot/src/bot_api/configuration/__init__.py | 4 +- bot/src/bot_api/controller/__init__.py | 4 +- bot/src/bot_api/event/__init__.py | 4 +- bot/src/bot_api/exception/__init__.py | 4 +- bot/src/bot_api/filter/__init__.py | 4 +- bot/src/bot_api/filter/discord/__init__.py | 4 +- bot/src/bot_api/logging/__init__.py | 4 +- bot/src/bot_api/model/__init__.py | 4 +- bot/src/bot_api/model/discord/__init__.py | 4 +- bot/src/bot_api/route/__init__.py | 4 +- bot/src/bot_api/service/__init__.py | 4 +- bot/src/bot_api/transformer/__init__.py | 4 +- bot/src/bot_core/__init__.py | 4 +- bot/src/bot_core/abc/__init__.py | 4 +- bot/src/bot_core/bot-core.json | 2 +- bot/src/bot_core/configuration/__init__.py | 4 +- bot/src/bot_core/core_extension/__init__.py | 4 +- bot/src/bot_core/events/__init__.py | 4 +- bot/src/bot_core/exception/__init__.py | 4 +- bot/src/bot_core/helper/__init__.py | 4 +- bot/src/bot_core/logging/__init__.py | 4 +- bot/src/bot_core/pipes/__init__.py | 4 +- bot/src/bot_core/service/__init__.py | 4 +- bot/src/bot_data/__init__.py | 4 +- bot/src/bot_data/abc/__init__.py | 4 +- bot/src/bot_data/bot-data.json | 2 +- bot/src/bot_data/model/__init__.py | 4 +- bot/src/bot_data/service/__init__.py | 4 +- bot/src/bot_graphql/__init__.py | 4 +- bot/src/bot_graphql/abc/__init__.py | 4 +- bot/src/bot_graphql/bot-graphql.json | 2 +- bot/src/bot_graphql/filter/__init__.py | 4 +- bot/src/bot_graphql/model/__init__.py | 4 +- bot/src/bot_graphql/mutations/__init__.py | 4 +- bot/src/bot_graphql/queries/__init__.py | 4 +- .../bot_graphql/queries/discord/__init__.py | 4 +- bot/src/modules/achievements/__init__.py | 4 +- .../modules/achievements/achievements.json | 2 +- .../modules/achievements/commands/__init__.py | 4 +- .../modules/achievements/events/__init__.py | 4 +- .../modules/achievements/model/__init__.py | 4 +- bot/src/modules/auto_role/__init__.py | 4 +- bot/src/modules/auto_role/auto-role.json | 2 +- bot/src/modules/auto_role/command/__init__.py | 4 +- bot/src/modules/auto_role/events/__init__.py | 4 +- bot/src/modules/auto_role/helper/__init__.py | 4 +- bot/src/modules/base/__init__.py | 4 +- bot/src/modules/base/base.json | 2 +- bot/src/modules/base/command/__init__.py | 4 +- bot/src/modules/base/events/__init__.py | 4 +- bot/src/modules/base/forms/__init__.py | 4 +- bot/src/modules/base/helper/__init__.py | 4 +- bot/src/modules/base/model/__init__.py | 4 +- bot/src/modules/base/service/__init__.py | 4 +- bot/src/modules/base/thread/__init__.py | 4 +- bot/src/modules/boot_log/__init__.py | 4 +- bot/src/modules/boot_log/boot-log.json | 2 +- bot/src/modules/config/__init__.py | 4 +- bot/src/modules/config/config.json | 2 +- bot/src/modules/config/events/__init__.py | 4 +- bot/src/modules/config/service/__init__.py | 4 +- bot/src/modules/database/__init__.py | 4 +- bot/src/modules/database/database.json | 2 +- bot/src/modules/level/__init__.py | 4 +- bot/src/modules/level/command/__init__.py | 4 +- .../modules/level/configuration/__init__.py | 4 +- bot/src/modules/level/events/__init__.py | 4 +- bot/src/modules/level/level.json | 2 +- bot/src/modules/level/service/__init__.py | 4 +- bot/src/modules/permission/__init__.py | 4 +- bot/src/modules/permission/abc/__init__.py | 4 +- bot/src/modules/permission/permission.json | 2 +- .../modules/permission/service/__init__.py | 4 +- bot/src/modules/short_role_name/__init__.py | 4 +- .../short_role_name/events/__init__.py | 4 +- .../short_role_name/service/__init__.py | 4 +- .../short_role_name/short-role-name.json | 2 +- bot/src/modules/special_offers/__init__.py | 4 +- .../special_offers/special-offers.json | 2 +- bot/src/modules/technician/__init__.py | 4 +- .../modules/technician/command/__init__.py | 4 +- bot/src/modules/technician/technician.json | 2 +- bot/tools/checks/checks.json | 2 +- bot/tools/get_version/get-version.json | 2 +- bot/tools/post_build/post-build.json | 2 +- bot/tools/set_version/set-version.json | 2 +- web/package.json | 108 +++++++++--------- web/src/assets/version.json | 10 +- 95 files changed, 223 insertions(+), 223 deletions(-) mode change 100644 => 100755 bot/src/bot/bot 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 68e20ef9..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", 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/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/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/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_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/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/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/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_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/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/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/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/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/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..acea20a4 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", 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/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/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..301f4630 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": "", 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/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..57329ee1 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": "", 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..8def3776 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": "", 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/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/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/assets/version.json b/web/src/assets/version.json index d77aca46..0e2d8ac7 100644 --- a/web/src/assets/version.json +++ b/web/src/assets/version.json @@ -1,7 +1,7 @@ { - "WebVersion": { - "Major": "1", - "Minor": "2", - "Micro": "1" - } + "WebVersion": { + "Major": "1", + "Minor": "2", + "Micro": "2" + } } -- 2.45.2 From 802d5478d16f504266769becdffa9737d466bee9 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 15 Nov 2023 19:30:29 +0100 Subject: [PATCH 23/37] Fixed migration service --- bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql | 2 -- bot/src/bot_data/service/migration_service.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql b/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql index 895e24ad..a202bfaa 100644 --- a/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql +++ b/bot/src/bot_data/scripts/1.2.0/5_MaintenanceMode_up.sql @@ -1,8 +1,6 @@ ALTER TABLE CFG_Technician ADD Maintenance BOOLEAN DEFAULT FALSE AFTER MaxSteamOfferCount; - - ALTER TABLE CFG_TechnicianHistory ADD Maintenance BOOLEAN DEFAULT FALSE AFTER MaxSteamOfferCount; diff --git a/bot/src/bot_data/service/migration_service.py b/bot/src/bot_data/service/migration_service.py index b2356eaa..a8caeb75 100644 --- a/bot/src/bot_data/service/migration_service.py +++ b/bot/src/bot_data/service/migration_service.py @@ -67,7 +67,7 @@ class MigrationService: def _load_scripts(self, upgrade: bool = True) -> List[Migration]: migrations = List(Migration) - path = "../../src/bot_data/scripts" + path = "../bot_data/scripts" if not os.path.exists(path): raise Exception("Migration path not found") -- 2.45.2 From 20e20969e42d75f44bdcbe9587d2c6a370821c5d Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 4 Nov 2023 12:02:19 +0100 Subject: [PATCH 24/37] Added scheduled event to db #410 --- .../abc/scheduled_event_repository_abc.py | 35 ++++ .../db_history_scripts/scheduled_events.sql | 65 ++++++ .../migration/scheduled_event_migration.py | 45 +++++ bot/src/bot_data/model/scheduled_event.py | 187 ++++++++++++++++++ .../bot_data/model/scheduled_event_history.py | 118 +++++++++++ .../scheduled_event_repository_service.py | 89 +++++++++ 6 files changed, 539 insertions(+) create mode 100644 bot/src/bot_data/abc/scheduled_event_repository_abc.py create mode 100644 bot/src/bot_data/migration/db_history_scripts/scheduled_events.sql create mode 100644 bot/src/bot_data/migration/scheduled_event_migration.py create mode 100644 bot/src/bot_data/model/scheduled_event.py create mode 100644 bot/src/bot_data/model/scheduled_event_history.py create mode 100644 bot/src/bot_data/service/scheduled_event_repository_service.py 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/migration/db_history_scripts/scheduled_events.sql b/bot/src/bot_data/migration/db_history_scripts/scheduled_events.sql new file mode 100644 index 00000000..5ba2cf39 --- /dev/null +++ b/bot/src/bot_data/migration/db_history_scripts/scheduled_events.sql @@ -0,0 +1,65 @@ +CREATE TABLE IF NOT EXISTS `ScheduledEventsHistory` +( + `Id` BIGINT(20) NOT NULL, + `Interval` VARCHAR(255) NOT NULL, + `Name` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NOT 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/migration/scheduled_event_migration.py b/bot/src/bot_data/migration/scheduled_event_migration.py new file mode 100644 index 00000000..50cdcec1 --- /dev/null +++ b/bot/src/bot_data/migration/scheduled_event_migration.py @@ -0,0 +1,45 @@ +from bot_core.logging.database_logger import DatabaseLogger +from bot_data.abc.migration_abc import MigrationABC +from bot_data.db_context import DBContext + + +class ScheduledEventMigration(MigrationABC): + name = "1.2.0_ScheduledEventMigration" + + 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 `ScheduledEvents` ( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Interval` VARCHAR(255) NOT NULL, + `Name` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NOT 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`) + ); + """ + ) + ) + + self._exec(__file__, "scheduled_events.sql") + + def downgrade(self): + self._cursor.execute("DROP TABLE `ShortRoleNames`;") + self._cursor.execute("DROP TABLE `ShortRoleNamesHistory`;") 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..fa05c946 --- /dev/null +++ b/bot/src/bot_data/model/scheduled_event.py @@ -0,0 +1,187 @@ +from datetime import datetime +from typing import Optional + +import discord +from cpl_core.database import TableABC + +from bot_data.model.server import Server + + +class ScheduledEvent(TableABC): + 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], + 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) -> 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 + + @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}', + '{self._name}', + '{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}', + {"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}', + `Name` = '{self._name}', + `Description` = '{self._start_time}', + `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}', + `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/service/scheduled_event_repository_service.py b/bot/src/bot_data/service/scheduled_event_repository_service.py new file mode 100644 index 00000000..7d5e67ba --- /dev/null +++ b/bot/src/bot_data/service/scheduled_event_repository_service.py @@ -0,0 +1,89 @@ +from typing import Optional + +from cpl_core.database.context import DatabaseContextABC +from cpl_query.extension import List + +from bot_core.logging.database_logger import DatabaseLogger +from bot_data.abc.server_repository_abc import ServerRepositoryABC +from bot_data.abc.scheduled_event_repository_abc import ScheduledEventRepositoryABC +from bot_data.model.scheduled_event import ScheduledEvent + + +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(sql_result[0]), # interval + self._get_value_from_result(sql_result[1]), # name + self._get_value_from_result(sql_result[2]), # description + int(self._get_value_from_result(sql_result[3])), # channel_id + self._get_value_from_result(sql_result[4]), # start_time + self._get_value_from_result(sql_result[5]), # end_time + self._get_value_from_result(sql_result[6]), # entity_type + self._get_value_from_result(sql_result[7]), # location + self._servers.get_server_by_id((sql_result[8])), # server + self._get_value_from_result(sql_result[9]), # created_at + self._get_value_from_result(sql_result[10]), # 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) -- 2.45.2 From e8cc42e155837167f8a77c573ab7f29ca0c30f9c Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sun, 5 Nov 2023 21:14:05 +0100 Subject: [PATCH 25/37] Added scheduledEvent to gql #410 --- .../db_history_scripts/scheduled_events.sql | 2 +- .../migration/scheduled_event_migration.py | 2 +- bot/src/bot_graphql/abc/filter_abc.py | 15 +++ bot/src/bot_graphql/abc/query_abc.py | 11 +++ .../filter/scheduled_event_filter.py | 71 ++++++++++++++ .../filter/short_role_name_filter.py | 4 +- bot/src/bot_graphql/graphql/mutation.gql | 1 + bot/src/bot_graphql/graphql/query.gql | 3 + .../bot_graphql/graphql/scheduledEvent.gql | 68 ++++++++++++++ bot/src/bot_graphql/graphql/server.gql | 3 + bot/src/bot_graphql/graphql_module.py | 6 ++ .../mutations/scheduled_event_mutation.py | 92 +++++++++++++++++++ .../queries/scheduled_event_history_query.py | 24 +++++ .../queries/scheduled_event_query.py | 23 +++++ bot/src/bot_graphql/queries/server_query.py | 8 ++ bot/src/bot_graphql/query.py | 8 ++ 16 files changed, 338 insertions(+), 3 deletions(-) create mode 100644 bot/src/bot_graphql/filter/scheduled_event_filter.py create mode 100644 bot/src/bot_graphql/graphql/scheduledEvent.gql create mode 100644 bot/src/bot_graphql/mutations/scheduled_event_mutation.py create mode 100644 bot/src/bot_graphql/queries/scheduled_event_history_query.py create mode 100644 bot/src/bot_graphql/queries/scheduled_event_query.py diff --git a/bot/src/bot_data/migration/db_history_scripts/scheduled_events.sql b/bot/src/bot_data/migration/db_history_scripts/scheduled_events.sql index 5ba2cf39..d456b410 100644 --- a/bot/src/bot_data/migration/db_history_scripts/scheduled_events.sql +++ b/bot/src/bot_data/migration/db_history_scripts/scheduled_events.sql @@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `ScheduledEventsHistory` `ChannelId` BIGINT NULL, `StartTime` DATETIME(6) NOT NULL, `EndTime` DATETIME(6) NULL, - `EntityType` ENUM (1,2,3) NOT NULL, + `EntityType` ENUM ('1','2','3') NOT NULL, `Location` VARCHAR(255) NULL, `ServerId` BIGINT(20) DEFAULT NULL, `Deleted` BOOL DEFAULT FALSE, diff --git a/bot/src/bot_data/migration/scheduled_event_migration.py b/bot/src/bot_data/migration/scheduled_event_migration.py index 50cdcec1..ee0dde63 100644 --- a/bot/src/bot_data/migration/scheduled_event_migration.py +++ b/bot/src/bot_data/migration/scheduled_event_migration.py @@ -26,7 +26,7 @@ class ScheduledEventMigration(MigrationABC): `ChannelId` BIGINT NULL, `StartTime` DATETIME(6) NOT NULL, `EndTime` DATETIME(6) NULL, - `EntityType` ENUM(1,2,3) NOT NULL, + `EntityType` ENUM('1','2','3') NOT NULL, `Location` VARCHAR(255) NULL, `ServerId` BIGINT, `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6), diff --git a/bot/src/bot_graphql/abc/filter_abc.py b/bot/src/bot_graphql/abc/filter_abc.py index e0d5ff8d..7c1fa477 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,16 @@ 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[Callable], values: List[T]) -> List[R]: + for attr in attrs: + values = values.where(attr) + 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/filter/scheduled_event_filter.py b/bot/src/bot_graphql/filter/scheduled_event_filter.py new file mode 100644 index 00000000..d1937c25 --- /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( + [ + lambda x: x.id == self._id, + lambda x: x.interval == self._interval, + lambda x: x.name == self._name, + lambda x: x.description == self._description, + lambda x: x.channel_id == self._channel_id, + lambda x: x.start_time == self._start_time, + lambda x: x.end_time == self._end_time, + lambda x: x.entity_type == self._entity_type, + 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..6892510d 100644 --- a/bot/src/bot_graphql/graphql/query.gql +++ b/bot/src/bot_graphql/graphql/query.gql @@ -41,6 +41,9 @@ 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] 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/mutations/scheduled_event_mutation.py b/bot/src/bot_graphql/mutations/scheduled_event_mutation.py new file mode 100644 index 00000000..c138b082 --- /dev/null +++ b/bot/src/bot_graphql/mutations/scheduled_event_mutation.py @@ -0,0 +1,92 @@ +from cpl_core.database.context import DatabaseContextABC +from cpl_discord.service import DiscordBotServiceABC + +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.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( + input["interval"], + input["name"], + input["description"], + input["channel_id"], + input["start_time"], + input["end_time"], + input["entity_type"], + input["location"], + 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.short_name = input["shortName"] if "shortName" in input else scheduled_event.short_name + scheduled_event.interval = 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["channel_id"] if "channel_id" in input else scheduled_event.channel_id + scheduled_event.start_time = input["start_time"] if "start_time" in input else scheduled_event.start_time + scheduled_event.end_time = input["end_time"] if "end_time" in input else scheduled_event.end_time + scheduled_event.entity_type = input["entity_type"] if "entity_type" 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/scheduled_event_history_query.py b/bot/src/bot_graphql/queries/scheduled_event_history_query.py new file mode 100644 index 00000000..279bcda1 --- /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) + 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..47b09a1b --- /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) + 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) + 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..154079d9 100644 --- a/bot/src/bot_graphql/query.py +++ b/bot/src/bot_graphql/query.py @@ -8,6 +8,7 @@ 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 @@ -27,6 +28,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 @@ -59,6 +61,7 @@ class Query(QueryABC): user_warnings: UserWarningsRepositoryABC, achievement_service: AchievementService, technician_config: TechnicianConfigRepositoryABC, + scheduled_events: ScheduledEventRepositoryABC, ): QueryABC.__init__(self, "Query") @@ -95,6 +98,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(), -- 2.45.2 From 2de5afd6487779f2b070893fcf76d8d42506255c Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 14 Nov 2023 17:46:12 +0100 Subject: [PATCH 26/37] Rebased & fixed backend #410 --- .../migration/scheduled_event_migration.py | 45 ------------------- .../scripts/1.2.2/1_ScheduledEvents_down.sql | 3 ++ .../1.2.2/1_ScheduledEvents_up.sql} | 40 ++++++++++++----- .../modules/achievements/achievements.json | 4 +- bot/src/modules/config/config.json | 4 +- .../short_role_name/short-role-name.json | 4 +- .../special_offers/special-offers.json | 4 +- .../migration_to_sql/migration-to-sql.json | 10 ++--- 8 files changed, 45 insertions(+), 69 deletions(-) delete mode 100644 bot/src/bot_data/migration/scheduled_event_migration.py create mode 100644 bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_down.sql rename bot/src/bot_data/{migration/db_history_scripts/scheduled_events.sql => scripts/1.2.2/1_ScheduledEvents_up.sql} (63%) diff --git a/bot/src/bot_data/migration/scheduled_event_migration.py b/bot/src/bot_data/migration/scheduled_event_migration.py deleted file mode 100644 index ee0dde63..00000000 --- a/bot/src/bot_data/migration/scheduled_event_migration.py +++ /dev/null @@ -1,45 +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 ScheduledEventMigration(MigrationABC): - name = "1.2.0_ScheduledEventMigration" - - 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 `ScheduledEvents` ( - `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Interval` VARCHAR(255) NOT NULL, - `Name` VARCHAR(255) NOT NULL, - `Description` VARCHAR(255) NOT 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`) - ); - """ - ) - ) - - self._exec(__file__, "scheduled_events.sql") - - def downgrade(self): - self._cursor.execute("DROP TABLE `ShortRoleNames`;") - self._cursor.execute("DROP TABLE `ShortRoleNamesHistory`;") 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/migration/db_history_scripts/scheduled_events.sql b/bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_up.sql similarity index 63% rename from bot/src/bot_data/migration/db_history_scripts/scheduled_events.sql rename to bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_up.sql index d456b410..2768651e 100644 --- a/bot/src/bot_data/migration/db_history_scripts/scheduled_events.sql +++ b/bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_up.sql @@ -1,18 +1,36 @@ +CREATE TABLE IF NOT EXISTS `ScheduledEvents` +( + `Id` BIGINT NOT NULL AUTO_INCREMENT, + `Interval` VARCHAR(255) NOT NULL, + `Name` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NOT 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` VARCHAR(255) NOT NULL, - `Name` VARCHAR(255) NOT NULL, - `Description` VARCHAR(255) NOT NULL, - `ChannelId` BIGINT NULL, - `StartTime` DATETIME(6) NOT NULL, - `EndTime` DATETIME(6) NULL, - `EntityType` ENUM ('1','2','3') NOT NULL, - `Location` VARCHAR(255) NULL, + `Id` BIGINT(20) NOT NULL, + `Interval` VARCHAR(255) NOT NULL, + `Name` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NOT 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 + `DateFrom` DATETIME(6) NOT NULL, + `DateTo` DATETIME(6) NOT NULL ); DROP TRIGGER IF EXISTS `TR_ScheduledEventsUpdate`; diff --git a/bot/src/modules/achievements/achievements.json b/bot/src/modules/achievements/achievements.json index acea20a4..911cf740 100644 --- a/bot/src/modules/achievements/achievements.json +++ b/bot/src/modules/achievements/achievements.json @@ -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/config/config.json b/bot/src/modules/config/config.json index 301f4630..6a80a8c4 100644 --- a/bot/src/modules/config/config.json +++ b/bot/src/modules/config/config.json @@ -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/short_role_name/short-role-name.json b/bot/src/modules/short_role_name/short-role-name.json index 57329ee1..23b81e41 100644 --- a/bot/src/modules/short_role_name/short-role-name.json +++ b/bot/src/modules/short_role_name/short-role-name.json @@ -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/special-offers.json b/bot/src/modules/special_offers/special-offers.json index 8def3776..cd6b44b1 100644 --- a/bot/src/modules/special_offers/special-offers.json +++ b/bot/src/modules/special_offers/special-offers.json @@ -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/tools/migration_to_sql/migration-to-sql.json b/bot/tools/migration_to_sql/migration-to-sql.json index 5e4a62f8..6be85895 100644 --- a/bot/tools/migration_to_sql/migration-to-sql.json +++ b/bot/tools/migration_to_sql/migration-to-sql.json @@ -2,9 +2,9 @@ "ProjectSettings": { "Name": "migration-to-sql", "Version": { - "Major": "0", - "Minor": "0", - "Micro": "0" + "Major": "1", + "Minor": "2", + "Micro": "2" }, "Author": "", "AuthorEmail": "", @@ -16,10 +16,10 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=2023.10.0" + "cpl-core>=1.2.dev410" ], "DevDependencies": [ - "cpl-cli>=2023.4.0.post3" + "cpl-cli>=1.2.dev410" ], "PythonVersion": ">=3.10.4", "PythonPath": { -- 2.45.2 From a3ebd07093c3887e9483bffbbf8223d9baeecd76 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 14 Nov 2023 23:45:39 +0100 Subject: [PATCH 27/37] Working on add/edit dialog #410 --- .../configuration/feature_flags_enum.py | 1 + .../configuration/feature_flags_settings.py | 1 + bot/src/bot_data/data_module.py | 3 + .../app/models/data/scheduled_events.model.ts | 34 ++ web/src/app/models/graphql/mutations.model.ts | 64 ++++ web/src/app/models/graphql/queries.model.ts | 52 +++ web/src/app/models/graphql/query.model.ts | 6 + web/src/app/models/graphql/result.model.ts | 9 + web/src/app/modules/shared/shared.module.ts | 22 +- ...edit-scheduled-event-dialog.component.html | 44 +++ ...edit-scheduled-event-dialog.component.scss | 0 ...t-scheduled-event-dialog.component.spec.ts | 23 ++ .../edit-scheduled-event-dialog.component.ts | 70 ++++ .../scheduled-events.component.html | 307 ++++++++++++++++++ .../scheduled-events.component.scss | 0 .../scheduled-events.component.spec.ts | 23 ++ .../scheduled-events.component.ts | 287 ++++++++++++++++ .../scheduled-events-routing.module.ts | 14 + .../scheduled-events.module.ts | 21 ++ .../view/server/server-routing.module.ts | 1 + .../short-role-name/short-role-name.module.ts | 18 +- .../app/services/sidebar/sidebar.service.ts | 11 +- web/src/assets/i18n/de.json | 35 ++ web/src/assets/i18n/en.json | 30 ++ web/src/styles.scss | 33 ++ .../styles/themes/sh-edraft-dark-theme.scss | 39 ++- 26 files changed, 1107 insertions(+), 41 deletions(-) create mode 100644 web/src/app/models/data/scheduled_events.model.ts create mode 100644 web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html create mode 100644 web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.scss create mode 100644 web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.spec.ts create mode 100644 web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.ts create mode 100644 web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.html create mode 100644 web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.scss create mode 100644 web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.spec.ts create mode 100644 web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts create mode 100644 web/src/app/modules/view/server/scheduled-events/scheduled-events-routing.module.ts create mode 100644 web/src/app/modules/view/server/scheduled-events/scheduled-events.module.ts diff --git a/bot/src/bot_core/configuration/feature_flags_enum.py b/bot/src/bot_core/configuration/feature_flags_enum.py index 6d051b0c..8506af95 100644 --- a/bot/src/bot_core/configuration/feature_flags_enum.py +++ b/bot/src/bot_core/configuration/feature_flags_enum.py @@ -27,3 +27,4 @@ class FeatureFlagsEnum(Enum): short_role_name = "ShortRoleName" technician_full_access = "TechnicianFullAccess" steam_special_offers = "SteamSpecialOffers" + scheduled_events = "ScheduledEvents" diff --git a/bot/src/bot_core/configuration/feature_flags_settings.py b/bot/src/bot_core/configuration/feature_flags_settings.py index 0ed95e71..3b994b17 100644 --- a/bot/src/bot_core/configuration/feature_flags_settings.py +++ b/bot/src/bot_core/configuration/feature_flags_settings.py @@ -29,6 +29,7 @@ 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 } def __init__(self, **kwargs: dict): 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/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..c3e8beea --- /dev/null +++ b/web/src/app/models/data/scheduled_events.model.ts @@ -0,0 +1,34 @@ +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?: string; + name?: string; + description?: string; + channelId?: string; + startTime?: string; + endTime?: string; + 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; +} diff --git a/web/src/app/models/graphql/mutations.model.ts b/web/src/app/models/graphql/mutations.model.ts index 4f52fa01..27fd48c1 100644 --- a/web/src/app/models/graphql/mutations.model.ts +++ b/web/src/app/models/graphql/mutations.model.ts @@ -173,6 +173,70 @@ 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} + ) { + id + name + description + attribute + operator + value + server { + id + } + } + } + } + `; + + static updateScheduledEvent = ` + mutation updateScheduledEvent($interval: String,$name: String,$description: String,$channelId: String,$startTime: String, $endTime: String,$entityType: Int,$location: String, $serverId: ID) { + scheduledEvent { + updateScheduledEvent(input: { + interval: $interval, + name: $name, + description: $description, + channelId: $channelId, + startTime: $startTime, + endTime: $endTime, + entityType: $entityType, + location: $location, + serverId: $serverId} + ) { + id + name + description + attribute + operator + value + } + } + } + `; + + 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 { diff --git a/web/src/app/models/graphql/queries.model.ts b/web/src/app/models/graphql/queries.model.ts index e44e3aab..1365d76e 100644 --- a/web/src/app/models/graphql/queries.model.ts +++ b/web/src/app/models/graphql/queries.model.ts @@ -229,6 +229,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/shared/shared.module.ts b/web/src/app/modules/shared/shared.module.ts index b3ca8e60..2a7bfc45 100644 --- a/web/src/app/modules/shared/shared.module.ts +++ b/web/src/app/modules/shared/shared.module.ts @@ -13,7 +13,7 @@ import { InputTextModule } from "primeng/inputtext"; import { MenuModule } from "primeng/menu"; import { PasswordModule } from "primeng/password"; import { ProgressSpinnerModule } from "primeng/progressspinner"; -import { SortableColumn, TableModule } from "primeng/table"; +import { TableModule } from "primeng/table"; import { ToastModule } from "primeng/toast"; import { AuthRolePipe } from "./pipes/auth-role.pipe"; import { IpAddressPipe } from "./pipes/ip-address.pipe"; @@ -24,18 +24,20 @@ import { InputNumberModule } from "primeng/inputnumber"; import { ImageModule } from "primeng/image"; import { SidebarModule } from "primeng/sidebar"; import { HistoryBtnComponent } from "./components/history-btn/history-btn.component"; -import { DataViewModule, DataViewLayoutOptions } from "primeng/dataview"; +import { DataViewLayoutOptions, DataViewModule } from "primeng/dataview"; import { ConfigListComponent } from "./components/config-list/config-list.component"; import { MultiSelectModule } from "primeng/multiselect"; -import { HideableColumnComponent } from './components/hideable-column/hideable-column.component'; -import { HideableHeaderComponent } from './components/hideable-header/hideable-header.component'; -import { MultiSelectColumnsComponent } from './base/multi-select-columns/multi-select-columns.component'; -import { FeatureFlagListComponent } from './components/feature-flag-list/feature-flag-list.component'; +import { HideableColumnComponent } from "./components/hideable-column/hideable-column.component"; +import { HideableHeaderComponent } from "./components/hideable-header/hideable-header.component"; +import { MultiSelectColumnsComponent } from "./base/multi-select-columns/multi-select-columns.component"; +import { FeatureFlagListComponent } from "./components/feature-flag-list/feature-flag-list.component"; import { InputSwitchModule } from "primeng/inputswitch"; import { CalendarModule } from "primeng/calendar"; -import { DataImportAndExportComponent } from './components/data-import-and-export/data-import-and-export.component'; +import { DataImportAndExportComponent } from "./components/data-import-and-export/data-import-and-export.component"; import { FileUploadModule } from "primeng/fileupload"; import { SelectButtonModule } from "primeng/selectbutton"; +import { TabViewModule } from "primeng/tabview"; +import { RadioButtonModule } from "primeng/radiobutton"; const PrimeNGModules = [ @@ -66,7 +68,9 @@ const PrimeNGModules = [ CalendarModule, FileUploadModule, SelectButtonModule, -] + TabViewModule, + RadioButtonModule +]; @NgModule({ declarations: [ @@ -79,7 +83,7 @@ const PrimeNGModules = [ HideableHeaderComponent, MultiSelectColumnsComponent, FeatureFlagListComponent, - DataImportAndExportComponent, + DataImportAndExportComponent ], imports: [ CommonModule, diff --git a/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html new file mode 100644 index 00000000..938281d5 --- /dev/null +++ b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html @@ -0,0 +1,44 @@ +
+ +
+ + +
+ + +
+ + +

+ Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem + aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. + Nemo + enim + ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos + qui + ratione voluptatem sequi nesciunt. Consectetur, adipisci velit, sed quia non numquam eius modi. +

+ + + +
+
+ +
+
+ + + +
+
+ +
+ +
diff --git a/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.scss b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.spec.ts b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.spec.ts new file mode 100644 index 00000000..e97349b3 --- /dev/null +++ b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EditScheduledEventDialogComponent } from './edit-scheduled-event-dialog.component'; + +describe('EditScheduledEventDialogComponent', () => { + let component: EditScheduledEventDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ EditScheduledEventDialogComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(EditScheduledEventDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.ts b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.ts new file mode 100644 index 00000000..ca5ff6d6 --- /dev/null +++ b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.ts @@ -0,0 +1,70 @@ +import { Component, EventEmitter, Input, Output } from "@angular/core"; +import { EventType, ScheduledEvent } from "../../../../../../models/data/scheduled_events.model"; +import { TranslateService } from "@ngx-translate/core"; +import { FormBuilder, FormControl, Validators } from "@angular/forms"; + +@Component({ + selector: "app-edit-scheduled-event-dialog", + templateUrl: "./edit-scheduled-event-dialog.component.html", + styleUrls: ["./edit-scheduled-event-dialog.component.scss"] +}) +export class EditScheduledEventDialogComponent { + @Input() event?: ScheduledEvent; + @Output() save = new EventEmitter(); + + get visible() { + return this.event != undefined; + } + + set visible(val: boolean) { + if (!val) { + this.event = undefined; + } + this.visible = val; + } + + get header() { + if (this.event && this.event.createdAt === "" && this.event.modifiedAt === "") { + return this.translate.instant("view.server.scheduled_events.edit_dialog.add_header"); + } else { + return this.translate.instant("view.server.scheduled_events.edit_dialog.edit_header"); + } + } + + public activeIndex: number = 0; + public inputForm = this.fb.group({ + id: new FormControl(this.event?.id), + interval: new FormControl(this.event?.interval, [Validators.required]), + entityType: new FormControl(this.event?.entityType, [Validators.required]), + channelId: new FormControl(this.event?.channelId, this.event?.entityType == EventType.voice || this.event?.entityType == EventType.stageInstance ? [Validators.required] : []), + location: new FormControl(this.event?.location, this.event?.entityType == EventType.external ? [Validators.required] : []), + name: new FormControl(this.event?.name, [Validators.required]), + startTime: new FormControl(this.event?.startTime, [Validators.required]), + endTime: new FormControl(this.event?.endTime), + description: new FormControl(this.event?.description) + }); + + constructor( + private translate: TranslateService, + private fb: FormBuilder + ) { + } + + public saveEvent() { + this.save.emit(this.event); + } + + public next() { + this.activeIndex++; + } + + public back() { + this.activeIndex--; + } + + protected readonly EventType = { + stage: EventType.stageInstance, + voice: EventType.voice, + somewhere_else: EventType.external + }; +} diff --git a/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.html b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.html new file mode 100644 index 00000000..1296b1bd --- /dev/null +++ b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.html @@ -0,0 +1,307 @@ + + +

+ {{'view.server.scheduled_events.header' | translate}} +

+
+
+ + + +
+
+
+ {{scheduledEvents.length}} {{'common.of' | translate}} + {{dt.totalRecords}} + + {{'view.server.scheduled_events.scheduled_events' | translate}} +
+ + +
+ +
+ + + +
+
+ + + + + +
+
{{'common.id' | translate}}
+ +
+ + + +
+
{{'common.interval' | translate}}
+ +
+ + +
+
{{'common.name' | translate}}
+ +
+ + +
+
{{'common.description' | translate}}
+ +
+ + +
+
{{'common.channel_id' | translate}}
+ +
+ + +
+
{{'common.start_time' | translate}}
+ +
+ + +
+
{{'common.end_time' | translate}}
+ +
+ + +
+
{{'common.type' | translate}}
+ +
+ + +
+
{{'common.location' | translate}}
+ +
+ + + +
+
{{'common.created_at' | translate}}
+
+ + + +
+
{{'common.modified_at' | translate}}
+
+ + + +
+
{{'common.actions' | translate}}
+
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + + + + + + + + + + + + + + + {{'common.id' | translate}}: + + + {{scheduledEvent.id}} + + + {{scheduledEvent.id}} + + + + + + {{'common.interval' | translate}}: + + + + + + {{scheduledEvent.interval}} + + + + + + {{'common.name' | translate}}: + + + + + + {{scheduledEvent.name}} + + + + + + {{'common.description' | translate}}: + + + + + + {{scheduledEvent.description}} + + + + + + {{'common.channel_id' | translate}}: + + + + + + {{scheduledEvent.channel_id}} + + + + + + {{'common.start_time' | translate}}: + + + + + + {{scheduledEvent.start_time}} + + + + + + {{'common.end_time' | translate}}: + + + + + + {{scheduledEvent.end_time}} + + + + + + {{'common.type' | translate}}: + + + + + + {{scheduledEvent.type}} + + + + + + {{'common.location' | translate}}: + + + + + + {{scheduledEvent.location}} + + + + + + {{'common.created_at' | translate}}: + + + {{scheduledEvent.createdAt | date:'dd.MM.yy HH:mm'}} + + + {{scheduledEvent.createdAt | date:'dd.MM.yy HH:mm'}} + + + + + {{'common.modified_at' | translate}}: + + + {{scheduledEvent.modifiedAt | date:'dd.MM.yy HH:mm'}} + + + {{scheduledEvent.modifiedAt | date:'dd.MM.yy HH:mm'}} + + + + +
+ + + +
+ + + + + + + + {{'common.no_entries_found' | translate}} + + + + + + + +
+
+ diff --git a/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.scss b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.spec.ts b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.spec.ts new file mode 100644 index 00000000..f7d3244f --- /dev/null +++ b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ScheduledEventsComponent } from './scheduled-events.component'; + +describe('ScheduledEventsComponent', () => { + let component: ScheduledEventsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ScheduledEventsComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ScheduledEventsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts new file mode 100644 index 00000000..da0e8972 --- /dev/null +++ b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts @@ -0,0 +1,287 @@ +import { Component, OnDestroy, OnInit } from "@angular/core"; +import { FormBuilder, FormControl, FormGroup } from "@angular/forms"; +import { Page } from "../../../../../../models/graphql/filter/page.model"; +import { Sort, SortDirection } from "../../../../../../models/graphql/filter/sort.model"; +import { Subject, throwError } from "rxjs"; +import { Server } from "../../../../../../models/data/server.model"; +import { UserDTO } from "../../../../../../models/auth/auth-user.dto"; +import { LazyLoadEvent } from "primeng/api"; +import { Queries } from "../../../../../../models/graphql/queries.model"; +import { AuthService } from "../../../../../../services/auth/auth.service"; +import { SpinnerService } from "../../../../../../services/spinner/spinner.service"; +import { ToastService } from "../../../../../../services/toast/toast.service"; +import { ConfirmationDialogService } from "../../../../../../services/confirmation-dialog/confirmation-dialog.service"; +import { TranslateService } from "@ngx-translate/core"; +import { DataService } from "../../../../../../services/data/data.service"; +import { SidebarService } from "../../../../../../services/sidebar/sidebar.service"; +import { ActivatedRoute } from "@angular/router"; +import { Query, ScheduledEventListQuery } from "../../../../../../models/graphql/query.model"; +import { catchError, debounceTime, takeUntil } from "rxjs/operators"; +import { Table } from "primeng/table"; +import { ScheduledEventMutationResult } from "../../../../../../models/graphql/result.model"; +import { Mutations } from "../../../../../../models/graphql/mutations.model"; +import { ComponentWithTable } from "../../../../../../base/component-with-table"; +import { EventType, ScheduledEvent, ScheduledEventFilter } from "../../../../../../models/data/scheduled_events.model"; + +@Component({ + selector: "app-scheduled-events", + templateUrl: "./scheduled-events.component.html", + styleUrls: ["./scheduled-events.component.scss"] +}) +export class ScheduledEventsComponent extends ComponentWithTable implements OnInit, OnDestroy { + public scheduledEvents: ScheduledEvent[] = []; + public loading = true; + + public filterForm!: FormGroup<{ + id: FormControl, + interval: FormControl, + name: FormControl, + description: FormControl, + channelId: FormControl, + startTime: FormControl, + endTime: FormControl, + entityType: FormControl, + location: FormControl, + }>; + + public filter: ScheduledEventFilter = {}; + public page: Page = { + pageSize: undefined, + pageIndex: undefined + }; + public sort: Sort = { + sortColumn: undefined, + sortDirection: undefined + }; + + public totalRecords: number = 0; + + private unsubscriber = new Subject(); + private server: Server = {}; + public user: UserDTO | null = null; + public query: string = Queries.scheduledEventWithHistoryQuery; + public editableScheduledEvent?: ScheduledEvent = undefined; + + public constructor( + private authService: AuthService, + private spinner: SpinnerService, + private toastService: ToastService, + private confirmDialog: ConfirmationDialogService, + private fb: FormBuilder, + private translate: TranslateService, + private data: DataService, + private sidebar: SidebarService, + private route: ActivatedRoute) { + super("ScheduledEvent", ["id", "interval", "name", "description", "channel_id", "start_time", "end_time", "type", "location"], + (oldElement: ScheduledEvent, newElement: ScheduledEvent) => { + return oldElement.name === newElement.name; + }); + } + + public ngOnInit(): void { + this.loading = true; + this.setFilterForm(); + this.data.getServerFromRoute(this.route).then(async server => { + this.server = server; + let authUser = await this.authService.getLoggedInUser(); + this.user = authUser?.users?.find(u => u.server == this.server.id) ?? null; + }); + } + + public ngOnDestroy(): void { + this.unsubscriber.next(); + this.unsubscriber.complete(); + } + + public loadNextPage(): void { + this.data.query(Queries.scheduledEventQuery, { + serverId: this.server.id, filter: this.filter, page: this.page, sort: this.sort + }, + (data: Query) => { + return data.servers[0]; + } + ).subscribe(data => { + this.totalRecords = data.scheduledEventCount; + this.scheduledEvents = data.scheduledEvents; + this.spinner.hideSpinner(); + this.loading = false; + }); + } + + public setFilterForm(): void { + this.filterForm = this.fb.group({ + id: new FormControl(null), + interval: new FormControl(null), + name: new FormControl(null), + description: new FormControl(null), + channelId: new FormControl(null), + startTime: new FormControl(null), + endTime: new FormControl(null), + entityType: new FormControl(null), + location: new FormControl(null), + }); + + this.filterForm.valueChanges.pipe( + takeUntil(this.unsubscriber), + debounceTime(600) + ).subscribe(changes => { + if (changes.id) { + this.filter.id = changes.id; + } else { + this.filter.id = undefined; + } + + if (changes.interval) { + this.filter.interval = changes.interval; + } else { + this.filter.interval = undefined; + } + + if (changes.name) { + this.filter.name = changes.name; + } else { + this.filter.name = undefined; + } + + if (changes.description) { + this.filter.description = changes.description; + } else { + this.filter.description = undefined; + } + + if (changes.channelId) { + this.filter.channelId = changes.channelId; + } else { + this.filter.channelId = undefined; + } + + if (changes.startTime) { + this.filter.startTime = changes.startTime; + } else { + this.filter.startTime = undefined; + } + + if (changes.endTime) { + this.filter.endTime = changes.endTime; + } else { + this.filter.endTime = undefined; + } + + if (changes.entityType) { + this.filter.entityType = changes.entityType; + } else { + this.filter.entityType = undefined; + } + + if (changes.location) { + this.filter.location = changes.location; + } else { + this.filter.location = undefined; + } + + if (this.page.pageSize) + this.page.pageSize = 10; + + if (this.page.pageIndex) + this.page.pageIndex = 0; + + this.loadNextPage(); + }); + } + + public newScheduledEventTemplate: ScheduledEvent = { + createdAt: "", + modifiedAt: "" + }; + + public nextPage(event: LazyLoadEvent): void { + this.page.pageSize = event.rows ?? 0; + if (event.first != null && event.rows != null) + this.page.pageIndex = event.first / event.rows; + this.sort.sortColumn = event.sortField ?? undefined; + this.sort.sortDirection = event.sortOrder === 1 ? SortDirection.ASC : event.sortOrder === -1 ? SortDirection.DESC : SortDirection.ASC; + + this.loadNextPage(); + } + + public resetFilters(): void { + this.filterForm.reset(); + } + + public onRowEditInit(table: Table, event: ScheduledEvent, index: number): void { + this.editableScheduledEvent = event; + } + + public override onRowEditSave(newScheduledEvent: ScheduledEvent): void { + if (this.isEditingNew && JSON.stringify(newScheduledEvent) === JSON.stringify(this.newScheduledEventTemplate)) { + this.isEditingNew = false; + return; + } + + if (this.isEditingNew) { + this.spinner.showSpinner(); + this.data.mutation(Mutations.createScheduledEvent, { + name: newScheduledEvent.name, + serverId: this.server.id + } + ).pipe(catchError(err => { + this.isEditingNew = false; + this.spinner.hideSpinner(); + return throwError(err); + })).subscribe(result => { + this.isEditingNew = false; + this.spinner.hideSpinner(); + this.toastService.success(this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_create"), this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_create_d", { name: result.scheduledEvent.createScheduledEvent?.name })); + this.loadNextPage(); + }); + return; + } + + this.spinner.showSpinner(); + this.data.mutation(Mutations.updateScheduledEvent, { + id: newScheduledEvent.id, + name: newScheduledEvent.name, + } + ).pipe(catchError(err => { + this.spinner.hideSpinner(); + return throwError(err); + })).subscribe(_ => { + this.spinner.hideSpinner(); + this.toastService.success(this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_update"), this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_update_d", { name: newScheduledEvent.name })); + this.loadNextPage(); + }); + } + + public deleteScheduledEvent(ScheduledEvent: ScheduledEvent): void { + this.confirmDialog.confirmDialog( + this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_delete"), this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_delete_q", { name: ScheduledEvent.name }), + () => { + this.spinner.showSpinner(); + this.data.mutation(Mutations.deleteScheduledEvent, { + id: ScheduledEvent.id + } + ).pipe(catchError(err => { + this.spinner.hideSpinner(); + return throwError(err); + })).subscribe(l => { + this.spinner.hideSpinner(); + this.toastService.success(this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_deleted"), this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_deleted_d", { name: ScheduledEvent.name })); + this.loadNextPage(); + }); + }); + } + + public addScheduledEvent(table: Table): void { + this.editableScheduledEvent = JSON.parse(JSON.stringify(this.newScheduledEventTemplate)); + // const newScheduledEvent = JSON.parse(JSON.stringify(this.newScheduledEventTemplate)); + // + // this.scheduledEvents = [newScheduledEvent, ...this.scheduledEvents]; + // + // table.initRowEdit(newScheduledEvent); + // + // const index = this.scheduledEvents.findIndex(l => l.id == newScheduledEvent.id); + // this.onRowEditInit(table, newScheduledEvent, index); + // + // this.isEditingNew = true; + } +} diff --git a/web/src/app/modules/view/server/scheduled-events/scheduled-events-routing.module.ts b/web/src/app/modules/view/server/scheduled-events/scheduled-events-routing.module.ts new file mode 100644 index 00000000..d0712636 --- /dev/null +++ b/web/src/app/modules/view/server/scheduled-events/scheduled-events-routing.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from "@angular/core"; +import { RouterModule, Routes } from "@angular/router"; +import { ScheduledEventsComponent } from "./components/scheduled-events/scheduled-events.component"; + +const routes: Routes = [ + { path: "", component: ScheduledEventsComponent } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class ScheduledEventsRoutingModule { +} diff --git a/web/src/app/modules/view/server/scheduled-events/scheduled-events.module.ts b/web/src/app/modules/view/server/scheduled-events/scheduled-events.module.ts new file mode 100644 index 00000000..752b6ce7 --- /dev/null +++ b/web/src/app/modules/view/server/scheduled-events/scheduled-events.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { ScheduledEventsRoutingModule } from './scheduled-events-routing.module'; +import { ScheduledEventsComponent } from "./components/scheduled-events/scheduled-events.component"; +import { SharedModule } from "../../../shared/shared.module"; +import { EditScheduledEventDialogComponent } from './components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component'; + + +@NgModule({ + declarations: [ + ScheduledEventsComponent, + EditScheduledEventDialogComponent + ], + imports: [ + CommonModule, + SharedModule, + ScheduledEventsRoutingModule + ] +}) +export class ScheduledEventsModule { } diff --git a/web/src/app/modules/view/server/server-routing.module.ts b/web/src/app/modules/view/server/server-routing.module.ts index 505aa609..310e44a5 100644 --- a/web/src/app/modules/view/server/server-routing.module.ts +++ b/web/src/app/modules/view/server/server-routing.module.ts @@ -19,6 +19,7 @@ const routes: Routes = [ { path: "levels", loadChildren: () => import("./levels/levels.module").then(m => m.LevelsModule), canActivate: [AuthGuard], data: { memberRole: MemberRoles.Moderator } }, { path: "achievements", loadChildren: () => import("./achievements/achievements.module").then(m => m.AchievementsModule), canActivate: [AuthGuard], data: { memberRole: MemberRoles.Moderator } }, { path: "short-role-names", loadChildren: () => import("./short-role-name/short-role-name.module").then(m => m.ShortRoleNameModule), canActivate: [AuthGuard], data: { memberRole: MemberRoles.Moderator } }, + { path: "scheduled-events", loadChildren: () => import("./scheduled-events/scheduled-events.module").then(m => m.ScheduledEventsModule), canActivate: [AuthGuard], data: { memberRole: MemberRoles.Moderator } }, { path: "config", loadChildren: () => import("./config/config.module").then(m => m.ConfigModule), canActivate: [AuthGuard], data: { memberRole: MemberRoles.Admin } } ]; diff --git a/web/src/app/modules/view/server/short-role-name/short-role-name.module.ts b/web/src/app/modules/view/server/short-role-name/short-role-name.module.ts index b675df35..dd6e101b 100644 --- a/web/src/app/modules/view/server/short-role-name/short-role-name.module.ts +++ b/web/src/app/modules/view/server/short-role-name/short-role-name.module.ts @@ -1,14 +1,8 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { ShortRoleNamesComponent } from './components/short-role-names/short-role-names.component'; +import { NgModule } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { ShortRoleNamesComponent } from "./components/short-role-names/short-role-names.component"; import { ShortRoleNameRoutingModule } from "./short-role-name-routing.module"; -import { ButtonModule } from "primeng/button"; -import { InputTextModule } from "primeng/inputtext"; -import { ReactiveFormsModule } from "@angular/forms"; import { SharedModule } from "../../../shared/shared.module"; -import { TableModule } from "primeng/table"; -import { TranslateModule } from "@ngx-translate/core"; - @NgModule({ @@ -18,13 +12,7 @@ import { TranslateModule } from "@ngx-translate/core"; imports: [ CommonModule, ShortRoleNameRoutingModule, - ButtonModule, - InputTextModule, - ReactiveFormsModule, SharedModule, - SharedModule, - TableModule, - TranslateModule ] }) export class ShortRoleNameModule { } diff --git a/web/src/app/services/sidebar/sidebar.service.ts b/web/src/app/services/sidebar/sidebar.service.ts index 2a1f3861..285b3a8f 100644 --- a/web/src/app/services/sidebar/sidebar.service.ts +++ b/web/src/app/services/sidebar/sidebar.service.ts @@ -30,6 +30,7 @@ export class SidebarService { serverAutoRoles: MenuItem = {}; serverLevels: MenuItem = {}; serverAchievements: MenuItem = {}; + serverScheduledEvents: MenuItem = {}; serverShortRoleNames: MenuItem = {}; serverConfig: MenuItem = {}; serverMenu: MenuItem = {}; @@ -110,6 +111,13 @@ export class SidebarService { routerLink: `server/${this.server?.id}/achievements` }; + this.serverScheduledEvents = { + label: this.isSidebarOpen ? this.translateService.instant("sidebar.server.scheduled_events") : "", + icon: "pi pi-calender", + visible: true, + routerLink: `server/${this.server?.id}/scheduled-events` + }; + this.serverShortRoleNames = { label: this.isSidebarOpen ? this.translateService.instant("sidebar.server.short_role_names") : "", icon: "pi pi-list", @@ -129,7 +137,7 @@ export class SidebarService { icon: "pi pi-server", visible: false, expanded: true, - items: [this.serverDashboard, this.serverProfile, this.serverMembers, this.serverAutoRoles, this.serverLevels, this.serverAchievements, this.serverShortRoleNames, this.serverConfig] + items: [this.serverDashboard, this.serverProfile, this.serverMembers, this.serverAutoRoles, this.serverLevels, this.serverAchievements, this.serverScheduledEvents, this.serverShortRoleNames, this.serverConfig] }; this.adminConfig = { label: this.isSidebarOpen ? this.translateService.instant("sidebar.config") : "", @@ -205,6 +213,7 @@ export class SidebarService { this.serverAutoRoles.visible = isTechnicianAndFullAccessActive || this.hasFeature("AutoRoleModule") && user?.isModerator; this.serverLevels.visible = isTechnicianAndFullAccessActive || this.hasFeature("LevelModule") && user?.isModerator; this.serverAchievements.visible = isTechnicianAndFullAccessActive || this.hasFeature("AchievementsModule") && user?.isModerator; + this.serverScheduledEvents.visible = isTechnicianAndFullAccessActive || this.hasFeature("ScheduledEvents") && user?.isModerator; this.serverShortRoleNames.visible = isTechnicianAndFullAccessActive || this.hasFeature("ShortRoleName") && user?.isAdmin; this.serverConfig.visible = isTechnicianAndFullAccessActive || user?.isAdmin; diff --git a/web/src/assets/i18n/de.json b/web/src/assets/i18n/de.json index e8a6e082..845e8a17 100644 --- a/web/src/assets/i18n/de.json +++ b/web/src/assets/i18n/de.json @@ -124,12 +124,14 @@ }, "common": { "404": "404 - Der Eintrag konnte nicht gefunden werden", + "abort": "Abbrechen", "actions": "Aktionen", "active": "Aktiv", "add": "Hinzufügen", "attribute": "Attribut", "auth_role": "Rolle", "author": "Autor", + "back": "Zurück", "bool_as_string": { "false": "Nein", "true": "Ja" @@ -137,12 +139,14 @@ "channel_id": "Kanal Id", "channel_name": "Kanal", "color": "Farbe", + "continue": "Weiter", "created_at": "Erstellt am", "description": "Beschreibung", "discord_id": "Discord Id", "edit": "Bearbeiten", "email": "E-Mail", "emoji": "Emoji", + "end_time": "Endzeit", "error": "Fehler", "export": "Exportieren", "feature_flags": "Funktionen", @@ -176,11 +180,13 @@ }, "id": "Id", "import": "Importieren", + "interval": "Interval", "joined_at": "Beigetreten am", "last_name": "Nachname", "leaved_at": "Verlassen am", "left_server": "Aktiv", "level": "Level", + "location": "Ort", "message_id": "Nachricht Id", "min_xp": "Min. XP", "modified_at": "Bearbeitet am", @@ -200,10 +206,12 @@ "role": "Rolle", "rule_count": "Regeln", "save": "Speichern", + "start_time": "Startzeit", "state": { "off": "Aus", "on": "Ein" }, + "type": "Typ", "user_warnings": "Verwarnungen", "users": "Benutzer", "value": "Wert", @@ -538,6 +546,33 @@ "reaction_count": "Anzahl Reaktionen", "xp": "XP" }, + "scheduled_events": { + "edit_dialog": { + "add_header": "Event hinzufügen", + "edit_header": "Event bearbeiten", + "event_info": { + "description_input": "Erzähl den Leuten ein wenig mehr über dein Event. Markdown, neue Zeilen und Links werden unterstützt.", + "event_topic": "Thema", + "event_topic_input": "Worum geht es bei deinem Event?", + "header": "Worum geht es bei deinem Event?", + "start_date": "Startdatum", + "start_time": "Startzeit", + "tab_name": "Eventinformationen" + }, + "location": { + "header": "Wo ist dein Event?", + "somewhere_else": "Irgendwo anders", + "somewhere_else_input": "Ort eingeben", + "stage": "Stage-Kanal", + "stage_input": "Stage-Kanal auswählen", + "tab_name": "Verzeichnis", + "voice": "Sprachkanal", + "voice_input": "Sprachkanal auswählen" + } + }, + "header": "Geplante Events", + "scheduled_events": "Geplante Events" + }, "short_role_names": { "header": "Rollen Kürzel", "message": { diff --git a/web/src/assets/i18n/en.json b/web/src/assets/i18n/en.json index 4f324ec6..86a3cd2a 100644 --- a/web/src/assets/i18n/en.json +++ b/web/src/assets/i18n/en.json @@ -124,12 +124,14 @@ }, "common": { "404": "404 - Entry not found!", + "abort": "Abort", "actions": "Actions", "active": "Active", "add": "Add", "attribute": "Attribute", "auth_role": "Role", "author": "Author", + "back": "Back", "bool_as_string": { "false": "No", "true": "Yes" @@ -137,6 +139,7 @@ "channel_id": "Channel Id", "channel_name": "Channel", "color": "Color", + "continue": "Continue", "created_at": "Created at", "description": "Description", "discord_id": "Discord Id", @@ -538,6 +541,33 @@ "reaction_count": "Reaction count", "xp": "XP" }, + "scheduled_events": { + "edit_dialog": { + "add_header": "Add event", + "edit_header": "Edit event", + "event_info": { + "description_input": "Tell people a little more about your event. Markdown, new lines and links are supported.", + "event_topic": "Event topic", + "event_topic_input": "What's your event?", + "header": "What's your event about?", + "start_date": "Start date", + "start_time": "Start time", + "tab_name": "Event info" + }, + "location": { + "header": "Where is your event?", + "somewhere_else": "Somewhere else", + "somewhere_else_input": "Enter a location", + "stage": "Stage channel", + "stage_input": "Select a stage channel", + "tab_name": "Location", + "voice": "Voice channel", + "voice_input": "Select a voice channel" + } + }, + "header": "Scheduled events", + "scheduled_events": "Scheduled events" + }, "short_role_names": { "header": "Level", "message": { diff --git a/web/src/styles.scss b/web/src/styles.scss index 64751ea5..3878c311 100644 --- a/web/src/styles.scss +++ b/web/src/styles.scss @@ -635,6 +635,18 @@ footer { border: 0; } +.btn, +.icon-btn, +.text-btn, +.danger-btn, +.danger-icon-btn { + span { + transition-duration: unset !important; + } + + transition: none !important; +} + .spinner-component-wrapper { position: absolute; top: 0; @@ -661,6 +673,27 @@ p-inputNumber { border: none !important; } +.edit-dialog { + .p-dialog-content { + padding: 0 !important; + + .p-tabview-nav { + justify-content: space-between; + + li { + width: 100%; + + a { + width: 100%; + justify-content: center; + } + } + } + + + } +} + @media (max-width: 720px) { footer { .left, diff --git a/web/src/styles/themes/sh-edraft-dark-theme.scss b/web/src/styles/themes/sh-edraft-dark-theme.scss index 6f483f02..f7b2f949 100644 --- a/web/src/styles/themes/sh-edraft-dark-theme.scss +++ b/web/src/styles/themes/sh-edraft-dark-theme.scss @@ -552,6 +552,7 @@ } } + .danger-btn, .danger-icon-btn { background-color: transparent !important; color: $primaryTextColor !important; @@ -568,22 +569,6 @@ } } - .danger-btn { - background-color: $primaryErrorColor !important; - color: $primaryErrorColor !important; - border: 0 !important; - - &:hover { - background-color: $primaryErrorColor !important; - color: $primaryTextColor !important; - border: 0; - } - - .pi { - font-size: 1.275rem !important; - } - } - .p-datatable .p-sortable-column.p-highlight, .p-datatable .p-sortable-column.p-highlight .p-sortable-column-icon, .p-datatable .p-sortable-column:not(.p-highlight):hover { @@ -777,4 +762,26 @@ } } } + + .edit-dialog { + .p-dialog-content { + .p-tabview { + .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus { + box-shadow: none !important; + } + + .p-tabview-nav li.p-highlight .p-tabview-nav-link { + color: $primaryHeaderColor !important; + border-color: $primaryHeaderColor !important; + } + + .p-tabview-nav, + .p-tabview-nav li .p-tabview-nav-link, + .p-tabview-panels { + background-color: $secondaryBackgroundColor !important; + color: $primaryTextColor !important; + } + } + } + } } -- 2.45.2 From 74dba4b98123e95c414038d6096e4c566ac5dfd8 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 18 Nov 2023 22:15:18 +0100 Subject: [PATCH 28/37] Added add dialog #410 --- bot/src/bot_data/model/scheduled_event.py | 15 +- .../model/scheduled_event_interval_enum.py | 8 + .../scripts/1.2.2/1_ScheduledEvents_up.sql | 8 +- .../scheduled_event_repository_service.py | 23 +-- bot/src/bot_graphql/abc/filter_abc.py | 6 +- .../filter/scheduled_event_filter.py | 18 +-- bot/src/bot_graphql/mutation.py | 3 + .../mutations/scheduled_event_mutation.py | 25 ++-- web/package.json | 110 +++++++------- web/src/app/models/data/discord.model.ts | 5 +- .../app/models/data/scheduled_events.model.ts | 13 +- web/src/app/models/graphql/mutations.model.ts | 28 ++-- web/src/app/modules/shared/shared.module.ts | 11 +- ...edit-scheduled-event-dialog.component.html | 110 ++++++++++---- .../edit-scheduled-event-dialog.component.ts | 139 +++++++++++++++--- .../scheduled-events.component.html | 128 ++++------------ .../scheduled-events.component.ts | 20 ++- .../scheduled-events.module.ts | 16 +- .../app/services/sidebar/sidebar.service.ts | 4 +- web/src/assets/i18n/de.json | 14 +- web/src/assets/i18n/en.json | 1 + web/src/assets/version.json | 12 +- web/src/styles.scss | 34 +++++ web/src/styles/primeng-fixes.scss | 1 + .../styles/themes/sh-edraft-dark-theme.scss | 30 ++++ 25 files changed, 504 insertions(+), 278 deletions(-) create mode 100644 bot/src/bot_data/model/scheduled_event_interval_enum.py diff --git a/bot/src/bot_data/model/scheduled_event.py b/bot/src/bot_data/model/scheduled_event.py index fa05c946..3f8fbee3 100644 --- a/bot/src/bot_data/model/scheduled_event.py +++ b/bot/src/bot_data/model/scheduled_event.py @@ -4,13 +4,14 @@ 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: str, + interval: ScheduledEventIntervalEnum, name: str, description: str, channel_id: int, @@ -43,11 +44,11 @@ class ScheduledEvent(TableABC): return self._id @property - def interval(self) -> str: + def interval(self) -> ScheduledEventIntervalEnum: return self._interval @interval.setter - def interval(self, value: str): + def interval(self, value: ScheduledEventIntervalEnum): self._interval = value @property @@ -145,11 +146,11 @@ class ScheduledEvent(TableABC): return str( f""" INSERT INTO `ScheduledEvents` ( - `Interval`, `Name`, `Description`, `ChannelId`, `StartTime`, `EndTime`, `EntityType`, `Location`, `ServerId`, + `Interval`, `Name`, `Description`, `ChannelId`, `StartTime`, `EndTime`, `EntityType`, `Location`, `ServerId` ) VALUES ( - '{self._interval}', + '{self._interval.value}', '{self._name}', - '{self._description}', + {"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}'"}, @@ -165,7 +166,7 @@ class ScheduledEvent(TableABC): return str( f""" UPDATE `ScheduledEvents` - SET `Interval` = '{self._interval}', + SET `Interval` = '{self._interval.value}', `Name` = '{self._name}', `Description` = '{self._start_time}', `ChannelId` = {"NULL" if self._channel_id is None else f"'{self._channel_id}'"}, 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/1.2.2/1_ScheduledEvents_up.sql b/bot/src/bot_data/scripts/1.2.2/1_ScheduledEvents_up.sql index 2768651e..843c21fc 100644 --- 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 @@ -1,9 +1,9 @@ CREATE TABLE IF NOT EXISTS `ScheduledEvents` ( `Id` BIGINT NOT NULL AUTO_INCREMENT, - `Interval` VARCHAR(255) NOT NULL, + `Interval` ENUM ('daily', 'weekly', 'monthly', 'yearly') NOT NULL, `Name` VARCHAR(255) NOT NULL, - `Description` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NULL, `ChannelId` BIGINT NULL, `StartTime` DATETIME(6) NOT NULL, `EndTime` DATETIME(6) NULL, @@ -19,9 +19,9 @@ CREATE TABLE IF NOT EXISTS `ScheduledEvents` CREATE TABLE IF NOT EXISTS `ScheduledEventsHistory` ( `Id` BIGINT(20) NOT NULL, - `Interval` VARCHAR(255) NOT NULL, + `Interval` ENUM ('daily', 'weekly', 'monthly', 'yearly') NOT NULL, `Name` VARCHAR(255) NOT NULL, - `Description` VARCHAR(255) NOT NULL, + `Description` VARCHAR(255) NULL, `ChannelId` BIGINT NULL, `StartTime` DATETIME(6) NOT NULL, `EndTime` DATETIME(6) NULL, diff --git a/bot/src/bot_data/service/scheduled_event_repository_service.py b/bot/src/bot_data/service/scheduled_event_repository_service.py index 7d5e67ba..01d4fc6c 100644 --- a/bot/src/bot_data/service/scheduled_event_repository_service.py +++ b/bot/src/bot_data/service/scheduled_event_repository_service.py @@ -7,6 +7,7 @@ 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): @@ -32,17 +33,17 @@ class ScheduledEventRepositoryService(ScheduledEventRepositoryABC): def _scheduled_event_from_result(self, sql_result: tuple) -> ScheduledEvent: return ScheduledEvent( - self._get_value_from_result(sql_result[0]), # interval - self._get_value_from_result(sql_result[1]), # name - self._get_value_from_result(sql_result[2]), # description - int(self._get_value_from_result(sql_result[3])), # channel_id - self._get_value_from_result(sql_result[4]), # start_time - self._get_value_from_result(sql_result[5]), # end_time - self._get_value_from_result(sql_result[6]), # entity_type - self._get_value_from_result(sql_result[7]), # location - self._servers.get_server_by_id((sql_result[8])), # server - self._get_value_from_result(sql_result[9]), # created_at - self._get_value_from_result(sql_result[10]), # modified_at + 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 + 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]), ) diff --git a/bot/src/bot_graphql/abc/filter_abc.py b/bot/src/bot_graphql/abc/filter_abc.py index 7c1fa477..3067b075 100644 --- a/bot/src/bot_graphql/abc/filter_abc.py +++ b/bot/src/bot_graphql/abc/filter_abc.py @@ -63,7 +63,9 @@ class FilterABC(ABC): self.__setattr__(f"_{attr}", attr_type(values[attr])) @staticmethod - def _filter_by_attributes(attrs: list[Callable], values: List[T]) -> List[R]: + def _filter_by_attributes(attrs: list[dict], values: List[T]) -> List[R]: for attr in attrs: - values = values.where(attr) + if attr["attr"] is None: + continue + values = values.where(attr["func"]) return values diff --git a/bot/src/bot_graphql/filter/scheduled_event_filter.py b/bot/src/bot_graphql/filter/scheduled_event_filter.py index d1937c25..e98be02b 100644 --- a/bot/src/bot_graphql/filter/scheduled_event_filter.py +++ b/bot/src/bot_graphql/filter/scheduled_event_filter.py @@ -51,15 +51,15 @@ class ScheduledEventFilter(FilterABC): query = self._filter_by_attributes( [ - lambda x: x.id == self._id, - lambda x: x.interval == self._interval, - lambda x: x.name == self._name, - lambda x: x.description == self._description, - lambda x: x.channel_id == self._channel_id, - lambda x: x.start_time == self._start_time, - lambda x: x.end_time == self._end_time, - lambda x: x.entity_type == self._entity_type, - lambda x: x.location == self._location, + {"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, ) 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/scheduled_event_mutation.py b/bot/src/bot_graphql/mutations/scheduled_event_mutation.py index c138b082..81353c62 100644 --- a/bot/src/bot_graphql/mutations/scheduled_event_mutation.py +++ b/bot/src/bot_graphql/mutations/scheduled_event_mutation.py @@ -1,9 +1,12 @@ +from datetime import datetime + from cpl_core.database.context import DatabaseContextABC from cpl_discord.service import DiscordBotServiceABC 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 @@ -35,14 +38,14 @@ class ScheduledEventMutation(QueryABC): self._can_user_mutate_data(server, UserRoleEnum.moderator) scheduled_event = ScheduledEvent( - input["interval"], + ScheduledEventIntervalEnum(input["interval"]), input["name"], - input["description"], - input["channel_id"], - input["start_time"], - input["end_time"], - input["entity_type"], - input["location"], + 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, + input["entityType"], + input["location"] if "location" in input else None, server, ) @@ -70,10 +73,10 @@ class ScheduledEventMutation(QueryABC): scheduled_event.interval = 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["channel_id"] if "channel_id" in input else scheduled_event.channel_id - scheduled_event.start_time = input["start_time"] if "start_time" in input else scheduled_event.start_time - scheduled_event.end_time = input["end_time"] if "end_time" in input else scheduled_event.end_time - scheduled_event.entity_type = input["entity_type"] if "entity_type" in input else scheduled_event.entity_type + scheduled_event.channel_id = input["channelId"] if "channelId" in input else scheduled_event.channel_id + scheduled_event.start_time = input["startTime"] if "startTime" in input else scheduled_event.start_time + scheduled_event.end_time = input["endTime"] if "endTime" in input else scheduled_event.end_time + scheduled_event.entity_type = 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) diff --git a/web/package.json b/web/package.json index 3255abc5..281eca54 100644 --- a/web/package.json +++ b/web/package.json @@ -1,56 +1,56 @@ { - "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" - } -} + "name": "web", + "version": "1.2.dev410", + "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" + } +} \ No newline at end of file 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 index c3e8beea..972c10bb 100644 --- a/web/src/app/models/data/scheduled_events.model.ts +++ b/web/src/app/models/data/scheduled_events.model.ts @@ -9,12 +9,12 @@ export enum EventType { export interface ScheduledEvent extends DataWithHistory { id?: number; - interval?: string; + interval?: ScheduledEventInterval; name?: string; description?: string; channelId?: string; - startTime?: string; - endTime?: string; + startTime?: Date; + endTime?: Date; entityType?: EventType; location?: string; server?: Server; @@ -32,3 +32,10 @@ export interface ScheduledEventFilter { location?: string; server?: ServerFilter; } + +export enum ScheduledEventInterval { + daily = "daily", + weekly = "weekly", + monthly = "monthly", + yearly = "yearly" +} diff --git a/web/src/app/models/graphql/mutations.model.ts b/web/src/app/models/graphql/mutations.model.ts index 27fd48c1..95843b64 100644 --- a/web/src/app/models/graphql/mutations.model.ts +++ b/web/src/app/models/graphql/mutations.model.ts @@ -185,14 +185,16 @@ export class Mutations { endTime: $endTime, entityType: $entityType, location: $location, - serverId: $serverId} - ) { - id + serverId: $serverId + }) { + interval name description - attribute - operator - value + channelId + startTime + endTime + entityType + location server { id } @@ -215,12 +217,17 @@ export class Mutations { location: $location, serverId: $serverId} ) { - id + interval name description - attribute - operator - value + channelId + startTime + endTime + entityType + location + server { + id + } } } } @@ -397,7 +404,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/modules/shared/shared.module.ts b/web/src/app/modules/shared/shared.module.ts index 2a7bfc45..af9e8ea8 100644 --- a/web/src/app/modules/shared/shared.module.ts +++ b/web/src/app/modules/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { CommonModule } from "@angular/common"; +import { CommonModule, DatePipe } from "@angular/common"; import { HttpClientModule } from "@angular/common/http"; import { NgModule } from "@angular/core"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; @@ -38,6 +38,8 @@ import { FileUploadModule } from "primeng/fileupload"; import { SelectButtonModule } from "primeng/selectbutton"; import { TabViewModule } from "primeng/tabview"; import { RadioButtonModule } from "primeng/radiobutton"; +import { InputTextareaModule } from "primeng/inputtextarea"; +import { InputMaskModule } from "primeng/inputmask"; const PrimeNGModules = [ @@ -69,7 +71,9 @@ const PrimeNGModules = [ FileUploadModule, SelectButtonModule, TabViewModule, - RadioButtonModule + RadioButtonModule, + InputTextareaModule, + InputMaskModule ]; @NgModule({ @@ -102,6 +106,9 @@ const PrimeNGModules = [ MultiSelectColumnsComponent, FeatureFlagListComponent, DataImportAndExportComponent + ], + providers: [ + DatePipe ] }) export class SharedModule { diff --git a/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html index 938281d5..62289884 100644 --- a/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html +++ b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html @@ -1,44 +1,92 @@
- + [style]="{ width: '500px', height: '575px' }">
-
- - +
+
+ {{'view.server.scheduled_events.edit_dialog.location.interval' | translate}}: + +
+ +
+
+ + +
+
+ +
+ + + +
-

- Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem - aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. - Nemo - enim - ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos - qui - ratione voluptatem sequi nesciunt. Consectetur, adipisci velit, sed quia non numquam eius modi. -

+
+
+ {{'view.server.scheduled_events.edit_dialog.event_info.event_topic' | translate}}: + +
+ +
+ {{'view.server.scheduled_events.edit_dialog.event_info.start_date_time' | translate}}: + +
+ +
+ {{'view.server.scheduled_events.edit_dialog.event_info.end_date_time' | translate}}: + +
+ +
+ {{'view.server.scheduled_events.edit_dialog.event_info.description' | translate}}: + +
+
- -
-
- -
-
- - - -
-
- + +
+
+ +
+
+ + + +
+
+
diff --git a/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.ts b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.ts index ca5ff6d6..f74fb1cd 100644 --- a/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.ts +++ b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.ts @@ -1,14 +1,26 @@ -import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { EventType, ScheduledEvent } from "../../../../../../models/data/scheduled_events.model"; +import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; +import { + EventType, + ScheduledEvent, + ScheduledEventInterval +} from "../../../../../../models/data/scheduled_events.model"; import { TranslateService } from "@ngx-translate/core"; -import { FormBuilder, FormControl, Validators } from "@angular/forms"; +import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; +import { SingleDiscordQuery } from "../../../../../../models/graphql/query.model"; +import { Queries } from "../../../../../../models/graphql/queries.model"; +import { Channel, ChannelType, Guild } from "../../../../../../models/data/discord.model"; +import { DataService } from "../../../../../../services/data/data.service"; +import { SpinnerService } from "../../../../../../services/spinner/spinner.service"; +import { ActivatedRoute } from "@angular/router"; +import { Server } from "../../../../../../models/data/server.model"; +import { DatePipe } from "@angular/common"; @Component({ selector: "app-edit-scheduled-event-dialog", templateUrl: "./edit-scheduled-event-dialog.component.html", styleUrls: ["./edit-scheduled-event-dialog.component.scss"] }) -export class EditScheduledEventDialogComponent { +export class EditScheduledEventDialogComponent implements OnInit { @Input() event?: ScheduledEvent; @Output() save = new EventEmitter(); @@ -19,8 +31,9 @@ export class EditScheduledEventDialogComponent { set visible(val: boolean) { if (!val) { this.event = undefined; + this.inputForm.reset(); + this.activeIndex = 0; } - this.visible = val; } get header() { @@ -32,26 +45,118 @@ export class EditScheduledEventDialogComponent { } public activeIndex: number = 0; - public inputForm = this.fb.group({ - id: new FormControl(this.event?.id), - interval: new FormControl(this.event?.interval, [Validators.required]), - entityType: new FormControl(this.event?.entityType, [Validators.required]), - channelId: new FormControl(this.event?.channelId, this.event?.entityType == EventType.voice || this.event?.entityType == EventType.stageInstance ? [Validators.required] : []), - location: new FormControl(this.event?.location, this.event?.entityType == EventType.external ? [Validators.required] : []), - name: new FormControl(this.event?.name, [Validators.required]), - startTime: new FormControl(this.event?.startTime, [Validators.required]), - endTime: new FormControl(this.event?.endTime), - description: new FormControl(this.event?.description) - }); + public inputForm!: FormGroup<{ + entityType: FormControl; + name: FormControl; + description: FormControl; + interval: FormControl; + location: FormControl; + startTime: FormControl; + id: FormControl; + endTime: FormControl; + channelId: FormControl + }>; + server: Server = {}; + public voiceChannels: Channel[] = []; + public stageChannels: Channel[] = []; + public guild: Guild = { channels: [], emojis: [], roles: [] }; + public times: string[] = []; + public now = new Date(); + public interval = Object.keys(ScheduledEventInterval).map(k => ( + { + label: this.translate.instant(`view.server.scheduled_events.edit_dialog.location.intervals.${k}`), + value: k + } + )); constructor( private translate: TranslateService, - private fb: FormBuilder + private fb: FormBuilder, + private data: DataService, + private spinner: SpinnerService, + private route: ActivatedRoute, + private datePipe: DatePipe ) { + for (let i = 0; i < 25; i++) { + let time = ""; + if (i < 10) { + time = `0${i}`; + } else { + time = `${i}`; + } + this.times.push(`${time}:00`); + this.times.push(`${time}:15`); + this.times.push(`${time}:30`); + this.times.push(`${time}:45`); + } + this.setInputForm(); + } + + public ngOnInit() { + this.data.getServerFromRoute(this.route).then(server => { + this.server = server; + this.spinner.showSpinner(); + + this.data.query(Queries.guildsQuery, { + id: server?.discordId + } + ).subscribe(data => { + if (data.discord.guilds) { + this.guild = data.discord.guilds[0]; + } + + this.voiceChannels = this.guild.channels.filter(x => x.type === ChannelType.voice); + this.stageChannels = this.guild.channels.filter(x => x.type === ChannelType.stage); + this.setInputForm(); + this.spinner.hideSpinner(); + }); + }); + } + + public setInputForm() { + if (this.now.getMinutes() % 15 != 0) { + if (this.now.getMinutes() < 15) { + this.now.setMinutes(15); + } else if (this.now.getMinutes() < 30) { + this.now.setMinutes(30); + } else if (this.now.getMinutes() < 45) { + this.now.setMinutes(45); + } else if (this.now.getMinutes() > 45) { + this.now.setMinutes(0); + this.now.setHours(this.now.getHours() + 1); + } + } + this.now.setSeconds(0); + + this.inputForm = this.fb.group({ + id: new FormControl(this.event?.id), + interval: new FormControl(this.event?.interval, [Validators.required]), + entityType: new FormControl(this.event?.entityType, [Validators.required]), + channelId: new FormControl(this.event?.channelId, this.event?.entityType == EventType.voice || this.event?.entityType == EventType.stageInstance ? [Validators.required] : []), + location: new FormControl(this.event?.location, this.event?.entityType == EventType.external ? [Validators.required] : []), + name: new FormControl(this.event?.name, [Validators.required]), + startTime: new FormControl(this.event?.startTime ? new Date(this.event.startTime) : this.now, [Validators.required]), + endTime: new FormControl(this.event?.endTime ? new Date(this.event.endTime) : undefined), + description: new FormControl(this.event?.description) + }); } public saveEvent() { + this.event = { + id: this.inputForm.controls.id.value ?? undefined, + interval: this.inputForm.controls.interval.value ?? undefined, + name: this.inputForm.controls.name.value ?? undefined, + description: this.inputForm.controls.description.value ?? undefined, + channelId: this.inputForm.controls.channelId.value ?? undefined, + startTime: this.inputForm.controls.startTime.value ?? undefined, + endTime: this.inputForm.controls.endTime.value ?? undefined, + entityType: this.inputForm.controls.entityType.value ?? undefined, + location: this.inputForm.controls.location.value ?? undefined, + server: this.server + }; + this.save.emit(this.event); + this.event = undefined; } public next() { diff --git a/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.html b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.html index 1296b1bd..4e2491b4 100644 --- a/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.html +++ b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.html @@ -1,4 +1,5 @@ - +

{{'view.server.scheduled_events.header' | translate}} @@ -123,7 +124,7 @@ - +
@@ -132,12 +133,24 @@
- - - - - - + +
+ +
+ + + +
+ +
+ + + + + + @@ -148,133 +161,56 @@ {{'common.id' | translate}}: - - - {{scheduledEvent.id}} - - - {{scheduledEvent.id}} - - + {{scheduledEvent.id}} {{'common.interval' | translate}}: - - - - - - {{scheduledEvent.interval}} - - + {{scheduledEvent.interval}} {{'common.name' | translate}}: - - - - - - {{scheduledEvent.name}} - - + {{scheduledEvent.name}} {{'common.description' | translate}}: - - - - - - {{scheduledEvent.description}} - - + {{scheduledEvent.description}} {{'common.channel_id' | translate}}: - - - - - - {{scheduledEvent.channel_id}} - - + {{scheduledEvent.channelId}} {{'common.start_time' | translate}}: - - - - - - {{scheduledEvent.start_time}} - - + {{scheduledEvent.startTime}} {{'common.end_time' | translate}}: - - - - - - {{scheduledEvent.end_time}} - - + {{scheduledEvent.endTime}} {{'common.type' | translate}}: - - - - - - {{scheduledEvent.type}} - - + {{scheduledEvent.entityType}} {{'common.location' | translate}}: - - - - - - {{scheduledEvent.location}} - - + {{scheduledEvent.location}} {{'common.created_at' | translate}}: - - - {{scheduledEvent.createdAt | date:'dd.MM.yy HH:mm'}} - - - {{scheduledEvent.createdAt | date:'dd.MM.yy HH:mm'}} - - + {{scheduledEvent.createdAt | date:'dd.MM.yy HH:mm'}} {{'common.modified_at' | translate}}: - - - {{scheduledEvent.modifiedAt | date:'dd.MM.yy HH:mm'}} - - - {{scheduledEvent.modifiedAt | date:'dd.MM.yy HH:mm'}} - - + {{scheduledEvent.modifiedAt | date:'dd.MM.yy HH:mm'}}
diff --git a/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts index da0e8972..a7534dc1 100644 --- a/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts +++ b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts @@ -118,7 +118,7 @@ export class ScheduledEventsComponent extends ComponentWithTable implements OnIn startTime: new FormControl(null), endTime: new FormControl(null), entityType: new FormControl(null), - location: new FormControl(null), + location: new FormControl(null) }); this.filterForm.valueChanges.pipe( @@ -221,7 +221,15 @@ export class ScheduledEventsComponent extends ComponentWithTable implements OnIn if (this.isEditingNew) { this.spinner.showSpinner(); this.data.mutation(Mutations.createScheduledEvent, { + id: newScheduledEvent.id, + interval: newScheduledEvent.interval, name: newScheduledEvent.name, + description: newScheduledEvent.description, + channelId: newScheduledEvent.channelId, + startTime: newScheduledEvent.startTime, + endTime: newScheduledEvent.endTime, + entityType: newScheduledEvent.entityType, + location: newScheduledEvent.location, serverId: this.server.id } ).pipe(catchError(err => { @@ -240,7 +248,15 @@ export class ScheduledEventsComponent extends ComponentWithTable implements OnIn this.spinner.showSpinner(); this.data.mutation(Mutations.updateScheduledEvent, { id: newScheduledEvent.id, + interval: newScheduledEvent.interval, name: newScheduledEvent.name, + description: newScheduledEvent.description, + channelId: newScheduledEvent.channelId, + startTime: newScheduledEvent.startTime, + endTime: newScheduledEvent.endTime, + entityType: newScheduledEvent.entityType, + location: newScheduledEvent.location, + serverId: this.server.id } ).pipe(catchError(err => { this.spinner.hideSpinner(); @@ -250,6 +266,7 @@ export class ScheduledEventsComponent extends ComponentWithTable implements OnIn this.toastService.success(this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_update"), this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_update_d", { name: newScheduledEvent.name })); this.loadNextPage(); }); + this.editableScheduledEvent = undefined; } public deleteScheduledEvent(ScheduledEvent: ScheduledEvent): void { @@ -272,6 +289,7 @@ export class ScheduledEventsComponent extends ComponentWithTable implements OnIn } public addScheduledEvent(table: Table): void { + this.isEditingNew = true; this.editableScheduledEvent = JSON.parse(JSON.stringify(this.newScheduledEventTemplate)); // const newScheduledEvent = JSON.parse(JSON.stringify(this.newScheduledEventTemplate)); // diff --git a/web/src/app/modules/view/server/scheduled-events/scheduled-events.module.ts b/web/src/app/modules/view/server/scheduled-events/scheduled-events.module.ts index 752b6ce7..2ba42372 100644 --- a/web/src/app/modules/view/server/scheduled-events/scheduled-events.module.ts +++ b/web/src/app/modules/view/server/scheduled-events/scheduled-events.module.ts @@ -1,10 +1,12 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import { NgModule } from "@angular/core"; +import { CommonModule } from "@angular/common"; -import { ScheduledEventsRoutingModule } from './scheduled-events-routing.module'; +import { ScheduledEventsRoutingModule } from "./scheduled-events-routing.module"; import { ScheduledEventsComponent } from "./components/scheduled-events/scheduled-events.component"; import { SharedModule } from "../../../shared/shared.module"; -import { EditScheduledEventDialogComponent } from './components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component'; +import { + EditScheduledEventDialogComponent +} from "./components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component"; @NgModule({ @@ -16,6 +18,8 @@ import { EditScheduledEventDialogComponent } from './components/edit-scheduled-e CommonModule, SharedModule, ScheduledEventsRoutingModule - ] + ], + exports: [] }) -export class ScheduledEventsModule { } +export class ScheduledEventsModule { +} diff --git a/web/src/app/services/sidebar/sidebar.service.ts b/web/src/app/services/sidebar/sidebar.service.ts index 285b3a8f..14c55841 100644 --- a/web/src/app/services/sidebar/sidebar.service.ts +++ b/web/src/app/services/sidebar/sidebar.service.ts @@ -4,7 +4,7 @@ import { BehaviorSubject, forkJoin, Observable } from "rxjs"; import { AuthRoles } from "../../models/auth/auth-roles.enum"; import { AuthService } from "../auth/auth.service"; import { TranslateService } from "@ngx-translate/core"; -import { NavigationEnd, Router } from "@angular/router"; +import { Router } from "@angular/router"; import { ThemeService } from "../theme/theme.service"; import { Server } from "../../models/data/server.model"; import { UserDTO } from "../../models/auth/auth-user.dto"; @@ -113,7 +113,7 @@ export class SidebarService { this.serverScheduledEvents = { label: this.isSidebarOpen ? this.translateService.instant("sidebar.server.scheduled_events") : "", - icon: "pi pi-calender", + icon: "pi pi-calendar", visible: true, routerLink: `server/${this.server?.id}/scheduled-events` }; diff --git a/web/src/assets/i18n/de.json b/web/src/assets/i18n/de.json index 845e8a17..7d70ae2d 100644 --- a/web/src/assets/i18n/de.json +++ b/web/src/assets/i18n/de.json @@ -335,6 +335,7 @@ "config": "Konfiguration", "dashboard": "Dashboard", "members": "Mitglieder", + "scheduled_events": "Geplante Events", "server": { "achievements": "Errungenschaften", "auto_roles": "Auto Rollen", @@ -343,6 +344,7 @@ "levels": "Level", "members": "Mitglieder", "profile": "Dein Profil", + "scheduled_events": "Geplante Events", "short_role_names": "Rollen Kürzel" }, "server_empty": "Kein Server ausgewählt", @@ -551,16 +553,24 @@ "add_header": "Event hinzufügen", "edit_header": "Event bearbeiten", "event_info": { + "description": "Beschreibung", "description_input": "Erzähl den Leuten ein wenig mehr über dein Event. Markdown, neue Zeilen und Links werden unterstützt.", "event_topic": "Thema", "event_topic_input": "Worum geht es bei deinem Event?", "header": "Worum geht es bei deinem Event?", - "start_date": "Startdatum", - "start_time": "Startzeit", + "start_date_time": "Startzeitpunkt", + "end_date_time": "Endzeitpunkt", "tab_name": "Eventinformationen" }, "location": { "header": "Wo ist dein Event?", + "interval": "Interval", + "intervals": { + "daily": "Täglich", + "weekly": "Wöchentlich", + "monthly": "Monatlich", + "yearly": "Jährlich" + }, "somewhere_else": "Irgendwo anders", "somewhere_else_input": "Ort eingeben", "stage": "Stage-Kanal", diff --git a/web/src/assets/i18n/en.json b/web/src/assets/i18n/en.json index 86a3cd2a..ebaa4b27 100644 --- a/web/src/assets/i18n/en.json +++ b/web/src/assets/i18n/en.json @@ -338,6 +338,7 @@ "levels": "Level", "members": "Members", "profile": "Your profile", + "scheduled_events": "Scheduled events", "short_role_names": "Short role names" }, "server_empty": "No server selected", diff --git a/web/src/assets/version.json b/web/src/assets/version.json index 0e2d8ac7..9e53173b 100644 --- a/web/src/assets/version.json +++ b/web/src/assets/version.json @@ -1,7 +1,7 @@ { - "WebVersion": { - "Major": "1", - "Minor": "2", - "Micro": "2" - } -} + "WebVersion": { + "Major": "1", + "Minor": "2", + "Micro": "dev410" + } +} \ No newline at end of file diff --git a/web/src/styles.scss b/web/src/styles.scss index 3878c311..8800861f 100644 --- a/web/src/styles.scss +++ b/web/src/styles.scss @@ -689,8 +689,42 @@ p-inputNumber { } } } + } + .form { + display: flex; + flex-direction: column; + gap: 20px; + textarea { + min-height: 101px !important; + + &:focus { + box-shadow: none !important; + } + } + + .type { + display: flex; + flex-direction: column; + gap: 10px; + + .field-checkbox { + display: flex; + gap: 15px; + } + } + + input, + .p-dropdown { + width: 100%; + } + } +} + +p-calendar { + .p-calendar { + width: 100% !important; } } diff --git a/web/src/styles/primeng-fixes.scss b/web/src/styles/primeng-fixes.scss index cf514b43..cbf7dea3 100644 --- a/web/src/styles/primeng-fixes.scss +++ b/web/src/styles/primeng-fixes.scss @@ -113,3 +113,4 @@ p-table { .pi-sort-amount-down:before { content: "\e913" !important; } + diff --git a/web/src/styles/themes/sh-edraft-dark-theme.scss b/web/src/styles/themes/sh-edraft-dark-theme.scss index f7b2f949..9d9bf6f5 100644 --- a/web/src/styles/themes/sh-edraft-dark-theme.scss +++ b/web/src/styles/themes/sh-edraft-dark-theme.scss @@ -705,6 +705,8 @@ } .p-datepicker { + color: $primaryTextColor !important; + .p-datepicker-header { color: $primaryHeaderColor !important; background-color: $primaryBackgroundColor !important; @@ -764,6 +766,19 @@ } .edit-dialog { + textarea { + background-color: $secondaryBackgroundColor; + color: $primaryTextColor; + + &:hover { + border-color: $primaryHeaderColor; + } + + &:focus { + border-color: $primaryHeaderColor; + } + } + .p-dialog-content { .p-tabview { .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus { @@ -784,4 +799,19 @@ } } } + + .p-radiobutton { + .p-radiobutton-box.p-highlight { + border-color: $primaryHeaderColor !important; + background: $primaryHeaderColor !important; + } + + .p-radiobutton-box:not(.p-disabled):not(.p-highlight):hover { + border-color: $primaryHeaderColor !important; + } + + .p-radiobutton-box:not(.p-disabled).p-focus { + box-shadow: none !important; + } + } } -- 2.45.2 From 171aa63df9865e44592b6348ce192654b2c6e5ed Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 18 Nov 2023 23:10:28 +0100 Subject: [PATCH 29/37] Improved update & add logic #410 --- bot/src/bot_data/model/scheduled_event.py | 2 +- .../mutations/scheduled_event_mutation.py | 17 +++-- .../queries/scheduled_event_history_query.py | 2 +- .../queries/scheduled_event_query.py | 2 +- .../app/models/data/scheduled_events.model.ts | 14 +++-- web/src/app/models/graphql/mutations.model.ts | 3 +- ...edit-scheduled-event-dialog.component.html | 4 +- .../edit-scheduled-event-dialog.component.ts | 63 +++++++++++++------ .../scheduled-events.component.html | 7 ++- .../scheduled-events.component.ts | 19 ++++-- 10 files changed, 91 insertions(+), 42 deletions(-) diff --git a/bot/src/bot_data/model/scheduled_event.py b/bot/src/bot_data/model/scheduled_event.py index 3f8fbee3..041cba28 100644 --- a/bot/src/bot_data/model/scheduled_event.py +++ b/bot/src/bot_data/model/scheduled_event.py @@ -168,7 +168,7 @@ class ScheduledEvent(TableABC): UPDATE `ScheduledEvents` SET `Interval` = '{self._interval.value}', `Name` = '{self._name}', - `Description` = '{self._start_time}', + `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}'"}, diff --git a/bot/src/bot_graphql/mutations/scheduled_event_mutation.py b/bot/src/bot_graphql/mutations/scheduled_event_mutation.py index 81353c62..43f1dd97 100644 --- a/bot/src/bot_graphql/mutations/scheduled_event_mutation.py +++ b/bot/src/bot_graphql/mutations/scheduled_event_mutation.py @@ -69,13 +69,22 @@ class ScheduledEventMutation(QueryABC): scheduled_event = self._scheduled_events.get_scheduled_event_by_id(input["id"]) self._can_user_mutate_data(scheduled_event.server, UserRoleEnum.moderator) - scheduled_event.short_name = input["shortName"] if "shortName" in input else scheduled_event.short_name - scheduled_event.interval = input["interval"] if "interval" in input else scheduled_event.interval + 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 = input["startTime"] if "startTime" in input else scheduled_event.start_time - scheduled_event.end_time = input["endTime"] if "endTime" in input else scheduled_event.end_time + 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 = input["entityType"] if "entityType" in input else scheduled_event.entity_type scheduled_event.location = input["location"] if "location" in input else scheduled_event.location diff --git a/bot/src/bot_graphql/queries/scheduled_event_history_query.py b/bot/src/bot_graphql/queries/scheduled_event_history_query.py index 279bcda1..f8fe921a 100644 --- a/bot/src/bot_graphql/queries/scheduled_event_history_query.py +++ b/bot/src/bot_graphql/queries/scheduled_event_history_query.py @@ -13,7 +13,7 @@ class ScheduledEventHistoryQuery(DataQueryWithHistoryABC): self.set_field("id", lambda x, *_: x.id) self.set_field("id", lambda x, *_: x.id) - self.set_field("interval", lambda x, *_: x.interval) + 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) diff --git a/bot/src/bot_graphql/queries/scheduled_event_query.py b/bot/src/bot_graphql/queries/scheduled_event_query.py index 47b09a1b..0cae786a 100644 --- a/bot/src/bot_graphql/queries/scheduled_event_query.py +++ b/bot/src/bot_graphql/queries/scheduled_event_query.py @@ -12,7 +12,7 @@ class ScheduledEventQuery(DataQueryWithHistoryABC): DataQueryWithHistoryABC.__init__(self, "ScheduledEvent", "ScheduledEventsHistory", ScheduledEventHistory, db) self.set_field("id", lambda x, *_: x.id) - self.set_field("interval", lambda x, *_: x.interval) + 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) diff --git a/web/src/app/models/data/scheduled_events.model.ts b/web/src/app/models/data/scheduled_events.model.ts index 972c10bb..e94db4b5 100644 --- a/web/src/app/models/data/scheduled_events.model.ts +++ b/web/src/app/models/data/scheduled_events.model.ts @@ -33,9 +33,11 @@ export interface ScheduledEventFilter { server?: ServerFilter; } -export enum ScheduledEventInterval { - daily = "daily", - weekly = "weekly", - monthly = "monthly", - yearly = "yearly" -} +// 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 95843b64..bdac7b0c 100644 --- a/web/src/app/models/graphql/mutations.model.ts +++ b/web/src/app/models/graphql/mutations.model.ts @@ -204,9 +204,10 @@ export class Mutations { `; static updateScheduledEvent = ` - mutation updateScheduledEvent($interval: String,$name: String,$description: String,$channelId: String,$startTime: String, $endTime: String,$entityType: Int,$location: String, $serverId: ID) { + 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, diff --git a/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html index 62289884..fe5985ff 100644 --- a/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html +++ b/web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html @@ -1,5 +1,5 @@
-
@@ -80,7 +80,7 @@
+ (click)="event = undefined"> + [disabled]="loginForm.invalid || !basicLoginFeatureFlags">