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

Renamed type_id to id for sorting #130

Browse Source
This commit is contained in:
Sven Heidemann
2023-02-17 18:12:27 +01:00
parent 85452c9a74
commit fea259fa3b
67 changed files with 224 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kdb-bot/src/bot_data/model/api_key.py
View File

@@ -73,7 +73,7 @@ class ApiKey(TableABC):
) VALUES (
'{self._identifier}',
'{self._key}',
{"NULL" if self._creator is None else self._creator.user_id},
{"NULL" if self._creator is None else self._creator.id},
'{self._created_at}',
'{self._modified_at}'
);

8
kdb-bot/src/bot_data/model/auth_user_users_relation.py
View File

@@ -71,7 +71,7 @@ class AuthUserUsersRelation(TableABC):
`AuthUserId`, `UserId`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._auth_user.id},
{self._user.user_id},
{self._user.id},
'{self._created_at}',
'{self._modified_at}'
);
@@ -84,10 +84,10 @@ class AuthUserUsersRelation(TableABC):
f"""
UPDATE `AuthUserUsersRelations`
SET `AuthUserId` = '{self._auth_user.id}',,
`UserId` = '{self._user.user_id}'
`UserId` = '{self._user.id}'
`LastModifiedAt` = '{self._modified_at}'
WHERE `AuthUserId` = {self._auth_user.id}
AND `UserId` = {self._user.user_id};
AND `UserId` = {self._user.id};
"""
)
@@ -97,6 +97,6 @@ class AuthUserUsersRelation(TableABC):
f"""
DELETE FROM `AuthUserUsersRelations`
WHERE `AuthUserId` = {self._auth_user.id}
AND `UserId` = {self._user.user_id};
AND `UserId` = {self._user.id};
"""
)

6
kdb-bot/src/bot_data/model/auto_role.py
View File

@@ -26,7 +26,7 @@ class AutoRole(TableABC):
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
def auto_role_id(self) -> int:
def id(self) -> int:
return self._auto_role_id
@property
@@ -91,7 +91,7 @@ class AutoRole(TableABC):
INSERT INTO `AutoRoles` (
`ServerId`, `DiscordChannelId`, `DiscordMessageId`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._server.server_id},
{self._server.id},
{self._discord_channel_id},
{self._discord_message_id},
'{self._created_at}',
@@ -105,7 +105,7 @@ class AutoRole(TableABC):
return str(
f"""
UPDATE `AutoRoles`
SET `ServerId` = {self._server.server_id},
SET `ServerId` = {self._server.id},
`DiscordChannelId` = {self._discord_channel_id},
`DiscordMessageId` = {self._discord_message_id},
`LastModifiedAt` = '{self._modified_at}'

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

@@ -25,7 +25,7 @@ class AutoRoleRule(TableABC):
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
def auto_role_rule_id(self) -> int:
def id(self) -> int:
return self._auto_role_rule_id
@property

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

@@ -1,4 +1,5 @@
from datetime import datetime
from cpl_core.database import TableABC
from bot_data.model.server import Server
@@ -32,7 +33,7 @@ class Client(TableABC):
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
def client_id(self) -> int:
def id(self) -> int:
return self._client_id
@property
@@ -154,7 +155,7 @@ class Client(TableABC):
{self._deleted_message_count},
{self._received_message_count},
{self._moved_users_count},
{self._server.server_id},
{self._server.id},
'{self._created_at}',
'{self._modified_at}'
);

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

@@ -19,7 +19,7 @@ class KnownUser(TableABC):
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
def known_user_id(self) -> int:
def id(self) -> int:
return self._known_user_id
@property

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

@@ -1,5 +1,6 @@
from datetime import datetime
from typing import Optional
from cpl_core.database import TableABC
from bot_data.model.server import Server
@@ -114,7 +115,7 @@ class Level(TableABC):
'{self._color}',
{self._min_xp},
{self._permissions},
{self._server.server_id},
{self._server.id},
'{self._created_at}',
'{self._modified_at}'
);

5
kdb-bot/src/bot_data/model/server.py
View File

@@ -1,5 +1,4 @@
from datetime import datetime
from typing import Optional
from cpl_core.database import TableABC
@@ -20,11 +19,11 @@ class Server(TableABC):
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
def server_id(self) -> int:
def id(self) -> int:
return self._server_id
@property
def discord_server_id(self) -> int:
def discord_id(self) -> int:
return self._discord_server_id
@staticmethod

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

@@ -101,7 +101,7 @@ class Statistic(TableABC):
'{self._name}',
'{self._description}',
'{self._code}',
{self._server.server_id},
{self._server.id},
'{self._created_at}',
'{self._modified_at}'
);

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

@@ -28,7 +28,7 @@ class User(TableABC):
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
def user_id(self) -> int:
def id(self) -> int:
return self._user_id
@property
@@ -111,7 +111,7 @@ class User(TableABC):
{self._discord_id},
{self._xp},
'{"NULL" if self._minecraft_id is None else self._minecraft_id}',
{self._server.server_id},
{self._server.id},
'{self._created_at}',
'{self._modified_at}'
);

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

@@ -100,7 +100,7 @@ class UserJoinedGameServer(TableABC):
INSERT INTO `UserJoinedGameServer` (
`UserId`, `GameServer`, `JoinedOn`, `LeavedOn`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.user_id},
{self._user.id},
'{self._game_server}',
'{self._joined_on}',
'{self._leaved_on}',
@@ -115,7 +115,7 @@ class UserJoinedGameServer(TableABC):
INSERT INTO `UserJoinedGameServer` (
`UserId`, `GameServer`, `JoinedOn`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.user_id},
{self._user.id},
'{self._game_server}',
'{self._joined_on}',
'{self._created_at}',

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

@@ -25,7 +25,7 @@ class UserJoinedServer(TableABC):
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
def join_id(self) -> int:
def id(self) -> int:
return self._join_id
@property
@@ -103,7 +103,7 @@ class UserJoinedServer(TableABC):
INSERT INTO `UserJoinedServers` (
`UserId`, `JoinedOn`, `LeavedOn`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.user_id},
{self._user.id},
'{self._joined_on}',
'{self._leaved_on}',
'{self._created_at}',
@@ -117,7 +117,7 @@ class UserJoinedServer(TableABC):
INSERT INTO `UserJoinedServers` (
`UserId`, `JoinedOn`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.user_id},
{self._user.id},
'{self._joined_on}',
'{self._created_at}',
'{self._modified_at}'
@@ -132,7 +132,7 @@ class UserJoinedServer(TableABC):
UPDATE `UserJoinedServers`
SET `LeavedOn` = '{self._leaved_on}',
`LastModifiedAt` = '{self._modified_at}'
WHERE `UserId` = {self._user.user_id};
WHERE `UserId` = {self._user.id};
"""
)

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

@@ -27,7 +27,7 @@ class UserJoinedVoiceChannel(TableABC):
self._modified_at = modified_at if modified_at is not None else self._modified_at
@property
def join_id(self) -> int:
def id(self) -> int:
return self._join_id
@property
@@ -100,7 +100,7 @@ class UserJoinedVoiceChannel(TableABC):
INSERT INTO `UserJoinedVoiceChannel` (
`UserId`, `DiscordChannelId`, `JoinedOn`, `LeavedOn`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.user_id},
{self._user.id},
{self._dc_channel_id},
'{self._joined_on}',
'{self._leaved_on}',
@@ -115,7 +115,7 @@ class UserJoinedVoiceChannel(TableABC):
INSERT INTO `UserJoinedVoiceChannel` (
`UserId`, `DiscordChannelId`, `JoinedOn`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.user_id},
{self._user.id},
{self._dc_channel_id},
'{self._joined_on}',
'{self._created_at}',

2
kdb-bot/src/bot_data/model/user_message_count_per_hour.py
View File

@@ -97,7 +97,7 @@ class UserMessageCountPerHour(TableABC):
INSERT INTO `UserMessageCountPerHour` (
`UserId`, `Date`, `Hour`, `XPCount`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.user_id},
{self._user.id},
'{self._date}',
{self._hour},
{self._xp_count},

4
kdb-bot/src/bot_data/service/client_repository_service.py
View File

@@ -193,9 +193,9 @@ class ClientRepositoryService(ClientRepositoryABC):
self._logger.warn(__name__, f"Cannot find server by id {server_id}")
raise Exception("Value not found")
client = self.find_client_by_discord_id_and_server_id(id, server.server_id)
client = self.find_client_by_discord_id_and_server_id(id, 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.id}")
raise Exception("Value not found")
return client