sh-edraft.de/sh_discord_bot
5
1
Fork 1
Code Issues 26 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 3a7daf8b42
commit be6361f619
226 changed files with 1083 additions and 3252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -86,14 +86,10 @@ class DataModule(ModuleABC):
def __init__(self, dc: DiscordCollectionABC):
ModuleABC.__init__(self, dc, FeatureFlagsEnum.data_module)
def configure_configuration(
self, config: ConfigurationABC, env: ApplicationEnvironmentABC
):
def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
pass
def configure_services(
self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC
):
def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
services.add_singleton(CacheService)
services.add_transient(ApiKeyRepositoryABC, ApiKeyRepositoryService)
@@ -102,15 +98,9 @@ class DataModule(ModuleABC):
services.add_transient(UserRepositoryABC, UserRepositoryService)
services.add_transient(ClientRepositoryABC, ClientRepositoryService)
services.add_transient(KnownUserRepositoryABC, KnownUserRepositoryService)
services.add_transient(
UserJoinedServerRepositoryABC, UserJoinedServerRepositoryService
)
services.add_transient(
UserJoinedVoiceChannelRepositoryABC, UserJoinedVoiceChannelRepositoryService
)
services.add_transient(
UserJoinedGameServerRepositoryABC, UserJoinedGameServerRepositoryService
)
services.add_transient(UserJoinedServerRepositoryABC, UserJoinedServerRepositoryService)
services.add_transient(UserJoinedVoiceChannelRepositoryABC, UserJoinedVoiceChannelRepositoryService)
services.add_transient(UserJoinedGameServerRepositoryABC, UserJoinedGameServerRepositoryService)
services.add_transient(AutoRoleRepositoryABC, AutoRoleRepositoryService)
services.add_transient(LevelRepositoryABC, LevelRepositoryService)
services.add_transient(UserWarningsRepositoryABC, UserWarningsRepositoryService)
@@ -119,20 +109,12 @@ class DataModule(ModuleABC):
UserMessageCountPerHourRepositoryService,
)
services.add_transient(GameServerRepositoryABC, GameServerRepositoryService)
services.add_transient(
UserGameIdentRepositoryABC, UserGameIdentRepositoryService
)
services.add_transient(UserGameIdentRepositoryABC, UserGameIdentRepositoryService)
services.add_transient(AchievementRepositoryABC, AchievementRepositoryService)
services.add_transient(
TechnicianConfigRepositoryABC, TechnicianConfigRepositoryService
)
services.add_transient(TechnicianConfigRepositoryABC, TechnicianConfigRepositoryService)
services.add_transient(ServerConfigRepositoryABC, ServerConfigRepositoryService)
services.add_transient(
ShortRoleNameRepositoryABC, ShortRoleNameRepositoryService
)
services.add_transient(
SteamSpecialOfferRepositoryABC, SteamSpecialOfferRepositoryService
)
services.add_transient(ShortRoleNameRepositoryABC, ShortRoleNameRepositoryService)
services.add_transient(SteamSpecialOfferRepositoryABC, SteamSpecialOfferRepositoryService)
services.add_transient(SeederService)
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.
self._cursor.execute(
str(
f"""ALTER TABLE Users ADD MessageCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""
)
)
self._cursor.execute(
str(
f"""ALTER TABLE Users ADD ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""
)
)
self._cursor.execute(
str(
f"""ALTER TABLE UsersHistory ADD MessageCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""
)
)
self._cursor.execute(
str(
f"""ALTER TABLE UsersHistory ADD ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""
)
)
self._cursor.execute(str(f"""ALTER TABLE Users ADD MessageCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""))
self._cursor.execute(str(f"""ALTER TABLE Users ADD ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""))
self._cursor.execute(str(f"""ALTER TABLE UsersHistory ADD MessageCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""))
self._cursor.execute(str(f"""ALTER TABLE UsersHistory ADD ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""))
self._cursor.execute(
str(f"""DROP TRIGGER IF EXISTS `TR_AchievementsUpdate`;""")
)
self._cursor.execute(str(f"""DROP TRIGGER IF EXISTS `TR_AchievementsUpdate`;"""))
self._cursor.execute(
str(
f"""
@@ -117,9 +99,7 @@ class AchievementsMigration(MigrationABC):
)
)
self._cursor.execute(
str(f"""DROP TRIGGER IF EXISTS `TR_AchievementsDelete`;""")
)
self._cursor.execute(str(f"""DROP TRIGGER IF EXISTS `TR_AchievementsDelete`;"""))
self._cursor.execute(
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._cursor.execute(
str(
"""ALTER TABLE CFG_Technician ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER CacheMaxMessages;"""
)
str("""ALTER TABLE CFG_Technician ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER CacheMaxMessages;""")
)
self._cursor.execute(
str(
"""ALTER TABLE CFG_Server ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId;"""
)
str("""ALTER TABLE CFG_Server ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId;""")
)
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(
"ALTER TABLE CFG_TechnicianHistory DROP COLUMN FeatureFlags;"
)
self._cursor.execute("ALTER TABLE CFG_TechnicianHistory 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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@ServiceProviderABC.inject
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
def id(self) -> int:

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

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

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

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

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

@@ -18,9 +18,7 @@ class Server(TableABC):
TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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._login_message_channel_id = login_message_channel_id
self._default_role_id = default_role_id
self._short_role_name_only_set_highest_role = (
short_role_name_only_set_highest_role
)
self._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._feature_flags = feature_flags
@@ -68,9 +66,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
TableABC.__init__(self)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@staticmethod
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._login_message_channel_id = login_message_channel_id
self._default_role_id = default_role_id
self._short_role_name_only_set_highest_role = (
short_role_name_only_set_highest_role
)
self._short_role_name_only_set_highest_role = short_role_name_only_set_highest_role
self._feature_flags = feature_flags
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
def id(self) -> int:

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

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

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

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

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

@@ -64,9 +64,7 @@ class UserHistory(HistoryTableABC):
UserJoinedServerRepositoryABC,
)
ujs: UserJoinedServerRepositoryABC = services.get_service(
UserJoinedServerRepositoryABC
)
ujs: UserJoinedServerRepositoryABC = services.get_service(UserJoinedServerRepositoryABC)
return ujs.find_active_user_joined_server_by_user_id(self.id) is None
@property
@@ -79,7 +77,5 @@ class UserHistory(HistoryTableABC):
UserGameIdentRepositoryABC,
)
game_idents_repo: UserGameIdentRepositoryABC = services.get_service(
UserGameIdentRepositoryABC
)
game_idents_repo: UserGameIdentRepositoryABC = services.get_service(UserGameIdentRepositoryABC)
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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)
self._created_at = created_at if created_at is not None else self._created_at
self._modified_at = (
modified_at if modified_at is not None else self._modified_at
)
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
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]:
achievements = List(Achievement)
self._logger.trace(
__name__, f"Send SQL command: {Achievement.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {Achievement.get_select_all_string()}")
results = self._context.select(Achievement.get_select_all_string())
for result in results:
self._logger.trace(__name__, f"Get user with id {result[0]}")
@@ -60,9 +58,7 @@ class AchievementRepositoryService(AchievementRepositoryABC):
return achievements
def get_achievement_by_id(self, id: int) -> Achievement:
self._logger.trace(
__name__, f"Send SQL command: {Achievement.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {Achievement.get_select_by_id_string(id)}")
result = self._context.select(Achievement.get_select_by_id_string(id))[0]
return self._from_result(result)
@@ -73,9 +69,7 @@ class AchievementRepositoryService(AchievementRepositoryABC):
__name__,
f"Send SQL command: {Achievement.get_select_by_server_id_string(server_id)}",
)
results = self._context.select(
Achievement.get_select_by_server_id_string(server_id)
)
results = self._context.select(Achievement.get_select_by_server_id_string(server_id))
for result in results:
self._logger.trace(__name__, f"Get user with id {result[0]}")
achievements.append(self._from_result(result))
@@ -89,34 +83,26 @@ class AchievementRepositoryService(AchievementRepositoryABC):
__name__,
f"Send SQL command: {UserGotAchievement.get_select_by_user_id_string(user_id)}",
)
results = self._context.select(
UserGotAchievement.get_select_by_user_id_string(user_id)
)
results = self._context.select(UserGotAchievement.get_select_by_user_id_string(user_id))
for result in results:
self._logger.trace(__name__, f"Got UserGotAchievement with id {result[0]}")
achievements_joins.append(self._join_from_result(result))
for achievements_join in achievements_joins:
results = self._context.select(
Achievement.get_select_by_id_string(achievements_join.achievement.id)
)
results = self._context.select(Achievement.get_select_by_id_string(achievements_join.achievement.id))
for result in results:
self._logger.trace(__name__, f"Got Achievement with id {result[0]}")
achievements.append(self._from_result(result))
return achievements
def get_user_got_achievements_by_achievement_id(
self, achievement_id: int
) -> List[Achievement]:
def get_user_got_achievements_by_achievement_id(self, achievement_id: int) -> List[Achievement]:
achievements_joins = List(UserGotAchievement)
self._logger.trace(
__name__,
f"Send SQL command: {UserGotAchievement.get_select_by_achievement_id_string(achievement_id)}",
)
results = self._context.select(
UserGotAchievement.get_select_by_achievement_id_string(achievement_id)
)
results = self._context.select(UserGotAchievement.get_select_by_achievement_id_string(achievement_id))
for result in results:
self._logger.trace(__name__, f"Got UserGotAchievement with id {result[0]}")
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]:
api_keys = List(ApiKey)
self._logger.trace(
__name__, f"Send SQL command: {ApiKey.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {ApiKey.get_select_all_string()}")
results = self._context.select(ApiKey.get_select_all_string())
for result in results:
api_keys.append(self._api_key_from_result(result))
@@ -55,26 +53,16 @@ class ApiKeyRepositoryService(ApiKeyRepositoryABC):
return api_keys
def get_api_key(self, identifier: str, key: str) -> ApiKey:
self._logger.trace(
__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]
)
self._logger.trace(__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])
def get_api_key_by_id(self, id: int) -> ApiKey:
self._logger.trace(__name__, f"Send SQL command: {ApiKey.get_select_by_id(id)}")
return self._api_key_from_result(
self._context.select(ApiKey.get_select_by_id(id))[0]
)
return self._api_key_from_result(self._context.select(ApiKey.get_select_by_id(id))[0])
def get_api_key_by_key(self, key: str) -> ApiKey:
self._logger.trace(
__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]
)
self._logger.trace(__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])
def add_api_key(self, api_key: ApiKey):
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]:
users = List(AuthUser)
self._logger.trace(
__name__, f"Send SQL command: {AuthUser.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {AuthUser.get_select_all_string()}")
results = self._context.select(AuthUser.get_select_all_string())
for result in results:
self._logger.trace(__name__, f"Get auth user with id {result[0]}")
@@ -84,36 +82,22 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
return users
def get_filtered_auth_users(
self, criteria: AuthUserSelectCriteria
) -> FilteredResult:
def get_filtered_auth_users(self, criteria: AuthUserSelectCriteria) -> FilteredResult:
users = self.get_all_auth_users()
self._logger.trace(
__name__, f"Send SQL command: {AuthUser.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {AuthUser.get_select_all_string()}")
query = users
if criteria.first_name is not None and criteria.first_name != "":
query = query.where(
lambda x: criteria.first_name in x.first_name
or x.first_name == criteria.first_name
)
query = query.where(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 != "":
query = query.where(
lambda x: criteria.last_name in x.last_name
or x.last_name == criteria.last_name
)
query = query.where(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 != "":
query = query.where(
lambda x: criteria.email in x.email or x.email == criteria.email
)
query = query.where(lambda x: criteria.email in x.email or x.email == criteria.email)
if criteria.auth_role is not None:
query = query.where(
lambda x: x.auth_role == AuthRoleEnum(criteria.auth_role)
)
query = query.where(lambda x: x.auth_role == AuthRoleEnum(criteria.auth_role))
# sort
if (
@@ -144,16 +128,12 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
return result
def get_auth_user_by_email(self, email: str) -> AuthUser:
self._logger.trace(
__name__, f"Send SQL command: {AuthUser.get_select_by_email_string(email)}"
)
self._logger.trace(__name__, f"Send SQL command: {AuthUser.get_select_by_email_string(email)}")
result = self._context.select(AuthUser.get_select_by_email_string(email))[0]
return self._user_from_result(result)
def find_auth_user_by_email(self, email: str) -> Optional[AuthUser]:
self._logger.trace(
__name__, f"Send SQL command: {AuthUser.get_select_by_email_string(email)}"
)
self._logger.trace(__name__, f"Send SQL command: {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:
return None
@@ -180,9 +160,7 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
__name__,
f"Send SQL command: {AuthUser.get_select_by_forgot_password_id_string(id)}",
)
result = self._context.select(
AuthUser.get_select_by_forgot_password_id_string(id)
)
result = self._context.select(AuthUser.get_select_by_forgot_password_id_string(id))
if result is None or len(result) == 0:
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]:
auto_roles = List(AutoRole)
self._logger.trace(
__name__, f"Send SQL command: {AutoRole.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {AutoRole.get_select_all_string()}")
results = self._context.select(AutoRole.get_select_all_string())
for result in results:
auto_roles.append(
@@ -44,9 +42,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
return auto_roles
def get_auto_role_by_id(self, id: int) -> AutoRole:
self._logger.trace(
__name__, f"Send SQL command: {AutoRole.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {AutoRole.get_select_by_id_string(id)}")
result = self._context.select(AutoRole.get_select_by_id_string(id))[0]
return AutoRole(
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]:
self._logger.trace(
__name__, f"Send SQL command: {AutoRole.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {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:
return None
@@ -77,9 +71,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
)
def get_auto_roles_by_server_id(self, id: int) -> List[AutoRole]:
self._logger.trace(
__name__, f"Send SQL command: {AutoRole.get_select_by_server_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {AutoRole.get_select_by_server_id_string(id)}")
auto_roles = List(AutoRole)
results = self._context.select(AutoRole.get_select_by_server_id_string(id))
for result in results:
@@ -145,9 +137,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
def get_auto_role_rules(self) -> List[AutoRoleRule]:
auto_role_rules = List(AutoRoleRule)
self._logger.trace(
__name__, f"Send SQL command: {AutoRoleRule.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {AutoRoleRule.get_select_all_string()}")
results = self._context.select(AutoRoleRule.get_select_all_string())
for result in results:
auto_role_rules.append(
@@ -164,9 +154,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
return auto_role_rules
def get_auto_role_rule_by_id(self, id: int) -> AutoRoleRule:
self._logger.trace(
__name__, f"Send SQL command: {AutoRoleRule.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {AutoRoleRule.get_select_by_id_string(id)}")
result = self._context.select(AutoRoleRule.get_select_by_id_string(id))[0]
return AutoRoleRule(
self.get_auto_role_by_id(result[1]),
@@ -183,9 +171,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
__name__,
f"Send SQL command: {AutoRoleRule.get_select_by_auto_role_id_string(id)}",
)
results = self._context.select(
AutoRoleRule.get_select_by_auto_role_id_string(id)
)
results = self._context.select(AutoRoleRule.get_select_by_auto_role_id_string(id))
for result in results:
auto_role_rules.append(
AutoRoleRule(
@@ -201,19 +187,13 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
return auto_role_rules
def add_auto_role_rule(self, auto_role_rule: AutoRoleRule):
self._logger.trace(
__name__, f"Send SQL command: {auto_role_rule.insert_string}"
)
self._logger.trace(__name__, f"Send SQL command: {auto_role_rule.insert_string}")
self._context.cursor.execute(auto_role_rule.insert_string)
def update_auto_role_rule(self, auto_role_rule: AutoRoleRule):
self._logger.trace(
__name__, f"Send SQL command: {auto_role_rule.udpate_string}"
)
self._logger.trace(__name__, f"Send SQL command: {auto_role_rule.udpate_string}")
self._context.cursor.execute(auto_role_rule.udpate_string)
def delete_auto_role_rule(self, auto_role_rule: AutoRoleRule):
self._logger.trace(
__name__, f"Send SQL command: {auto_role_rule.delete_string}"
)
self._logger.trace(__name__, f"Send SQL command: {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]:
clients = List(Client)
self._logger.trace(
__name__, f"Send SQL command: {Client.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {Client.get_select_all_string()}")
results = self._context.select(Client.get_select_all_string())
for result in results:
self._logger.trace(__name__, f"Get client with id {result[0]}")
@@ -49,9 +47,7 @@ class ClientRepositoryService(ClientRepositoryABC):
return clients
def get_client_by_id(self, client_id: int) -> Client:
self._logger.trace(
__name__, f"Send SQL command: {Client.get_select_by_id_string(client_id)}"
)
self._logger.trace(__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))
return Client(
result[1],
@@ -96,9 +92,7 @@ class ClientRepositoryService(ClientRepositoryABC):
__name__,
f"Send SQL command: {Client.get_select_by_discord_id_string(discord_id)}",
)
result = self._context.select(
Client.get_select_by_discord_id_string(discord_id)
)[0]
result = self._context.select(Client.get_select_by_discord_id_string(discord_id))[0]
return Client(
result[1],
result[2],
@@ -117,9 +111,7 @@ class ClientRepositoryService(ClientRepositoryABC):
__name__,
f"Send SQL command: {Client.get_select_by_discord_id_string(discord_id)}",
)
result = self._context.select(
Client.get_select_by_discord_id_string(discord_id)
)
result = self._context.select(Client.get_select_by_discord_id_string(discord_id))
if result is None or len(result) == 0:
return None
@@ -162,16 +154,12 @@ class ClientRepositoryService(ClientRepositoryABC):
id=result[0],
)
def find_client_by_discord_id_and_server_id(
self, discord_id: int, server_id: int
) -> Optional[Client]:
def find_client_by_discord_id_and_server_id(self, discord_id: int, server_id: int) -> Optional[Client]:
self._logger.trace(
__name__,
f"Send SQL command: {Client.get_select_by_discord_id_and_server_id_string(discord_id, server_id)}",
)
result = self._context.select(
Client.get_select_by_discord_id_and_server_id_string(discord_id, server_id)
)
result = self._context.select(Client.get_select_by_discord_id_and_server_id_string(discord_id, server_id))
if result is None or len(result) == 0:
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())
for result in results:
self._logger.trace(
__name__, f"Get user-joined-game-server with id {result[0]}"
)
self._logger.trace(__name__, f"Get user-joined-game-server with id {result[0]}")
game_servers.append(self._from_result(result))
return game_servers
@@ -57,9 +55,7 @@ class GameServerRepositoryService(GameServerRepositoryABC):
)
results = self._context.select(GameServer.get_select_by_server_id_string(id))
for result in results:
self._logger.trace(
__name__, f"Get user-joined-game-server with id {result[0]}"
)
self._logger.trace(__name__, f"Get user-joined-game-server with id {result[0]}")
game_servers.append(self._from_result(result))
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]:
users = List(KnownUser)
self._logger.trace(
__name__, f"Send SQL command: {KnownUser.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {KnownUser.get_select_all_string()}")
results = self._context.select(KnownUser.get_select_all_string())
for result in results:
self._logger.trace(__name__, f"Get known_user with id {result[0]}")
@@ -36,9 +34,7 @@ class KnownUserRepositoryService(KnownUserRepositoryABC):
return users
def get_user_by_id(self, id: int) -> KnownUser:
self._logger.trace(
__name__, f"Send SQL command: {KnownUser.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {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])
@@ -47,9 +43,7 @@ class KnownUserRepositoryService(KnownUserRepositoryABC):
__name__,
f"Send SQL command: {KnownUser.get_select_by_discord_id_string(discord_id)}",
)
result = self._context.select(
KnownUser.get_select_by_discord_id_string(discord_id)
)[0]
result = self._context.select(KnownUser.get_select_by_discord_id_string(discord_id))[0]
return KnownUser(result[1], result[2], result[3], id=result[0])
def find_user_by_discord_id(self, discord_id: int) -> Optional[KnownUser]:
@@ -57,9 +51,7 @@ class KnownUserRepositoryService(KnownUserRepositoryABC):
__name__,
f"Send SQL command: {KnownUser.get_select_by_discord_id_string(discord_id)}",
)
result = self._context.select(
KnownUser.get_select_by_discord_id_string(discord_id)
)
result = self._context.select(KnownUser.get_select_by_discord_id_string(discord_id))
if result is None or len(result) == 0:
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]:
levels = List(Level)
self._logger.trace(
__name__, f"Send SQL command: {Level.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {Level.get_select_all_string()}")
results = self._context.select(Level.get_select_all_string())
for result in results:
self._logger.trace(__name__, f"Get level with id {result[0]}")
@@ -53,17 +51,13 @@ class LevelRepositoryService(LevelRepositoryABC):
return levels
def get_level_by_id(self, id: int) -> Level:
self._logger.trace(
__name__, f"Send SQL command: {Level.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {Level.get_select_by_id_string(id)}")
result = self._context.select(Level.get_select_by_id_string(id))[0]
return self._level_from_result(result)
def find_level_by_id(self, id: int) -> Optional[Level]:
self._logger.trace(
__name__, f"Send SQL command: {Level.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {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:
return None

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

@@ -21,9 +21,7 @@ class MigrationService:
self._cursor = db.cursor
self._migrations: List[MigrationABC] = (
List(type, MigrationABC.__subclasses__())
.order_by(lambda x: x.name)
.order_by(lambda x: x.prio)
List(type, MigrationABC.__subclasses__()).order_by(lambda x: x.name).order_by(lambda x: x.prio)
)
def migrate(self):
@@ -40,21 +38,15 @@ class MigrationService:
__name__,
f"Running SQL Command: {MigrationHistory.get_select_by_id_string(migration_id)}",
)
migration_from_db = self._db.select(
MigrationHistory.get_select_by_id_string(migration_id)
)
migration_from_db = self._db.select(MigrationHistory.get_select_by_id_string(migration_id))
if migration_from_db is not None and len(migration_from_db) > 0:
continue
self._logger.debug(__name__, f"Running Migration {migration_id}")
migration_as_service: MigrationABC = self._services.get_service(
migration
)
migration_as_service: MigrationABC = self._services.get_service(migration)
migration_as_service.upgrade()
self._cursor.execute(MigrationHistory(migration_id).insert_string)
self._db.save_changes()
except Exception as e:
self._logger.error(
__name__, f"Cannot get migration with id {migration}", e
)
self._logger.error(__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__,
f"Send SQL command: {ServerTeamRoleIdsConfig.get_select_by_server_id_string(server_id)}",
)
results = self._context.select(
ServerTeamRoleIdsConfig.get_select_by_server_id_string(server_id)
)
results = self._context.select(ServerTeamRoleIdsConfig.get_select_by_server_id_string(server_id))
for result in results:
self._logger.trace(
__name__, f"Got ServerTeamRoleIdsConfig with id {result[0]}"
)
self._logger.trace(__name__, f"Got ServerTeamRoleIdsConfig with id {result[0]}")
ids.append(
ServerTeamRoleIdsConfig(
result[1],
@@ -57,13 +53,9 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
__name__,
f"Send SQL command: {ServerAFKChannelIdsConfig.get_select_by_server_id_string(server_id)}",
)
results = self._context.select(
ServerAFKChannelIdsConfig.get_select_by_server_id_string(server_id)
)
results = self._context.select(ServerAFKChannelIdsConfig.get_select_by_server_id_string(server_id))
for result in results:
self._logger.trace(
__name__, f"Got ServerAFKChannelIdsConfig with id {result[0]}"
)
self._logger.trace(__name__, f"Got ServerAFKChannelIdsConfig with id {result[0]}")
urls.append(result[1])
return urls
@@ -101,9 +93,7 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
__name__,
f"Send SQL command: {ServerConfig.get_select_by_server_id_string(server_id)}",
)
result = self._context.select(
ServerConfig.get_select_by_server_id_string(server_id)
)
result = self._context.select(ServerConfig.get_select_by_server_id_string(server_id))
return len(result) > 0
@@ -112,9 +102,7 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
__name__,
f"Send SQL command: {ServerConfig.get_select_by_server_id_string(server_id)}",
)
result = self._context.select(
ServerConfig.get_select_by_server_id_string(server_id)
)[0]
result = self._context.select(ServerConfig.get_select_by_server_id_string(server_id))[0]
return self._from_result(result)
@@ -123,9 +111,7 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
__name__,
f"Send SQL command: {ServerConfig.get_select_by_id_string(config_id)}",
)
result = self._context.select(ServerConfig.get_select_by_id_string(config_id))[
0
]
result = self._context.select(ServerConfig.get_select_by_id_string(config_id))[0]
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._context.cursor.execute(server_config.delete_string)
def add_server_team_role_id_config(
self, server_team_role_id: ServerTeamRoleIdsConfig
):
self._logger.trace(
__name__, f"Send SQL command: {server_team_role_id.insert_string}"
)
def add_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
self._logger.trace(__name__, f"Send SQL command: {server_team_role_id.insert_string}")
self._context.cursor.execute(server_team_role_id.insert_string)
def update_server_team_role_id_config(
self, server_team_role_id: ServerTeamRoleIdsConfig
):
self._logger.trace(
__name__, f"Send SQL command: {server_team_role_id.udpate_string}"
)
def update_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
self._logger.trace(__name__, f"Send SQL command: {server_team_role_id.udpate_string}")
self._context.cursor.execute(server_team_role_id.udpate_string)
def delete_server_team_role_id_config(
self, server_team_role_id: ServerTeamRoleIdsConfig
):
self._logger.trace(
__name__, f"Send SQL command: {server_team_role_id.delete_string}"
)
def delete_server_team_role_id_config(self, server_team_role_id: ServerTeamRoleIdsConfig):
self._logger.trace(__name__, f"Send SQL command: {server_team_role_id.delete_string}")
self._context.cursor.execute(server_team_role_id.delete_string)
def add_server_afk_channel_config(
self, server_afk_channel: ServerAFKChannelIdsConfig
):
self._logger.trace(
__name__, f"Send SQL command: {server_afk_channel.insert_string}"
)
def add_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
self._logger.trace(__name__, f"Send SQL command: {server_afk_channel.insert_string}")
self._context.cursor.execute(server_afk_channel.insert_string)
def update_server_afk_channel_config(
self, server_afk_channel: ServerAFKChannelIdsConfig
):
self._logger.trace(
__name__, f"Send SQL command: {server_afk_channel.udpate_string}"
)
def update_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
self._logger.trace(__name__, f"Send SQL command: {server_afk_channel.udpate_string}")
self._context.cursor.execute(server_afk_channel.udpate_string)
def delete_server_afk_channel_config(
self, server_afk_channel: ServerAFKChannelIdsConfig
):
self._logger.trace(
__name__, f"Send SQL command: {server_afk_channel.delete_string}"
)
def delete_server_afk_channel_config(self, server_afk_channel: ServerAFKChannelIdsConfig):
self._logger.trace(__name__, f"Send SQL command: {server_afk_channel.delete_string}")
self._context.cursor.execute(server_afk_channel.delete_string)

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]:
servers = List(Server)
self._logger.trace(
__name__, f"Send SQL command: {Server.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {Server.get_select_all_string()}")
results = self._context.select(Server.get_select_all_string())
for result in results:
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:
servers = self.get_servers()
self._logger.trace(
__name__, f"Send SQL command: {Server.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {Server.get_select_all_string()}")
query = servers
# sort
@@ -52,9 +48,7 @@ class ServerRepositoryService(ServerRepositoryABC):
):
crit_sort_direction = criteria.sort_direction.lower()
if crit_sort_direction == "desc" or crit_sort_direction == "descending":
query = query.order_by_descending(
lambda x: getattr(x, criteria.sort_column)
)
query = query.order_by_descending(lambda x: getattr(x, criteria.sort_column))
else:
query = query.order_by(lambda x: getattr(x, criteria.sort_column))
@@ -66,25 +60,19 @@ class ServerRepositoryService(ServerRepositoryABC):
return result
def get_server_by_id(self, server_id: int) -> Server:
cs = self._cache.cached_server.where(
lambda x: x.id == server_id
).single_or_default()
cs = self._cache.cached_server.where(lambda x: x.id == server_id).single_or_default()
if cs is not None:
return cs
self._logger.trace(
__name__, f"Send SQL command: {Server.get_select_by_id_string(server_id)}"
)
self._logger.trace(__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]
server = Server(result[1], result[2], result[3], id=result[0])
self._cache.add_server(server)
return server
def get_server_by_discord_id(self, discord_id: int) -> Server:
cs = self._cache.cached_server.where(
lambda x: x.discord_id == discord_id
).single_or_default()
cs = self._cache.cached_server.where(lambda x: x.discord_id == discord_id).single_or_default()
if cs is not None:
return cs
@@ -92,15 +80,11 @@ class ServerRepositoryService(ServerRepositoryABC):
__name__,
f"Send SQL command: {Server.get_select_by_discord_id_string(discord_id)}",
)
result = self._context.select(
Server.get_select_by_discord_id_string(discord_id)
)[0]
result = self._context.select(Server.get_select_by_discord_id_string(discord_id))[0]
return Server(result[1], result[2], result[3], id=result[0])
def find_server_by_discord_id(self, discord_id: int) -> Optional[Server]:
cs = self._cache.cached_server.where(
lambda x: x.discord_id == discord_id
).single_or_default()
cs = self._cache.cached_server.where(lambda x: x.discord_id == discord_id).single_or_default()
if cs is not None:
return cs
@@ -108,9 +92,7 @@ class ServerRepositoryService(ServerRepositoryABC):
__name__,
f"Send SQL command: {Server.get_select_by_discord_id_string(discord_id)}",
)
result = self._context.select(
Server.get_select_by_discord_id_string(discord_id)
)
result = self._context.select(Server.get_select_by_discord_id_string(discord_id))
if result is None or len(result) == 0:
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(
self._get_value_from_result(sql_result[1]), # name
int(self._get_value_from_result(sql_result[2])), # role_id
ShortRoleNamePositionEnum(
self._get_value_from_result(sql_result[3])
), # position
ShortRoleNamePositionEnum(self._get_value_from_result(sql_result[3])), # position
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[6]), # modified_at
@@ -46,9 +44,7 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
def get_short_role_names(self) -> List[ShortRoleName]:
short_role_names = List(ShortRoleName)
self._logger.trace(
__name__, f"Send SQL command: {ShortRoleName.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {ShortRoleName.get_select_all_string()}")
results = self._context.select(ShortRoleName.get_select_all_string())
for result in results:
self._logger.trace(__name__, f"Get short_role_name with id {result[0]}")
@@ -57,9 +53,7 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
return short_role_names
def get_short_role_name_by_id(self, id: int) -> ShortRoleName:
self._logger.trace(
__name__, f"Send SQL command: {ShortRoleName.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {ShortRoleName.get_select_by_id_string(id)}")
result = self._context.select(ShortRoleName.get_select_by_id_string(id))[0]
return self._short_role_name_from_result(result)
@@ -70,9 +64,7 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
__name__,
f"Send SQL command: {ShortRoleName.get_select_by_role_id_string(role_id)}",
)
results = self._context.select(
ShortRoleName.get_select_by_role_id_string(role_id)
)
results = self._context.select(ShortRoleName.get_select_by_role_id_string(role_id))
for result in results:
self._logger.trace(__name__, f"Get short_role_name with id {result[0]}")
short_role_names.append(self._short_role_name_from_result(result))
@@ -85,9 +77,7 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
__name__,
f"Send SQL command: {ShortRoleName.get_select_by_server_id_string(server_id)}",
)
results = self._context.select(
ShortRoleName.get_select_by_server_id_string(server_id)
)
results = self._context.select(ShortRoleName.get_select_by_server_id_string(server_id))
for result in results:
self._logger.trace(__name__, f"Get short_role_name with id {result[0]}")
@@ -96,19 +86,13 @@ class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
return short_role_names
def add_short_role_name(self, short_role_name: ShortRoleName):
self._logger.trace(
__name__, f"Send SQL command: {short_role_name.insert_string}"
)
self._logger.trace(__name__, f"Send SQL command: {short_role_name.insert_string}")
self._context.cursor.execute(short_role_name.insert_string)
def update_short_role_name(self, short_role_name: ShortRoleName):
self._logger.trace(
__name__, f"Send SQL command: {short_role_name.udpate_string}"
)
self._logger.trace(__name__, f"Send SQL command: {short_role_name.udpate_string}")
self._context.cursor.execute(short_role_name.udpate_string)
def delete_short_role_name(self, short_role_name: ShortRoleName):
self._logger.trace(
__name__, f"Send SQL command: {short_role_name.delete_string}"
)
self._logger.trace(__name__, f"Send SQL command: {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]:
steam_special_offers = List(SteamSpecialOffer)
self._logger.trace(
__name__, f"Send SQL command: {SteamSpecialOffer.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {SteamSpecialOffer.get_select_all_string()}")
results = self._context.select(SteamSpecialOffer.get_select_all_string())
for result in results:
self._logger.trace(__name__, f"Get steam_special_offer with id {result[0]}")
@@ -58,26 +56,18 @@ class SteamSpecialOfferRepositoryService(SteamSpecialOfferRepositoryABC):
__name__,
f"Send SQL command: {SteamSpecialOffer.get_select_by_name_string(name)}",
)
result = self._context.select(
SteamSpecialOffer.get_select_by_name_string(name)
)[0]
result = self._context.select(SteamSpecialOffer.get_select_by_name_string(name))[0]
return self._steam_special_offer_from_result(result)
def add_steam_special_offer(self, steam_special_offer: SteamSpecialOffer):
self._logger.trace(
__name__, f"Send SQL command: {steam_special_offer.insert_string}"
)
self._logger.trace(__name__, f"Send SQL command: {steam_special_offer.insert_string}")
self._context.cursor.execute(steam_special_offer.insert_string)
def update_steam_special_offer(self, steam_special_offer: SteamSpecialOffer):
self._logger.trace(
__name__, f"Send SQL command: {steam_special_offer.udpate_string}"
)
self._logger.trace(__name__, f"Send SQL command: {steam_special_offer.udpate_string}")
self._context.cursor.execute(steam_special_offer.udpate_string)
def delete_steam_special_offer(self, steam_special_offer: SteamSpecialOffer):
self._logger.trace(
__name__, f"Send SQL command: {steam_special_offer.delete_string}"
)
self._logger.trace(__name__, f"Send SQL command: {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]:
ids = List(int)
self._logger.trace(
__name__, f"Send SQL command: {TechnicianIdConfig.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {TechnicianIdConfig.get_select_all_string()}")
results = self._context.select(TechnicianIdConfig.get_select_all_string())
for result in results:
self._logger.trace(__name__, f"Got TechnicianId with id {result[0]}")
@@ -57,37 +55,27 @@ class TechnicianConfigRepositoryService(TechnicianConfigRepositoryABC):
)
def does_technician_config_exists(self) -> bool:
self._logger.trace(
__name__, f"Send SQL command: {TechnicianConfig.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {TechnicianConfig.get_select_all_string()}")
result = self._context.select(TechnicianConfig.get_select_all_string())
return len(result) > 0
def get_technician_config(self) -> TechnicianConfig:
self._logger.trace(
__name__, f"Send SQL command: {TechnicianConfig.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {TechnicianConfig.get_select_all_string()}")
result = self._context.select(TechnicianConfig.get_select_all_string())[0]
return self._from_result(result)
def add_technician_config(self, technician_config: TechnicianConfig):
self._logger.trace(
__name__, f"Send SQL command: {technician_config.insert_string}"
)
self._logger.trace(__name__, f"Send SQL command: {technician_config.insert_string}")
self._context.cursor.execute(technician_config.insert_string)
def update_technician_config(self, technician_config: TechnicianConfig):
self._logger.trace(
__name__, f"Send SQL command: {technician_config.udpate_string}"
)
self._logger.trace(__name__, f"Send SQL command: {technician_config.udpate_string}")
self._context.cursor.execute(technician_config.udpate_string)
def delete_technician_config(self, technician_config: TechnicianConfig):
self._logger.trace(
__name__, f"Send SQL command: {technician_config.delete_string}"
)
self._logger.trace(__name__, f"Send SQL command: {technician_config.delete_string}")
self._context.cursor.execute(technician_config.delete_string)
def add_technician_id_config(self, technician_id: TechnicianIdConfig):
@@ -102,26 +90,14 @@ class TechnicianConfigRepositoryService(TechnicianConfigRepositoryABC):
self._logger.trace(__name__, f"Send SQL command: {technician_id.delete_string}")
self._context.cursor.execute(technician_id.delete_string)
def add_technician_ping_url_config(
self, technician_ping_url: TechnicianPingUrlConfig
):
self._logger.trace(
__name__, f"Send SQL command: {technician_ping_url.insert_string}"
)
def add_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
self._logger.trace(__name__, f"Send SQL command: {technician_ping_url.insert_string}")
self._context.cursor.execute(technician_ping_url.insert_string)
def update_technician_ping_url_config(
self, technician_ping_url: TechnicianPingUrlConfig
):
self._logger.trace(
__name__, f"Send SQL command: {technician_ping_url.udpate_string}"
)
def update_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
self._logger.trace(__name__, f"Send SQL command: {technician_ping_url.udpate_string}")
self._context.cursor.execute(technician_ping_url.udpate_string)
def delete_technician_ping_url_config(
self, technician_ping_url: TechnicianPingUrlConfig
):
self._logger.trace(
__name__, f"Send SQL command: {technician_ping_url.delete_string}"
)
def delete_technician_ping_url_config(self, technician_ping_url: TechnicianPingUrlConfig):
self._logger.trace(__name__, f"Send SQL command: {technician_ping_url.delete_string}")
self._context.cursor.execute(technician_ping_url.delete_string)

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)
for technician in config.technician_ids:
self._technician_config.add_technician_id_config(
TechnicianIdConfig(technician)
)
self._technician_config.add_technician_id_config(TechnicianIdConfig(technician))
for url in config.ping_urls:
self._technician_config.add_technician_ping_url_config(
TechnicianPingUrlConfig(url)
)
self._technician_config.add_technician_ping_url_config(TechnicianPingUrlConfig(url))
self._db.save_changes()
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
def get_user_game_idents_by_game_server_id(
self, game_server_id: int
) -> List[UserGameIdent]:
def get_user_game_idents_by_game_server_id(self, game_server_id: int) -> List[UserGameIdent]:
joins = List(UserGameIdent)
self._logger.trace(
__name__,
f"Send SQL command: {UserGameIdent.get_select_by_game_server_id_string(game_server_id)}",
)
results = self._context.select(
UserGameIdent.get_select_by_game_server_id_string(game_server_id)
)
results = self._context.select(UserGameIdent.get_select_by_game_server_id_string(game_server_id))
for result in results:
self._logger.trace(__name__, f"Get UserGameIdent with id {result[0]}")
joins.append(self._from_result(result))
@@ -81,9 +77,7 @@ class UserGameIdentRepositoryService(UserGameIdentRepositoryABC):
__name__,
f"Send SQL command: {UserGameIdent.get_select_by_ident_string(ident)}",
)
result = self._context.select(UserGameIdent.get_select_by_ident_string(ident))[
0
]
result = self._context.select(UserGameIdent.get_select_by_ident_string(ident))[0]
return self._from_result(result)
def find_user_game_ident_by_ident(self, ident: str) -> Optional[UserGameIdent]:
@@ -104,30 +98,22 @@ class UserGameIdentRepositoryService(UserGameIdentRepositoryABC):
__name__,
f"Send SQL command: {UserGameIdent.get_select_by_user_id_string(user_id)}",
)
results = self._context.select(
UserGameIdent.get_select_by_user_id_string(user_id)
)
results = self._context.select(UserGameIdent.get_select_by_user_id_string(user_id))
for result in results:
joins.append(self._from_result(result))
return joins
def add_user_game_ident(self, user_game_ident: UserGameIdent):
self._logger.trace(
__name__, f"Send SQL command: {user_game_ident.insert_string}"
)
self._logger.trace(__name__, f"Send SQL command: {user_game_ident.insert_string}")
self._context.cursor.execute(user_game_ident.insert_string)
def update_user_game_ident(self, user_game_ident: UserGameIdent):
self._logger.trace(
__name__, f"Send SQL command: {user_game_ident.udpate_string}"
)
self._logger.trace(__name__, f"Send SQL command: {user_game_ident.udpate_string}")
self._context.cursor.execute(user_game_ident.udpate_string)
def delete_user_game_ident(self, user_game_ident: UserGameIdent):
self._logger.trace(
__name__, f"Send SQL command: {user_game_ident.delete_string}"
)
self._logger.trace(__name__, f"Send SQL command: {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):

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())
for result in results:
self._logger.trace(
__name__, f"Get user-joined-game-server with id {result[0]}"
)
self._logger.trace(__name__, f"Get user-joined-game-server with id {result[0]}")
joins.append(self._from_result(result))
return joins
@@ -58,49 +56,35 @@ class UserJoinedGameServerRepositoryService(UserJoinedGameServerRepositoryABC):
__name__,
f"Send SQL command: {UserJoinedGameServer.get_select_by_id_string(id)}",
)
result = self._context.select(UserJoinedGameServer.get_select_by_id_string(id))[
0
]
result = self._context.select(UserJoinedGameServer.get_select_by_id_string(id))[0]
return self._from_result(result)
def get_user_joined_game_servers_by_user_id(
self, user_id: int
) -> List[UserJoinedGameServer]:
def get_user_joined_game_servers_by_user_id(self, user_id: int) -> List[UserJoinedGameServer]:
joins = List(UserJoinedGameServer)
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedGameServer.get_select_by_user_id_string(user_id)}",
)
results = self._context.select(
UserJoinedGameServer.get_select_by_user_id_string(user_id)
)
results = self._context.select(UserJoinedGameServer.get_select_by_user_id_string(user_id))
for result in results:
joins.append(self._from_result(result))
return joins
def get_active_user_joined_game_server_by_user_id(
self, user_id: int
) -> UserJoinedGameServer:
def get_active_user_joined_game_server_by_user_id(self, user_id: int) -> UserJoinedGameServer:
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedGameServer.get_select_by_user_id_string(user_id)}",
)
result = self._context.select(
UserJoinedGameServer.get_select_active_by_user_id_string(user_id)
)[0]
result = self._context.select(UserJoinedGameServer.get_select_active_by_user_id_string(user_id))[0]
return self._from_result(result)
def find_active_user_joined_game_server_by_user_id(
self, user_id: int
) -> Optional[UserJoinedGameServer]:
def find_active_user_joined_game_server_by_user_id(self, user_id: int) -> Optional[UserJoinedGameServer]:
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedGameServer.get_select_by_user_id_string(user_id)}",
)
result = self._context.select(
UserJoinedGameServer.get_select_active_by_user_id_string(user_id)
)
result = self._context.select(UserJoinedGameServer.get_select_active_by_user_id_string(user_id))
if result is None or len(result) == 0:
return None
@@ -108,45 +92,29 @@ class UserJoinedGameServerRepositoryService(UserJoinedGameServerRepositoryABC):
return self._from_result(result)
def find_active_user_joined_game_servers_by_user_id(
self, user_id: int
) -> List[Optional[UserJoinedGameServer]]:
def find_active_user_joined_game_servers_by_user_id(self, user_id: int) -> List[Optional[UserJoinedGameServer]]:
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedGameServer.get_select_active_by_user_id_string(user_id)}",
)
result = List(UserJoinedGameServer)
db_results = self._context.select(
UserJoinedGameServer.get_select_active_by_user_id_string(user_id)
)
db_results = self._context.select(UserJoinedGameServer.get_select_active_by_user_id_string(user_id))
for db_result in db_results:
result.append(self._from_result(db_result))
return result
def add_user_joined_game_server(
self, user_joined_game_server: UserJoinedGameServer
):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_game_server.insert_string}"
)
def add_user_joined_game_server(self, user_joined_game_server: UserJoinedGameServer):
self._logger.trace(__name__, f"Send SQL command: {user_joined_game_server.insert_string}")
self._context.cursor.execute(user_joined_game_server.insert_string)
def update_user_joined_game_server(
self, user_joined_game_server: UserJoinedGameServer
):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_game_server.udpate_string}"
)
def update_user_joined_game_server(self, user_joined_game_server: UserJoinedGameServer):
self._logger.trace(__name__, f"Send SQL command: {user_joined_game_server.udpate_string}")
self._context.cursor.execute(user_joined_game_server.udpate_string)
def delete_user_joined_game_server(
self, user_joined_game_server: UserJoinedGameServer
):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_game_server.delete_string}"
)
def delete_user_joined_game_server(self, user_joined_game_server: UserJoinedGameServer):
self._logger.trace(__name__, f"Send SQL command: {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):
@@ -154,6 +122,4 @@ class UserJoinedGameServerRepositoryService(UserJoinedGameServerRepositoryABC):
__name__,
f"Send SQL command: {UserJoinedGameServer.delete_by_user_id_string}",
)
self._context.cursor.execute(
UserJoinedGameServer.delete_by_user_id_string(user_id)
)
self._context.cursor.execute(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]:
joins = List(UserJoinedServer)
self._logger.trace(
__name__, f"Send SQL command: {UserJoinedServer.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {UserJoinedServer.get_select_all_string()}")
results = self._context.select(UserJoinedServer.get_select_all_string())
for result in results:
self._logger.trace(__name__, f"Get user-joined-server with id {result[0]}")
@@ -74,17 +72,13 @@ class UserJoinedServerRepositoryService(UserJoinedServerRepositoryABC):
id=result[0],
)
def get_user_joined_servers_by_user_id(
self, user_id: int
) -> List[UserJoinedServer]:
def get_user_joined_servers_by_user_id(self, user_id: int) -> List[UserJoinedServer]:
joins = List(UserJoinedServer)
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedServer.get_select_by_user_id_string(user_id)}",
)
results = self._context.select(
UserJoinedServer.get_select_by_user_id_string(user_id)
)
results = self._context.select(UserJoinedServer.get_select_by_user_id_string(user_id))
for result in results:
joins.append(
UserJoinedServer(
@@ -99,16 +93,12 @@ class UserJoinedServerRepositoryService(UserJoinedServerRepositoryABC):
return joins
def get_active_user_joined_server_by_user_id(
self, user_id: int
) -> UserJoinedServer:
def get_active_user_joined_server_by_user_id(self, user_id: int) -> UserJoinedServer:
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedServer.get_select_by_user_id_string(user_id)}",
)
result = self._context.select(
UserJoinedServer.get_select_active_by_user_id_string(user_id)
)[0]
result = self._context.select(UserJoinedServer.get_select_active_by_user_id_string(user_id))[0]
return UserJoinedServer(
self._users.get_user_by_id(result[1]),
result[2],
@@ -118,16 +108,12 @@ class UserJoinedServerRepositoryService(UserJoinedServerRepositoryABC):
id=result[0],
)
def find_active_user_joined_server_by_user_id(
self, user_id: int
) -> Optional[UserJoinedServer]:
def find_active_user_joined_server_by_user_id(self, user_id: int) -> Optional[UserJoinedServer]:
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedServer.get_select_by_user_id_string(user_id)}",
)
result = self._context.select(
UserJoinedServer.get_select_active_by_user_id_string(user_id)
)
result = self._context.select(UserJoinedServer.get_select_active_by_user_id_string(user_id))
if result is None or len(result) == 0:
return None
@@ -143,19 +129,13 @@ class UserJoinedServerRepositoryService(UserJoinedServerRepositoryABC):
)
def add_user_joined_server(self, user_joined_server: UserJoinedServer):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_server.insert_string}"
)
self._logger.trace(__name__, f"Send SQL command: {user_joined_server.insert_string}")
self._context.cursor.execute(user_joined_server.insert_string)
def update_user_joined_server(self, user_joined_server: UserJoinedServer):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_server.udpate_string}"
)
self._logger.trace(__name__, f"Send SQL command: {user_joined_server.udpate_string}")
self._context.cursor.execute(user_joined_server.udpate_string)
def delete_user_joined_server(self, user_joined_server: UserJoinedServer):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_server.delete_string}"
)
self._logger.trace(__name__, f"Send SQL command: {user_joined_server.delete_string}")
self._context.cursor.execute(user_joined_server.delete_string)

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

@@ -33,9 +33,7 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
)
results = self._context.select(UserJoinedVoiceChannel.get_select_all_string())
for result in results:
self._logger.trace(
__name__, f"Get user-joined-voice-channel with id {result[0]}"
)
self._logger.trace(__name__, f"Get user-joined-voice-channel with id {result[0]}")
joins.append(
UserJoinedVoiceChannel(
self._users.get_user_by_id(result[1]),
@@ -54,9 +52,7 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
__name__,
f"Send SQL command: {UserJoinedVoiceChannel.get_select_by_id_string(id)}",
)
result = self._context.select(
UserJoinedVoiceChannel.get_select_by_id_string(id)
)[0]
result = self._context.select(UserJoinedVoiceChannel.get_select_by_id_string(id))[0]
return UserJoinedVoiceChannel(
self._users.get_user_by_id(result[1]),
result[2],
@@ -66,17 +62,13 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
id=result[0],
)
def get_user_joined_voice_channels_by_user_id(
self, user_id: int
) -> List[UserJoinedVoiceChannel]:
def get_user_joined_voice_channels_by_user_id(self, user_id: int) -> List[UserJoinedVoiceChannel]:
joins = List(UserJoinedVoiceChannel)
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedVoiceChannel.get_select_by_user_id_string(user_id)}",
)
results = self._context.select(
UserJoinedVoiceChannel.get_select_by_user_id_string(user_id)
)
results = self._context.select(UserJoinedVoiceChannel.get_select_by_user_id_string(user_id))
for result in results:
joins.append(
UserJoinedVoiceChannel(
@@ -91,16 +83,12 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
return joins
def get_active_user_joined_voice_channel_by_user_id(
self, user_id: int
) -> UserJoinedVoiceChannel:
def get_active_user_joined_voice_channel_by_user_id(self, user_id: int) -> UserJoinedVoiceChannel:
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedVoiceChannel.get_select_by_user_id_string(user_id)}",
)
result = self._context.select(
UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id)
)[0]
result = self._context.select(UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id))[0]
return UserJoinedVoiceChannel(
self._users.get_user_by_id(result[1]),
result[2],
@@ -110,16 +98,12 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
id=result[0],
)
def find_active_user_joined_voice_channel_by_user_id(
self, user_id: int
) -> Optional[UserJoinedVoiceChannel]:
def find_active_user_joined_voice_channel_by_user_id(self, user_id: int) -> Optional[UserJoinedVoiceChannel]:
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedVoiceChannel.get_select_by_user_id_string(user_id)}",
)
result = self._context.select(
UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id)
)
result = self._context.select(UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id))
if result is None or len(result) == 0:
return None
@@ -134,17 +118,13 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
id=result[0],
)
def find_active_user_joined_voice_channels_by_user_id(
self, user_id: int
) -> List[Optional[UserJoinedVoiceChannel]]:
def find_active_user_joined_voice_channels_by_user_id(self, user_id: int) -> List[Optional[UserJoinedVoiceChannel]]:
self._logger.trace(
__name__,
f"Send SQL command: {UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id)}",
)
result = List(UserJoinedVoiceChannel)
db_results = self._context.select(
UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id)
)
db_results = self._context.select(UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id))
for db_result in db_results:
result.append(
@@ -160,28 +140,16 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
return result
def add_user_joined_voice_channel(
self, user_joined_voice_channel: UserJoinedVoiceChannel
):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_voice_channel.insert_string}"
)
def add_user_joined_voice_channel(self, user_joined_voice_channel: UserJoinedVoiceChannel):
self._logger.trace(__name__, f"Send SQL command: {user_joined_voice_channel.insert_string}")
self._context.cursor.execute(user_joined_voice_channel.insert_string)
def update_user_joined_voice_channel(
self, user_joined_voice_channel: UserJoinedVoiceChannel
):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_voice_channel.udpate_string}"
)
def update_user_joined_voice_channel(self, user_joined_voice_channel: UserJoinedVoiceChannel):
self._logger.trace(__name__, f"Send SQL command: {user_joined_voice_channel.udpate_string}")
self._context.cursor.execute(user_joined_voice_channel.udpate_string)
def delete_user_joined_voice_channel(
self, user_joined_voice_channel: UserJoinedVoiceChannel
):
self._logger.trace(
__name__, f"Send SQL command: {user_joined_voice_channel.delete_string}"
)
def delete_user_joined_voice_channel(self, user_joined_voice_channel: UserJoinedVoiceChannel):
self._logger.trace(__name__, f"Send SQL command: {user_joined_voice_channel.delete_string}")
self._context.cursor.execute(user_joined_voice_channel.delete_string)
def delete_user_joined_voice_channel_by_user_id(self, user_id: int):
@@ -189,6 +157,4 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
__name__,
f"Send SQL command: {UserJoinedVoiceChannel.delete_by_user_id_string}",
)
self._context.cursor.execute(
UserJoinedVoiceChannel.delete_by_user_id_string(user_id)
)
self._context.cursor.execute(UserJoinedVoiceChannel.delete_by_user_id_string(user_id))

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

@@ -51,16 +51,12 @@ class UserMessageCountPerHourRepositoryService(UserMessageCountPerHourRepository
)
results = self._context.select(UserMessageCountPerHour.get_select_all_string())
for result in results:
self._logger.trace(
__name__, f"Get user message count per hour with id {result[0]}"
)
self._logger.trace(__name__, f"Get user message count per hour with id {result[0]}")
umcphs.append(self._from_result(result))
return umcphs
def find_user_message_count_per_hour_by_user_id(
self, user_id: int
) -> List[Optional[UserMessageCountPerHour]]:
def find_user_message_count_per_hour_by_user_id(self, user_id: int) -> List[Optional[UserMessageCountPerHour]]:
umcphs = List(UserMessageCountPerHour)
sql = UserMessageCountPerHour.get_select_by_user_id_string(user_id)
self._logger.trace(__name__, f"Send SQL command: {sql}")
@@ -69,9 +65,7 @@ class UserMessageCountPerHourRepositoryService(UserMessageCountPerHourRepository
return umcphs
for result in results:
self._logger.trace(
__name__, f"Get user message count per hour with id {result[0]}"
)
self._logger.trace(__name__, f"Get user message count per hour with id {result[0]}")
umcphs.append(self._from_result(result))
return umcphs
@@ -79,9 +73,7 @@ class UserMessageCountPerHourRepositoryService(UserMessageCountPerHourRepository
def get_user_message_count_per_hour_by_user_id_and_date(
self, user_id: int, date: datetime
) -> UserMessageCountPerHour:
sql = UserMessageCountPerHour.get_select_by_user_id_and_date_string(
user_id, date
)
sql = UserMessageCountPerHour.get_select_by_user_id_and_date_string(user_id, date)
self._logger.trace(__name__, f"Send SQL command: {sql}")
result = self._context.select(sql)[0]
return self._from_result(result)
@@ -89,9 +81,7 @@ class UserMessageCountPerHourRepositoryService(UserMessageCountPerHourRepository
def find_user_message_count_per_hour_by_user_id_and_date(
self, user_id: int, date: datetime
) -> Optional[UserMessageCountPerHour]:
sql = UserMessageCountPerHour.get_select_by_user_id_and_date_string(
user_id, date
)
sql = UserMessageCountPerHour.get_select_by_user_id_and_date_string(user_id, date)
self._logger.trace(__name__, f"Send SQL command: {sql}")
result = self._context.select(sql)
if result is None or len(result) == 0:

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

@@ -39,9 +39,7 @@ class UserRepositoryService(UserRepositoryABC):
def get_users(self) -> List[User]:
users = List(User)
self._logger.trace(
__name__, f"Send SQL command: {User.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {User.get_select_all_string()}")
results = self._context.select(User.get_select_all_string())
for result in results:
self._logger.trace(__name__, f"Get user with id {result[0]}")
@@ -50,17 +48,13 @@ class UserRepositoryService(UserRepositoryABC):
return users
def get_user_by_id(self, id: int) -> User:
self._logger.trace(
__name__, f"Send SQL command: {User.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {User.get_select_by_id_string(id)}")
result = self._context.select(User.get_select_by_id_string(id))[0]
return self._from_result(result)
def find_user_by_id(self, id: int) -> Optional[User]:
self._logger.trace(
__name__, f"Send SQL command: {User.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {User.get_select_by_id_string(id)}")
result = self._context.select(User.get_select_by_id_string(id))
if result is None or len(result) == 0:
return None
@@ -93,29 +87,21 @@ class UserRepositoryService(UserRepositoryABC):
return users
def get_user_by_discord_id_and_server_id(
self, discord_id: int, server_id: int
) -> User:
def get_user_by_discord_id_and_server_id(self, discord_id: int, server_id: int) -> User:
self._logger.trace(
__name__,
f"Send SQL command: {User.get_select_by_discord_id_and_server_id_string(discord_id, server_id)}",
)
result = self._context.select(
User.get_select_by_discord_id_and_server_id_string(discord_id, server_id)
)[0]
result = self._context.select(User.get_select_by_discord_id_and_server_id_string(discord_id, server_id))[0]
return self._from_result(result)
def find_user_by_discord_id_and_server_id(
self, discord_id: int, server_id: int
) -> Optional[User]:
def find_user_by_discord_id_and_server_id(self, discord_id: int, server_id: int) -> Optional[User]:
self._logger.trace(
__name__,
f"Send SQL command: {User.get_select_by_discord_id_and_server_id_string(discord_id, server_id)}",
)
result = self._context.select(
User.get_select_by_discord_id_and_server_id_string(discord_id, server_id)
)
result = self._context.select(User.get_select_by_discord_id_and_server_id_string(discord_id, server_id))
if result is None or len(result) == 0:
return None

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

@@ -47,9 +47,7 @@ class UserWarningsRepositoryService(UserWarningsRepositoryABC):
def get_user_warnings(self) -> List[UserWarnings]:
warnings = List(UserWarnings)
self._logger.trace(
__name__, f"Send SQL command: {UserWarnings.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {UserWarnings.get_select_all_string()}")
results = self._context.select(UserWarnings.get_select_all_string())
for result in results:
warnings.append(self._from_result(result))
@@ -57,9 +55,7 @@ class UserWarningsRepositoryService(UserWarningsRepositoryABC):
return warnings
def get_user_warnings_by_id(self, id: int) -> UserWarnings:
self._logger.trace(
__name__, f"Send SQL command: {UserWarnings.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {UserWarnings.get_select_by_id_string(id)}")
result = self._context.select(UserWarnings.get_select_by_id_string(id))[0]
return self._from_result(result)
@@ -69,9 +65,7 @@ class UserWarningsRepositoryService(UserWarningsRepositoryABC):
__name__,
f"Send SQL command: {UserWarnings.get_select_by_user_id_string(user_id)}",
)
results = self._context.select(
UserWarnings.get_select_by_user_id_string(user_id)
)
results = self._context.select(UserWarnings.get_select_by_user_id_string(user_id))
for result in results:
warnings.append(self._from_result(result))