Fixed auth user and user relation #70

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

@@ -15,7 +15,6 @@ class AuthUserDTO(DtoABC):
             password: str = None,
             confirmation_id: Optional[str] = None,
             auth_role: AuthRoleEnum = None,
-            user_id: Optional[int] = None,
     ):
         DtoABC.__init__(self)
 
@@ -26,7 +25,6 @@ class AuthUserDTO(DtoABC):
         self._password = password
         self._is_confirmed = confirmation_id is None
         self._auth_role = auth_role
-        self._user_id = user_id
 
     @property
     def id(self) -> int:
@@ -80,14 +78,6 @@ class AuthUserDTO(DtoABC):
     def auth_role(self, value: AuthRoleEnum):
         self._auth_role = value
 
-    @property
-    def user_id(self) -> Optional[int]:
-        return self._user_id
-
-    @user_id.setter
-    def user_id(self, value: Optional[int]):
-        self._user_id = value
-
     def from_dict(self, values: dict):
         self._id = values['id']
         self._first_name = values['firstName']
@@ -96,7 +86,6 @@ class AuthUserDTO(DtoABC):
         self._password = values['password']
         self._is_confirmed = values['isConfirmed']
         self._auth_role = values['authRole']
-        self._user_id = values['userId']
 
     def to_dict(self) -> dict:
         return {
@@ -107,5 +96,4 @@ class AuthUserDTO(DtoABC):
             'password': self._password,
             'isConfirmed': self._is_confirmed,
             'authRole': self._auth_role.value,
-            'userId': self._user_id,
         }

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

@@ -12,6 +12,7 @@ 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
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.auth_role_enum import AuthRoleEnum
@@ -25,11 +26,13 @@ class DiscordService:
             bot: DiscordBotServiceABC,
             servers: ServerRepositoryABC,
             auth: AuthServiceABC,
+            auth_users: AuthUserRepositoryABC,
             users: UserRepositoryABC,
     ):
         self._bot = bot
         self._servers = servers
         self._auth = auth
+        self._auth_users = auth_users
         self._users = users
 
     def _to_dto(self, x: Server) -> Optional[ServerDTO]:
@@ -43,11 +46,11 @@ class DiscordService:
             )
 
         return ServerTransformer.to_dto(
-                x,
-                guild.name,
-                guild.member_count,
-                guild.icon
-            )
+            x,
+            guild.name,
+            guild.member_count,
+            guild.icon
+        )
 
     async def get_all_servers(self) -> List[ServerDTO]:
         servers = List(ServerDTO, self._servers.get_servers())
@@ -59,12 +62,12 @@ class DiscordService:
             raise ServiceException(ServiceErrorCode.InvalidData, 'Token invalid')
 
         role = AuthRoleEnum(token['role'])
-        if role == AuthRoleEnum.admin:
-            servers = self._servers.get_servers()
-        else:
-            user = await self._auth.find_auth_user_by_email_async(token['email'])
-            user_from_db = self._users.find_user_by_id(0 if user.user_id is None else user.user_id)
-            servers = self._servers.get_servers().where(lambda x: user_from_db is not None and x.server_id == user_from_db.server.server_id)
+        servers = self._servers.get_servers()
+        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)
 
         servers = List(ServerDTO, servers)
         return servers.select(self._to_dto).where(lambda x: x.name != '')
@@ -78,9 +81,10 @@ class DiscordService:
         filtered_result = self._servers.get_filtered_servers(criteria)
         # filter out servers, where the user not exists
         if role != AuthRoleEnum.admin:
-            user = await self._auth.find_auth_user_by_email_async(token['email'])
-            user_from_db = self._users.find_user_by_id(0 if user.user_id is None else user.user_id)
-            filtered_result.result = filtered_result.result.where(lambda x: user_from_db is not None and x.server_id == user_from_db.server.server_id)
+            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)
 
         servers: List = filtered_result.result.select(self._to_dto).where(lambda x: x.name != '')
         result = List(ServerDTO, servers)

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

@@ -23,7 +23,7 @@ class AuthUserTransformer(TransformerABC):
             datetime.now(tz=timezone.utc),
             AuthRoleEnum.normal if dto.auth_role is None else AuthRoleEnum(dto.auth_role),
             dto.user_id,
-            id=0 if dto.id is None else dto.id
+            auth_user_id=0 if dto.id is None else dto.id
         )
 
     @staticmethod
@@ -35,6 +35,5 @@ class AuthUserTransformer(TransformerABC):
             db.email,
             '' if password is None else password,
             db.confirmation_id,
-            db.auth_role,
-            db.user_id
+            db.auth_role
         )