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

Added db to stats #46

Browse Source
This commit is contained in:
Sven Heidemann
2022-11-09 19:23:10 +01:00
parent b52cdf0f34
commit 7fe0f19adf
6 changed files with 85 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ from bot_data.abc.client_repository_abc import ClientRepositoryABC
from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
from bot_data.abc.level_repository_abc import LevelRepositoryABC
from bot_data.abc.server_repository_abc import ServerRepositoryABC
from bot_data.abc.statistic_repository_abc import StatisticRepositoryABC
from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
from bot_data.abc.user_repository_abc import UserRepositoryABC
@@ -21,6 +22,7 @@ from bot_data.service.known_user_repository_service import KnownUserRepositorySe
from bot_data.service.level_repository_service import LevelRepositoryService
from bot_data.service.seeder_service import SeederService
from bot_data.service.server_repository_service import ServerRepositoryService
from bot_data.service.statistic_repository_service import StatisticRepositoryService
from bot_data.service.user_joined_server_repository_service import UserJoinedServerRepositoryService
from bot_data.service.user_joined_voice_channel_service import UserJoinedVoiceChannelRepositoryService
from bot_data.service.user_repository_service import UserRepositoryService
@@ -44,5 +46,6 @@ class DataModule(ModuleABC):
services.add_transient(UserJoinedVoiceChannelRepositoryABC, UserJoinedVoiceChannelRepositoryService)
services.add_transient(AutoRoleRepositoryABC, AutoRoleRepositoryService)
services.add_transient(LevelRepositoryABC, LevelRepositoryService)
services.add_transient(StatisticRepositoryABC, StatisticRepositoryService)
services.add_transient(SeederService)

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

@@ -1,7 +1,7 @@
from datetime import datetime
from typing import Optional
from cpl_core.database import TableABC
from cpl_core.utils import CredentialManager
from bot_data.model.server import Server
@@ -12,7 +12,7 @@ class Statistic(TableABC):
self._id = id
self._name = name
self._description = description
self._code = code
self._code = CredentialManager.encrypt(code)
self._server = server
TableABC.__init__(self)
@@ -37,11 +37,11 @@ class Statistic(TableABC):
@property
def code(self) -> str:
return self._code
return CredentialManager.decrypt(self._code)
@code.setter
def code(self, value: str):
self._code = value
self._code = CredentialManager.encrypt(value)
@property
def server(self) -> Server:
@@ -64,7 +64,8 @@ class Statistic(TableABC):
def get_select_by_name_string(name: str, s_id: int) -> str:
return str(f"""
SELECT * FROM `Statistics`
WHERE `Name` = {name};
WHERE `ServerId` = {s_id}
AND `Name` = '{name}';
""")
@staticmethod
@@ -93,9 +94,9 @@ class Statistic(TableABC):
def udpate_string(self) -> str:
return str(f"""
UPDATE `Statistics`
SET `Name` = {self._name},
`Description` = '{self._description}'
`Code` = '{self._code}'
SET `Name` = '{self._name}',
`Description` = '{self._description}',
`Code` = '{self._code}',
`LastModifiedAt` = '{self._modified_at}'
WHERE `Id` = {self._id};
""")

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

@@ -1,6 +1,7 @@
from typing import Optional
from cpl_core.database.context import DatabaseContextABC
from cpl_core.utils import CredentialManager
from cpl_query.extension import List
from bot_core.logging.database_logger import DatabaseLogger
@@ -27,10 +28,14 @@ class StatisticRepositoryService(StatisticRepositoryABC):
return value
def _statistic_from_result(self, sql_result: tuple) -> Statistic:
code = self._get_value_from_result(sql_result[3])
if code is not None:
code = CredentialManager.decrypt(code)
statistic = Statistic(
self._get_value_from_result(sql_result[1]),
self._get_value_from_result(sql_result[2]),
self._get_value_from_result(sql_result[3]),
code,
self._statistics.get_server_by_id(sql_result[4]),
id=self._get_value_from_result(sql_result[0])
)