Renamed type_id to id for sorting #130

kdb-bot/src/bot_api/model/user_dto.py

@@ -81,7 +81,7 @@ class UserDTO(DtoABC):
             "dcId": self._discord_id,
             "xp": self._xp,
             "minecraftId": self._minecraft_id,
-            "server": self._server.server_id,
+            "server": self._server.id,
             "isTechnician": self.is_technician,
             "isAdmin": self.is_admin,
             "isModerator": self.is_moderator,

kdb-bot/src/bot_api/service/discord_service.py

@@ -2,7 +2,6 @@ from typing import Optional
 
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_query.extension import List
-from flask import jsonify
 
 from bot_api.abc.auth_service_abc import AuthServiceABC
 from bot_api.exception.service_error_code_enum import ServiceErrorCode
@@ -10,7 +9,6 @@ from bot_api.exception.service_exception import ServiceException
 from bot_api.filter.discord.server_select_criteria import ServerSelectCriteria
 from bot_api.model.discord.server_dto import ServerDTO
 from bot_api.model.discord.server_filtered_result_dto import ServerFilteredResultDTO
-from bot_api.model.error_dto import ErrorDTO
 from bot_api.transformer.server_transformer import ServerTransformer
 from bot_data.abc.auth_user_repository_abc import AuthUserRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
@@ -35,7 +33,7 @@ class DiscordService:
         self._users = users
 
     def _to_dto(self, x: Server) -> Optional[ServerDTO]:
-        guild = self._bot.get_guild(x.discord_server_id)
+        guild = self._bot.get_guild(x.discord_id)
         if guild is None:
             return ServerTransformer.to_dto(x, "", 0, None)
 
@@ -55,8 +53,8 @@ class DiscordService:
         if role != AuthRoleEnum.admin:
             auth_user = self._auth_users.find_auth_user_by_email(token["email"])
             if auth_user is not None:
-                user_ids = auth_user.users.select(lambda x: x.server is not None and x.server.server_id)
-                servers = servers.where(lambda x: x.server_id in user_ids)
+                user_ids = auth_user.users.select(lambda x: x.server is not None and x.server.id)
+                servers = servers.where(lambda x: x.id in user_ids)
 
         servers = List(ServerDTO, servers)
         return servers.select(self._to_dto).where(lambda x: x.name != "")
@@ -72,8 +70,8 @@ class DiscordService:
         if role != AuthRoleEnum.admin:
             auth_user = self._auth_users.find_auth_user_by_email(token["email"])
             if auth_user is not None:
-                user_ids = auth_user.users.select(lambda x: x.server is not None and x.server.server_id)
-                filtered_result.result = filtered_result.result.where(lambda x: x.server_id in user_ids)
+                user_ids = auth_user.users.select(lambda x: x.server is not None and x.server.id)
+                filtered_result.result = filtered_result.result.where(lambda x: x.id in user_ids)
 
         servers: List = filtered_result.result.select(self._to_dto).where(lambda x: x.name != "")
         result = List(ServerDTO, servers)
@@ -87,7 +85,7 @@ class DiscordService:
 
     async def get_server_by_id_async(self, id: int) -> ServerDTO:
         server = self._servers.get_server_by_id(id)
-        guild = self._bot.get_guild(server.discord_server_id)
+        guild = self._bot.get_guild(server.discord_id)
 
         server_dto = ServerTransformer.to_dto(server, guild.name, guild.member_count, guild.icon)
         return server_dto

kdb-bot/src/bot_api/transformer/auth_user_transformer.py

@@ -34,21 +34,21 @@ class AuthUserTransformer(TransformerABC):
     @staticmethod
     @ServiceProviderABC.inject
     def _is_technician(user: User, bot: DiscordBotServiceABC, permissions: PermissionServiceABC):
-        guild = bot.get_guild(user.server.discord_server_id)
+        guild = bot.get_guild(user.server.discord_id)
         member = guild.get_member(user.discord_id)
         return permissions.is_member_technician(member)
 
     @staticmethod
     @ServiceProviderABC.inject
     def _is_admin(user: User, bot: DiscordBotServiceABC, permissions: PermissionServiceABC):
-        guild = bot.get_guild(user.server.discord_server_id)
+        guild = bot.get_guild(user.server.discord_id)
         member = guild.get_member(user.discord_id)
         return permissions.is_member_technician(member)
 
     @staticmethod
     @ServiceProviderABC.inject
     def _is_moderator(user: User, bot: DiscordBotServiceABC, permissions: PermissionServiceABC):
-        guild = bot.get_guild(user.server.discord_server_id)
+        guild = bot.get_guild(user.server.discord_id)
         member = guild.get_member(user.discord_id)
         return permissions.is_member_technician(member)
 
@@ -66,7 +66,7 @@ class AuthUserTransformer(TransformerABC):
                 UserDTO,
                 db.users.select(
                     lambda u: UserDTO(
-                        u.user_id,
+                        u.id,
                         u.discord_id,
                         u.xp,
                         u.minecraft_id,

kdb-bot/src/bot_api/transformer/server_transformer.py

@@ -15,8 +15,8 @@ class ServerTransformer(TransformerABC):
     @staticmethod
     def to_dto(db: Server, name: str, member_count: int, icon_url: Optional[discord.Asset]) -> ServerDTO:
         return ServerDTO(
-            db.server_id,
-            db.discord_server_id,
+            db.id,
+            db.discord_id,
             name,
             member_count,
             icon_url.url if icon_url is not None else None,