sh-edraft.de/sh_discord_bot
4
1
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

Formatted stuff #405

Browse Source
This commit is contained in:
Sven Heidemann 2023-10-15 11:30:29 +02:00
parent dd6b609094
commit 9c5760e0f9
226 changed files with 1083 additions and 3252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitea/workflows/deploy_dev.yaml
View File

@ -24,17 +24,17 @@ jobs:
uses: https://github.com/actions/checkout@v3 uses: https://github.com/actions/checkout@v3
- name: Shutdown stack - name: Shutdown stack
run: docker stack rm kdb_staging run: docker stack rm sdb_staging
- name: Prepare bot build - name: Prepare bot build
run: | run: |
cd kdb-bot cd bot
pip install --extra-index-url https://pip.sh-edraft.de cpl-cli pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
cpl i cpl i
- name: Build docker bot - name: Build docker bot
run: | run: |
cd kdb-bot cd bot
docker image prune -f docker image prune -f
cpl docker-build cpl docker-build
@ -43,13 +43,13 @@ jobs:
- name: Prepare web build - name: Prepare web build
run: | run: |
cd kdb-web cd web
npm install -g ts-node npm install -g ts-node
npm i npm i
- name: Build docker web - name: Build docker web
run: | run: |
cd kdb-web cd web
docker image prune -f docker image prune -f
npm run docker-build npm run docker-build
@ -60,6 +60,6 @@ jobs:
portainer-username: "gitea_job" portainer-username: "gitea_job"
portainer-password: "${{ secrets.docker_job }}" portainer-password: "${{ secrets.docker_job }}"
portainer-endpoint: 2 portainer-endpoint: 2
name: kdb_staging name: sdb_staging
file: ./docker-compose.staging.yml file: ./docker-compose.staging.yml
variables: '{}' variables: '{}'

12
.gitea/workflows/deploy_prod.yaml
View File

@ -24,17 +24,17 @@ jobs:
uses: https://github.com/actions/checkout@v3 uses: https://github.com/actions/checkout@v3
- name: Shutdown stack - name: Shutdown stack
run: docker stack rm kdb_prod run: docker stack rm sdb_prod
- name: Prepare bot build - name: Prepare bot build
run: | run: |
cd kdb-bot cd bot
pip install --extra-index-url https://pip.sh-edraft.de cpl-cli pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
cpl i cpl i
- name: Build docker bot - name: Build docker bot
run: | run: |
cd kdb-bot cd bot
docker image prune -f docker image prune -f
cpl docker-build cpl docker-build
@ -43,13 +43,13 @@ jobs:
- name: Prepare web build - name: Prepare web build
run: | run: |
cd kdb-web cd web
npm install -g ts-node npm install -g ts-node
npm i npm i
- name: Build docker web - name: Build docker web
run: | run: |
cd kdb-web cd web
docker image prune -f docker image prune -f
npm run docker-build npm run docker-build
@ -60,6 +60,6 @@ jobs:
portainer-username: "gitea_job" portainer-username: "gitea_job"
portainer-password: "${{ secrets.docker_job }}" portainer-password: "${{ secrets.docker_job }}"
portainer-endpoint: 2 portainer-endpoint: 2
name: kdb_prod name: sdb_prod
file: ./docker-compose.yml file: ./docker-compose.yml
variables: '{}' variables: '{}'

8
bot/cpl-workspace.json
View File

@ -32,12 +32,12 @@
"pre-build": "cpl set-version $ARGS; black ./;", "pre-build": "cpl set-version $ARGS; black ./;",
"post-build": "cpl run post-build --dev; black ./;", "post-build": "cpl run post-build --dev; black ./;",
"pre-prod": "cpl build", "pre-prod": "cpl build",
"prod": "export KDB_ENVIRONMENT=production; export KDB_NAME=KDB-Prod; cpl start;", "prod": "export SDB_ENVIRONMENT=production; export SDB_NAME=SDB-Prod; cpl start;",
"pre-stage": "cpl build", "pre-stage": "cpl build",
"stage": "export KDB_ENVIRONMENT=staging; export KDB_NAME=KDB-Stage; cpl start;", "stage": "export SDB_ENVIRONMENT=staging; export SDB_NAME=SDB-Stage; cpl start;",
"pre-dev": "cpl build", "pre-dev": "cpl build",
"dev": "export KDB_ENVIRONMENT=development; export KDB_NAME=KDB-Dev; cpl start;", "dev": "export SDB_ENVIRONMENT=development; export SDB_NAME=SDB-Dev; cpl start;",
"docker-build": "cpl build $ARGS; docker build -t sh-edraft.de/kdb-bot:$(cpl gv) .;", "docker-build": "cpl build $ARGS; docker build -t sh-edraft.de/sdb-bot:$(cpl gv) .;",
"dc-up": "docker-compose up -d", "dc-up": "docker-compose up -d",
"dc-down": "docker-compose down", "dc-down": "docker-compose down",
"docker": "cpl dc-down; cpl docker-build; cpl dc-up;" "docker": "cpl dc-down; cpl docker-build; cpl dc-up;"

2
bot/dockerfile
View File

@ -2,7 +2,7 @@
FROM python:3.10.4-alpine FROM python:3.10.4-alpine
WORKDIR /app WORKDIR /app
COPY ./dist/bot/build/kdb-bot/ . COPY ./dist/bot/build/bot/ .
COPY ./dist/bot/build/requirements.txt . COPY ./dist/bot/build/requirements.txt .
RUN python -m pip install --upgrade pip RUN python -m pip install --upgrade pip

26
bot/src/bot/application.py
View File

@ -23,25 +23,17 @@ class Application(DiscordBotApplicationABC):
# cpl-core # cpl-core
self._logger: LoggerABC = services.get_service(LoggerABC) self._logger: LoggerABC = services.get_service(LoggerABC)
self._data_integrity: DataIntegrityService = services.get_service( self._data_integrity: DataIntegrityService = services.get_service(DataIntegrityService)
DataIntegrityService
)
# cpl-discord # cpl-discord
self._bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC) self._bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC)
self._bot_settings: DiscordBotSettings = config.get_configuration( self._bot_settings: DiscordBotSettings = config.get_configuration(DiscordBotSettings)
DiscordBotSettings
)
# cpl-translation # cpl-translation
self._translation: TranslationServiceABC = services.get_service( self._translation: TranslationServiceABC = services.get_service(TranslationServiceABC)
TranslationServiceABC
)
self._t: TranslatePipe = services.get_service(TranslatePipe) self._t: TranslatePipe = services.get_service(TranslatePipe)
# internal stuff # internal stuff
self._tasks = services.get_services(TaskABC) self._tasks = services.get_services(TaskABC)
self._feature_flags: FeatureFlagsSettings = config.get_configuration( self._feature_flags: FeatureFlagsSettings = config.get_configuration(FeatureFlagsSettings)
FeatureFlagsSettings
)
# api # api
if self._feature_flags.get_flag(FeatureFlagsEnum.api_module): if self._feature_flags.get_flag(FeatureFlagsEnum.api_module):
@ -50,9 +42,7 @@ class Application(DiscordBotApplicationABC):
self._is_stopping = False self._is_stopping = False
async def configure(self): async def configure(self):
self._translation.load_by_settings( self._translation.load_by_settings(self._configuration.get_configuration(TranslationSettings))
self._configuration.get_configuration(TranslationSettings)
)
async def main(self): async def main(self):
try: try:
@ -95,8 +85,4 @@ class Application(DiscordBotApplicationABC):
Console.write_line() Console.write_line()
def is_restart(self): def is_restart(self):
return ( return True if self._configuration.get_configuration("IS_RESTART") == "true" else False
True
if self._configuration.get_configuration("IS_RESTART") == "true"
else False
)

4
bot/src/bot/extension/init_bot_extension.py
View File

@ -13,6 +13,4 @@ class InitBotExtension(ApplicationExtensionABC):
async def run(self, config: ConfigurationABC, services: ServiceProviderABC): async def run(self, config: ConfigurationABC, services: ServiceProviderABC):
settings = config.get_configuration(TechnicianConfig) settings = config.get_configuration(TechnicianConfig)
bot: DiscordBotServiceABC = services.get_service( bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC, max_messages=settings.cache_max_messages)
DiscordBotServiceABC, max_messages=settings.cache_max_messages
)

4
bot/src/bot/startup.py
View File

@ -50,9 +50,7 @@ class Startup(StartupABC):
services.add_singleton(CustomFileLoggerABC, ApiLogger) services.add_singleton(CustomFileLoggerABC, ApiLogger)
services.add_translation() services.add_translation()
services.add_db_context( services.add_db_context(DBContext, self._config.get_configuration(DatabaseSettings))
DBContext, self._config.get_configuration(DatabaseSettings)
)
provider = services.build_service_provider() provider = services.build_service_provider()
# instantiate custom logger # instantiate custom logger

8
bot/src/bot/startup_discord_extension.py
View File

@ -9,13 +9,9 @@ class StartupDiscordExtension(StartupExtensionABC):
def __init__(self): def __init__(self):
pass pass
def configure_configuration( def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
self, config: ConfigurationABC, env: ApplicationEnvironmentABC
):
pass pass
def configure_services( def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC
):
services.add_discord() services.add_discord()
dcc = get_discord_collection(services) dcc = get_discord_collection(services)

72
bot/src/bot/startup_migration_extension.py
View File

@ -41,66 +41,30 @@ class StartupMigrationExtension(StartupExtensionABC):
def __init__(self): def __init__(self):
pass pass
def configure_configuration( def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
self, config: ConfigurationABC, env: ApplicationEnvironmentABC
):
pass pass
def configure_services( def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC
):
services.add_transient(MigrationService) services.add_transient(MigrationService)
services.add_transient(MigrationABC, InitialMigration) services.add_transient(MigrationABC, InitialMigration)
services.add_transient( services.add_transient(MigrationABC, AutoRoleMigration) # 03.10.2022 #54 - 0.2.2
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, ApiMigration) # 15.10.2022 #70 - 0.3.0
services.add_transient(MigrationABC, LevelMigration) # 06.11.2022 #25 - 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, StatsMigration) # 09.11.2022 #46 - 0.3.0
services.add_transient( services.add_transient(MigrationABC, AutoRoleFix1Migration) # 30.12.2022 #151 - 0.3.0
MigrationABC, AutoRoleFix1Migration services.add_transient(MigrationABC, UserMessageCountPerHourMigration) # 11.01.2023 #168 - 0.3.1
) # 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, ApiKeyMigration) # 09.02.2023 #162 - 1.0.0
services.add_transient( services.add_transient(MigrationABC, UserJoinedGameServerMigration) # 12.02.2023 #181 - 1.0.0
MigrationABC, UserJoinedGameServerMigration services.add_transient(MigrationABC, RemoveStatsMigration) # 19.02.2023 #190 - 1.0.0
) # 12.02.2023 #181 - 1.0.0 services.add_transient(MigrationABC, UserWarningMigration) # 21.02.2023 #35 - 1.0.0
services.add_transient( services.add_transient(MigrationABC, DBHistoryMigration) # 06.03.2023 #246 - 1.0.0
MigrationABC, RemoveStatsMigration services.add_transient(MigrationABC, AchievementsMigration) # 14.06.2023 #268 - 1.1.0
) # 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, ConfigMigration) # 19.07.2023 #127 - 1.1.0
services.add_transient( services.add_transient(MigrationABC, ConfigFeatureFlagsMigration) # 15.08.2023 #334 - 1.1.0
MigrationABC, ConfigFeatureFlagsMigration services.add_transient(MigrationABC, DefaultRoleMigration) # 24.09.2023 #360 - 1.1.3
) # 15.08.2023 #334 - 1.1.0 services.add_transient(MigrationABC, ShortRoleNameMigration) # 28.09.2023 #378 - 1.1.7
services.add_transient( services.add_transient(MigrationABC, FixUpdatesMigration) # 28.09.2023 #378 - 1.1.7
MigrationABC, DefaultRoleMigration services.add_transient(MigrationABC, ShortRoleNameOnlyHighestMigration) # 02.10.2023 #391 - 1.1.9
) # 24.09.2023 #360 - 1.1.3 services.add_transient(MigrationABC, FixUserHistoryMigration) # 10.10.2023 #401 - 1.2.0
services.add_transient( services.add_transient(MigrationABC, BirthdayMigration) # 10.10.2023 #401 - 1.2.0
MigrationABC, ShortRoleNameMigration services.add_transient(MigrationABC, SteamSpecialOfferMigration) # 10.10.2023 #188 - 1.2.0
) # 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

8
bot/src/bot/startup_module_extension.py
View File

@ -18,15 +18,11 @@ class StartupModuleExtension(StartupExtensionABC):
self._modules = ModuleList.get_modules() self._modules = ModuleList.get_modules()
def configure_configuration( def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
self, config: ConfigurationABC, env: ApplicationEnvironmentABC
):
self._config = config self._config = config
self._feature_flags = config.get_configuration(FeatureFlagsSettings) self._feature_flags = config.get_configuration(FeatureFlagsSettings)
def configure_services( def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC
):
provider = services.build_service_provider() provider = services.build_service_provider()
dc_collection: DiscordCollectionABC = provider.get_service(DiscordCollectionABC) dc_collection: DiscordCollectionABC = provider.get_service(DiscordCollectionABC)

28
bot/src/bot/startup_settings_extension.py
View File

@ -14,38 +14,26 @@ class StartupSettingsExtension(StartupExtensionABC):
def __init__(self): def __init__(self):
self._start_time = datetime.now() self._start_time = datetime.now()
def configure_configuration( def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironmentABC):
self, configuration: ConfigurationABC, environment: ApplicationEnvironmentABC
):
# this shit has to be done here because we need settings in subsequent startup extensions # this shit has to be done here because we need settings in subsequent startup extensions
environment.set_working_directory(os.path.dirname(os.path.realpath(__file__))) environment.set_working_directory(os.path.dirname(os.path.realpath(__file__)))
configuration.add_environment_variables("KDB_") configuration.add_environment_variables("KDB_")
configuration.add_environment_variables("DISCORD_") configuration.add_environment_variables("DISCORD_")
configuration.add_json_file(f"config/appsettings.json", optional=False) configuration.add_json_file(f"config/appsettings.json", optional=False)
configuration.add_json_file( configuration.add_json_file(f"config/appsettings.{environment.environment_name}.json", optional=True)
f"config/appsettings.{environment.environment_name}.json", optional=True configuration.add_json_file(f"config/appsettings.{environment.host_name}.json", optional=True)
)
configuration.add_json_file(
f"config/appsettings.{environment.host_name}.json", optional=True
)
# load feature-flags # load feature-flags
configuration.add_json_file(f"config/feature-flags.json", optional=False) configuration.add_json_file(f"config/feature-flags.json", optional=False)
configuration.add_json_file( configuration.add_json_file(f"config/feature-flags.{environment.environment_name}.json", optional=True)
f"config/feature-flags.{environment.environment_name}.json", optional=True configuration.add_json_file(f"config/feature-flags.{environment.host_name}.json", optional=True)
)
configuration.add_json_file(
f"config/feature-flags.{environment.host_name}.json", optional=True
)
configuration.add_configuration("Startup_StartTime", str(self._start_time)) configuration.add_configuration("Startup_StartTime", str(self._start_time))
self._configure_settings_with_sub_settings( self._configure_settings_with_sub_settings(
configuration, BotLoggingSettings, lambda x: x.files, lambda x: x.key configuration, BotLoggingSettings, lambda x: x.files, lambda x: x.key
) )
def configure_services( def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC
):
pass pass
@staticmethod @staticmethod
@ -57,6 +45,4 @@ class StartupSettingsExtension(StartupExtensionABC):
return return
for sub_settings in list_atr(settings): for sub_settings in list_atr(settings):
config.add_configuration( config.add_configuration(f"{type(sub_settings).__name__}_{atr(sub_settings)}", sub_settings)
f"{type(sub_settings).__name__}_{atr(sub_settings)}", sub_settings
)

8
bot/src/bot_api/abc/auth_service_abc.py
View File

@ -40,15 +40,11 @@ class AuthServiceABC(ABC):
pass pass
@abstractmethod @abstractmethod
async def get_filtered_auth_users_async( async def get_filtered_auth_users_async(self, criteria: AuthUserSelectCriteria) -> AuthUserFilteredResultDTO:
self, criteria: AuthUserSelectCriteria
) -> AuthUserFilteredResultDTO:
pass pass
@abstractmethod @abstractmethod
async def get_auth_user_by_email_async( async def get_auth_user_by_email_async(self, email: str, with_password: bool = False) -> AuthUserDTO:
self, email: str, with_password: bool = False
) -> AuthUserDTO:
pass pass
@abstractmethod @abstractmethod

4
bot/src/bot_api/abc/select_criteria_abc.py
View File

@ -3,9 +3,7 @@ from abc import ABC, abstractmethod
class SelectCriteriaABC(ABC): class SelectCriteriaABC(ABC):
@abstractmethod @abstractmethod
def __init__( def __init__(self, page_index: int, page_size: int, sort_direction: str, sort_column: str):
self, page_index: int, page_size: int, sort_direction: str, sort_column: str
):
self.page_index = page_index self.page_index = page_index
self.page_size = page_size self.page_size = page_size
self.sort_direction = sort_direction self.sort_direction = sort_direction

12
bot/src/bot_api/api.py
View File

@ -57,9 +57,7 @@ class Api(Flask):
# Added async_mode see link below # Added async_mode see link below
# https://github.com/miguelgrinberg/Flask-SocketIO/discussions/1849 # https://github.com/miguelgrinberg/Flask-SocketIO/discussions/1849
# https://stackoverflow.com/questions/39370848/flask-socket-io-sometimes-client-calls-freeze-the-server # https://stackoverflow.com/questions/39370848/flask-socket-io-sometimes-client-calls-freeze-the-server
self._socketio = SocketIO( self._socketio = SocketIO(self, cors_allowed_origins="*", path="/api/socket.io", async_mode="eventlet")
self, cors_allowed_origins="*", path="/api/socket.io", async_mode="eventlet"
)
self._socketio.on_event("connect", self.on_connect) self._socketio.on_event("connect", self.on_connect)
self._socketio.on_event("disconnect", self.on_disconnect) self._socketio.on_event("disconnect", self.on_disconnect)
@ -145,9 +143,7 @@ class Api(Flask):
data = request.get_data() data = request.get_data()
data = "" if len(data) == 0 else str(data.decode(encoding="utf-8")) data = "" if len(data) == 0 else str(data.decode(encoding="utf-8"))
text = textwrap.dedent( text = textwrap.dedent(f"Request: {request_id}:\n\tHeader:\n\t\t{headers}\n\tResponse: {data}")
f"Request: {request_id}:\n\tHeader:\n\t\t{headers}\n\tResponse: {data}"
)
self._logger.trace(__name__, text) self._logger.trace(__name__, text)
return response return response
@ -162,9 +158,7 @@ class Api(Flask):
# from waitress import serve # from waitress import serve
# https://docs.pylonsproject.org/projects/waitress/en/stable/arguments.html # https://docs.pylonsproject.org/projects/waitress/en/stable/arguments.html
# serve(self, host=self._apt_settings.host, port=self._apt_settings.port, threads=10, connection_limit=1000, channel_timeout=10) # serve(self, host=self._apt_settings.host, port=self._apt_settings.port, threads=10, connection_limit=1000, channel_timeout=10)
self._socket = eventlet.listen( self._socket = eventlet.listen((self._api_settings.host, self._api_settings.port))
(self._api_settings.host, self._api_settings.port)
)
wsgi.server(self._socket, self, log_output=False) wsgi.server(self._socket, self, log_output=False)
def stop(self): def stop(self):

12
bot/src/bot_api/api_module.py
View File

@ -26,21 +26,15 @@ class ApiModule(ModuleABC):
def __init__(self, dc: DiscordCollectionABC): def __init__(self, dc: DiscordCollectionABC):
ModuleABC.__init__(self, dc, FeatureFlagsEnum.api_module) ModuleABC.__init__(self, dc, FeatureFlagsEnum.api_module)
def configure_configuration( def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
self, config: ConfigurationABC, env: ApplicationEnvironmentABC
):
cwd = env.working_directory cwd = env.working_directory
env.set_working_directory(os.path.dirname(os.path.realpath(__file__))) env.set_working_directory(os.path.dirname(os.path.realpath(__file__)))
config.add_json_file(f"config/apisettings.json", optional=False) config.add_json_file(f"config/apisettings.json", optional=False)
config.add_json_file( config.add_json_file(f"config/apisettings.{env.environment_name}.json", optional=True)
f"config/apisettings.{env.environment_name}.json", optional=True
)
config.add_json_file(f"config/apisettings.{env.host_name}.json", optional=True) config.add_json_file(f"config/apisettings.{env.host_name}.json", optional=True)
env.set_working_directory(cwd) env.set_working_directory(cwd)
def configure_services( def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC
):
services.add_singleton(EMailClientABC, EMailClient) services.add_singleton(EMailClientABC, EMailClient)
services.add_singleton(ApiThread) services.add_singleton(ApiThread)

4
bot/src/bot_api/app_api_extension.py
View File

@ -12,9 +12,7 @@ class AppApiExtension(ApplicationExtensionABC):
ApplicationExtensionABC.__init__(self) ApplicationExtensionABC.__init__(self)
async def run(self, config: ConfigurationABC, services: ServiceProviderABC): async def run(self, config: ConfigurationABC, services: ServiceProviderABC):
feature_flags: FeatureFlagsSettings = config.get_configuration( feature_flags: FeatureFlagsSettings = config.get_configuration(FeatureFlagsSettings)
FeatureFlagsSettings
)
if not feature_flags.get_flag(FeatureFlagsEnum.api_module): if not feature_flags.get_flag(FeatureFlagsEnum.api_module):
return return

4
bot/src/bot_api/configuration/authentication_settings.py
View File

@ -16,9 +16,7 @@ class AuthenticationSettings(ConfigurationModelABC):
self._issuer = "" if issuer is None else issuer self._issuer = "" if issuer is None else issuer
self._audience = "" if audience is None else audience self._audience = "" if audience is None else audience
self._token_expire_time = 0 if token_expire_time is None else token_expire_time self._token_expire_time = 0 if token_expire_time is None else token_expire_time
self._refresh_token_expire_time = ( self._refresh_token_expire_time = 0 if refresh_token_expire_time is None else refresh_token_expire_time
0 if refresh_token_expire_time is None else refresh_token_expire_time
)
@property @property
def secret_key(self) -> str: def secret_key(self) -> str:

32
bot/src/bot_api/controller/auth_controller.py
View File

@ -70,9 +70,7 @@ class AuthController:
@Route.post(f"{BasePath}/register") @Route.post(f"{BasePath}/register")
async def register(self): async def register(self):
dto: AuthUserDTO = JSONProcessor.process( dto: AuthUserDTO = JSONProcessor.process(AuthUserDTO, request.get_json(force=True, silent=True))
AuthUserDTO, request.get_json(force=True, silent=True)
)
self._auth_service.add_auth_user(dto) self._auth_service.add_auth_user(dto)
return "", 200 return "", 200
@ -83,9 +81,7 @@ class AuthController:
@Route.post(f"{BasePath}/login") @Route.post(f"{BasePath}/login")
async def login(self) -> Response: async def login(self) -> Response:
dto: AuthUserDTO = JSONProcessor.process( dto: AuthUserDTO = JSONProcessor.process(AuthUserDTO, request.get_json(force=True, silent=True))
AuthUserDTO, request.get_json(force=True, silent=True)
)
result = await self._auth_service.login_async(dto) result = await self._auth_service.login_async(dto)
return jsonify(result.to_dict()) return jsonify(result.to_dict())
@ -114,52 +110,40 @@ class AuthController:
@Route.post(f"{BasePath}/reset-password") @Route.post(f"{BasePath}/reset-password")
async def reset_password(self): async def reset_password(self):
dto: ResetPasswordDTO = JSONProcessor.process( dto: ResetPasswordDTO = JSONProcessor.process(ResetPasswordDTO, request.get_json(force=True, silent=True))
ResetPasswordDTO, request.get_json(force=True, silent=True)
)
await self._auth_service.reset_password_async(dto) await self._auth_service.reset_password_async(dto)
return "", 200 return "", 200
@Route.post(f"{BasePath}/update-user") @Route.post(f"{BasePath}/update-user")
@Route.authorize @Route.authorize
async def update_user(self): async def update_user(self):
dto: UpdateAuthUserDTO = JSONProcessor.process( dto: UpdateAuthUserDTO = JSONProcessor.process(UpdateAuthUserDTO, request.get_json(force=True, silent=True))
UpdateAuthUserDTO, request.get_json(force=True, silent=True)
)
await self._auth_service.update_user_async(dto) await self._auth_service.update_user_async(dto)
return "", 200 return "", 200
@Route.post(f"{BasePath}/update-user-as-admin") @Route.post(f"{BasePath}/update-user-as-admin")
@Route.authorize(role=AuthRoleEnum.admin) @Route.authorize(role=AuthRoleEnum.admin)
async def update_user_as_admin(self): async def update_user_as_admin(self):
dto: UpdateAuthUserDTO = JSONProcessor.process( dto: UpdateAuthUserDTO = JSONProcessor.process(UpdateAuthUserDTO, request.get_json(force=True, silent=True))
UpdateAuthUserDTO, request.get_json(force=True, silent=True)
)
await self._auth_service.update_user_as_admin_async(dto) await self._auth_service.update_user_as_admin_async(dto)
return "", 200 return "", 200
@Route.post(f"{BasePath}/refresh") @Route.post(f"{BasePath}/refresh")
async def refresh(self) -> Response: async def refresh(self) -> Response:
dto: TokenDTO = JSONProcessor.process( dto: TokenDTO = JSONProcessor.process(TokenDTO, request.get_json(force=True, silent=True))
TokenDTO, request.get_json(force=True, silent=True)
)
result = await self._auth_service.refresh_async(dto) result = await self._auth_service.refresh_async(dto)
return jsonify(result.to_dict()) return jsonify(result.to_dict())
@Route.post(f"{BasePath}/revoke") @Route.post(f"{BasePath}/revoke")
async def revoke(self): async def revoke(self):
dto: TokenDTO = JSONProcessor.process( dto: TokenDTO = JSONProcessor.process(TokenDTO, request.get_json(force=True, silent=True))
TokenDTO, request.get_json(force=True, silent=True)
)
await self._auth_service.revoke_async(dto) await self._auth_service.revoke_async(dto)
return "", 200 return "", 200
@Route.post(f"{BasePath}/delete-user") @Route.post(f"{BasePath}/delete-user")
@Route.authorize(role=AuthRoleEnum.admin) @Route.authorize(role=AuthRoleEnum.admin)
async def delete_user(self): async def delete_user(self):
dto: AuthUserDTO = JSONProcessor.process( dto: AuthUserDTO = JSONProcessor.process(AuthUserDTO, request.get_json(force=True, silent=True))
AuthUserDTO, request.get_json(force=True, silent=True)
)
await self._auth_service.delete_auth_user_async(dto) await self._auth_service.delete_auth_user_async(dto)
return "", 200 return "", 200

4
bot/src/bot_api/filter/auth_user_select_criteria.py
View File

@ -13,9 +13,7 @@ class AuthUserSelectCriteria(SelectCriteriaABC):
email: str, email: str,
auth_role: int, auth_role: int,
): ):
SelectCriteriaABC.__init__( SelectCriteriaABC.__init__(self, page_index, page_size, sort_direction, sort_column)
self, page_index, page_size, sort_direction, sort_column
)
self.first_name = first_name self.first_name = first_name
self.last_name = last_name self.last_name = last_name

4
bot/src/bot_api/filter/discord/server_select_criteria.py
View File

@ -10,8 +10,6 @@ class ServerSelectCriteria(SelectCriteriaABC):
sort_column: str, sort_column: str,
name: str, name: str,
): ):
SelectCriteriaABC.__init__( SelectCriteriaABC.__init__(self, page_index, page_size, sort_direction, sort_column)
self, page_index, page_size, sort_direction, sort_column
)
self.name = name self.name = name

4
bot/src/bot_api/model/error_dto.py
View File

@ -11,9 +11,7 @@ class ErrorDTO(DtoABC):
def __init__(self, error_code: Optional[ServiceErrorCode], message: str): def __init__(self, error_code: Optional[ServiceErrorCode], message: str):
DtoABC.__init__(self) DtoABC.__init__(self)
self._error_code = ( self._error_code = ServiceErrorCode.Unknown if error_code is None else error_code
ServiceErrorCode.Unknown if error_code is None else error_code
)
self._message = message self._message = message
@property @property

4
bot/src/bot_api/model/update_auth_user_dto.py
View File

@ -34,9 +34,7 @@ class UpdateAuthUserDTO(DtoABC):
def from_dict(self, values: dict): def from_dict(self, values: dict):
self._auth_user = AuthUserDTO().from_dict(values["authUser"]) self._auth_user = AuthUserDTO().from_dict(values["authUser"])
self._new_auth_user = AuthUserDTO().from_dict(values["newAuthUser"]) self._new_auth_user = AuthUserDTO().from_dict(values["newAuthUser"])
self._change_password = ( self._change_password = False if "changePassword" not in values else bool(values["changePassword"])
False if "changePassword" not in values else bool(values["changePassword"])
)
def to_dict(self) -> dict: def to_dict(self) -> dict:
return { return {

20
bot/src/bot_api/route/route.py
View File

@ -65,9 +65,7 @@ class Route:
by_api_key=False, by_api_key=False,
): ):
if f is None: if f is None:
return functools.partial( return functools.partial(cls.authorize, role=role, skip_in_dev=skip_in_dev, by_api_key=by_api_key)
cls.authorize, role=role, skip_in_dev=skip_in_dev, by_api_key=by_api_key
)
@wraps(f) @wraps(f)
async def decorator(*args, **kwargs): async def decorator(*args, **kwargs):
@ -78,9 +76,7 @@ class Route:
api_key = None api_key = None
if "Authorization" in request.headers: if "Authorization" in request.headers:
if " " not in request.headers.get("Authorization"): if " " not in request.headers.get("Authorization"):
ex = ServiceException( ex = ServiceException(ServiceErrorCode.Unauthorized, f"Token not set")
ServiceErrorCode.Unauthorized, f"Token not set"
)
error = ErrorDTO(ex.error_code, ex.message) error = ErrorDTO(ex.error_code, ex.message)
return jsonify(error.to_dict()), 401 return jsonify(error.to_dict()), 401
@ -102,9 +98,7 @@ class Route:
return jsonify(e), 500 return jsonify(e), 500
if not valid: if not valid:
ex = ServiceException( ex = ServiceException(ServiceErrorCode.Unauthorized, f"API-Key invalid")
ServiceErrorCode.Unauthorized, f"API-Key invalid"
)
error = ErrorDTO(ex.error_code, ex.message) error = ErrorDTO(ex.error_code, ex.message)
return jsonify(error.to_dict()), 401 return jsonify(error.to_dict()), 401
@ -116,9 +110,7 @@ class Route:
return jsonify(error.to_dict()), 401 return jsonify(error.to_dict()), 401
if cls._auth_users is None or cls._auth is None: if cls._auth_users is None or cls._auth is None:
ex = ServiceException( ex = ServiceException(ServiceErrorCode.Unauthorized, f"Authorize is not initialized")
ServiceErrorCode.Unauthorized, f"Authorize is not initialized"
)
error = ErrorDTO(ex.error_code, ex.message) error = ErrorDTO(ex.error_code, ex.message)
return jsonify(error.to_dict()), 401 return jsonify(error.to_dict()), 401
@ -140,9 +132,7 @@ class Route:
return jsonify(error.to_dict()), 401 return jsonify(error.to_dict()), 401
if role is not None and user.auth_role.value < role.value: if role is not None and user.auth_role.value < role.value:
ex = ServiceException( ex = ServiceException(ServiceErrorCode.Unauthorized, f"Role {role} required")
ServiceErrorCode.Unauthorized, f"Role {role} required"
)
error = ErrorDTO(ex.error_code, ex.message) error = ErrorDTO(ex.error_code, ex.message)
return jsonify(error.to_dict()), 403 return jsonify(error.to_dict()), 403

165
bot/src/bot_api/service/auth_service.py
View File

@ -90,9 +90,7 @@ class AuthService(AuthServiceABC):
def _get_api_key_str(self, api_key: ApiKey) -> str: def _get_api_key_str(self, api_key: ApiKey) -> str:
return hashlib.sha256( return hashlib.sha256(
f"{api_key.identifier}:{api_key.key}+{self._auth_settings.secret_key}".encode( f"{api_key.identifier}:{api_key.key}+{self._auth_settings.secret_key}".encode("utf-8")
"utf-8"
)
).hexdigest() ).hexdigest()
def generate_token(self, user: AuthUser) -> str: def generate_token(self, user: AuthUser) -> str:
@ -101,8 +99,7 @@ class AuthService(AuthServiceABC):
"user_id": user.id, "user_id": user.id,
"email": user.email, "email": user.email,
"role": user.auth_role.value, "role": user.auth_role.value,
"exp": datetime.now(tz=timezone.utc) "exp": datetime.now(tz=timezone.utc) + timedelta(days=self._auth_settings.token_expire_time),
+ timedelta(days=self._auth_settings.token_expire_time),
"iss": self._auth_settings.issuer, "iss": self._auth_settings.issuer,
"aud": self._auth_settings.audience, "aud": self._auth_settings.audience,
}, },
@ -158,9 +155,7 @@ class AuthService(AuthServiceABC):
def _create_and_save_refresh_token(self, user: AuthUser) -> str: def _create_and_save_refresh_token(self, user: AuthUser) -> str:
token = str(uuid.uuid4()) token = str(uuid.uuid4())
user.refresh_token = token user.refresh_token = token
user.refresh_token_expire_time = datetime.now() + timedelta( user.refresh_token_expire_time = datetime.now() + timedelta(days=self._auth_settings.refresh_token_expire_time)
days=self._auth_settings.refresh_token_expire_time
)
self._auth_users.update_auth_user(user) self._auth_users.update_auth_user(user)
self._db.save_changes() self._db.save_changes()
return token return token
@ -193,12 +188,8 @@ class AuthService(AuthServiceABC):
self._send_link_mail( self._send_link_mail(
user.email, user.email,
self._t.transform("api.auth.confirmation.subject").format( self._t.transform("api.auth.confirmation.subject").format(user.first_name, user.last_name),
user.first_name, user.last_name self._t.transform("api.auth.confirmation.message").format(url, user.confirmation_id),
),
self._t.transform("api.auth.confirmation.message").format(
url, user.confirmation_id
),
) )
def _send_forgot_password_id_to_user(self, user: AuthUser): def _send_forgot_password_id_to_user(self, user: AuthUser):
@ -208,38 +199,28 @@ class AuthService(AuthServiceABC):
self._send_link_mail( self._send_link_mail(
user.email, user.email,
self._t.transform("api.auth.forgot_password.subject").format( self._t.transform("api.auth.forgot_password.subject").format(user.first_name, user.last_name),
user.first_name, user.last_name self._t.transform("api.auth.forgot_password.message").format(url, user.forgot_password_id),
),
self._t.transform("api.auth.forgot_password.message").format(
url, user.forgot_password_id
),
) )
async def get_all_auth_users_async(self) -> List[AuthUserDTO]: async def get_all_auth_users_async(self) -> List[AuthUserDTO]:
result = self._auth_users.get_all_auth_users().select(lambda x: AUT.to_dto(x)) result = self._auth_users.get_all_auth_users().select(lambda x: AUT.to_dto(x))
return List(AuthUserDTO, result) return List(AuthUserDTO, result)
async def get_filtered_auth_users_async( async def get_filtered_auth_users_async(self, criteria: AuthUserSelectCriteria) -> AuthUserFilteredResultDTO:
self, criteria: AuthUserSelectCriteria
) -> AuthUserFilteredResultDTO:
users = self._auth_users.get_filtered_auth_users(criteria) users = self._auth_users.get_filtered_auth_users(criteria)
result = users.result.select(lambda x: AUT.to_dto(x)) result = users.result.select(lambda x: AUT.to_dto(x))
return AuthUserFilteredResultDTO(List(AuthUserDTO, result), users.total_count) return AuthUserFilteredResultDTO(List(AuthUserDTO, result), users.total_count)
async def get_auth_user_by_email_async( async def get_auth_user_by_email_async(self, email: str, with_password: bool = False) -> AuthUserDTO:
self, email: str, with_password: bool = False
) -> AuthUserDTO:
try: try:
# todo: check if logged in user is admin then send mail # todo: check if logged in user is admin then send mail
user = self._auth_users.get_auth_user_by_email(email) user = self._auth_users.get_auth_user_by_email(email)
return AUT.to_dto(user, password=user.password if with_password else None) return AUT.to_dto(user, password=user.password if with_password else None)
except Exception as e: except Exception as e:
self._logger.error(__name__, f"AuthUser not found", e) self._logger.error(__name__, f"AuthUser not found", e)
raise ServiceException( raise ServiceException(ServiceErrorCode.InvalidData, f"User not found {email}")
ServiceErrorCode.InvalidData, f"User not found {email}"
)
async def find_auth_user_by_email_async(self, email: str) -> Optional[AuthUser]: async def find_auth_user_by_email_async(self, email: str) -> Optional[AuthUser]:
user = self._auth_users.find_auth_user_by_email(email) user = self._auth_users.find_auth_user_by_email(email)
@ -257,22 +238,16 @@ class AuthService(AuthServiceABC):
user.password_salt = uuid.uuid4() user.password_salt = uuid.uuid4()
user.password = self._hash_sha256(user_dto.password, user.password_salt) user.password = self._hash_sha256(user_dto.password, user.password_salt)
if not self._is_email_valid(user.email): if not self._is_email_valid(user.email):
raise ServiceException( raise ServiceException(ServiceErrorCode.InvalidData, "Invalid E-Mail address")
ServiceErrorCode.InvalidData, "Invalid E-Mail address"
)
try: try:
user.confirmation_id = uuid.uuid4() user.confirmation_id = uuid.uuid4()
self._auth_users.add_auth_user(user) self._auth_users.add_auth_user(user)
self._send_confirmation_id_to_user(user) self._send_confirmation_id_to_user(user)
self._db.save_changes() self._db.save_changes()
self._logger.info( self._logger.info(__name__, f"Added auth user with E-Mail: {user_dto.email}")
__name__, f"Added auth user with E-Mail: {user_dto.email}"
)
except Exception as e: except Exception as e:
self._logger.error( self._logger.error(__name__, f"Cannot add user with E-Mail {user_dto.email}", e)
__name__, f"Cannot add user with E-Mail {user_dto.email}", e
)
raise ServiceException(ServiceErrorCode.UnableToAdd, "Invalid E-Mail") raise ServiceException(ServiceErrorCode.UnableToAdd, "Invalid E-Mail")
async def add_auth_user_by_oauth_async(self, dto: OAuthDTO): async def add_auth_user_by_oauth_async(self, dto: OAuthDTO):
@ -288,20 +263,14 @@ class AuthService(AuthServiceABC):
db_user.first_name = dto.user.first_name db_user.first_name = dto.user.first_name
db_user.last_name = dto.user.last_name db_user.last_name = dto.user.last_name
db_user.password_salt = uuid.uuid4() db_user.password_salt = uuid.uuid4()
db_user.password = self._hash_sha256( db_user.password = self._hash_sha256(dto.user.password, db_user.password_salt)
dto.user.password, db_user.password_salt
)
db_user.oauth_id = None db_user.oauth_id = None
db_user.confirmation_id = uuid.uuid4() db_user.confirmation_id = uuid.uuid4()
self._send_confirmation_id_to_user(db_user) self._send_confirmation_id_to_user(db_user)
self._auth_users.update_auth_user(db_user) self._auth_users.update_auth_user(db_user)
self._logger.info( self._logger.info(__name__, f"Added auth user with E-Mail: {dto.user.email}")
__name__, f"Added auth user with E-Mail: {dto.user.email}"
)
except Exception as e: except Exception as e:
self._logger.error( self._logger.error(__name__, f"Cannot add user with E-Mail {dto.user.email}", e)
__name__, f"Cannot add user with E-Mail {dto.user.email}", e
)
raise ServiceException(ServiceErrorCode.UnableToAdd, "Invalid E-Mail") raise ServiceException(ServiceErrorCode.UnableToAdd, "Invalid E-Mail")
self._db.save_changes() self._db.save_changes()
@ -311,16 +280,14 @@ class AuthService(AuthServiceABC):
raise ServiceException(ServiceErrorCode.InvalidData, f"User is empty") raise ServiceException(ServiceErrorCode.InvalidData, f"User is empty")
if update_user_dto.auth_user is None: if update_user_dto.auth_user is None:
raise ServiceException( raise ServiceException(ServiceErrorCode.InvalidData, f"Existing user is empty")
ServiceErrorCode.InvalidData, f"Existing user is empty"
)
if update_user_dto.new_auth_user is None: if update_user_dto.new_auth_user is None:
raise ServiceException(ServiceErrorCode.InvalidData, f"New user is empty") raise ServiceException(ServiceErrorCode.InvalidData, f"New user is empty")
if not self._is_email_valid( if not self._is_email_valid(update_user_dto.auth_user.email) or not self._is_email_valid(
update_user_dto.auth_user.email update_user_dto.new_auth_user.email
) or not self._is_email_valid(update_user_dto.new_auth_user.email): ):
raise ServiceException(ServiceErrorCode.InvalidData, f"Invalid E-Mail") raise ServiceException(ServiceErrorCode.InvalidData, f"Invalid E-Mail")
user = self._auth_users.find_auth_user_by_email(update_user_dto.auth_user.email) user = self._auth_users.find_auth_user_by_email(update_user_dto.auth_user.email)
@ -333,8 +300,7 @@ class AuthService(AuthServiceABC):
# update first name # update first name
if ( if (
update_user_dto.new_auth_user.first_name is not None update_user_dto.new_auth_user.first_name is not None
and update_user_dto.auth_user.first_name and update_user_dto.auth_user.first_name != update_user_dto.new_auth_user.first_name
!= update_user_dto.new_auth_user.first_name
): ):
user.first_name = update_user_dto.new_auth_user.first_name user.first_name = update_user_dto.new_auth_user.first_name
@ -342,8 +308,7 @@ class AuthService(AuthServiceABC):
if ( if (
update_user_dto.new_auth_user.last_name is not None update_user_dto.new_auth_user.last_name is not None
and update_user_dto.new_auth_user.last_name != "" and update_user_dto.new_auth_user.last_name != ""
and update_user_dto.auth_user.last_name and update_user_dto.auth_user.last_name != update_user_dto.new_auth_user.last_name
!= update_user_dto.new_auth_user.last_name
): ):
user.last_name = update_user_dto.new_auth_user.last_name user.last_name = update_user_dto.new_auth_user.last_name
@ -353,33 +318,22 @@ class AuthService(AuthServiceABC):
and update_user_dto.new_auth_user.email != "" and update_user_dto.new_auth_user.email != ""
and update_user_dto.auth_user.email != update_user_dto.new_auth_user.email and update_user_dto.auth_user.email != update_user_dto.new_auth_user.email
): ):
user_by_new_e_mail = self._auth_users.find_auth_user_by_email( user_by_new_e_mail = self._auth_users.find_auth_user_by_email(update_user_dto.new_auth_user.email)
update_user_dto.new_auth_user.email
)
if user_by_new_e_mail is not None: if user_by_new_e_mail is not None:
raise ServiceException( raise ServiceException(ServiceErrorCode.InvalidUser, "User already exists")
ServiceErrorCode.InvalidUser, "User already exists"
)
user.email = update_user_dto.new_auth_user.email user.email = update_user_dto.new_auth_user.email
update_user_dto.auth_user.password = self._hash_sha256( update_user_dto.auth_user.password = self._hash_sha256(update_user_dto.auth_user.password, user.password_salt)
update_user_dto.auth_user.password, user.password_salt
)
if update_user_dto.auth_user.password != user.password: if update_user_dto.auth_user.password != user.password:
raise ServiceException(ServiceErrorCode.InvalidUser, "Wrong password") raise ServiceException(ServiceErrorCode.InvalidUser, "Wrong password")
# update password # update password
if ( if (
update_user_dto.new_auth_user.password is not None update_user_dto.new_auth_user.password is not None
and self._hash_sha256( and self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt) != user.password
update_user_dto.new_auth_user.password, user.password_salt
)
!= user.password
): ):
user.password_salt = uuid.uuid4() user.password_salt = uuid.uuid4()
user.password = self._hash_sha256( user.password = self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt)
update_user_dto.new_auth_user.password, user.password_salt
)
self._auth_users.update_auth_user(user) self._auth_users.update_auth_user(user)
self._db.save_changes() self._db.save_changes()
@ -389,31 +343,23 @@ class AuthService(AuthServiceABC):
raise ServiceException(ServiceErrorCode.InvalidData, f"User is empty") raise ServiceException(ServiceErrorCode.InvalidData, f"User is empty")
if update_user_dto.auth_user is None: if update_user_dto.auth_user is None:
raise ServiceException( raise ServiceException(ServiceErrorCode.InvalidData, f"Existing user is empty")
ServiceErrorCode.InvalidData, f"Existing user is empty"
)
if update_user_dto.new_auth_user is None: if update_user_dto.new_auth_user is None:
raise ServiceException(ServiceErrorCode.InvalidData, f"New user is empty") raise ServiceException(ServiceErrorCode.InvalidData, f"New user is empty")
if not self._is_email_valid( if not self._is_email_valid(update_user_dto.auth_user.email) or not self._is_email_valid(
update_user_dto.auth_user.email update_user_dto.new_auth_user.email
) or not self._is_email_valid(update_user_dto.new_auth_user.email): ):
raise ServiceException(ServiceErrorCode.InvalidData, f"Invalid E-Mail") raise ServiceException(ServiceErrorCode.InvalidData, f"Invalid E-Mail")
user = self._auth_users.find_auth_user_by_email(update_user_dto.auth_user.email) user = self._auth_users.find_auth_user_by_email(update_user_dto.auth_user.email)
if user is None: if user is None:
raise ServiceException(ServiceErrorCode.InvalidUser, "User not found") raise ServiceException(ServiceErrorCode.InvalidUser, "User not found")
if ( if user.confirmation_id is not None and update_user_dto.new_auth_user.is_confirmed:
user.confirmation_id is not None
and update_user_dto.new_auth_user.is_confirmed
):
user.confirmation_id = None user.confirmation_id = None
elif ( elif user.confirmation_id is None and not update_user_dto.new_auth_user.is_confirmed:
user.confirmation_id is None
and not update_user_dto.new_auth_user.is_confirmed
):
user.confirmation_id = uuid.uuid4() user.confirmation_id = uuid.uuid4()
# else # else
# raise ServiceException(ServiceErrorCode.InvalidUser, 'E-Mail not confirmed') # raise ServiceException(ServiceErrorCode.InvalidUser, 'E-Mail not confirmed')
@ -421,8 +367,7 @@ class AuthService(AuthServiceABC):
# update first name # update first name
if ( if (
update_user_dto.new_auth_user.first_name is not None update_user_dto.new_auth_user.first_name is not None
and update_user_dto.auth_user.first_name and update_user_dto.auth_user.first_name != update_user_dto.new_auth_user.first_name
!= update_user_dto.new_auth_user.first_name
): ):
user.first_name = update_user_dto.new_auth_user.first_name user.first_name = update_user_dto.new_auth_user.first_name
@ -430,8 +375,7 @@ class AuthService(AuthServiceABC):
if ( if (
update_user_dto.new_auth_user.last_name is not None update_user_dto.new_auth_user.last_name is not None
and update_user_dto.new_auth_user.last_name != "" and update_user_dto.new_auth_user.last_name != ""
and update_user_dto.auth_user.last_name and update_user_dto.auth_user.last_name != update_user_dto.new_auth_user.last_name
!= update_user_dto.new_auth_user.last_name
): ):
user.last_name = update_user_dto.new_auth_user.last_name user.last_name = update_user_dto.new_auth_user.last_name
@ -441,28 +385,19 @@ class AuthService(AuthServiceABC):
and update_user_dto.new_auth_user.email != "" and update_user_dto.new_auth_user.email != ""
and update_user_dto.auth_user.email != update_user_dto.new_auth_user.email and update_user_dto.auth_user.email != update_user_dto.new_auth_user.email
): ):
user_by_new_e_mail = self._auth_users.find_auth_user_by_email( user_by_new_e_mail = self._auth_users.find_auth_user_by_email(update_user_dto.new_auth_user.email)
update_user_dto.new_auth_user.email
)
if user_by_new_e_mail is not None: if user_by_new_e_mail is not None:
raise ServiceException( raise ServiceException(ServiceErrorCode.InvalidUser, "User already exists")
ServiceErrorCode.InvalidUser, "User already exists"
)
user.email = update_user_dto.new_auth_user.email user.email = update_user_dto.new_auth_user.email
# update password # update password
if ( if (
update_user_dto.new_auth_user.password is not None update_user_dto.new_auth_user.password is not None
and update_user_dto.change_password and update_user_dto.change_password
and user.password and user.password != self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt)
!= self._hash_sha256(
update_user_dto.new_auth_user.password, user.password_salt
)
): ):
user.password_salt = uuid.uuid4() user.password_salt = uuid.uuid4()
user.password = self._hash_sha256( user.password = self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt)
update_user_dto.new_auth_user.password, user.password_salt
)
# update role # update role
if ( if (
@ -481,9 +416,7 @@ class AuthService(AuthServiceABC):
self._db.save_changes() self._db.save_changes()
except Exception as e: except Exception as e:
self._logger.error(__name__, f"Cannot delete user", e) self._logger.error(__name__, f"Cannot delete user", e)
raise ServiceException( raise ServiceException(ServiceErrorCode.UnableToDelete, f"Cannot delete user by mail {email}")
ServiceErrorCode.UnableToDelete, f"Cannot delete user by mail {email}"
)
async def delete_auth_user_async(self, user_dto: AuthUser): async def delete_auth_user_async(self, user_dto: AuthUser):
try: try:
@ -567,9 +500,7 @@ class AuthService(AuthServiceABC):
if user.id in user_ids: if user.id in user_ids:
continue continue
self._auth_users.add_auth_user_user_rel( self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, user))
AuthUserUsersRelation(db_user, user)
)
if db_user.confirmation_id is not None and not added_user: if db_user.confirmation_id is not None and not added_user:
raise ServiceException(ServiceErrorCode.Forbidden, "E-Mail not verified") raise ServiceException(ServiceErrorCode.Forbidden, "E-Mail not verified")
@ -599,19 +530,13 @@ class AuthService(AuthServiceABC):
): ):
raise ServiceException(ServiceErrorCode.InvalidData, "Token expired") raise ServiceException(ServiceErrorCode.InvalidData, "Token expired")
return TokenDTO( return TokenDTO(self.generate_token(user), self._create_and_save_refresh_token(user))
self.generate_token(user), self._create_and_save_refresh_token(user)
)
except Exception as e: except Exception as e:
self._logger.error(__name__, f"Refreshing token failed", e) self._logger.error(__name__, f"Refreshing token failed", e)
return TokenDTO("", "") return TokenDTO("", "")
async def revoke_async(self, token_dto: TokenDTO): async def revoke_async(self, token_dto: TokenDTO):
if ( if token_dto is None or token_dto.token is None or token_dto.refresh_token is None:
token_dto is None
or token_dto.token is None
or token_dto.refresh_token is None
):
raise ServiceException(ServiceErrorCode.InvalidData, "Token not set") raise ServiceException(ServiceErrorCode.InvalidData, "Token not set")
try: try:
@ -664,9 +589,7 @@ class AuthService(AuthServiceABC):
) )
if user.confirmation_id is not None: if user.confirmation_id is not None:
raise ServiceException( raise ServiceException(ServiceErrorCode.InvalidUser, f"E-Mail not confirmed")
ServiceErrorCode.InvalidUser, f"E-Mail not confirmed"
)
if user.password is None or rp_dto.password == "": if user.password is None or rp_dto.password == "":
raise ServiceException(ServiceErrorCode.InvalidData, f"Password not set") raise ServiceException(ServiceErrorCode.InvalidData, f"Password not set")

27
bot/src/bot_api/service/discord_service.py
View File

@ -53,17 +53,13 @@ class DiscordService:
if role != AuthRoleEnum.admin: if role != AuthRoleEnum.admin:
auth_user = self._auth_users.find_auth_user_by_email(token["email"]) auth_user = self._auth_users.find_auth_user_by_email(token["email"])
if auth_user is not None: if auth_user is not None:
user_ids = auth_user.users.select( user_ids = auth_user.users.select(lambda x: x.server is not None and x.server.id)
lambda x: x.server is not None and x.server.id
)
servers = servers.where(lambda x: x.id in user_ids) servers = servers.where(lambda x: x.id in user_ids)
servers = List(ServerDTO, servers) servers = List(ServerDTO, servers)
return servers.select(self._to_dto).where(lambda x: x.name != "") return servers.select(self._to_dto).where(lambda x: x.name != "")
async def get_filtered_servers_async( async def get_filtered_servers_async(self, criteria: ServerSelectCriteria) -> ServerFilteredResultDTO:
self, criteria: ServerSelectCriteria
) -> ServerFilteredResultDTO:
token = self._auth.get_decoded_token_from_request() token = self._auth.get_decoded_token_from_request()
if token is None or "email" not in token or "role" not in token: if token is None or "email" not in token or "role" not in token:
raise ServiceException(ServiceErrorCode.InvalidData, "Token invalid") raise ServiceException(ServiceErrorCode.InvalidData, "Token invalid")
@ -74,22 +70,15 @@ class DiscordService:
if role != AuthRoleEnum.admin: if role != AuthRoleEnum.admin:
auth_user = self._auth_users.find_auth_user_by_email(token["email"]) auth_user = self._auth_users.find_auth_user_by_email(token["email"])
if auth_user is not None: if auth_user is not None:
user_ids = auth_user.users.select( user_ids = auth_user.users.select(lambda x: x.server is not None and x.server.id)
lambda x: x.server is not None and x.server.id filtered_result.result = filtered_result.result.where(lambda x: x.id in user_ids)
)
filtered_result.result = filtered_result.result.where(
lambda x: x.id in user_ids
)
servers: List = filtered_result.result.select(self._to_dto).where( servers: List = filtered_result.result.select(self._to_dto).where(lambda x: x.name != "")
lambda x: x.name != ""
)
result = List(ServerDTO, servers) result = List(ServerDTO, servers)
if criteria.name is not None and criteria.name != "": if criteria.name is not None and criteria.name != "":
result = result.where( result = result.where(
lambda x: criteria.name.lower() in x.name.lower() lambda x: criteria.name.lower() in x.name.lower() or x.name.lower() == criteria.name.lower()
or x.name.lower() == criteria.name.lower()
) )
return ServerFilteredResultDTO(List(ServerDTO, result), servers.count()) return ServerFilteredResultDTO(List(ServerDTO, result), servers.count())
@ -98,7 +87,5 @@ class DiscordService:
server = self._servers.get_server_by_id(id) server = self._servers.get_server_by_id(id)
guild = self._bot.get_guild(server.discord_id) guild = self._bot.get_guild(server.discord_id)
server_dto = ServerTransformer.to_dto( server_dto = ServerTransformer.to_dto(server, guild.name, guild.member_count, guild.icon)
server, guild.name, guild.member_count, guild.icon
)
return server_dto return server_dto

16
bot/src/bot_api/transformer/auth_user_transformer.py
View File

@ -27,35 +27,27 @@ class AuthUserTransformer(TransformerABC):
None, None,
None, None,
datetime.now(), datetime.now(),
AuthRoleEnum.normal AuthRoleEnum.normal if dto.auth_role is None else AuthRoleEnum(dto.auth_role),
if dto.auth_role is None
else AuthRoleEnum(dto.auth_role),
auth_user_id=0 if dto.id is None else dto.id, auth_user_id=0 if dto.id is None else dto.id,
) )
@staticmethod @staticmethod
@ServiceProviderABC.inject @ServiceProviderABC.inject
def _is_technician( def _is_technician(user: User, bot: DiscordBotServiceABC, permissions: PermissionServiceABC):
user: User, bot: DiscordBotServiceABC, permissions: PermissionServiceABC
):
guild = bot.get_guild(user.server.discord_id) guild = bot.get_guild(user.server.discord_id)
member = guild.get_member(user.discord_id) member = guild.get_member(user.discord_id)
return permissions.is_member_technician(member) return permissions.is_member_technician(member)
@staticmethod @staticmethod
@ServiceProviderABC.inject @ServiceProviderABC.inject
def _is_admin( def _is_admin(user: User, bot: DiscordBotServiceABC, permissions: PermissionServiceABC):
user: User, bot: DiscordBotServiceABC, permissions: PermissionServiceABC
):
guild = bot.get_guild(user.server.discord_id) guild = bot.get_guild(user.server.discord_id)
member = guild.get_member(user.discord_id) member = guild.get_member(user.discord_id)
return permissions.is_member_admin(member) return permissions.is_member_admin(member)
@staticmethod @staticmethod
@ServiceProviderABC.inject @ServiceProviderABC.inject
def _is_moderator( def _is_moderator(user: User, bot: DiscordBotServiceABC, permissions: PermissionServiceABC):
user: User, bot: DiscordBotServiceABC, permissions: PermissionServiceABC
):
guild = bot.get_guild(user.server.discord_id) guild = bot.get_guild(user.server.discord_id)
member = guild.get_member(user.discord_id) member = guild.get_member(user.discord_id)
return permissions.is_member_moderator(member) return permissions.is_member_moderator(member)

4
bot/src/bot_api/transformer/server_transformer.py
View File

@ -13,9 +13,7 @@ class ServerTransformer(TransformerABC):
return Server(dto.discord_id) return Server(dto.discord_id)
@staticmethod @staticmethod
def to_dto( def to_dto(db: Server, name: str, member_count: int, icon_url: Optional[discord.Asset]) -> ServerDTO:
db: Server, name: str, member_count: int, icon_url: Optional[discord.Asset]
) -> ServerDTO:
return ServerDTO( return ServerDTO(
db.id, db.id,
db.discord_id, db.discord_id,

4
bot/src/bot_core/abc/client_utils_abc.py
View File

@ -45,9 +45,7 @@ class ClientUtilsABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_auto_complete_list( def get_auto_complete_list(self, _l: List, current: str, select: Callable = None) -> List:
self, _l: List, current: str, select: Callable = None
) -> List:
pass pass
@abstractmethod @abstractmethod

8
bot/src/bot_core/abc/custom_file_logger_abc.py
View File

@ -18,9 +18,7 @@ class CustomFileLoggerABC(Logger, ABC):
env: ApplicationEnvironmentABC, env: ApplicationEnvironmentABC,
): ):
self._key = key self._key = key
self._settings: LoggingSettings = config.get_configuration( self._settings: LoggingSettings = config.get_configuration(f"{FileLoggingSettings.__name__}_{key}")
f"{FileLoggingSettings.__name__}_{key}"
)
Logger.__init__(self, self._settings, time_format, env) Logger.__init__(self, self._settings, time_format, env)
self._begin_log() self._begin_log()
@ -34,9 +32,7 @@ class CustomFileLoggerABC(Logger, ABC):
self.info(__name__, f"Starting...") self.info(__name__, f"Starting...")
self._console = LoggingLevelEnum(console_level) self._console = LoggingLevelEnum(console_level)
def _get_string( def _get_string(self, name_list_as_str: str, level: LoggingLevelEnum, message: str) -> str:
self, name_list_as_str: str, level: LoggingLevelEnum, message: str
) -> str:
names = name_list_as_str.split(" ") names = name_list_as_str.split(" ")
log_level = level.name log_level = level.name
string = f"<{self._get_datetime_now()}> [ {log_level} ]" string = f"<{self._get_datetime_now()}> [ {log_level} ]"

4
bot/src/bot_core/abc/message_service_abc.py
View File

@ -13,9 +13,7 @@ class MessageServiceABC(ABC):
pass pass
@abstractmethod @abstractmethod
async def delete_messages( async def delete_messages(self, messages: List[discord.Message], guild_id: int, without_tracking=False):
self, messages: List[discord.Message], guild_id: int, without_tracking=False
):
pass pass
@abstractmethod @abstractmethod

4
bot/src/bot_core/abc/task_abc.py
View File

@ -15,9 +15,7 @@ class TaskABC(commands.Cog):
commands.Cog.__init__(self) commands.Cog.__init__(self)
@ServiceProviderABC.inject @ServiceProviderABC.inject
async def _wait_until_ready( async def _wait_until_ready(self, config: ConfigurationABC, logger: TaskLogger, bot: DiscordBotServiceABC):
self, config: ConfigurationABC, logger: TaskLogger, bot: DiscordBotServiceABC
):
logger.debug(__name__, f"Waiting before {type(self).__name__}") logger.debug(__name__, f"Waiting before {type(self).__name__}")
await bot.wait_until_ready() await bot.wait_until_ready()

4
bot/src/bot_core/configuration/file_logging_settings.py
View File

@ -10,9 +10,7 @@ class FileLoggingSettings(LoggingSettings):
console_log_level: LoggingLevelEnum = None, console_log_level: LoggingLevelEnum = None,
file_log_level: LoggingLevelEnum = None, file_log_level: LoggingLevelEnum = None,
): ):
LoggingSettings.__init__( LoggingSettings.__init__(self, path, filename, console_log_level, file_log_level)
self, path, filename, console_log_level, file_log_level
)
self._key = key self._key = key

4
bot/src/bot_core/core_extension/core_extension.py
View File

@ -17,9 +17,7 @@ class CoreExtension(ApplicationExtensionABC):
ApplicationExtensionABC.__init__(self) ApplicationExtensionABC.__init__(self)
async def run(self, config: ConfigurationABC, services: ServiceProviderABC): async def run(self, config: ConfigurationABC, services: ServiceProviderABC):
feature_flags: FeatureFlagsSettings = config.get_configuration( feature_flags: FeatureFlagsSettings = config.get_configuration(FeatureFlagsSettings)
FeatureFlagsSettings
)
if not feature_flags.get_flag(FeatureFlagsEnum.core_module): if not feature_flags.get_flag(FeatureFlagsEnum.core_module):
return return

12
bot/src/bot_core/core_extension/core_extension_module.py
View File

@ -15,14 +15,8 @@ class CoreExtensionModule(ModuleABC):
def __init__(self, dc: DiscordCollectionABC): def __init__(self, dc: DiscordCollectionABC):
ModuleABC.__init__(self, dc, FeatureFlagsEnum.core_extension_module) ModuleABC.__init__(self, dc, FeatureFlagsEnum.core_extension_module)
def configure_configuration( def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
self, config: ConfigurationABC, env: ApplicationEnvironmentABC
):
pass pass
def configure_services( def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC services.add_transient(DiscordEventTypesEnum.on_ready.value, CoreExtensionOnReadyEvent)
):
services.add_transient(
DiscordEventTypesEnum.on_ready.value, CoreExtensionOnReadyEvent
)

8
bot/src/bot_core/core_module.py
View File

@ -20,14 +20,10 @@ class CoreModule(ModuleABC):
def __init__(self, dc: DiscordCollectionABC): def __init__(self, dc: DiscordCollectionABC):
ModuleABC.__init__(self, dc, FeatureFlagsEnum.core_module) ModuleABC.__init__(self, dc, FeatureFlagsEnum.core_module)
def configure_configuration( def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
self, config: ConfigurationABC, env: ApplicationEnvironmentABC
):
pass pass
def configure_services( def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC
):
services.add_transient(ConfigService) services.add_transient(ConfigService)
services.add_transient(MessageServiceABC, MessageService) services.add_transient(MessageServiceABC, MessageService)
services.add_transient(ClientUtilsABC, ClientUtilsService) services.add_transient(ClientUtilsABC, ClientUtilsService)

12
bot/src/bot_core/helper/command_checks.py
View File

@ -44,9 +44,7 @@ class CommandChecks:
async def check_is_member_admin(ctx: Context): async def check_is_member_admin(ctx: Context):
has_permission = cls._permissions.is_member_admin(ctx.author) has_permission = cls._permissions.is_member_admin(ctx.author)
if not has_permission: if not has_permission:
await cls._message_service.send_ctx_msg( await cls._message_service.send_ctx_msg(ctx, cls._t.transform("common.no_permission_message"))
ctx, cls._t.transform("common.no_permission_message")
)
raise CheckError(f"Member {ctx.author.name} is not admin") raise CheckError(f"Member {ctx.author.name} is not admin")
return has_permission return has_permission
@ -58,9 +56,7 @@ class CommandChecks:
async def check_is_member_technician(ctx: Context): async def check_is_member_technician(ctx: Context):
has_permission = cls._permissions.is_member_technician(ctx.author) has_permission = cls._permissions.is_member_technician(ctx.author)
if not has_permission: if not has_permission:
await cls._message_service.send_ctx_msg( await cls._message_service.send_ctx_msg(ctx, cls._t.transform("common.no_permission_message"))
ctx, cls._t.transform("common.no_permission_message")
)
raise CheckError(f"Member {ctx.author.name} is not technician") raise CheckError(f"Member {ctx.author.name} is not technician")
return has_permission return has_permission
@ -72,9 +68,7 @@ class CommandChecks:
async def check_is_member_moderator(ctx: Context): async def check_is_member_moderator(ctx: Context):
has_permission = cls._permissions.is_member_moderator(ctx.author) has_permission = cls._permissions.is_member_moderator(ctx.author)
if not has_permission: if not has_permission:
await cls._message_service.send_ctx_msg( await cls._message_service.send_ctx_msg(ctx, cls._t.transform("common.no_permission_message"))
ctx, cls._t.transform("common.no_permission_message")
)
raise CheckError(f"Member {ctx.author.name} is not moderator") raise CheckError(f"Member {ctx.author.name} is not moderator")
return has_permission return has_permission

48
bot/src/bot_core/service/client_utils_service.py
View File

@ -62,36 +62,28 @@ class ClientUtilsService(ClientUtilsABC):
def received_command(self, guild_id: int): def received_command(self, guild_id: int):
server = self._servers.get_server_by_discord_id(guild_id) server = self._servers.get_server_by_discord_id(guild_id)
client = self._clients.find_client_by_discord_id_and_server_id( client = self._clients.find_client_by_discord_id_and_server_id(self._bot.user.id, server.id)
self._bot.user.id, server.id
)
client.received_command_count += 1 client.received_command_count += 1
self._clients.update_client(client) self._clients.update_client(client)
self._db.save_changes() self._db.save_changes()
def moved_user(self, guild_id: int): def moved_user(self, guild_id: int):
server = self._servers.get_server_by_discord_id(guild_id) server = self._servers.get_server_by_discord_id(guild_id)
client = self._clients.find_client_by_discord_id_and_server_id( client = self._clients.find_client_by_discord_id_and_server_id(self._bot.user.id, server.id)
self._bot.user.id, server.id
)
client.moved_users_count += 1 client.moved_users_count += 1
self._clients.update_client(client) self._clients.update_client(client)
self._db.save_changes() self._db.save_changes()
def moved_users(self, guild_id: int, count: int): def moved_users(self, guild_id: int, count: int):
server = self._servers.get_server_by_discord_id(guild_id) server = self._servers.get_server_by_discord_id(guild_id)
client = self._clients.find_client_by_discord_id_and_server_id( client = self._clients.find_client_by_discord_id_and_server_id(self._bot.user.id, server.id)
self._bot.user.id, server.id
)
client.moved_users_count += count client.moved_users_count += count
self._clients.update_client(client) self._clients.update_client(client)
self._db.save_changes() self._db.save_changes()
def get_client(self, dc_ic: int, guild_id: int): def get_client(self, dc_ic: int, guild_id: int):
server = self._servers.get_server_by_discord_id(guild_id) server = self._servers.get_server_by_discord_id(guild_id)
client = self._clients.find_client_by_discord_id_and_server_id( client = self._clients.find_client_by_discord_id_and_server_id(self._bot.user.id, server.id)
self._bot.user.id, server.id
)
return client return client
async def check_if_bot_is_ready_yet(self) -> bool: async def check_if_bot_is_ready_yet(self) -> bool:
@ -129,9 +121,7 @@ class ClientUtilsService(ClientUtilsABC):
await self._bot.change_presence(activity=discord.Game(name=name)) await self._bot.change_presence(activity=discord.Game(name=name))
self._logger.info(__name__, f"Set presence {name}") self._logger.info(__name__, f"Set presence {name}")
def get_auto_complete_list( def get_auto_complete_list(self, _l: List, current: str, select: Callable = None) -> List:
self, _l: List, current: str, select: Callable = None
) -> List:
if current != "": if current != "":
if select is None: if select is None:
select = lambda x: x select = lambda x: x
@ -154,9 +144,7 @@ class ClientUtilsService(ClientUtilsABC):
) -> bool: ) -> bool:
umcph = None umcph = None
try: try:
umcph = self._umcphs.find_user_message_count_per_hour_by_user_id_and_date( umcph = self._umcphs.find_user_message_count_per_hour_by_user_id_and_date(user.id, created_at)
user.id, created_at
)
if umcph is None: if umcph is None:
self._umcphs.add_user_message_count_per_hour( self._umcphs.add_user_message_count_per_hour(
UserMessageCountPerHour( UserMessageCountPerHour(
@ -169,11 +157,7 @@ class ClientUtilsService(ClientUtilsABC):
self._db.save_changes() self._db.save_changes()
umcph = ( umcph = self._umcphs.get_user_message_count_per_hour_by_user_id_and_date(user.id, created_at)
self._umcphs.get_user_message_count_per_hour_by_user_id_and_date(
user.id, created_at
)
)
except Exception as e: except Exception as e:
self._logger.error( self._logger.error(
__name__, __name__,
@ -205,9 +189,7 @@ class ClientUtilsService(ClientUtilsABC):
def get_ontime_for_user(self, user: User) -> float: def get_ontime_for_user(self, user: User) -> float:
return round( return round(
self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id( self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.id)
user.id
)
.where(lambda x: x.leaved_on is not None and x.joined_on is not None) .where(lambda x: x.leaved_on is not None and x.joined_on is not None)
.sum(lambda join: (join.leaved_on - join.joined_on).total_seconds() / 3600), .sum(lambda join: (join.leaved_on - join.joined_on).total_seconds() / 3600),
2, 2,
@ -224,11 +206,7 @@ class ClientUtilsService(ClientUtilsABC):
guild: Guild = self._bot.guilds.where(lambda g: g == guild).single() guild: Guild = self._bot.guilds.where(lambda g: g == guild).single()
channel = guild.get_channel(discord_channel_id) channel = guild.get_channel(discord_channel_id)
message = await channel.fetch_message(discord_message_id) message = await channel.fetch_message(discord_message_id)
emoji = ( emoji = List(discord.Emoji, guild.emojis).where(lambda x: x.name == rule.emoji_name).single()
List(discord.Emoji, guild.emojis)
.where(lambda x: x.name == rule.emoji_name)
.single()
)
if emoji is None: if emoji is None:
self._logger.debug(__name__, f"Emoji {rule.emoji_name} not found") self._logger.debug(__name__, f"Emoji {rule.emoji_name} not found")
@ -248,9 +226,7 @@ class ClientUtilsService(ClientUtilsABC):
async def check_default_role(self, member: Union[discord.User, discord.Member]): async def check_default_role(self, member: Union[discord.User, discord.Member]):
try: try:
server = self._servers.get_server_by_discord_id(member.guild.id) server = self._servers.get_server_by_discord_id(member.guild.id)
settings: ServerConfig = self._config.get_configuration( settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{server.discord_id}")
f"ServerConfig_{server.discord_id}"
)
if settings.default_role_id is None: if settings.default_role_id is None:
return return
@ -262,6 +238,4 @@ class ClientUtilsService(ClientUtilsABC):
await member.add_roles(default_role) await member.add_roles(default_role)
except Exception as e: except Exception as e:
self._logger.error( self._logger.error(__name__, f"Cannot check for default role for member {member.id}", e)
__name__, f"Cannot check for default role for member {member.id}", e
)

141
bot/src/bot_core/service/data_integrity_service.py
View File

@ -67,16 +67,12 @@ class DataIntegrityService:
self._is_for_shutdown = False self._is_for_shutdown = False
def _check_known_users(self): def _check_known_users(self):
self._logger.debug( self._logger.debug(__name__, f"Start checking KnownUsers table, {len(self._bot.users)}")
__name__, f"Start checking KnownUsers table, {len(self._bot.users)}"
)
for u in self._bot.users: for u in self._bot.users:
u: discord.User = u u: discord.User = u
try: try:
if u.bot: if u.bot:
self._logger.trace( self._logger.trace(__name__, f"User {u.id} is ignored, because its a bot")
__name__, f"User {u.id} is ignored, because its a bot"
)
continue continue
user = self._known_users.find_user_by_discord_id(u.id) user = self._known_users.find_user_by_discord_id(u.id)
@ -129,9 +125,7 @@ class DataIntegrityService:
try: try:
server: Server = self._servers.find_server_by_discord_id(g.id) server: Server = self._servers.find_server_by_discord_id(g.id)
if server is None: if server is None:
self._logger.fatal( self._logger.fatal(__name__, f"Server not found in database: {g.id}")
__name__, f"Server not found in database: {g.id}"
)
client = self._clients.find_client_by_server_id(server.id) client = self._clients.find_client_by_server_id(server.id)
if client is not None: if client is not None:
@ -142,9 +136,7 @@ class DataIntegrityService:
f"Client for server {g.id} not found in database: {self._bot.user.id}", f"Client for server {g.id} not found in database: {self._bot.user.id}",
) )
self._logger.debug(__name__, f"Add client: {self._bot.user.id}") self._logger.debug(__name__, f"Add client: {self._bot.user.id}")
self._clients.add_client( self._clients.add_client(Client(self._bot.user.id, 0, 0, 0, 0, 0, server))
Client(self._bot.user.id, 0, 0, 0, 0, 0, server)
)
self._db_context.save_changes() self._db_context.save_changes()
client = self._clients.find_client_by_server_id(server.id) client = self._clients.find_client_by_server_id(server.id)
@ -170,21 +162,15 @@ class DataIntegrityService:
try: try:
server = self._servers.find_server_by_discord_id(g.id) server = self._servers.find_server_by_discord_id(g.id)
if server is None: if server is None:
self._logger.fatal( self._logger.fatal(__name__, f"Server not found in database: {g.id}")
__name__, f"Server not found in database: {g.id}"
)
for u in g.members: for u in g.members:
u: Union[discord.Member, discord.User] = u u: Union[discord.Member, discord.User] = u
if u.bot: if u.bot:
self._logger.trace( self._logger.trace(__name__, f"User {u.id} is ignored, because its a bot")
__name__, f"User {u.id} is ignored, because its a bot"
)
continue continue
user = self._users.find_user_by_discord_id_and_server_id( user = self._users.find_user_by_discord_id_and_server_id(u.id, server.id)
u.id, server.id
)
if user is not None: if user is not None:
continue continue
@ -208,30 +194,20 @@ class DataIntegrityService:
server = self._servers.find_server_by_discord_id(guild.id) server = self._servers.find_server_by_discord_id(guild.id)
if server is None: if server is None:
self._logger.fatal( self._logger.fatal(__name__, f"Server not found in database: {guild.id}")
__name__, f"Server not found in database: {guild.id}"
)
try: try:
for u in guild.members: for u in guild.members:
u: discord.User = u u: discord.User = u
if u.bot: if u.bot:
self._logger.trace( self._logger.trace(__name__, f"User {u.id} is ignored, because its a bot")
__name__, f"User {u.id} is ignored, because its a bot"
)
continue continue
user = self._users.find_user_by_discord_id_and_server_id( user = self._users.find_user_by_discord_id_and_server_id(u.id, server.id)
u.id, server.id
)
if user is None: if user is None:
self._logger.fatal( self._logger.fatal(__name__, f"User not found in database: {u.id}")
__name__, f"User not found in database: {u.id}"
)
join = self._user_joins.find_active_user_joined_server_by_user_id( join = self._user_joins.find_active_user_joined_server_by_user_id(user.id)
user.id
)
if join is not None: if join is not None:
continue continue
@ -281,36 +257,24 @@ class DataIntegrityService:
self._logger.debug(__name__, f"Start checking UserJoinedVoiceChannel table") self._logger.debug(__name__, f"Start checking UserJoinedVoiceChannel table")
for guild in self._bot.guilds: for guild in self._bot.guilds:
guild: discord.Guild = guild guild: discord.Guild = guild
settings: ServerConfig = self._config.get_configuration( settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild.id}")
f"ServerConfig_{guild.id}"
)
server = self._servers.find_server_by_discord_id(guild.id) server = self._servers.find_server_by_discord_id(guild.id)
if server is None: if server is None:
self._logger.fatal( self._logger.fatal(__name__, f"Server not found in database: {guild.id}")
__name__, f"Server not found in database: {guild.id}"
)
try: try:
# close open voice states # close open voice states
for member in guild.members: for member in guild.members:
if member.bot: if member.bot:
self._logger.trace( self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
__name__, f"User {member.id} is ignored, because its a bot"
)
continue continue
user = self._users.find_user_by_discord_id_and_server_id( user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
member.id, server.id
)
if user is None: if user is None:
self._logger.fatal( self._logger.fatal(__name__, f"User not found in database: {member.id}")
__name__, f"User not found in database: {member.id}"
)
joins = self._user_joins_vc.find_active_user_joined_voice_channels_by_user_id( joins = self._user_joins_vc.find_active_user_joined_voice_channels_by_user_id(user.id)
user.id
)
if joins is None or len(joins) == 0: if joins is None or len(joins) == 0:
continue continue
@ -324,9 +288,7 @@ class DataIntegrityService:
if ( if (
(join.leaved_on - join.joined_on).total_seconds() / 60 / 60 (join.leaved_on - join.joined_on).total_seconds() / 60 / 60
) > settings.max_voice_state_hours: ) > settings.max_voice_state_hours:
join.leaved_on = join.joined_on + timedelta( join.leaved_on = join.joined_on + timedelta(hours=settings.max_voice_state_hours)
hours=settings.max_voice_state_hours
)
self._user_joins_vc.update_user_joined_voice_channel(join) self._user_joins_vc.update_user_joined_voice_channel(join)
@ -341,28 +303,17 @@ class DataIntegrityService:
# add open voice states # add open voice states
for member in guild.members: for member in guild.members:
if member.bot: if member.bot:
self._logger.trace( self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
__name__, f"User {member.id} is ignored, because its a bot"
)
continue continue
if ( if member.voice is None or member.voice.channel.id in settings.afk_channel_ids:
member.voice is None
or member.voice.channel.id in settings.afk_channel_ids
):
continue continue
user = self._users.find_user_by_discord_id_and_server_id( user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
member.id, server.id
)
if user is None: if user is None:
self._logger.fatal( self._logger.fatal(__name__, f"User not found in database: {member.id}")
__name__, f"User not found in database: {member.id}"
)
join = UserJoinedVoiceChannel( join = UserJoinedVoiceChannel(user, member.voice.channel.id, datetime.now())
user, member.voice.channel.id, datetime.now()
)
self._user_joins_vc.add_user_joined_voice_channel(join) self._user_joins_vc.add_user_joined_voice_channel(join)
self._db_context.save_changes() self._db_context.save_changes()
@ -376,29 +327,19 @@ class DataIntegrityService:
server = self._servers.find_server_by_discord_id(guild.id) server = self._servers.find_server_by_discord_id(guild.id)
if server is None: if server is None:
self._logger.fatal( self._logger.fatal(__name__, f"Server not found in database: {guild.id}")
__name__, f"Server not found in database: {guild.id}"
)
try: try:
for member in guild.members: for member in guild.members:
if member.bot: if member.bot:
self._logger.trace( self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
__name__, f"User {member.id} is ignored, because its a bot"
)
continue continue
user = self._users.find_user_by_discord_id_and_server_id( user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
member.id, server.id
)
if user is None: if user is None:
self._logger.fatal( self._logger.fatal(__name__, f"User not found in database: {member.id}")
__name__, f"User not found in database: {member.id}"
)
joins = self._user_joined_gs.find_active_user_joined_game_servers_by_user_id( joins = self._user_joined_gs.find_active_user_joined_game_servers_by_user_id(user.id)
user.id
)
if joins is None or len(joins) == 0: if joins is None or len(joins) == 0:
continue continue
@ -408,16 +349,12 @@ class DataIntegrityService:
f"Active UserJoinedGameServer found in database: {guild.id}:{member.id}@{join.joined_on}", f"Active UserJoinedGameServer found in database: {guild.id}:{member.id}@{join.joined_on}",
) )
join.leaved_on = datetime.now() join.leaved_on = datetime.now()
settings: ServerConfig = self._config.get_configuration( settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild.id}")
f"ServerConfig_{guild.id}"
)
if ( if (
(join.leaved_on - join.joined_on).total_seconds() / 60 / 60 (join.leaved_on - join.joined_on).total_seconds() / 60 / 60
) > settings.max_voice_state_hours: ) > settings.max_voice_state_hours:
join.leaved_on = join.joined_on + timedelta( join.leaved_on = join.joined_on + timedelta(hours=settings.max_voice_state_hours)
hours=settings.max_voice_state_hours
)
self._user_joined_gs.update_user_joined_game_server(join) self._user_joined_gs.update_user_joined_game_server(join)
if self._is_for_shutdown: if self._is_for_shutdown:
@ -434,24 +371,16 @@ class DataIntegrityService:
for guild in self._bot.guilds: for guild in self._bot.guilds:
server = self._servers.find_server_by_discord_id(guild.id) server = self._servers.find_server_by_discord_id(guild.id)
if server is None: if server is None:
self._logger.fatal( self._logger.fatal(__name__, f"Server not found in database: {guild.id}")
__name__, f"Server not found in database: {guild.id}"
)
for member in guild.members: for member in guild.members:
if member.bot: if member.bot:
self._logger.trace( self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
__name__, f"User {member.id} is ignored, because its a bot"
)
continue continue
user = self._users.find_user_by_discord_id_and_server_id( user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
member.id, server.id
)
if user is None: if user is None:
self._logger.fatal( self._logger.fatal(__name__, f"User not found in database: {member.id}")
__name__, f"User not found in database: {member.id}"
)
await self._achievements.validate_achievements_for_user(user) await self._achievements.validate_achievements_for_user(user)

88
bot/src/bot_core/service/message_service.py
View File

@ -31,23 +31,15 @@ class MessageService(MessageServiceABC):
self._clients = clients self._clients = clients
self._db = db self._db = db
async def delete_messages( async def delete_messages(self, messages: List[discord.Message], guild_id: int, without_tracking=False):
self, messages: List[discord.Message], guild_id: int, without_tracking=False
):
self._logger.debug(__name__, f"Try to delete {messages.count()} messages") self._logger.debug(__name__, f"Try to delete {messages.count()} messages")
server_st: ServerConfig = self._config.get_configuration( server_st: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild_id}")
f"ServerConfig_{guild_id}"
)
await asyncio.sleep(server_st.message_delete_timer) await asyncio.sleep(server_st.message_delete_timer)
for message in messages: for message in messages:
await self.delete_message( await self.delete_message(message, mass_delete=True, without_tracking=without_tracking)
message, mass_delete=True, without_tracking=without_tracking
)
self._logger.debug(__name__, "Deleting messages finished") self._logger.debug(__name__, "Deleting messages finished")
async def delete_message( async def delete_message(self, message: discord.Message, mass_delete=False, without_tracking=False):
self, message: discord.Message, mass_delete=False, without_tracking=False
):
guild_id = ( guild_id = (
message.guild.id message.guild.id
if message.guild is not None if message.guild is not None
@ -58,9 +50,7 @@ class MessageService(MessageServiceABC):
else None else None
) )
server_st: ServerConfig = self._config.get_configuration( server_st: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild_id}")
f"ServerConfig_{guild_id}"
)
if not mass_delete: if not mass_delete:
await asyncio.sleep(server_st.message_delete_timer) await asyncio.sleep(server_st.message_delete_timer)
self._logger.debug( self._logger.debug(
@ -74,9 +64,7 @@ class MessageService(MessageServiceABC):
self._logger.error(__name__, f"Deleting message failed", e) self._logger.error(__name__, f"Deleting message failed", e)
else: else:
if not without_tracking: if not without_tracking:
self._clients.append_deleted_message_count( self._clients.append_deleted_message_count(self._bot.user.id, guild_id, 1)
self._bot.user.id, guild_id, 1
)
self._db.save_changes() self._db.save_changes()
self._logger.info(__name__, f"Deleted message {message}") self._logger.info(__name__, f"Deleted message {message}")
@ -88,9 +76,7 @@ class MessageService(MessageServiceABC):
wait_before_delete: int = None, wait_before_delete: int = None,
without_tracking=False, without_tracking=False,
): ):
self._logger.debug( self._logger.debug(__name__, f"Try to send message\n\t{message}\n\tto: {channel}")
__name__, f"Try to send message\n\t{message}\n\tto: {channel}"
)
msg = None msg = None
try: try:
if isinstance(message, discord.Embed): if isinstance(message, discord.Embed):
@ -100,15 +86,11 @@ class MessageService(MessageServiceABC):
else: else:
msg = await channel.send(message) msg = await channel.send(message)
except Exception as e: except Exception as e:
self._logger.error( self._logger.error(__name__, f"Send message to channel {channel.id} failed", e)
__name__, f"Send message to channel {channel.id} failed", e
)
else: else:
self._logger.info(__name__, f"Sent message to channel {channel.id}") self._logger.info(__name__, f"Sent message to channel {channel.id}")
if not without_tracking: if not without_tracking:
self._clients.append_sent_message_count( self._clients.append_sent_message_count(self._bot.user.id, channel.guild.id, 1)
self._bot.user.id, channel.guild.id, 1
)
self._db.save_changes() self._db.save_changes()
if wait_before_delete is not None: if wait_before_delete is not None:
@ -125,23 +107,17 @@ class MessageService(MessageServiceABC):
receiver: Union[discord.User, discord.Member], receiver: Union[discord.User, discord.Member],
without_tracking=False, without_tracking=False,
): ):
self._logger.debug( self._logger.debug(__name__, f"Try to send message\n\t{message}\n\tto: {receiver}")
__name__, f"Try to send message\n\t{message}\n\tto: {receiver}"
)
try: try:
if isinstance(message, discord.Embed): if isinstance(message, discord.Embed):
msg = await receiver.send(embed=message) msg = await receiver.send(embed=message)
else: else:
msg = await receiver.send(message) msg = await receiver.send(message)
except Exception as e: except Exception as e:
self._logger.error( self._logger.error(__name__, f"Send message to user {receiver.id} failed", e)
__name__, f"Send message to user {receiver.id} failed", e
)
else: else:
if not without_tracking: if not without_tracking:
self._clients.append_sent_message_count( self._clients.append_sent_message_count(self._bot.user.id, receiver.guild.id, 1)
self._bot.user.id, receiver.guild.id, 1
)
self._db.save_changes() self._db.save_changes()
self._logger.info(__name__, f"Sent message to user {receiver.id}") self._logger.info(__name__, f"Sent message to user {receiver.id}")
@ -160,9 +136,7 @@ class MessageService(MessageServiceABC):
self._logger.debug(__name__, f"Message: {message}") self._logger.debug(__name__, f"Message: {message}")
return None return None
self._logger.debug( self._logger.debug(__name__, f"Try to send message\t\t{message}\n\tto: {ctx.channel}")
__name__, f"Try to send message\t\t{message}\n\tto: {ctx.channel}"
)
msg = None msg = None
try: try:
if isinstance(message, discord.Embed): if isinstance(message, discord.Embed):
@ -170,15 +144,11 @@ class MessageService(MessageServiceABC):
else: else:
msg = await ctx.send(message, file=file, ephemeral=not is_public) msg = await ctx.send(message, file=file, ephemeral=not is_public)
except Exception as e: except Exception as e:
self._logger.error( self._logger.error(__name__, f"Send message to channel {ctx.channel.id} failed", e)
__name__, f"Send message to channel {ctx.channel.id} failed", e
)
else: else:
self._logger.info(__name__, f"Sent message to channel {ctx.channel.id}") self._logger.info(__name__, f"Sent message to channel {ctx.channel.id}")
if not without_tracking and ctx.guild is not None: if not without_tracking and ctx.guild is not None:
self._clients.append_sent_message_count( self._clients.append_sent_message_count(self._bot.user.id, ctx.guild.id, 1)
self._bot.user.id, ctx.guild.id, 1
)
self._db.save_changes() self._db.save_changes()
if wait_before_delete is not None: if wait_before_delete is not None:
@ -207,30 +177,18 @@ class MessageService(MessageServiceABC):
self._logger.debug(__name__, f"Message: {message}") self._logger.debug(__name__, f"Message: {message}")
return return
self._logger.debug( self._logger.debug(__name__, f"Try to send message\t\t{message}\n\tto: {interaction.channel}")
__name__, f"Try to send message\t\t{message}\n\tto: {interaction.channel}"
)
try: try:
if isinstance(message, discord.Embed): if isinstance(message, discord.Embed):
await interaction.response.send_message( await interaction.response.send_message(embed=message, ephemeral=not is_public, **kwargs)
embed=message, ephemeral=not is_public, **kwargs
)
else: else:
await interaction.response.send_message( await interaction.response.send_message(message, ephemeral=not is_public, **kwargs)
message, ephemeral=not is_public, **kwargs
)
except Exception as e: except Exception as e:
self._logger.error( self._logger.error(__name__, f"Send message to channel {interaction.channel.id} failed", e)
__name__, f"Send message to channel {interaction.channel.id} failed", e
)
else: else:
self._logger.info( self._logger.info(__name__, f"Sent message to channel {interaction.channel.id}")
__name__, f"Sent message to channel {interaction.channel.id}"
)
if not without_tracking and interaction.guild is not None: if not without_tracking and interaction.guild is not None:
self._clients.append_sent_message_count( self._clients.append_sent_message_count(self._bot.user.id, interaction.guild.id, 1)
self._bot.user.id, interaction.guild.id, 1
)
self._db.save_changes() self._db.save_changes()
if wait_before_delete is not None: if wait_before_delete is not None:
@ -239,6 +197,4 @@ class MessageService(MessageServiceABC):
if is_persistent: if is_persistent:
return return
await self.delete_message( await self.delete_message(await interaction.original_response(), without_tracking)
await interaction.original_response(), without_tracking
)

4
bot/src/bot_data/abc/achievement_repository_abc.py
View File

@ -28,9 +28,7 @@ class AchievementRepositoryABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_user_got_achievements_by_achievement_id( def get_user_got_achievements_by_achievement_id(self, achievement_id: int) -> List[Achievement]:
self, achievement_id: int
) -> List[Achievement]:
pass pass
@abstractmethod @abstractmethod

4
bot/src/bot_data/abc/auth_user_repository_abc.py
View File

@ -23,9 +23,7 @@ class AuthUserRepositoryABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_filtered_auth_users( def get_filtered_auth_users(self, criteria: AuthUserSelectCriteria) -> FilteredResult:
self, criteria: AuthUserSelectCriteria
) -> FilteredResult:
pass pass
@abstractmethod @abstractmethod

4
bot/src/bot_data/abc/client_repository_abc.py
View File

@ -36,9 +36,7 @@ class ClientRepositoryABC(ABC):
pass pass
@abstractmethod @abstractmethod
def find_client_by_discord_id_and_server_id( def find_client_by_discord_id_and_server_id(self, discord_id: int, server_id: int) -> Optional[Client]:
self, discord_id: int, server_id: int
) -> Optional[Client]:
pass pass
@abstractmethod @abstractmethod

24
bot/src/bot_data/abc/server_config_repository_abc.py
View File

@ -35,37 +35,25 @@ class ServerConfigRepositoryABC(ABC):
pass pass
@abstractmethod @abstractmethod
def add_server_team_role_id_config( def add_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
self, server_team_role_id: ServerTeamRoleIdsConfig
):
pass pass
@abstractmethod @abstractmethod
def update_server_team_role_id_config( def update_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
self, server_team_role_id: ServerTeamRoleIdsConfig
):
pass pass
@abstractmethod @abstractmethod
def delete_server_team_role_id_config( def delete_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
self, server_team_role_id: ServerTeamRoleIdsConfig
):
pass pass
@abstractmethod @abstractmethod
def add_server_afk_channel_config( def add_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
self, server_afk_channel: ServerAFKChannelIdsConfig
):
pass pass
@abstractmethod @abstractmethod
def update_server_afk_channel_config( def update_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
self, server_afk_channel: ServerAFKChannelIdsConfig
):
pass pass
@abstractmethod @abstractmethod
def delete_server_afk_channel_config( def delete_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
self, server_afk_channel: ServerAFKChannelIdsConfig
):
pass pass

12
bot/src/bot_data/abc/technician_config_repository_abc.py
View File

@ -43,19 +43,13 @@ class TechnicianConfigRepositoryABC(ABC):
pass pass
@abstractmethod @abstractmethod
def add_technician_ping_url_config( def add_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
self, technician_ping_url: TechnicianPingUrlConfig
):
pass pass
@abstractmethod @abstractmethod
def update_technician_ping_url_config( def update_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
self, technician_ping_url: TechnicianPingUrlConfig
):
pass pass
@abstractmethod @abstractmethod
def delete_technician_ping_url_config( def delete_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
self, technician_ping_url: TechnicianPingUrlConfig
):
pass pass

28
bot/src/bot_data/abc/user_joined_game_server_repository_abc.py
View File

@ -20,45 +20,31 @@ class UserJoinedGameServerRepositoryABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_user_joined_game_servers_by_user_id( def get_user_joined_game_servers_by_user_id(self, user_id: int) -> List[UserJoinedGameServer]:
self, user_id: int
) -> List[UserJoinedGameServer]:
pass pass
@abstractmethod @abstractmethod
def get_active_user_joined_game_server_by_user_id( def get_active_user_joined_game_server_by_user_id(self, user_id: int) -> UserJoinedGameServer:
self, user_id: int
) -> UserJoinedGameServer:
pass pass
@abstractmethod @abstractmethod
def find_active_user_joined_game_server_by_user_id( def find_active_user_joined_game_server_by_user_id(self, user_id: int) -> Optional[UserJoinedGameServer]:
self, user_id: int
) -> Optional[UserJoinedGameServer]:
pass pass
@abstractmethod @abstractmethod
def find_active_user_joined_game_servers_by_user_id( def find_active_user_joined_game_servers_by_user_id(self, user_id: int) -> List[Optional[UserJoinedGameServer]]:
self, user_id: int
) -> List[Optional[UserJoinedGameServer]]:
pass pass
@abstractmethod @abstractmethod
def add_user_joined_game_server( def add_user_joined_game_server(self, user_joined_game_server: UserJoinedGameServer):
self, user_joined_game_server: UserJoinedGameServer
):
pass pass
@abstractmethod @abstractmethod
def update_user_joined_game_server( def update_user_joined_game_server(self, user_joined_game_server: UserJoinedGameServer):
self, user_joined_game_server: UserJoinedGameServer
):
pass pass
@abstractmethod @abstractmethod
def delete_user_joined_game_server( def delete_user_joined_game_server(self, user_joined_game_server: UserJoinedGameServer):
self, user_joined_game_server: UserJoinedGameServer
):
pass pass
@abstractmethod @abstractmethod

12
bot/src/bot_data/abc/user_joined_server_repository_abc.py
View File

@ -24,21 +24,15 @@ class UserJoinedServerRepositoryABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_user_joined_servers_by_user_id( def get_user_joined_servers_by_user_id(self, user_id: int) -> list[UserJoinedServer]:
self, user_id: int
) -> list[UserJoinedServer]:
pass pass
@abstractmethod @abstractmethod
def get_active_user_joined_server_by_user_id( def get_active_user_joined_server_by_user_id(self, user_id: int) -> UserJoinedServer:
self, user_id: int
) -> UserJoinedServer:
pass pass
@abstractmethod @abstractmethod
def find_active_user_joined_server_by_user_id( def find_active_user_joined_server_by_user_id(self, user_id: int) -> Optional[UserJoinedServer]:
self, user_id: int
) -> Optional[UserJoinedServer]:
pass pass
@abstractmethod @abstractmethod

28
bot/src/bot_data/abc/user_joined_voice_channel_repository_abc.py
View File

@ -19,45 +19,31 @@ class UserJoinedVoiceChannelRepositoryABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_user_joined_voice_channels_by_user_id( def get_user_joined_voice_channels_by_user_id(self, user_id: int) -> List[UserJoinedVoiceChannel]:
self, user_id: int
) -> List[UserJoinedVoiceChannel]:
pass pass
@abstractmethod @abstractmethod
def get_active_user_joined_voice_channel_by_user_id( def get_active_user_joined_voice_channel_by_user_id(self, user_id: int) -> UserJoinedVoiceChannel:
self, user_id: int
) -> UserJoinedVoiceChannel:
pass pass
@abstractmethod @abstractmethod
def find_active_user_joined_voice_channel_by_user_id( def find_active_user_joined_voice_channel_by_user_id(self, user_id: int) -> Optional[UserJoinedVoiceChannel]:
self, user_id: int
) -> Optional[UserJoinedVoiceChannel]:
pass pass
@abstractmethod @abstractmethod
def find_active_user_joined_voice_channels_by_user_id( def find_active_user_joined_voice_channels_by_user_id(self, user_id: int) -> List[Optional[UserJoinedVoiceChannel]]:
self, user_id: int
) -> List[Optional[UserJoinedVoiceChannel]]:
pass pass
@abstractmethod @abstractmethod
def add_user_joined_voice_channel( def add_user_joined_voice_channel(self, user_joined_voice_channel: UserJoinedVoiceChannel):
self, user_joined_voice_channel: UserJoinedVoiceChannel
):
pass pass
@abstractmethod @abstractmethod
def update_user_joined_voice_channel( def update_user_joined_voice_channel(self, user_joined_voice_channel: UserJoinedVoiceChannel):
self, user_joined_voice_channel: UserJoinedVoiceChannel
):
pass pass
@abstractmethod @abstractmethod
def delete_user_joined_voice_channel( def delete_user_joined_voice_channel(self, user_joined_voice_channel: UserJoinedVoiceChannel):
self, user_joined_voice_channel: UserJoinedVoiceChannel
):
pass pass
@abstractmethod @abstractmethod

4
bot/src/bot_data/abc/user_message_count_per_hour_repository_abc.py
View File

@ -17,9 +17,7 @@ class UserMessageCountPerHourRepositoryABC(ABC):
pass pass
@abstractmethod @abstractmethod
def find_user_message_count_per_hour_by_user_id( def find_user_message_count_per_hour_by_user_id(self, user_id: int) -> Optional[UserMessageCountPerHour]:
self, user_id: int
) -> Optional[UserMessageCountPerHour]:
pass pass
@abstractmethod @abstractmethod

8
bot/src/bot_data/abc/user_repository_abc.py
View File

@ -32,15 +32,11 @@ class UserRepositoryABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_user_by_discord_id_and_server_id( def get_user_by_discord_id_and_server_id(self, discord_id: int, server_id: int) -> User:
self, discord_id: int, server_id: int
) -> User:
pass pass
@abstractmethod @abstractmethod
def find_user_by_discord_id_and_server_id( def find_user_by_discord_id_and_server_id(self, discord_id: int, server_id: int) -> Optional[User]:
self, discord_id: int, server_id: int
) -> Optional[User]:
pass pass
@abstractmethod @abstractmethod

36
bot/src/bot_data/data_module.py
View File

@ -86,14 +86,10 @@ class DataModule(ModuleABC):
def __init__(self, dc: DiscordCollectionABC): def __init__(self, dc: DiscordCollectionABC):
ModuleABC.__init__(self, dc, FeatureFlagsEnum.data_module) ModuleABC.__init__(self, dc, FeatureFlagsEnum.data_module)
def configure_configuration( def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
self, config: ConfigurationABC, env: ApplicationEnvironmentABC
):
pass pass
def configure_services( def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC
):
services.add_singleton(CacheService) services.add_singleton(CacheService)
services.add_transient(ApiKeyRepositoryABC, ApiKeyRepositoryService) services.add_transient(ApiKeyRepositoryABC, ApiKeyRepositoryService)
@ -102,15 +98,9 @@ class DataModule(ModuleABC):
services.add_transient(UserRepositoryABC, UserRepositoryService) services.add_transient(UserRepositoryABC, UserRepositoryService)
services.add_transient(ClientRepositoryABC, ClientRepositoryService) services.add_transient(ClientRepositoryABC, ClientRepositoryService)
services.add_transient(KnownUserRepositoryABC, KnownUserRepositoryService) services.add_transient(KnownUserRepositoryABC, KnownUserRepositoryService)
services.add_transient( services.add_transient(UserJoinedServerRepositoryABC, UserJoinedServerRepositoryService)
UserJoinedServerRepositoryABC, UserJoinedServerRepositoryService services.add_transient(UserJoinedVoiceChannelRepositoryABC, UserJoinedVoiceChannelRepositoryService)
) services.add_transient(UserJoinedGameServerRepositoryABC, UserJoinedGameServerRepositoryService)
services.add_transient(
UserJoinedVoiceChannelRepositoryABC, UserJoinedVoiceChannelRepositoryService
)
services.add_transient(
UserJoinedGameServerRepositoryABC, UserJoinedGameServerRepositoryService
)
services.add_transient(AutoRoleRepositoryABC, AutoRoleRepositoryService) services.add_transient(AutoRoleRepositoryABC, AutoRoleRepositoryService)
services.add_transient(LevelRepositoryABC, LevelRepositoryService) services.add_transient(LevelRepositoryABC, LevelRepositoryService)
services.add_transient(UserWarningsRepositoryABC, UserWarningsRepositoryService) services.add_transient(UserWarningsRepositoryABC, UserWarningsRepositoryService)
@ -119,20 +109,12 @@ class DataModule(ModuleABC):
UserMessageCountPerHourRepositoryService, UserMessageCountPerHourRepositoryService,
) )
services.add_transient(GameServerRepositoryABC, GameServerRepositoryService) services.add_transient(GameServerRepositoryABC, GameServerRepositoryService)
services.add_transient( services.add_transient(UserGameIdentRepositoryABC, UserGameIdentRepositoryService)
UserGameIdentRepositoryABC, UserGameIdentRepositoryService
)
services.add_transient(AchievementRepositoryABC, AchievementRepositoryService) services.add_transient(AchievementRepositoryABC, AchievementRepositoryService)
services.add_transient( services.add_transient(TechnicianConfigRepositoryABC, TechnicianConfigRepositoryService)
TechnicianConfigRepositoryABC, TechnicianConfigRepositoryService
)
services.add_transient(ServerConfigRepositoryABC, ServerConfigRepositoryService) services.add_transient(ServerConfigRepositoryABC, ServerConfigRepositoryService)
services.add_transient( services.add_transient(ShortRoleNameRepositoryABC, ShortRoleNameRepositoryService)
ShortRoleNameRepositoryABC, ShortRoleNameRepositoryService services.add_transient(SteamSpecialOfferRepositoryABC, SteamSpecialOfferRepositoryService)
)
services.add_transient(
SteamSpecialOfferRepositoryABC, SteamSpecialOfferRepositoryService
)
services.add_transient(SeederService) services.add_transient(SeederService)
services.add_transient(DataSeederABC, TechnicianConfigSeeder) services.add_transient(DataSeederABC, TechnicianConfigSeeder)

32
bot/src/bot_data/migration/achievements_migration.py
View File

@ -74,30 +74,12 @@ class AchievementsMigration(MigrationABC):
# A join table history between users and achievements is not necessary. # A join table history between users and achievements is not necessary.
self._cursor.execute( self._cursor.execute(str(f"""ALTER TABLE Users ADD MessageCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""))
str( self._cursor.execute(str(f"""ALTER TABLE Users ADD ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""))
f"""ALTER TABLE Users ADD MessageCount 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"""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( self._cursor.execute(str(f"""DROP TRIGGER IF EXISTS `TR_AchievementsUpdate`;"""))
str(f"""DROP TRIGGER IF EXISTS `TR_AchievementsUpdate`;""")
)
self._cursor.execute( self._cursor.execute(
str( str(
f""" f"""
@ -117,9 +99,7 @@ class AchievementsMigration(MigrationABC):
) )
) )
self._cursor.execute( self._cursor.execute(str(f"""DROP TRIGGER IF EXISTS `TR_AchievementsDelete`;"""))
str(f"""DROP TRIGGER IF EXISTS `TR_AchievementsDelete`;""")
)
self._cursor.execute( self._cursor.execute(
str( str(

8
bot/src/bot_data/migration/config_feature_flags_migration.py
View File

@ -16,15 +16,11 @@ class ConfigFeatureFlagsMigration(MigrationABC):
self._logger.debug(__name__, "Running upgrade") self._logger.debug(__name__, "Running upgrade")
self._cursor.execute( self._cursor.execute(
str( str("""ALTER TABLE CFG_Technician ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER CacheMaxMessages;""")
"""ALTER TABLE CFG_Technician ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER CacheMaxMessages;"""
)
) )
self._cursor.execute( self._cursor.execute(
str( str("""ALTER TABLE CFG_Server ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId;""")
"""ALTER TABLE CFG_Server ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId;"""
)
) )
def downgrade(self): def downgrade(self):

4
bot/src/bot_data/migration/fix_updates_migration.py
View File

@ -47,7 +47,5 @@ class FixUpdatesMigration(MigrationABC):
""" """
) )
) )
self._cursor.execute( self._cursor.execute("ALTER TABLE CFG_TechnicianHistory DROP COLUMN FeatureFlags;")
"ALTER TABLE CFG_TechnicianHistory DROP COLUMN FeatureFlags;"
)
self._cursor.execute("ALTER TABLE CFG_ServerHistory DROP COLUMN FeatureFlags;") self._cursor.execute("ALTER TABLE CFG_ServerHistory DROP COLUMN FeatureFlags;")

4
bot/src/bot_data/model/achievement.py
View File

@ -34,9 +34,7 @@ class Achievement(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@ServiceProviderABC.inject @ServiceProviderABC.inject
def _is_operator_valid(self, operator, service: ServiceProviderABC) -> bool: def _is_operator_valid(self, operator, service: ServiceProviderABC) -> bool:

4
bot/src/bot_data/model/api_key.py
View File

@ -23,9 +23,7 @@ class ApiKey(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/auth_user.py
View File

@ -49,9 +49,7 @@ class AuthUser(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/auth_user_users_relation.py
View File

@ -19,9 +19,7 @@ class AuthUserUsersRelation(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def auth_user(self) -> AuthUser: def auth_user(self) -> AuthUser:

4
bot/src/bot_data/model/auto_role.py
View File

@ -25,9 +25,7 @@ class AutoRole(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/auto_role_rule.py
View File

@ -24,9 +24,7 @@ class AutoRoleRule(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/client.py
View File

@ -32,9 +32,7 @@ class Client(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/game_server.py
View File

@ -23,9 +23,7 @@ class GameServer(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/known_user.py
View File

@ -16,9 +16,7 @@ class KnownUser(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/level.py
View File

@ -27,9 +27,7 @@ class Level(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/server.py
View File

@ -18,9 +18,7 @@ class Server(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/server_afk_channel_ids_config.py
View File

@ -18,9 +18,7 @@ class ServerAFKChannelIdsConfig(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def channel_id(self) -> int: def channel_id(self) -> int:

8
bot/src/bot_data/model/server_config.py
View File

@ -56,9 +56,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
self._team_channel_id = team_channel_id self._team_channel_id = team_channel_id
self._login_message_channel_id = login_message_channel_id self._login_message_channel_id = login_message_channel_id
self._default_role_id = default_role_id self._default_role_id = default_role_id
self._short_role_name_only_set_highest_role = ( self._short_role_name_only_set_highest_role = short_role_name_only_set_highest_role
short_role_name_only_set_highest_role
)
self._game_offer_notification_chat_id = game_offer_notification_chat_id self._game_offer_notification_chat_id = game_offer_notification_chat_id
self._feature_flags = feature_flags self._feature_flags = feature_flags
@ -68,9 +66,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@staticmethod @staticmethod
def new(guild: Guild, server: Server) -> "ServerConfig": def new(guild: Guild, server: Server) -> "ServerConfig":

4
bot/src/bot_data/model/server_config_history.py
View File

@ -43,9 +43,7 @@ class ServerConfigHistory(HistoryTableABC):
self._team_channel_id = team_channel_id self._team_channel_id = team_channel_id
self._login_message_channel_id = login_message_channel_id self._login_message_channel_id = login_message_channel_id
self._default_role_id = default_role_id self._default_role_id = default_role_id
self._short_role_name_only_set_highest_role = ( self._short_role_name_only_set_highest_role = short_role_name_only_set_highest_role
short_role_name_only_set_highest_role
)
self._feature_flags = feature_flags self._feature_flags = feature_flags
self._server_id = server_id self._server_id = server_id

4
bot/src/bot_data/model/server_team_role_ids_config.py
View File

@ -22,9 +22,7 @@ class ServerTeamRoleIdsConfig(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/short_role_name.py
View File

@ -27,9 +27,7 @@ class ShortRoleName(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/steam_special_offer.py
View File

@ -22,9 +22,7 @@ class SteamSpecialOffer(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/technician_config.py
View File

@ -33,9 +33,7 @@ class TechnicianConfig(TableABC, ConfigurationModelABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/technician_id_config.py
View File

@ -16,9 +16,7 @@ class TechnicianIdConfig(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/technician_ping_url_config.py
View File

@ -16,9 +16,7 @@ class TechnicianPingUrlConfig(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

12
bot/src/bot_data/model/user.py
View File

@ -33,9 +33,7 @@ class User(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:
@ -121,9 +119,7 @@ class User(TableABC):
UserJoinedServerRepositoryABC, UserJoinedServerRepositoryABC,
) )
ujs: UserJoinedServerRepositoryABC = services.get_service( ujs: UserJoinedServerRepositoryABC = services.get_service(UserJoinedServerRepositoryABC)
UserJoinedServerRepositoryABC
)
return ujs.find_active_user_joined_server_by_user_id(self.id) is None return ujs.find_active_user_joined_server_by_user_id(self.id) is None
@property @property
@ -136,9 +132,7 @@ class User(TableABC):
UserGameIdentRepositoryABC, UserGameIdentRepositoryABC,
) )
game_idents_repo: UserGameIdentRepositoryABC = services.get_service( game_idents_repo: UserGameIdentRepositoryABC = services.get_service(UserGameIdentRepositoryABC)
UserGameIdentRepositoryABC
)
return game_idents_repo.get_user_game_idents_by_user_id(self.id) return game_idents_repo.get_user_game_idents_by_user_id(self.id)
@staticmethod @staticmethod

4
bot/src/bot_data/model/user_game_ident.py
View File

@ -23,9 +23,7 @@ class UserGameIdent(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/user_got_achievement.py
View File

@ -22,9 +22,7 @@ class UserGotAchievement(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

8
bot/src/bot_data/model/user_history.py
View File

@ -64,9 +64,7 @@ class UserHistory(HistoryTableABC):
UserJoinedServerRepositoryABC, UserJoinedServerRepositoryABC,
) )
ujs: UserJoinedServerRepositoryABC = services.get_service( ujs: UserJoinedServerRepositoryABC = services.get_service(UserJoinedServerRepositoryABC)
UserJoinedServerRepositoryABC
)
return ujs.find_active_user_joined_server_by_user_id(self.id) is None return ujs.find_active_user_joined_server_by_user_id(self.id) is None
@property @property
@ -79,7 +77,5 @@ class UserHistory(HistoryTableABC):
UserGameIdentRepositoryABC, UserGameIdentRepositoryABC,
) )
game_idents_repo: UserGameIdentRepositoryABC = services.get_service( game_idents_repo: UserGameIdentRepositoryABC = services.get_service(UserGameIdentRepositoryABC)
UserGameIdentRepositoryABC
)
return game_idents_repo.get_user_game_idents_by_user_id(self.id) return game_idents_repo.get_user_game_idents_by_user_id(self.id)

4
bot/src/bot_data/model/user_joined_game_server.py
View File

@ -25,9 +25,7 @@ class UserJoinedGameServer(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/user_joined_server.py
View File

@ -22,9 +22,7 @@ class UserJoinedServer(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/user_joined_voice_channel.py
View File

@ -26,9 +26,7 @@ class UserJoinedVoiceChannel(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/user_message_count_per_hour.py
View File

@ -24,9 +24,7 @@ class UserMessageCountPerHour(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

4
bot/src/bot_data/model/user_warnings.py
View File

@ -24,9 +24,7 @@ class UserWarnings(TableABC):
TableABC.__init__(self) TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = ( self._modified_at = modified_at if modified_at is not None else self._modified_at
modified_at if modified_at is not None else self._modified_at
)
@property @property
def id(self) -> int: def id(self) -> int:

28
bot/src/bot_data/service/achievements_repository_service.py
View File

@ -49,9 +49,7 @@ class AchievementRepositoryService(AchievementRepositoryABC):
def get_achievements(self) -> List[Achievement]: def get_achievements(self) -> List[Achievement]:
achievements = List(Achievement) achievements = List(Achievement)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {Achievement.get_select_all_string()}")
__name__, f"Send SQL command: {Achievement.get_select_all_string()}"
)
results = self._context.select(Achievement.get_select_all_string()) results = self._context.select(Achievement.get_select_all_string())
for result in results: for result in results:
self._logger.trace(__name__, f"Get user with id {result[0]}") self._logger.trace(__name__, f"Get user with id {result[0]}")
@ -60,9 +58,7 @@ class AchievementRepositoryService(AchievementRepositoryABC):
return achievements return achievements
def get_achievement_by_id(self, id: int) -> Achievement: def get_achievement_by_id(self, id: int) -> Achievement:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {Achievement.get_select_by_id_string(id)}")
__name__, f"Send SQL command: {Achievement.get_select_by_id_string(id)}"
)
result = self._context.select(Achievement.get_select_by_id_string(id))[0] result = self._context.select(Achievement.get_select_by_id_string(id))[0]
return self._from_result(result) return self._from_result(result)
@ -73,9 +69,7 @@ class AchievementRepositoryService(AchievementRepositoryABC):
__name__, __name__,
f"Send SQL command: {Achievement.get_select_by_server_id_string(server_id)}", f"Send SQL command: {Achievement.get_select_by_server_id_string(server_id)}",
) )
results = self._context.select( results = self._context.select(Achievement.get_select_by_server_id_string(server_id))
Achievement.get_select_by_server_id_string(server_id)
)
for result in results: for result in results:
self._logger.trace(__name__, f"Get user with id {result[0]}") self._logger.trace(__name__, f"Get user with id {result[0]}")
achievements.append(self._from_result(result)) achievements.append(self._from_result(result))
@ -89,34 +83,26 @@ class AchievementRepositoryService(AchievementRepositoryABC):
__name__, __name__,
f"Send SQL command: {UserGotAchievement.get_select_by_user_id_string(user_id)}", f"Send SQL command: {UserGotAchievement.get_select_by_user_id_string(user_id)}",
) )
results = self._context.select( results = self._context.select(UserGotAchievement.get_select_by_user_id_string(user_id))
UserGotAchievement.get_select_by_user_id_string(user_id)
)
for result in results: for result in results:
self._logger.trace(__name__, f"Got UserGotAchievement with id {result[0]}") self._logger.trace(__name__, f"Got UserGotAchievement with id {result[0]}")
achievements_joins.append(self._join_from_result(result)) achievements_joins.append(self._join_from_result(result))
for achievements_join in achievements_joins: for achievements_join in achievements_joins:
results = self._context.select( results = self._context.select(Achievement.get_select_by_id_string(achievements_join.achievement.id))
Achievement.get_select_by_id_string(achievements_join.achievement.id)
)
for result in results: for result in results:
self._logger.trace(__name__, f"Got Achievement with id {result[0]}") self._logger.trace(__name__, f"Got Achievement with id {result[0]}")
achievements.append(self._from_result(result)) achievements.append(self._from_result(result))
return achievements return achievements
def get_user_got_achievements_by_achievement_id( def get_user_got_achievements_by_achievement_id(self, achievement_id: int) -> List[Achievement]:
self, achievement_id: int
) -> List[Achievement]:
achievements_joins = List(UserGotAchievement) achievements_joins = List(UserGotAchievement)
self._logger.trace( self._logger.trace(
__name__, __name__,
f"Send SQL command: {UserGotAchievement.get_select_by_achievement_id_string(achievement_id)}", f"Send SQL command: {UserGotAchievement.get_select_by_achievement_id_string(achievement_id)}",
) )
results = self._context.select( results = self._context.select(UserGotAchievement.get_select_by_achievement_id_string(achievement_id))
UserGotAchievement.get_select_by_achievement_id_string(achievement_id)
)
for result in results: for result in results:
self._logger.trace(__name__, f"Got UserGotAchievement with id {result[0]}") self._logger.trace(__name__, f"Got UserGotAchievement with id {result[0]}")
achievements_joins.append(self._join_from_result(result)) achievements_joins.append(self._join_from_result(result))

24
bot/src/bot_data/service/api_key_repository_service.py
View File

@ -45,9 +45,7 @@ class ApiKeyRepositoryService(ApiKeyRepositoryABC):
def get_api_keys(self) -> List[ApiKey]: def get_api_keys(self) -> List[ApiKey]:
api_keys = List(ApiKey) api_keys = List(ApiKey)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {ApiKey.get_select_all_string()}")
__name__, f"Send SQL command: {ApiKey.get_select_all_string()}"
)
results = self._context.select(ApiKey.get_select_all_string()) results = self._context.select(ApiKey.get_select_all_string())
for result in results: for result in results:
api_keys.append(self._api_key_from_result(result)) api_keys.append(self._api_key_from_result(result))
@ -55,26 +53,16 @@ class ApiKeyRepositoryService(ApiKeyRepositoryABC):
return api_keys return api_keys
def get_api_key(self, identifier: str, key: str) -> ApiKey: def get_api_key(self, identifier: str, key: str) -> ApiKey:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {ApiKey.get_select_string(identifier, key)}")
__name__, f"Send SQL command: {ApiKey.get_select_string(identifier, key)}" return self._api_key_from_result(self._context.select(ApiKey.get_select_string(identifier, key))[0])
)
return self._api_key_from_result(
self._context.select(ApiKey.get_select_string(identifier, key))[0]
)
def get_api_key_by_id(self, id: int) -> ApiKey: def get_api_key_by_id(self, id: int) -> ApiKey:
self._logger.trace(__name__, f"Send SQL command: {ApiKey.get_select_by_id(id)}") self._logger.trace(__name__, f"Send SQL command: {ApiKey.get_select_by_id(id)}")
return self._api_key_from_result( return self._api_key_from_result(self._context.select(ApiKey.get_select_by_id(id))[0])
self._context.select(ApiKey.get_select_by_id(id))[0]
)
def get_api_key_by_key(self, key: str) -> ApiKey: def get_api_key_by_key(self, key: str) -> ApiKey:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {ApiKey.get_select_by_key(key)}")
__name__, f"Send SQL command: {ApiKey.get_select_by_key(key)}" return self._api_key_from_result(self._context.select(ApiKey.get_select_by_key(key))[0])
)
return self._api_key_from_result(
self._context.select(ApiKey.get_select_by_key(key))[0]
)
def add_api_key(self, api_key: ApiKey): def add_api_key(self, api_key: ApiKey):
self._logger.trace(__name__, f"Send SQL command: {api_key.insert_string}") self._logger.trace(__name__, f"Send SQL command: {api_key.insert_string}")

42
bot/src/bot_data/service/auth_user_repository_service.py
View File

@ -74,9 +74,7 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
def get_all_auth_users(self) -> List[AuthUser]: def get_all_auth_users(self) -> List[AuthUser]:
users = List(AuthUser) users = List(AuthUser)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {AuthUser.get_select_all_string()}")
__name__, f"Send SQL command: {AuthUser.get_select_all_string()}"
)
results = self._context.select(AuthUser.get_select_all_string()) results = self._context.select(AuthUser.get_select_all_string())
for result in results: for result in results:
self._logger.trace(__name__, f"Get auth user with id {result[0]}") self._logger.trace(__name__, f"Get auth user with id {result[0]}")
@ -84,36 +82,22 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
return users return users
def get_filtered_auth_users( def get_filtered_auth_users(self, criteria: AuthUserSelectCriteria) -> FilteredResult:
self, criteria: AuthUserSelectCriteria
) -> FilteredResult:
users = self.get_all_auth_users() users = self.get_all_auth_users()
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {AuthUser.get_select_all_string()}")
__name__, f"Send SQL command: {AuthUser.get_select_all_string()}"
)
query = users query = users
if criteria.first_name is not None and criteria.first_name != "": if criteria.first_name is not None and criteria.first_name != "":
query = query.where( query = query.where(lambda x: criteria.first_name in x.first_name or x.first_name == criteria.first_name)
lambda x: criteria.first_name in x.first_name
or x.first_name == criteria.first_name
)
if criteria.last_name is not None and criteria.last_name != "": if criteria.last_name is not None and criteria.last_name != "":
query = query.where( query = query.where(lambda x: criteria.last_name in x.last_name or x.last_name == criteria.last_name)
lambda x: criteria.last_name in x.last_name
or x.last_name == criteria.last_name
)
if criteria.email is not None and criteria.email != "": if criteria.email is not None and criteria.email != "":
query = query.where( query = query.where(lambda x: criteria.email in x.email or x.email == criteria.email)
lambda x: criteria.email in x.email or x.email == criteria.email
)
if criteria.auth_role is not None: if criteria.auth_role is not None:
query = query.where( query = query.where(lambda x: x.auth_role == AuthRoleEnum(criteria.auth_role))
lambda x: x.auth_role == AuthRoleEnum(criteria.auth_role)
)
# sort # sort
if ( if (
@ -144,16 +128,12 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
return result return result
def get_auth_user_by_email(self, email: str) -> AuthUser: def get_auth_user_by_email(self, email: str) -> AuthUser:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {AuthUser.get_select_by_email_string(email)}")
__name__, f"Send SQL command: {AuthUser.get_select_by_email_string(email)}"
)
result = self._context.select(AuthUser.get_select_by_email_string(email))[0] result = self._context.select(AuthUser.get_select_by_email_string(email))[0]
return self._user_from_result(result) return self._user_from_result(result)
def find_auth_user_by_email(self, email: str) -> Optional[AuthUser]: def find_auth_user_by_email(self, email: str) -> Optional[AuthUser]:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {AuthUser.get_select_by_email_string(email)}")
__name__, f"Send SQL command: {AuthUser.get_select_by_email_string(email)}"
)
result = self._context.select(AuthUser.get_select_by_email_string(email)) result = self._context.select(AuthUser.get_select_by_email_string(email))
if result is None or len(result) == 0: if result is None or len(result) == 0:
return None return None
@ -180,9 +160,7 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
__name__, __name__,
f"Send SQL command: {AuthUser.get_select_by_forgot_password_id_string(id)}", f"Send SQL command: {AuthUser.get_select_by_forgot_password_id_string(id)}",
) )
result = self._context.select( result = self._context.select(AuthUser.get_select_by_forgot_password_id_string(id))
AuthUser.get_select_by_forgot_password_id_string(id)
)
if result is None or len(result) == 0: if result is None or len(result) == 0:
return None return None

40
bot/src/bot_data/service/auto_role_repository_service.py
View File

@ -25,9 +25,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
def get_auto_roles(self) -> List[AutoRole]: def get_auto_roles(self) -> List[AutoRole]:
auto_roles = List(AutoRole) auto_roles = List(AutoRole)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {AutoRole.get_select_all_string()}")
__name__, f"Send SQL command: {AutoRole.get_select_all_string()}"
)
results = self._context.select(AutoRole.get_select_all_string()) results = self._context.select(AutoRole.get_select_all_string())
for result in results: for result in results:
auto_roles.append( auto_roles.append(
@ -44,9 +42,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
return auto_roles return auto_roles
def get_auto_role_by_id(self, id: int) -> AutoRole: def get_auto_role_by_id(self, id: int) -> AutoRole:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {AutoRole.get_select_by_id_string(id)}")
__name__, f"Send SQL command: {AutoRole.get_select_by_id_string(id)}"
)
result = self._context.select(AutoRole.get_select_by_id_string(id))[0] result = self._context.select(AutoRole.get_select_by_id_string(id))[0]
return AutoRole( return AutoRole(
self._servers.get_server_by_id(result[1]), self._servers.get_server_by_id(result[1]),
@ -58,9 +54,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
) )
def find_auto_role_by_id(self, id: int) -> Optional[AutoRole]: def find_auto_role_by_id(self, id: int) -> Optional[AutoRole]:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {AutoRole.get_select_by_id_string(id)}")
__name__, f"Send SQL command: {AutoRole.get_select_by_id_string(id)}"
)
result = self._context.select(AutoRole.get_select_by_id_string(id)) result = self._context.select(AutoRole.get_select_by_id_string(id))
if result is None or len(result) == 0: if result is None or len(result) == 0:
return None return None
@ -77,9 +71,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
) )
def get_auto_roles_by_server_id(self, id: int) -> List[AutoRole]: def get_auto_roles_by_server_id(self, id: int) -> List[AutoRole]:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {AutoRole.get_select_by_server_id_string(id)}")
__name__, f"Send SQL command: {AutoRole.get_select_by_server_id_string(id)}"
)
auto_roles = List(AutoRole) auto_roles = List(AutoRole)
results = self._context.select(AutoRole.get_select_by_server_id_string(id)) results = self._context.select(AutoRole.get_select_by_server_id_string(id))
for result in results: for result in results:
@ -145,9 +137,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
def get_auto_role_rules(self) -> List[AutoRoleRule]: def get_auto_role_rules(self) -> List[AutoRoleRule]:
auto_role_rules = List(AutoRoleRule) auto_role_rules = List(AutoRoleRule)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {AutoRoleRule.get_select_all_string()}")
__name__, f"Send SQL command: {AutoRoleRule.get_select_all_string()}"
)
results = self._context.select(AutoRoleRule.get_select_all_string()) results = self._context.select(AutoRoleRule.get_select_all_string())
for result in results: for result in results:
auto_role_rules.append( auto_role_rules.append(
@ -164,9 +154,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
return auto_role_rules return auto_role_rules
def get_auto_role_rule_by_id(self, id: int) -> AutoRoleRule: def get_auto_role_rule_by_id(self, id: int) -> AutoRoleRule:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {AutoRoleRule.get_select_by_id_string(id)}")
__name__, f"Send SQL command: {AutoRoleRule.get_select_by_id_string(id)}"
)
result = self._context.select(AutoRoleRule.get_select_by_id_string(id))[0] result = self._context.select(AutoRoleRule.get_select_by_id_string(id))[0]
return AutoRoleRule( return AutoRoleRule(
self.get_auto_role_by_id(result[1]), self.get_auto_role_by_id(result[1]),
@ -183,9 +171,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
__name__, __name__,
f"Send SQL command: {AutoRoleRule.get_select_by_auto_role_id_string(id)}", f"Send SQL command: {AutoRoleRule.get_select_by_auto_role_id_string(id)}",
) )
results = self._context.select( results = self._context.select(AutoRoleRule.get_select_by_auto_role_id_string(id))
AutoRoleRule.get_select_by_auto_role_id_string(id)
)
for result in results: for result in results:
auto_role_rules.append( auto_role_rules.append(
AutoRoleRule( AutoRoleRule(
@ -201,19 +187,13 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
return auto_role_rules return auto_role_rules
def add_auto_role_rule(self, auto_role_rule: AutoRoleRule): def add_auto_role_rule(self, auto_role_rule: AutoRoleRule):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {auto_role_rule.insert_string}")
__name__, f"Send SQL command: {auto_role_rule.insert_string}"
)
self._context.cursor.execute(auto_role_rule.insert_string) self._context.cursor.execute(auto_role_rule.insert_string)
def update_auto_role_rule(self, auto_role_rule: AutoRoleRule): def update_auto_role_rule(self, auto_role_rule: AutoRoleRule):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {auto_role_rule.udpate_string}")
__name__, f"Send SQL command: {auto_role_rule.udpate_string}"
)
self._context.cursor.execute(auto_role_rule.udpate_string) self._context.cursor.execute(auto_role_rule.udpate_string)
def delete_auto_role_rule(self, auto_role_rule: AutoRoleRule): def delete_auto_role_rule(self, auto_role_rule: AutoRoleRule):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {auto_role_rule.delete_string}")
__name__, f"Send SQL command: {auto_role_rule.delete_string}"
)
self._context.cursor.execute(auto_role_rule.delete_string) self._context.cursor.execute(auto_role_rule.delete_string)

24
bot/src/bot_data/service/client_repository_service.py
View File

@ -25,9 +25,7 @@ class ClientRepositoryService(ClientRepositoryABC):
def get_clients(self) -> List[Client]: def get_clients(self) -> List[Client]:
clients = List(Client) clients = List(Client)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {Client.get_select_all_string()}")
__name__, f"Send SQL command: {Client.get_select_all_string()}"
)
results = self._context.select(Client.get_select_all_string()) results = self._context.select(Client.get_select_all_string())
for result in results: for result in results:
self._logger.trace(__name__, f"Get client with id {result[0]}") self._logger.trace(__name__, f"Get client with id {result[0]}")
@ -49,9 +47,7 @@ class ClientRepositoryService(ClientRepositoryABC):
return clients return clients
def get_client_by_id(self, client_id: int) -> Client: def get_client_by_id(self, client_id: int) -> Client:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {Client.get_select_by_id_string(client_id)}")
__name__, f"Send SQL command: {Client.get_select_by_id_string(client_id)}"
)
result = self._context.select(Client.get_select_by_id_string(client_id)) result = self._context.select(Client.get_select_by_id_string(client_id))
return Client( return Client(
result[1], result[1],
@ -96,9 +92,7 @@ class ClientRepositoryService(ClientRepositoryABC):
__name__, __name__,
f"Send SQL command: {Client.get_select_by_discord_id_string(discord_id)}", f"Send SQL command: {Client.get_select_by_discord_id_string(discord_id)}",
) )
result = self._context.select( result = self._context.select(Client.get_select_by_discord_id_string(discord_id))[0]
Client.get_select_by_discord_id_string(discord_id)
)[0]
return Client( return Client(
result[1], result[1],
result[2], result[2],
@ -117,9 +111,7 @@ class ClientRepositoryService(ClientRepositoryABC):
__name__, __name__,
f"Send SQL command: {Client.get_select_by_discord_id_string(discord_id)}", f"Send SQL command: {Client.get_select_by_discord_id_string(discord_id)}",
) )
result = self._context.select( result = self._context.select(Client.get_select_by_discord_id_string(discord_id))
Client.get_select_by_discord_id_string(discord_id)
)
if result is None or len(result) == 0: if result is None or len(result) == 0:
return None return None
@ -162,16 +154,12 @@ class ClientRepositoryService(ClientRepositoryABC):
id=result[0], id=result[0],
) )
def find_client_by_discord_id_and_server_id( def find_client_by_discord_id_and_server_id(self, discord_id: int, server_id: int) -> Optional[Client]:
self, discord_id: int, server_id: int
) -> Optional[Client]:
self._logger.trace( self._logger.trace(
__name__, __name__,
f"Send SQL command: {Client.get_select_by_discord_id_and_server_id_string(discord_id, server_id)}", f"Send SQL command: {Client.get_select_by_discord_id_and_server_id_string(discord_id, server_id)}",
) )
result = self._context.select( result = self._context.select(Client.get_select_by_discord_id_and_server_id_string(discord_id, server_id))
Client.get_select_by_discord_id_and_server_id_string(discord_id, server_id)
)
if result is None or len(result) == 0: if result is None or len(result) == 0:
return None return None

8
bot/src/bot_data/service/game_server_repository_service.py
View File

@ -42,9 +42,7 @@ class GameServerRepositoryService(GameServerRepositoryABC):
) )
results = self._context.select(GameServer.get_select_all_string()) results = self._context.select(GameServer.get_select_all_string())
for result in results: for result in results:
self._logger.trace( self._logger.trace(__name__, f"Get user-joined-game-server with id {result[0]}")
__name__, f"Get user-joined-game-server with id {result[0]}"
)
game_servers.append(self._from_result(result)) game_servers.append(self._from_result(result))
return game_servers return game_servers
@ -57,9 +55,7 @@ class GameServerRepositoryService(GameServerRepositoryABC):
) )
results = self._context.select(GameServer.get_select_by_server_id_string(id)) results = self._context.select(GameServer.get_select_by_server_id_string(id))
for result in results: for result in results:
self._logger.trace( self._logger.trace(__name__, f"Get user-joined-game-server with id {result[0]}")
__name__, f"Get user-joined-game-server with id {result[0]}"
)
game_servers.append(self._from_result(result)) game_servers.append(self._from_result(result))
return game_servers return game_servers

16
bot/src/bot_data/service/known_user_repository_service.py
View File

@ -25,9 +25,7 @@ class KnownUserRepositoryService(KnownUserRepositoryABC):
def get_users(self) -> List[KnownUser]: def get_users(self) -> List[KnownUser]:
users = List(KnownUser) users = List(KnownUser)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {KnownUser.get_select_all_string()}")
__name__, f"Send SQL command: {KnownUser.get_select_all_string()}"
)
results = self._context.select(KnownUser.get_select_all_string()) results = self._context.select(KnownUser.get_select_all_string())
for result in results: for result in results:
self._logger.trace(__name__, f"Get known_user with id {result[0]}") self._logger.trace(__name__, f"Get known_user with id {result[0]}")
@ -36,9 +34,7 @@ class KnownUserRepositoryService(KnownUserRepositoryABC):
return users return users
def get_user_by_id(self, id: int) -> KnownUser: def get_user_by_id(self, id: int) -> KnownUser:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {KnownUser.get_select_by_id_string(id)}")
__name__, f"Send SQL command: {KnownUser.get_select_by_id_string(id)}"
)
result = self._context.select(KnownUser.get_select_by_id_string(id)) result = self._context.select(KnownUser.get_select_by_id_string(id))
return KnownUser(result[1], result[2], result[3], id=result[0]) return KnownUser(result[1], result[2], result[3], id=result[0])
@ -47,9 +43,7 @@ class KnownUserRepositoryService(KnownUserRepositoryABC):
__name__, __name__,
f"Send SQL command: {KnownUser.get_select_by_discord_id_string(discord_id)}", f"Send SQL command: {KnownUser.get_select_by_discord_id_string(discord_id)}",
) )
result = self._context.select( result = self._context.select(KnownUser.get_select_by_discord_id_string(discord_id))[0]
KnownUser.get_select_by_discord_id_string(discord_id)
)[0]
return KnownUser(result[1], result[2], result[3], id=result[0]) return KnownUser(result[1], result[2], result[3], id=result[0])
def find_user_by_discord_id(self, discord_id: int) -> Optional[KnownUser]: def find_user_by_discord_id(self, discord_id: int) -> Optional[KnownUser]:
@ -57,9 +51,7 @@ class KnownUserRepositoryService(KnownUserRepositoryABC):
__name__, __name__,
f"Send SQL command: {KnownUser.get_select_by_discord_id_string(discord_id)}", f"Send SQL command: {KnownUser.get_select_by_discord_id_string(discord_id)}",
) )
result = self._context.select( result = self._context.select(KnownUser.get_select_by_discord_id_string(discord_id))
KnownUser.get_select_by_discord_id_string(discord_id)
)
if result is None or len(result) == 0: if result is None or len(result) == 0:
return None return None

12
bot/src/bot_data/service/level_repository_service.py
View File

@ -42,9 +42,7 @@ class LevelRepositoryService(LevelRepositoryABC):
def get_levels(self) -> List[Level]: def get_levels(self) -> List[Level]:
levels = List(Level) levels = List(Level)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {Level.get_select_all_string()}")
__name__, f"Send SQL command: {Level.get_select_all_string()}"
)
results = self._context.select(Level.get_select_all_string()) results = self._context.select(Level.get_select_all_string())
for result in results: for result in results:
self._logger.trace(__name__, f"Get level with id {result[0]}") self._logger.trace(__name__, f"Get level with id {result[0]}")
@ -53,17 +51,13 @@ class LevelRepositoryService(LevelRepositoryABC):
return levels return levels
def get_level_by_id(self, id: int) -> Level: def get_level_by_id(self, id: int) -> Level:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {Level.get_select_by_id_string(id)}")
__name__, f"Send SQL command: {Level.get_select_by_id_string(id)}"
)
result = self._context.select(Level.get_select_by_id_string(id))[0] result = self._context.select(Level.get_select_by_id_string(id))[0]
return self._level_from_result(result) return self._level_from_result(result)
def find_level_by_id(self, id: int) -> Optional[Level]: def find_level_by_id(self, id: int) -> Optional[Level]:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {Level.get_select_by_id_string(id)}")
__name__, f"Send SQL command: {Level.get_select_by_id_string(id)}"
)
result = self._context.select(Level.get_select_by_id_string(id)) result = self._context.select(Level.get_select_by_id_string(id))
if result is None or len(result) == 0: if result is None or len(result) == 0:
return None return None

16
bot/src/bot_data/service/migration_service.py
View File

@ -21,9 +21,7 @@ class MigrationService:
self._cursor = db.cursor self._cursor = db.cursor
self._migrations: List[MigrationABC] = ( self._migrations: List[MigrationABC] = (
List(type, MigrationABC.__subclasses__()) List(type, MigrationABC.__subclasses__()).order_by(lambda x: x.name).order_by(lambda x: x.prio)
.order_by(lambda x: x.name)
.order_by(lambda x: x.prio)
) )
def migrate(self): def migrate(self):
@ -40,21 +38,15 @@ class MigrationService:
__name__, __name__,
f"Running SQL Command: {MigrationHistory.get_select_by_id_string(migration_id)}", f"Running SQL Command: {MigrationHistory.get_select_by_id_string(migration_id)}",
) )
migration_from_db = self._db.select( migration_from_db = self._db.select(MigrationHistory.get_select_by_id_string(migration_id))
MigrationHistory.get_select_by_id_string(migration_id)
)
if migration_from_db is not None and len(migration_from_db) > 0: if migration_from_db is not None and len(migration_from_db) > 0:
continue continue
self._logger.debug(__name__, f"Running Migration {migration_id}") self._logger.debug(__name__, f"Running Migration {migration_id}")
migration_as_service: MigrationABC = self._services.get_service( migration_as_service: MigrationABC = self._services.get_service(migration)
migration
)
migration_as_service.upgrade() migration_as_service.upgrade()
self._cursor.execute(MigrationHistory(migration_id).insert_string) self._cursor.execute(MigrationHistory(migration_id).insert_string)
self._db.save_changes() self._db.save_changes()
except Exception as e: except Exception as e:
self._logger.error( self._logger.error(__name__, f"Cannot get migration with id {migration}", e)
__name__, f"Cannot get migration with id {migration}", e
)

76
bot/src/bot_data/service/server_config_repository_service.py
View File

@ -31,13 +31,9 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
__name__, __name__,
f"Send SQL command: {ServerTeamRoleIdsConfig.get_select_by_server_id_string(server_id)}", f"Send SQL command: {ServerTeamRoleIdsConfig.get_select_by_server_id_string(server_id)}",
) )
results = self._context.select( results = self._context.select(ServerTeamRoleIdsConfig.get_select_by_server_id_string(server_id))
ServerTeamRoleIdsConfig.get_select_by_server_id_string(server_id)
)
for result in results: for result in results:
self._logger.trace( self._logger.trace(__name__, f"Got ServerTeamRoleIdsConfig with id {result[0]}")
__name__, f"Got ServerTeamRoleIdsConfig with id {result[0]}"
)
ids.append( ids.append(
ServerTeamRoleIdsConfig( ServerTeamRoleIdsConfig(
result[1], result[1],
@ -57,13 +53,9 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
__name__, __name__,
f"Send SQL command: {ServerAFKChannelIdsConfig.get_select_by_server_id_string(server_id)}", f"Send SQL command: {ServerAFKChannelIdsConfig.get_select_by_server_id_string(server_id)}",
) )
results = self._context.select( results = self._context.select(ServerAFKChannelIdsConfig.get_select_by_server_id_string(server_id))
ServerAFKChannelIdsConfig.get_select_by_server_id_string(server_id)
)
for result in results: for result in results:
self._logger.trace( self._logger.trace(__name__, f"Got ServerAFKChannelIdsConfig with id {result[0]}")
__name__, f"Got ServerAFKChannelIdsConfig with id {result[0]}"
)
urls.append(result[1]) urls.append(result[1])
return urls return urls
@ -101,9 +93,7 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
__name__, __name__,
f"Send SQL command: {ServerConfig.get_select_by_server_id_string(server_id)}", f"Send SQL command: {ServerConfig.get_select_by_server_id_string(server_id)}",
) )
result = self._context.select( result = self._context.select(ServerConfig.get_select_by_server_id_string(server_id))
ServerConfig.get_select_by_server_id_string(server_id)
)
return len(result) > 0 return len(result) > 0
@ -112,9 +102,7 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
__name__, __name__,
f"Send SQL command: {ServerConfig.get_select_by_server_id_string(server_id)}", f"Send SQL command: {ServerConfig.get_select_by_server_id_string(server_id)}",
) )
result = self._context.select( result = self._context.select(ServerConfig.get_select_by_server_id_string(server_id))[0]
ServerConfig.get_select_by_server_id_string(server_id)
)[0]
return self._from_result(result) return self._from_result(result)
@ -123,9 +111,7 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
__name__, __name__,
f"Send SQL command: {ServerConfig.get_select_by_id_string(config_id)}", f"Send SQL command: {ServerConfig.get_select_by_id_string(config_id)}",
) )
result = self._context.select(ServerConfig.get_select_by_id_string(config_id))[ result = self._context.select(ServerConfig.get_select_by_id_string(config_id))[0]
0
]
return self._from_result(result) return self._from_result(result)
@ -141,50 +127,26 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
self._logger.trace(__name__, f"Send SQL command: {server_config.delete_string}") self._logger.trace(__name__, f"Send SQL command: {server_config.delete_string}")
self._context.cursor.execute(server_config.delete_string) self._context.cursor.execute(server_config.delete_string)
def add_server_team_role_id_config( def add_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
self, server_team_role_id: ServerTeamRoleIdsConfig self._logger.trace(__name__, f"Send SQL command: {server_team_role_id.insert_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {server_team_role_id.insert_string}"
)
self._context.cursor.execute(server_team_role_id.insert_string) self._context.cursor.execute(server_team_role_id.insert_string)
def update_server_team_role_id_config( def update_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
self, server_team_role_id: ServerTeamRoleIdsConfig self._logger.trace(__name__, f"Send SQL command: {server_team_role_id.udpate_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {server_team_role_id.udpate_string}"
)
self._context.cursor.execute(server_team_role_id.udpate_string) self._context.cursor.execute(server_team_role_id.udpate_string)
def delete_server_team_role_id_config( def delete_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
self, server_team_role_id: ServerTeamRoleIdsConfig self._logger.trace(__name__, f"Send SQL command: {server_team_role_id.delete_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {server_team_role_id.delete_string}"
)
self._context.cursor.execute(server_team_role_id.delete_string) self._context.cursor.execute(server_team_role_id.delete_string)
def add_server_afk_channel_config( def add_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
self, server_afk_channel: ServerAFKChannelIdsConfig self._logger.trace(__name__, f"Send SQL command: {server_afk_channel.insert_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {server_afk_channel.insert_string}"
)
self._context.cursor.execute(server_afk_channel.insert_string) self._context.cursor.execute(server_afk_channel.insert_string)
def update_server_afk_channel_config( def update_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
self, server_afk_channel: ServerAFKChannelIdsConfig self._logger.trace(__name__, f"Send SQL command: {server_afk_channel.udpate_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {server_afk_channel.udpate_string}"
)
self._context.cursor.execute(server_afk_channel.udpate_string) self._context.cursor.execute(server_afk_channel.udpate_string)
def delete_server_afk_channel_config( def delete_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
self, server_afk_channel: ServerAFKChannelIdsConfig self._logger.trace(__name__, f"Send SQL command: {server_afk_channel.delete_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {server_afk_channel.delete_string}"
)
self._context.cursor.execute(server_afk_channel.delete_string) self._context.cursor.execute(server_afk_channel.delete_string)

36
bot/src/bot_data/service/server_repository_service.py
View File

@ -26,9 +26,7 @@ class ServerRepositoryService(ServerRepositoryABC):
def get_servers(self) -> List[Server]: def get_servers(self) -> List[Server]:
servers = List(Server) servers = List(Server)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {Server.get_select_all_string()}")
__name__, f"Send SQL command: {Server.get_select_all_string()}"
)
results = self._context.select(Server.get_select_all_string()) results = self._context.select(Server.get_select_all_string())
for result in results: for result in results:
servers.append(Server(result[1], result[2], result[3], id=result[0])) servers.append(Server(result[1], result[2], result[3], id=result[0]))
@ -38,9 +36,7 @@ class ServerRepositoryService(ServerRepositoryABC):
def get_filtered_servers(self, criteria: ServerSelectCriteria) -> FilteredResult: def get_filtered_servers(self, criteria: ServerSelectCriteria) -> FilteredResult:
servers = self.get_servers() servers = self.get_servers()
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {Server.get_select_all_string()}")
__name__, f"Send SQL command: {Server.get_select_all_string()}"
)
query = servers query = servers
# sort # sort
@ -52,9 +48,7 @@ class ServerRepositoryService(ServerRepositoryABC):
): ):
crit_sort_direction = criteria.sort_direction.lower() crit_sort_direction = criteria.sort_direction.lower()
if crit_sort_direction == "desc" or crit_sort_direction == "descending": if crit_sort_direction == "desc" or crit_sort_direction == "descending":
query = query.order_by_descending( query = query.order_by_descending(lambda x: getattr(x, criteria.sort_column))
lambda x: getattr(x, criteria.sort_column)
)
else: else:
query = query.order_by(lambda x: getattr(x, criteria.sort_column)) query = query.order_by(lambda x: getattr(x, criteria.sort_column))
@ -66,25 +60,19 @@ class ServerRepositoryService(ServerRepositoryABC):
return result return result
def get_server_by_id(self, server_id: int) -> Server: def get_server_by_id(self, server_id: int) -> Server:
cs = self._cache.cached_server.where( cs = self._cache.cached_server.where(lambda x: x.id == server_id).single_or_default()
lambda x: x.id == server_id
).single_or_default()
if cs is not None: if cs is not None:
return cs return cs
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {Server.get_select_by_id_string(server_id)}")
__name__, f"Send SQL command: {Server.get_select_by_id_string(server_id)}"
)
result = self._context.select(Server.get_select_by_id_string(server_id))[0] result = self._context.select(Server.get_select_by_id_string(server_id))[0]
server = Server(result[1], result[2], result[3], id=result[0]) server = Server(result[1], result[2], result[3], id=result[0])
self._cache.add_server(server) self._cache.add_server(server)
return server return server
def get_server_by_discord_id(self, discord_id: int) -> Server: def get_server_by_discord_id(self, discord_id: int) -> Server:
cs = self._cache.cached_server.where( cs = self._cache.cached_server.where(lambda x: x.discord_id == discord_id).single_or_default()
lambda x: x.discord_id == discord_id
).single_or_default()
if cs is not None: if cs is not None:
return cs return cs
@ -92,15 +80,11 @@ class ServerRepositoryService(ServerRepositoryABC):
__name__, __name__,
f"Send SQL command: {Server.get_select_by_discord_id_string(discord_id)}", f"Send SQL command: {Server.get_select_by_discord_id_string(discord_id)}",
) )
result = self._context.select( result = self._context.select(Server.get_select_by_discord_id_string(discord_id))[0]
Server.get_select_by_discord_id_string(discord_id)
)[0]
return Server(result[1], result[2], result[3], id=result[0]) return Server(result[1], result[2], result[3], id=result[0])
def find_server_by_discord_id(self, discord_id: int) -> Optional[Server]: def find_server_by_discord_id(self, discord_id: int) -> Optional[Server]:
cs = self._cache.cached_server.where( cs = self._cache.cached_server.where(lambda x: x.discord_id == discord_id).single_or_default()
lambda x: x.discord_id == discord_id
).single_or_default()
if cs is not None: if cs is not None:
return cs return cs
@ -108,9 +92,7 @@ class ServerRepositoryService(ServerRepositoryABC):
__name__, __name__,
f"Send SQL command: {Server.get_select_by_discord_id_string(discord_id)}", f"Send SQL command: {Server.get_select_by_discord_id_string(discord_id)}",
) )
result = self._context.select( result = self._context.select(Server.get_select_by_discord_id_string(discord_id))
Server.get_select_by_discord_id_string(discord_id)
)
if result is None or len(result) == 0: if result is None or len(result) == 0:
return None return None

32
bot/src/bot_data/service/short_role_name_repository_service.py
View File

@ -35,9 +35,7 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
return ShortRoleName( return ShortRoleName(
self._get_value_from_result(sql_result[1]), # name self._get_value_from_result(sql_result[1]), # name
int(self._get_value_from_result(sql_result[2])), # role_id int(self._get_value_from_result(sql_result[2])), # role_id
ShortRoleNamePositionEnum( ShortRoleNamePositionEnum(self._get_value_from_result(sql_result[3])), # position
self._get_value_from_result(sql_result[3])
), # position
self._servers.get_server_by_id(sql_result[4]), # server self._servers.get_server_by_id(sql_result[4]), # server
self._get_value_from_result(sql_result[5]), # created_at self._get_value_from_result(sql_result[5]), # created_at
self._get_value_from_result(sql_result[6]), # modified_at self._get_value_from_result(sql_result[6]), # modified_at
@ -46,9 +44,7 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
def get_short_role_names(self) -> List[ShortRoleName]: def get_short_role_names(self) -> List[ShortRoleName]:
short_role_names = List(ShortRoleName) short_role_names = List(ShortRoleName)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {ShortRoleName.get_select_all_string()}")
__name__, f"Send SQL command: {ShortRoleName.get_select_all_string()}"
)
results = self._context.select(ShortRoleName.get_select_all_string()) results = self._context.select(ShortRoleName.get_select_all_string())
for result in results: for result in results:
self._logger.trace(__name__, f"Get short_role_name with id {result[0]}") self._logger.trace(__name__, f"Get short_role_name with id {result[0]}")
@ -57,9 +53,7 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
return short_role_names return short_role_names
def get_short_role_name_by_id(self, id: int) -> ShortRoleName: def get_short_role_name_by_id(self, id: int) -> ShortRoleName:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {ShortRoleName.get_select_by_id_string(id)}")
__name__, f"Send SQL command: {ShortRoleName.get_select_by_id_string(id)}"
)
result = self._context.select(ShortRoleName.get_select_by_id_string(id))[0] result = self._context.select(ShortRoleName.get_select_by_id_string(id))[0]
return self._short_role_name_from_result(result) return self._short_role_name_from_result(result)
@ -70,9 +64,7 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
__name__, __name__,
f"Send SQL command: {ShortRoleName.get_select_by_role_id_string(role_id)}", f"Send SQL command: {ShortRoleName.get_select_by_role_id_string(role_id)}",
) )
results = self._context.select( results = self._context.select(ShortRoleName.get_select_by_role_id_string(role_id))
ShortRoleName.get_select_by_role_id_string(role_id)
)
for result in results: for result in results:
self._logger.trace(__name__, f"Get short_role_name with id {result[0]}") self._logger.trace(__name__, f"Get short_role_name with id {result[0]}")
short_role_names.append(self._short_role_name_from_result(result)) short_role_names.append(self._short_role_name_from_result(result))
@ -85,9 +77,7 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
__name__, __name__,
f"Send SQL command: {ShortRoleName.get_select_by_server_id_string(server_id)}", f"Send SQL command: {ShortRoleName.get_select_by_server_id_string(server_id)}",
) )
results = self._context.select( results = self._context.select(ShortRoleName.get_select_by_server_id_string(server_id))
ShortRoleName.get_select_by_server_id_string(server_id)
)
for result in results: for result in results:
self._logger.trace(__name__, f"Get short_role_name with id {result[0]}") self._logger.trace(__name__, f"Get short_role_name with id {result[0]}")
@ -96,19 +86,13 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
return short_role_names return short_role_names
def add_short_role_name(self, short_role_name: ShortRoleName): def add_short_role_name(self, short_role_name: ShortRoleName):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {short_role_name.insert_string}")
__name__, f"Send SQL command: {short_role_name.insert_string}"
)
self._context.cursor.execute(short_role_name.insert_string) self._context.cursor.execute(short_role_name.insert_string)
def update_short_role_name(self, short_role_name: ShortRoleName): def update_short_role_name(self, short_role_name: ShortRoleName):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {short_role_name.udpate_string}")
__name__, f"Send SQL command: {short_role_name.udpate_string}"
)
self._context.cursor.execute(short_role_name.udpate_string) self._context.cursor.execute(short_role_name.udpate_string)
def delete_short_role_name(self, short_role_name: ShortRoleName): def delete_short_role_name(self, short_role_name: ShortRoleName):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {short_role_name.delete_string}")
__name__, f"Send SQL command: {short_role_name.delete_string}"
)
self._context.cursor.execute(short_role_name.delete_string) self._context.cursor.execute(short_role_name.delete_string)

20
bot/src/bot_data/service/steam_special_offer_repository_service.py
View File

@ -43,9 +43,7 @@ class SteamSpecialOfferRepositoryService(SteamSpecialOfferRepositoryABC):
def get_steam_special_offers(self) -> List[SteamSpecialOffer]: def get_steam_special_offers(self) -> List[SteamSpecialOffer]:
steam_special_offers = List(SteamSpecialOffer) steam_special_offers = List(SteamSpecialOffer)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {SteamSpecialOffer.get_select_all_string()}")
__name__, f"Send SQL command: {SteamSpecialOffer.get_select_all_string()}"
)
results = self._context.select(SteamSpecialOffer.get_select_all_string()) results = self._context.select(SteamSpecialOffer.get_select_all_string())
for result in results: for result in results:
self._logger.trace(__name__, f"Get steam_special_offer with id {result[0]}") self._logger.trace(__name__, f"Get steam_special_offer with id {result[0]}")
@ -58,26 +56,18 @@ class SteamSpecialOfferRepositoryService(SteamSpecialOfferRepositoryABC):
__name__, __name__,
f"Send SQL command: {SteamSpecialOffer.get_select_by_name_string(name)}", f"Send SQL command: {SteamSpecialOffer.get_select_by_name_string(name)}",
) )
result = self._context.select( result = self._context.select(SteamSpecialOffer.get_select_by_name_string(name))[0]
SteamSpecialOffer.get_select_by_name_string(name)
)[0]
return self._steam_special_offer_from_result(result) return self._steam_special_offer_from_result(result)
def add_steam_special_offer(self, steam_special_offer: SteamSpecialOffer): def add_steam_special_offer(self, steam_special_offer: SteamSpecialOffer):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {steam_special_offer.insert_string}")
__name__, f"Send SQL command: {steam_special_offer.insert_string}"
)
self._context.cursor.execute(steam_special_offer.insert_string) self._context.cursor.execute(steam_special_offer.insert_string)
def update_steam_special_offer(self, steam_special_offer: SteamSpecialOffer): def update_steam_special_offer(self, steam_special_offer: SteamSpecialOffer):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {steam_special_offer.udpate_string}")
__name__, f"Send SQL command: {steam_special_offer.udpate_string}"
)
self._context.cursor.execute(steam_special_offer.udpate_string) self._context.cursor.execute(steam_special_offer.udpate_string)
def delete_steam_special_offer(self, steam_special_offer: SteamSpecialOffer): def delete_steam_special_offer(self, steam_special_offer: SteamSpecialOffer):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {steam_special_offer.delete_string}")
__name__, f"Send SQL command: {steam_special_offer.delete_string}"
)
self._context.cursor.execute(steam_special_offer.delete_string) self._context.cursor.execute(steam_special_offer.delete_string)

48
bot/src/bot_data/service/technician_config_repository_service.py
View File

@ -19,9 +19,7 @@ class TechnicianConfigRepositoryService(TechnicianConfigRepositoryABC):
def _get_technician_ids(self) -> List[int]: def _get_technician_ids(self) -> List[int]:
ids = List(int) ids = List(int)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {TechnicianIdConfig.get_select_all_string()}")
__name__, f"Send SQL command: {TechnicianIdConfig.get_select_all_string()}"
)
results = self._context.select(TechnicianIdConfig.get_select_all_string()) results = self._context.select(TechnicianIdConfig.get_select_all_string())
for result in results: for result in results:
self._logger.trace(__name__, f"Got TechnicianId with id {result[0]}") self._logger.trace(__name__, f"Got TechnicianId with id {result[0]}")
@ -57,37 +55,27 @@ class TechnicianConfigRepositoryService(TechnicianConfigRepositoryABC):
) )
def does_technician_config_exists(self) -> bool: def does_technician_config_exists(self) -> bool:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {TechnicianConfig.get_select_all_string()}")
__name__, f"Send SQL command: {TechnicianConfig.get_select_all_string()}"
)
result = self._context.select(TechnicianConfig.get_select_all_string()) result = self._context.select(TechnicianConfig.get_select_all_string())
return len(result) > 0 return len(result) > 0
def get_technician_config(self) -> TechnicianConfig: def get_technician_config(self) -> TechnicianConfig:
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {TechnicianConfig.get_select_all_string()}")
__name__, f"Send SQL command: {TechnicianConfig.get_select_all_string()}"
)
result = self._context.select(TechnicianConfig.get_select_all_string())[0] result = self._context.select(TechnicianConfig.get_select_all_string())[0]
return self._from_result(result) return self._from_result(result)
def add_technician_config(self, technician_config: TechnicianConfig): def add_technician_config(self, technician_config: TechnicianConfig):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {technician_config.insert_string}")
__name__, f"Send SQL command: {technician_config.insert_string}"
)
self._context.cursor.execute(technician_config.insert_string) self._context.cursor.execute(technician_config.insert_string)
def update_technician_config(self, technician_config: TechnicianConfig): def update_technician_config(self, technician_config: TechnicianConfig):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {technician_config.udpate_string}")
__name__, f"Send SQL command: {technician_config.udpate_string}"
)
self._context.cursor.execute(technician_config.udpate_string) self._context.cursor.execute(technician_config.udpate_string)
def delete_technician_config(self, technician_config: TechnicianConfig): def delete_technician_config(self, technician_config: TechnicianConfig):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {technician_config.delete_string}")
__name__, f"Send SQL command: {technician_config.delete_string}"
)
self._context.cursor.execute(technician_config.delete_string) self._context.cursor.execute(technician_config.delete_string)
def add_technician_id_config(self, technician_id: TechnicianIdConfig): def add_technician_id_config(self, technician_id: TechnicianIdConfig):
@ -102,26 +90,14 @@ class TechnicianConfigRepositoryService(TechnicianConfigRepositoryABC):
self._logger.trace(__name__, f"Send SQL command: {technician_id.delete_string}") self._logger.trace(__name__, f"Send SQL command: {technician_id.delete_string}")
self._context.cursor.execute(technician_id.delete_string) self._context.cursor.execute(technician_id.delete_string)
def add_technician_ping_url_config( def add_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
self, technician_ping_url: TechnicianPingUrlConfig self._logger.trace(__name__, f"Send SQL command: {technician_ping_url.insert_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {technician_ping_url.insert_string}"
)
self._context.cursor.execute(technician_ping_url.insert_string) self._context.cursor.execute(technician_ping_url.insert_string)
def update_technician_ping_url_config( def update_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
self, technician_ping_url: TechnicianPingUrlConfig self._logger.trace(__name__, f"Send SQL command: {technician_ping_url.udpate_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {technician_ping_url.udpate_string}"
)
self._context.cursor.execute(technician_ping_url.udpate_string) self._context.cursor.execute(technician_ping_url.udpate_string)
def delete_technician_ping_url_config( def delete_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
self, technician_ping_url: TechnicianPingUrlConfig self._logger.trace(__name__, f"Send SQL command: {technician_ping_url.delete_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {technician_ping_url.delete_string}"
)
self._context.cursor.execute(technician_ping_url.delete_string) self._context.cursor.execute(technician_ping_url.delete_string)

8
bot/src/bot_data/service/technician_config_seeder.py
View File

@ -42,14 +42,10 @@ class TechnicianConfigSeeder(DataSeederABC):
self._technician_config.add_technician_config(config) self._technician_config.add_technician_config(config)
for technician in config.technician_ids: for technician in config.technician_ids:
self._technician_config.add_technician_id_config( self._technician_config.add_technician_id_config(TechnicianIdConfig(technician))
TechnicianIdConfig(technician)
)
for url in config.ping_urls: for url in config.ping_urls:
self._technician_config.add_technician_ping_url_config( self._technician_config.add_technician_ping_url_config(TechnicianPingUrlConfig(url))
TechnicianPingUrlConfig(url)
)
self._db.save_changes() self._db.save_changes()
self._logger.debug(__name__, "Seeded technician config") self._logger.debug(__name__, "Seeded technician config")

28
bot/src/bot_data/service/user_game_ident_repository_service.py
View File

@ -51,17 +51,13 @@ class UserGameIdentRepositoryService(UserGameIdentRepositoryABC):
return joins return joins
def get_user_game_idents_by_game_server_id( def get_user_game_idents_by_game_server_id(self, game_server_id: int) -> List[UserGameIdent]:
self, game_server_id: int
) -> List[UserGameIdent]:
joins = List(UserGameIdent) joins = List(UserGameIdent)
self._logger.trace( self._logger.trace(
__name__, __name__,
f"Send SQL command: {UserGameIdent.get_select_by_game_server_id_string(game_server_id)}", f"Send SQL command: {UserGameIdent.get_select_by_game_server_id_string(game_server_id)}",
) )
results = self._context.select( results = self._context.select(UserGameIdent.get_select_by_game_server_id_string(game_server_id))
UserGameIdent.get_select_by_game_server_id_string(game_server_id)
)
for result in results: for result in results:
self._logger.trace(__name__, f"Get UserGameIdent with id {result[0]}") self._logger.trace(__name__, f"Get UserGameIdent with id {result[0]}")
joins.append(self._from_result(result)) joins.append(self._from_result(result))
@ -81,9 +77,7 @@ class UserGameIdentRepositoryService(UserGameIdentRepositoryABC):
__name__, __name__,
f"Send SQL command: {UserGameIdent.get_select_by_ident_string(ident)}", f"Send SQL command: {UserGameIdent.get_select_by_ident_string(ident)}",
) )
result = self._context.select(UserGameIdent.get_select_by_ident_string(ident))[ result = self._context.select(UserGameIdent.get_select_by_ident_string(ident))[0]
0
]
return self._from_result(result) return self._from_result(result)
def find_user_game_ident_by_ident(self, ident: str) -> Optional[UserGameIdent]: def find_user_game_ident_by_ident(self, ident: str) -> Optional[UserGameIdent]:
@ -104,30 +98,22 @@ class UserGameIdentRepositoryService(UserGameIdentRepositoryABC):
__name__, __name__,
f"Send SQL command: {UserGameIdent.get_select_by_user_id_string(user_id)}", f"Send SQL command: {UserGameIdent.get_select_by_user_id_string(user_id)}",
) )
results = self._context.select( results = self._context.select(UserGameIdent.get_select_by_user_id_string(user_id))
UserGameIdent.get_select_by_user_id_string(user_id)
)
for result in results: for result in results:
joins.append(self._from_result(result)) joins.append(self._from_result(result))
return joins return joins
def add_user_game_ident(self, user_game_ident: UserGameIdent): def add_user_game_ident(self, user_game_ident: UserGameIdent):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {user_game_ident.insert_string}")
__name__, f"Send SQL command: {user_game_ident.insert_string}"
)
self._context.cursor.execute(user_game_ident.insert_string) self._context.cursor.execute(user_game_ident.insert_string)
def update_user_game_ident(self, user_game_ident: UserGameIdent): def update_user_game_ident(self, user_game_ident: UserGameIdent):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {user_game_ident.udpate_string}")
__name__, f"Send SQL command: {user_game_ident.udpate_string}"
)
self._context.cursor.execute(user_game_ident.udpate_string) self._context.cursor.execute(user_game_ident.udpate_string)
def delete_user_game_ident(self, user_game_ident: UserGameIdent): def delete_user_game_ident(self, user_game_ident: UserGameIdent):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {user_game_ident.delete_string}")
__name__, f"Send SQL command: {user_game_ident.delete_string}"
)
self._context.cursor.execute(user_game_ident.delete_string) self._context.cursor.execute(user_game_ident.delete_string)
def delete_user_game_ident_by_user_id(self, user_id: int): def delete_user_game_ident_by_user_id(self, user_id: int):

68
bot/src/bot_data/service/user_joined_game_server_repository_service.py
View File

@ -46,9 +46,7 @@ class UserJoinedGameServerRepositoryService(UserJoinedGameServerRepositoryABC):
) )
results = self._context.select(UserJoinedGameServer.get_select_all_string()) results = self._context.select(UserJoinedGameServer.get_select_all_string())
for result in results: for result in results:
self._logger.trace( self._logger.trace(__name__, f"Get user-joined-game-server with id {result[0]}")
__name__, f"Get user-joined-game-server with id {result[0]}"
)
joins.append(self._from_result(result)) joins.append(self._from_result(result))
return joins return joins
@ -58,49 +56,35 @@ class UserJoinedGameServerRepositoryService(UserJoinedGameServerRepositoryABC):
__name__, __name__,
f"Send SQL command: {UserJoinedGameServer.get_select_by_id_string(id)}", f"Send SQL command: {UserJoinedGameServer.get_select_by_id_string(id)}",
) )
result = self._context.select(UserJoinedGameServer.get_select_by_id_string(id))[ result = self._context.select(UserJoinedGameServer.get_select_by_id_string(id))[0]
0
]
return self._from_result(result) return self._from_result(result)
def get_user_joined_game_servers_by_user_id( def get_user_joined_game_servers_by_user_id(self, user_id: int) -> List[UserJoinedGameServer]:
self, user_id: int
) -> List[UserJoinedGameServer]:
joins = List(UserJoinedGameServer) joins = List(UserJoinedGameServer)
self._logger.trace( self._logger.trace(
__name__, __name__,
f"Send SQL command: {UserJoinedGameServer.get_select_by_user_id_string(user_id)}", f"Send SQL command: {UserJoinedGameServer.get_select_by_user_id_string(user_id)}",
) )
results = self._context.select( results = self._context.select(UserJoinedGameServer.get_select_by_user_id_string(user_id))
UserJoinedGameServer.get_select_by_user_id_string(user_id)
)
for result in results: for result in results:
joins.append(self._from_result(result)) joins.append(self._from_result(result))
return joins return joins
def get_active_user_joined_game_server_by_user_id( def get_active_user_joined_game_server_by_user_id(self, user_id: int) -> UserJoinedGameServer:
self, user_id: int
) -> UserJoinedGameServer:
self._logger.trace( self._logger.trace(
__name__, __name__,
f"Send SQL command: {UserJoinedGameServer.get_select_by_user_id_string(user_id)}", f"Send SQL command: {UserJoinedGameServer.get_select_by_user_id_string(user_id)}",
) )
result = self._context.select( result = self._context.select(UserJoinedGameServer.get_select_active_by_user_id_string(user_id))[0]
UserJoinedGameServer.get_select_active_by_user_id_string(user_id)
)[0]
return self._from_result(result) return self._from_result(result)
def find_active_user_joined_game_server_by_user_id( def find_active_user_joined_game_server_by_user_id(self, user_id: int) -> Optional[UserJoinedGameServer]:
self, user_id: int
) -> Optional[UserJoinedGameServer]:
self._logger.trace( self._logger.trace(
__name__, __name__,
f"Send SQL command: {UserJoinedGameServer.get_select_by_user_id_string(user_id)}", f"Send SQL command: {UserJoinedGameServer.get_select_by_user_id_string(user_id)}",
) )
result = self._context.select( result = self._context.select(UserJoinedGameServer.get_select_active_by_user_id_string(user_id))
UserJoinedGameServer.get_select_active_by_user_id_string(user_id)
)
if result is None or len(result) == 0: if result is None or len(result) == 0:
return None return None
@ -108,45 +92,29 @@ class UserJoinedGameServerRepositoryService(UserJoinedGameServerRepositoryABC):
return self._from_result(result) return self._from_result(result)
def find_active_user_joined_game_servers_by_user_id( def find_active_user_joined_game_servers_by_user_id(self, user_id: int) -> List[Optional[UserJoinedGameServer]]:
self, user_id: int
) -> List[Optional[UserJoinedGameServer]]:
self._logger.trace( self._logger.trace(
__name__, __name__,
f"Send SQL command: {UserJoinedGameServer.get_select_active_by_user_id_string(user_id)}", f"Send SQL command: {UserJoinedGameServer.get_select_active_by_user_id_string(user_id)}",
) )
result = List(UserJoinedGameServer) result = List(UserJoinedGameServer)
db_results = self._context.select( db_results = self._context.select(UserJoinedGameServer.get_select_active_by_user_id_string(user_id))
UserJoinedGameServer.get_select_active_by_user_id_string(user_id)
)
for db_result in db_results: for db_result in db_results:
result.append(self._from_result(db_result)) result.append(self._from_result(db_result))
return result return result
def add_user_joined_game_server( def add_user_joined_game_server(self, user_joined_game_server: UserJoinedGameServer):
self, user_joined_game_server: UserJoinedGameServer self._logger.trace(__name__, f"Send SQL command: {user_joined_game_server.insert_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_game_server.insert_string}"
)
self._context.cursor.execute(user_joined_game_server.insert_string) self._context.cursor.execute(user_joined_game_server.insert_string)
def update_user_joined_game_server( def update_user_joined_game_server(self, user_joined_game_server: UserJoinedGameServer):
self, user_joined_game_server: UserJoinedGameServer self._logger.trace(__name__, f"Send SQL command: {user_joined_game_server.udpate_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_game_server.udpate_string}"
)
self._context.cursor.execute(user_joined_game_server.udpate_string) self._context.cursor.execute(user_joined_game_server.udpate_string)
def delete_user_joined_game_server( def delete_user_joined_game_server(self, user_joined_game_server: UserJoinedGameServer):
self, user_joined_game_server: UserJoinedGameServer self._logger.trace(__name__, f"Send SQL command: {user_joined_game_server.delete_string}")
):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_game_server.delete_string}"
)
self._context.cursor.execute(user_joined_game_server.delete_string) self._context.cursor.execute(user_joined_game_server.delete_string)
def delete_user_joined_game_server_by_user_id(self, user_id: int): def delete_user_joined_game_server_by_user_id(self, user_id: int):
@ -154,6 +122,4 @@ class UserJoinedGameServerRepositoryService(UserJoinedGameServerRepositoryABC):
__name__, __name__,
f"Send SQL command: {UserJoinedGameServer.delete_by_user_id_string}", f"Send SQL command: {UserJoinedGameServer.delete_by_user_id_string}",
) )
self._context.cursor.execute( self._context.cursor.execute(UserJoinedGameServer.delete_by_user_id_string(user_id))
UserJoinedGameServer.delete_by_user_id_string(user_id)
)

40
bot/src/bot_data/service/user_joined_server_repository_service.py
View File

@ -25,9 +25,7 @@ class UserJoinedServerRepositoryService(UserJoinedServerRepositoryABC):
def get_user_joined_servers(self) -> List[UserJoinedServer]: def get_user_joined_servers(self) -> List[UserJoinedServer]:
joins = List(UserJoinedServer) joins = List(UserJoinedServer)
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {UserJoinedServer.get_select_all_string()}")
__name__, f"Send SQL command: {UserJoinedServer.get_select_all_string()}"
)
results = self._context.select(UserJoinedServer.get_select_all_string()) results = self._context.select(UserJoinedServer.get_select_all_string())
for result in results: for result in results:
self._logger.trace(__name__, f"Get user-joined-server with id {result[0]}") self._logger.trace(__name__, f"Get user-joined-server with id {result[0]}")
@ -74,17 +72,13 @@ class UserJoinedServerRepositoryService(UserJoinedServerRepositoryABC):
id=result[0], id=result[0],
) )
def get_user_joined_servers_by_user_id( def get_user_joined_servers_by_user_id(self, user_id: int) -> List[UserJoinedServer]:
self, user_id: int
) -> List[UserJoinedServer]:
joins = List(UserJoinedServer) joins = List(UserJoinedServer)
self._logger.trace( self._logger.trace(
__name__, __name__,
f"Send SQL command: {UserJoinedServer.get_select_by_user_id_string(user_id)}", f"Send SQL command: {UserJoinedServer.get_select_by_user_id_string(user_id)}",
) )
results = self._context.select( results = self._context.select(UserJoinedServer.get_select_by_user_id_string(user_id))
UserJoinedServer.get_select_by_user_id_string(user_id)
)
for result in results: for result in results:
joins.append( joins.append(
UserJoinedServer( UserJoinedServer(
@ -99,16 +93,12 @@ class UserJoinedServerRepositoryService(UserJoinedServerRepositoryABC):
return joins return joins
def get_active_user_joined_server_by_user_id( def get_active_user_joined_server_by_user_id(self, user_id: int) -> UserJoinedServer:
self, user_id: int
) -> UserJoinedServer:
self._logger.trace( self._logger.trace(
__name__, __name__,
f"Send SQL command: {UserJoinedServer.get_select_by_user_id_string(user_id)}", f"Send SQL command: {UserJoinedServer.get_select_by_user_id_string(user_id)}",
) )
result = self._context.select( result = self._context.select(UserJoinedServer.get_select_active_by_user_id_string(user_id))[0]
UserJoinedServer.get_select_active_by_user_id_string(user_id)
)[0]
return UserJoinedServer( return UserJoinedServer(
self._users.get_user_by_id(result[1]), self._users.get_user_by_id(result[1]),
result[2], result[2],
@ -118,16 +108,12 @@ class UserJoinedServerRepositoryService(UserJoinedServerRepositoryABC):
id=result[0], id=result[0],
) )
def find_active_user_joined_server_by_user_id( def find_active_user_joined_server_by_user_id(self, user_id: int) -> Optional[UserJoinedServer]:
self, user_id: int
) -> Optional[UserJoinedServer]:
self._logger.trace( self._logger.trace(
__name__, __name__,
f"Send SQL command: {UserJoinedServer.get_select_by_user_id_string(user_id)}", f"Send SQL command: {UserJoinedServer.get_select_by_user_id_string(user_id)}",
) )
result = self._context.select( result = self._context.select(UserJoinedServer.get_select_active_by_user_id_string(user_id))
UserJoinedServer.get_select_active_by_user_id_string(user_id)
)
if result is None or len(result) == 0: if result is None or len(result) == 0:
return None return None
@ -143,19 +129,13 @@ class UserJoinedServerRepositoryService(UserJoinedServerRepositoryABC):
) )
def add_user_joined_server(self, user_joined_server: UserJoinedServer): def add_user_joined_server(self, user_joined_server: UserJoinedServer):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {user_joined_server.insert_string}")
__name__, f"Send SQL command: {user_joined_server.insert_string}"
)
self._context.cursor.execute(user_joined_server.insert_string) self._context.cursor.execute(user_joined_server.insert_string)
def update_user_joined_server(self, user_joined_server: UserJoinedServer): def update_user_joined_server(self, user_joined_server: UserJoinedServer):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {user_joined_server.udpate_string}")
__name__, f"Send SQL command: {user_joined_server.udpate_string}"
)
self._context.cursor.execute(user_joined_server.udpate_string) self._context.cursor.execute(user_joined_server.udpate_string)
def delete_user_joined_server(self, user_joined_server: UserJoinedServer): def delete_user_joined_server(self, user_joined_server: UserJoinedServer):
self._logger.trace( self._logger.trace(__name__, f"Send SQL command: {user_joined_server.delete_string}")
__name__, f"Send SQL command: {user_joined_server.delete_string}"
)
self._context.cursor.execute(user_joined_server.delete_string) self._context.cursor.execute(user_joined_server.delete_string)

Some files were not shown because too many files have changed in this diff Show More