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

Fixed table loading #220

Browse Source
This commit is contained in:
Sven Heidemann
2023-02-22 21:02:49 +01:00
parent 42b71525bd
commit 6915515932
17 changed files with 139 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kdb-bot/src/bot/config

Submodule kdb-bot/src/bot/config updated: 7986144705...6e2ec8f2f8

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

@@ -69,11 +69,11 @@ class ApiKey(TableABC):
return str(
f"""
INSERT INTO `ApiKeys` (
`Identifier`, `Key`, {"" if self._creator is None else "`CreatorId`,"} `CreatedAt`, `LastModifiedAt`
`Identifier`, `Key`, `CreatorId`, `CreatedAt`, `LastModifiedAt`
) VALUES (
'{self._identifier}',
'{self._key}',
{"" if self._creator is None else f"{self._creator.id},"}
{"NULL" if self._creator is None else f"'{self._creator.id}'"},
'{self._created_at}',
'{self._modified_at}'
);
@@ -87,7 +87,7 @@ class ApiKey(TableABC):
UPDATE `ApiKeys`
SET `Identifier` = '{self._identifier}',
`Key` = '{self._key}',
{"" if self._creator is None else f"`CreatorId` = {self._creator.id},"}
`CreatorId` = {"NULL" if self._creator is None else f"'{self._creator.id}'"},
`LastModifiedAt` = '{self._modified_at}'
WHERE `Id` = {self._id};
"""

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

@@ -215,10 +215,10 @@ class AuthUser(TableABC):
`EMail`,
`Password`,
`PasswordSalt`,
{"" if self._refresh_token is None else f"`RefreshToken`,"}
{"" if self._confirmation_id is None else f"`ConfirmationId`,"}
{"" if self._forgot_password_id is None else f"`ForgotPasswordId`,"}
{"" if self._oauth_id is None else f"`OAuthId`,"}
`RefreshToken`,
`ConfirmationId`,
`ForgotPasswordId`,
`OAuthId`,
`RefreshTokenExpiryTime`,
`AuthRole`,
`CreatedAt`,
@@ -230,10 +230,10 @@ class AuthUser(TableABC):
'{self._email}',
'{self._password}',
'{self._password_salt}',
{"" if self._refresh_token is None else f"'{self._refresh_token}',"}
{"" if self._confirmation_id is None else f"'{self._confirmation_id}',"}
{"" if self._forgot_password_id is None else f"'{self._forgot_password_id}',"}
{"" if self._oauth_id is None else f"'{self._oauth_id}',"}
{"NULL" if self._refresh_token is None else f"'{self._refresh_token}'"},
{"NULL" if self._confirmation_id is None else f"'{self._confirmation_id}'"},
{"NULL" if self._forgot_password_id is None else f"'{self._forgot_password_id}'"},
{"NULL" if self._oauth_id is None else f"'{self._oauth_id}'"},
'{self._refresh_token_expire_time.isoformat()}',
{self._auth_role_id.value},
'{self._created_at}',
@@ -252,10 +252,10 @@ class AuthUser(TableABC):
`EMail` = '{self._email}',
`Password` = '{self._password}',
`PasswordSalt` = '{self._password_salt}',
{'' if self._refresh_token is None else f"`RefreshToken` = '{self._refresh_token}',"}
{'' if self._confirmation_id is None else f"'`ConfirmationId` = '{self._confirmation_id}',"}
{'' if self._forgot_password_id is None else f"`ForgotPasswordId` = '{self._forgot_password_id}',"}
{'' if self._oauth_id is None else f"`OAuthId` = '{self._oauth_id}',"}
`RefreshToken` = {"NULL" if self._refresh_token is None else f"'{self._refresh_token}'"},
`ConfirmationId` = {"NULL" if self._confirmation_id is None else f"'{self._confirmation_id}'"},
`ForgotPasswordId` = {"NULL" if self._forgot_password_id is None else f"'{self._forgot_password_id}'"},
`OAuthId` = {"NULL" if self._oauth_id is None else f"'{self._oauth_id}'"},
`RefreshTokenExpiryTime` = '{self._refresh_token_expire_time.isoformat()}',
`AuthRole` = {self._auth_role_id.value},
`LastModifiedAt` = '{self._modified_at}'

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

@@ -150,11 +150,11 @@ class User(TableABC):
return str(
f"""
INSERT INTO `Users` (
`DiscordId`, `XP`, {"" if self._minecraft_id is None else "`MinecraftId`,"} `ServerId`, `CreatedAt`, `LastModifiedAt`
`DiscordId`, `XP`, `MinecraftId`, `ServerId`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._discord_id},
{self._xp},
{"" if self._minecraft_id is None else f"'{self._minecraft_id}',"}
{"NULL" if self._minecraft_id is None else f"'{self._minecraft_id}'"},
{self._server.id},
'{self._created_at}',
'{self._modified_at}'
@@ -168,7 +168,7 @@ class User(TableABC):
f"""
UPDATE `Users`
SET `XP` = {self._xp},
{"" if self._minecraft_id is None else f"`MinecraftId` = '{self._minecraft_id}',"}
`MinecraftId` = {"NULL" if self._minecraft_id is None else f"'{self._minecraft_id}'"},
`LastModifiedAt` = '{self._modified_at}'
WHERE `UserId` = {self._user_id};
"""

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

@@ -101,12 +101,12 @@ class UserJoinedGameServer(TableABC):
return str(
f"""
INSERT INTO `UserJoinedGameServer` (
`UserId`, `GameServer`, `JoinedOn`, {"" if self._leaved_on is None else "`LeavedOn`,"} `CreatedAt`, `LastModifiedAt`
`UserId`, `GameServer`, `JoinedOn`, `LeavedOn`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.id},
'{self._game_server}',
'{self._joined_on}',
{"" if self._leaved_on is None else f"'{self._leaved_on}',"}
{"NULL" if self._leaved_on is None else f"'{self._leaved_on}'"},
'{self._created_at}',
'{self._modified_at}'
);
@@ -118,8 +118,7 @@ class UserJoinedGameServer(TableABC):
return str(
f"""
UPDATE `UserJoinedGameServer`
SET
{"" if self._leaved_on is None else f"`LeavedOn` = '{self._leaved_on}',"}
SET `LeavedOn` = {"NULL" if self._leaved_on is None else f"'{self._leaved_on}'"},
`LastModifiedAt` = '{self._modified_at}'
WHERE `Id` = {self._id};
"""

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

@@ -100,11 +100,11 @@ class UserJoinedServer(TableABC):
return str(
f"""
INSERT INTO `UserJoinedServers` (
`UserId`, `JoinedOn`, {"" if self._leaved_on is None else "`LeavedOn`,"} `CreatedAt`, `LastModifiedAt`
`UserId`, `JoinedOn`, `LeavedOn`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.id},
'{self._joined_on}',
{"" if self._leaved_on is None else f"'{self._leaved_on}',"}
{"NULL" if self._leaved_on is None else f"'{self._leaved_on}'"},
'{self._created_at}',
'{self._modified_at}'
);
@@ -116,8 +116,7 @@ class UserJoinedServer(TableABC):
return str(
f"""
UPDATE `UserJoinedServers`
SET
{"" if self._leaved_on is None else f"`LeavedOn` = '{self._leaved_on}',"}
SET `LeavedOn` = {"NULL" if self._leaved_on is None else f"'{self._leaved_on}'"},
`LastModifiedAt` = '{self._modified_at}'
WHERE `UserId` = {self._user.id};
"""

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

@@ -108,12 +108,12 @@ class UserJoinedVoiceChannel(TableABC):
return str(
f"""
INSERT INTO `UserJoinedVoiceChannel` (
`UserId`, `DiscordChannelId`, `JoinedOn`, {"" if self._leaved_on is None else "`LeavedOn`,"} `CreatedAt`, `LastModifiedAt`
`UserId`, `DiscordChannelId`, `JoinedOn`, `LeavedOn`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.id},
{self._channel_id},
'{self._joined_on}',
{"" if self._leaved_on is None else f"'{self._leaved_on}',"}
{"NULL" if self._leaved_on is None else f"'{self._leaved_on}'"},
'{self._created_at}',
'{self._modified_at}'
);
@@ -125,8 +125,7 @@ class UserJoinedVoiceChannel(TableABC):
return str(
f"""
UPDATE `UserJoinedVoiceChannel`
SET
{"" if self._leaved_on is None else f"`LeavedOn` = '{self._leaved_on}',"}
SET `LeavedOn` = {"NULL" if self._leaved_on is None else f"'{self._leaved_on}'"},
`LastModifiedAt` = '{self._modified_at}'
WHERE `JoinId` = {self._join_id};
"""

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

@@ -28,7 +28,7 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
@staticmethod
def _get_value_from_result(value: any) -> Optional[any]:
if isinstance(value, str) and "null" in value:
if isinstance(value, str) and "NULL" in value:
return None
return value