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

Formatted files with black

Browse Source
This commit is contained in:
Sven Heidemann
2023-01-13 23:54:06 +01:00
parent e2b2fb5abb
commit ea266cc5be
141 changed files with 741 additions and 1886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,9 +19,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
kdb-bot/src/bot_data/abc/client_repository_abc.py
View File

@@ -31,9 +31,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

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

@@ -19,21 +19,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
kdb-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
kdb-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
kdb-bot/src/bot_data/abc/user_repository_abc.py
View File

@@ -28,15 +28,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

16
kdb-bot/src/bot_data/data_module.py
View File

@@ -44,25 +44,17 @@ 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_transient(AuthUserRepositoryABC, AuthUserRepositoryService)
services.add_transient(ServerRepositoryABC, ServerRepositoryService)
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(UserJoinedServerRepositoryABC, UserJoinedServerRepositoryService)
services.add_transient(UserJoinedVoiceChannelRepositoryABC, UserJoinedVoiceChannelRepositoryService)
services.add_transient(AutoRoleRepositoryABC, AutoRoleRepositoryService)
services.add_transient(LevelRepositoryABC, LevelRepositoryService)
services.add_transient(StatisticRepositoryABC, StatisticRepositoryService)

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

@@ -47,9 +47,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
kdb-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
kdb-bot/src/bot_data/model/auto_role.py
View File

@@ -21,9 +21,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 auto_role_id(self) -> int:

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

@@ -21,9 +21,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 auto_role_rule_id(self) -> int:

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

@@ -29,9 +29,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 client_id(self) -> int:

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

@@ -18,9 +18,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 known_user_id(self) -> int:

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

@@ -26,9 +26,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
kdb-bot/src/bot_data/model/server.py
View File

@@ -17,9 +17,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 server_id(self) -> int:

4
kdb-bot/src/bot_data/model/statistic.py
View File

@@ -25,9 +25,7 @@ class Statistic(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
kdb-bot/src/bot_data/model/user.py
View File

@@ -22,9 +22,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 user_id(self) -> int:

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

@@ -24,9 +24,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 join_id(self) -> int:

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

@@ -24,9 +24,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 join_id(self) -> int:

4
kdb-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:

46
kdb-bot/src/bot_data/service/auth_user_repository_service.py
View File

@@ -67,9 +67,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]}")
@@ -77,36 +75,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 (
@@ -117,9 +101,7 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
):
crit_sort_direction = criteria.sort_direction.lower()
if crit_sort_direction == "desc" or crit_sort_direction == "descending":
query = query.order_by_descending(
lambda x: getattr(x, criteria.sort_column)
)
query = query.order_by_descending(lambda x: getattr(x, criteria.sort_column))
else:
query = query.order_by(lambda x: getattr(x, criteria.sort_column))
@@ -131,16 +113,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
@@ -167,9 +145,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

84
kdb-bot/src/bot_data/service/auto_role_repository_service.py
View File

@@ -18,54 +18,34 @@ 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(
AutoRole(
result[1], result[2], result[3], result[4], result[5], id=result[0]
)
)
auto_roles.append(AutoRole(result[1], result[2], result[3], result[4], result[5], id=result[0]))
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(
result[1], result[2], result[3], result[4], result[5], id=result[0]
)
return AutoRole(result[1], result[2], result[3], result[4], result[5], id=result[0])
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
result = result[0]
return AutoRole(
result[1], result[2], result[3], result[4], result[5], id=result[0]
)
return AutoRole(result[1], result[2], result[3], result[4], result[5], id=result[0])
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:
auto_roles.append(
AutoRole(
result[1], result[2], result[3], result[4], result[5], id=result[0]
)
)
auto_roles.append(AutoRole(result[1], result[2], result[3], result[4], result[5], id=result[0]))
return auto_roles
@@ -75,9 +55,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
f"Send SQL command: {AutoRole.get_select_by_message_id_string(id)}",
)
result = self._context.select(AutoRole.get_select_by_message_id_string(id))[0]
return AutoRole(
result[1], result[2], result[3], result[4], result[5], id=result[0]
)
return AutoRole(result[1], result[2], result[3], result[4], result[5], id=result[0])
def find_auto_role_by_message_id(self, id: int) -> Optional[AutoRole]:
self._logger.trace(
@@ -90,9 +68,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
result = result[0]
return AutoRole(
result[1], result[2], result[3], result[4], result[5], id=result[0]
)
return AutoRole(result[1], result[2], result[3], result[4], result[5], id=result[0])
def add_auto_role(self, auto_role: AutoRole):
self._logger.trace(__name__, f"Send SQL command: {auto_role.insert_string}")
@@ -108,27 +84,17 @@ 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(
AutoRoleRule(
result[1], result[2], result[3], result[4], result[5], id=result[0]
)
)
auto_role_rules.append(AutoRoleRule(result[1], result[2], result[3], result[4], result[5], id=result[0]))
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(
result[1], result[2], result[3], result[4], result[5], id=result[0]
)
return AutoRoleRule(result[1], result[2], result[3], result[4], result[5], id=result[0])
def get_auto_role_rules_by_auto_role_id(self, id: int) -> List[AutoRoleRule]:
auto_role_rules = List(AutoRoleRule)
@@ -136,32 +102,20 @@ 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(
result[1], result[2], result[3], result[4], result[5], id=result[0]
)
)
auto_role_rules.append(AutoRoleRule(result[1], result[2], result[3], result[4], result[5], id=result[0]))
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)

28
kdb-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]}")
@@ -47,9 +45,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],
@@ -67,9 +63,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],
@@ -86,9 +80,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
@@ -127,16 +119,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
@@ -173,9 +161,7 @@ class ClientRepositoryService(ClientRepositoryABC):
client = self.find_client_by_discord_id_and_server_id(id, server.server_id)
if client is None:
self._logger.warn(
__name__, f"Cannot find client by ids {id}@{server.server_id}"
)
self._logger.warn(__name__, f"Cannot find client by ids {id}@{server.server_id}")
raise Exception("Value not found")
return client

16
kdb-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
kdb-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
kdb-bot/src/bot_data/service/migration_service.py
View File

@@ -22,9 +22,7 @@ class MigrationService:
self._db = db
self._cursor = db.cursor
self._migrations = List(type, MigrationABC.__subclasses__()).order_by(
lambda x: x.name
)
self._migrations = List(type, MigrationABC.__subclasses__()).order_by(lambda x: x.name)
def migrate(self):
self._logger.info(__name__, f"Running Migrations")
@@ -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)

24
kdb-bot/src/bot_data/service/server_repository_service.py
View File

@@ -19,9 +19,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], id=result[0]))
@@ -30,9 +28,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
@@ -44,9 +40,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))
@@ -58,9 +52,7 @@ class ServerRepositoryService(ServerRepositoryABC):
return result
def get_server_by_id(self, server_id: int) -> Server:
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]
return Server(result[1], id=result[0])
@@ -69,9 +61,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)
)[0]
result = self._context.select(Server.get_select_by_discord_id_string(discord_id))[0]
return Server(result[1], id=result[0])
def find_server_by_discord_id(self, discord_id: int) -> Optional[Server]:
@@ -79,9 +69,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

16
kdb-bot/src/bot_data/service/statistic_repository_service.py
View File

@@ -48,9 +48,7 @@ class StatisticRepositoryService(StatisticRepositoryABC):
def get_statistics(self) -> List[Statistic]:
statistics = List(Statistic)
self._logger.trace(
__name__, f"Send SQL command: {Statistic.get_select_all_string()}"
)
self._logger.trace(__name__, f"Send SQL command: {Statistic.get_select_all_string()}")
results = self._context.select(Statistic.get_select_all_string())
for result in results:
statistics.append(self._statistic_from_result(result))
@@ -70,9 +68,7 @@ class StatisticRepositoryService(StatisticRepositoryABC):
return statistics
def get_statistic_by_id(self, id: int) -> Statistic:
self._logger.trace(
__name__, f"Send SQL command: {Statistic.get_select_by_id_string(id)}"
)
self._logger.trace(__name__, f"Send SQL command: {Statistic.get_select_by_id_string(id)}")
result = self._context.select(Statistic.get_select_by_id_string(id))[0]
return self._statistic_from_result(result)
@@ -81,9 +77,7 @@ class StatisticRepositoryService(StatisticRepositoryABC):
__name__,
f"Send SQL command: {Statistic.get_select_by_name_string(name, server_id)}",
)
result = self._context.select(
Statistic.get_select_by_name_string(name, server_id)
)[0]
result = self._context.select(Statistic.get_select_by_name_string(name, server_id))[0]
return self._statistic_from_result(result)
def find_statistic_by_name(self, name: str, server_id: int) -> Optional[Statistic]:
@@ -91,9 +85,7 @@ class StatisticRepositoryService(StatisticRepositoryABC):
__name__,
f"Send SQL command: {Statistic.get_select_by_name_string(name, server_id)}",
)
result = self._context.select(
Statistic.get_select_by_name_string(name, server_id)
)
result = self._context.select(Statistic.get_select_by_name_string(name, server_id))
if result is None or len(result) == 0:
return None

40
kdb-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]}")
@@ -59,17 +57,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(
@@ -84,16 +78,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],
@@ -103,16 +93,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
@@ -128,19 +114,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
kdb-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
kdb-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
kdb-bot/src/bot_data/service/user_repository_service.py
View File

@@ -25,9 +25,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]}")
@@ -43,9 +41,7 @@ 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 User(
@@ -56,9 +52,7 @@ class UserRepositoryService(UserRepositoryABC):
)
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
@@ -91,16 +85,12 @@ 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 User(
result[1],
@@ -109,16 +99,12 @@ class UserRepositoryService(UserRepositoryABC):
id=result[0],
)
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