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

Added minecraft id #181

Browse Source
This commit is contained in:
Sven Heidemann
2023-02-12 16:55:35 +01:00
parent bd4e088032
commit 2ef4d079ed
6 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kdb-bot/src/bot_data/migration/user_joined_game_server_migration.py
View File

@@ -33,5 +33,20 @@ class UserJoinedGameServerMigration(MigrationABC):
)
)
self._cursor.execute(
str(
f"""
ALTER TABLE Users ADD MinecraftId VARCHAR(255) NULL AFTER XP;
"""
)
)
def downgrade(self):
self._cursor.execute("DROP TABLE `UserJoinedGameServer`;")
self._cursor.execute(
str(
f"""
ALTER TABLE Users DROP COLUMN MinecraftId;
"""
)
)

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

@@ -11,6 +11,7 @@ class User(TableABC):
self,
dc_id: int,
xp: int,
minecraft_id: Optional[str],
server: Optional[Server],
created_at: datetime = None,
modified_at: datetime = None,
@@ -19,6 +20,7 @@ class User(TableABC):
self._user_id = id
self._discord_id = dc_id
self._xp = xp
self._minecraft_id = minecraft_id
self._server = server
TableABC.__init__(self)
@@ -42,6 +44,10 @@ class User(TableABC):
self._modified_at = datetime.now().isoformat()
self._xp = value
@property
def minecraft_id(self) -> Optional[str]:
return self._minecraft_id
@property
def server(self) -> Optional[Server]:
return self._server
@@ -96,10 +102,11 @@ class User(TableABC):
return str(
f"""
INSERT INTO `Users` (
`DiscordId`, `XP`, `ServerId`, `CreatedAt`, `LastModifiedAt`
`DiscordId`, `XP`, `MinecraftId`, `ServerId`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._discord_id},
{self._xp},
'{"NULL" if self._minecraft_id is None else self._minecraft_id}',
{self._server.server_id},
'{self._created_at}',
'{self._modified_at}'
@@ -113,6 +120,7 @@ class User(TableABC):
f"""
UPDATE `Users`
SET `XP` = {self._xp},
`MinecraftId` = '{"NULL" if self._minecraft_id is None else self._minecraft_id}',
`LastModifiedAt` = '{self._modified_at}'
WHERE `UserId` = {self._user_id};
"""

35
kdb-bot/src/bot_data/service/user_repository_service.py
View File

@@ -33,7 +33,10 @@ class UserRepositoryService(UserRepositoryABC):
User(
result[1],
result[2],
self._servers.get_server_by_id(result[3]),
result[3],
self._servers.get_server_by_id(result[4]),
result[5],
result[6],
id=result[0],
)
)
@@ -47,7 +50,10 @@ class UserRepositoryService(UserRepositoryABC):
return User(
result[1],
result[2],
self._servers.get_server_by_id(result[3]),
result[3],
self._servers.get_server_by_id(result[4]),
result[5],
result[6],
id=result[0],
)
@@ -62,7 +68,10 @@ class UserRepositoryService(UserRepositoryABC):
return User(
result[1],
result[2],
self._servers.get_server_by_id(result[3]),
result[3],
self._servers.get_server_by_id(result[4]),
result[5],
result[6],
id=result[0],
)
@@ -78,7 +87,10 @@ class UserRepositoryService(UserRepositoryABC):
User(
result[1],
result[2],
self._servers.get_server_by_id(result[3]),
result[3],
self._servers.get_server_by_id(result[4]),
result[5],
result[6],
id=result[0],
)
)
@@ -97,7 +109,10 @@ class UserRepositoryService(UserRepositoryABC):
User(
result[1],
result[2],
self._servers.get_server_by_id(result[3]),
result[3],
self._servers.get_server_by_id(result[4]),
result[5],
result[6],
id=result[0],
)
)
@@ -114,7 +129,10 @@ class UserRepositoryService(UserRepositoryABC):
return User(
result[1],
result[2],
self._servers.get_server_by_id(result[3]),
result[3],
self._servers.get_server_by_id(result[4]),
result[5],
result[6],
id=result[0],
)
@@ -132,9 +150,10 @@ class UserRepositoryService(UserRepositoryABC):
return User(
result[1],
result[2],
self._servers.get_server_by_id(result[3]),
result[4],
result[3],
self._servers.get_server_by_id(result[4]),
result[5],
result[6],
id=result[0],
)