Improved get server logic #72

kdb-bot/src/bot_data/abc/user_repository_abc.py

@@ -16,6 +16,9 @@ class UserRepositoryABC(ABC):
     
     @abstractmethod
     def get_user_by_id(self, id: int) -> User: pass
+
+    @abstractmethod
+    def find_user_by_id(self, id: int) -> Optional[User]: pass
     
     @abstractmethod
     def get_users_by_discord_id(self, discord_id: int) -> List[User]: pass

kdb-bot/src/bot_data/migration/api_migration.py

@@ -28,9 +28,11 @@ class ApiMigration(MigrationABC):
               `ForgotPasswordId` VARCHAR(255) DEFAULT NULL,
               `RefreshTokenExpiryTime` DATETIME(6) NOT NULL,
               `AuthRole` INT NOT NULL DEFAULT '0',
+              `UserId` BIGINT NOT NULL DEFAULT '0',
               `CreatedOn` DATETIME(6) NOT NULL,
               `LastModifiedOn` DATETIME(6) NOT NULL,
-              PRIMARY KEY(`Id`)
+              PRIMARY KEY(`Id`),
+              FOREIGN KEY (`UserId`) REFERENCES `Users`(`UserId`)
             )
             """)
         )

kdb-bot/src/bot_data/model/auth_user.py

@@ -19,6 +19,7 @@ class AuthUser(TableABC):
             forgot_password_id: Optional[str],
             refresh_token_expire_time: datetime,
             auth_role: AuthRoleEnum,
+            user_id: Optional[int],
             created_at: datetime = None,
             modified_at: datetime = None,
             id=0
@@ -34,6 +35,7 @@ class AuthUser(TableABC):
         self._refresh_token_expire_time = refresh_token_expire_time
 
         self._auth_role_id = auth_role
+        self._user_id = user_id
 
         TableABC.__init__(self)
         self._created_at = created_at if created_at is not None else self._created_at
@@ -115,6 +117,14 @@ class AuthUser(TableABC):
     def auth_role(self, value: AuthRoleEnum):
         self._auth_role_id = 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
+
     @staticmethod
     def get_select_all_string() -> str:
         return str(f"""
@@ -163,6 +173,7 @@ class AuthUser(TableABC):
                 `ForgotPasswordId`,
                 `RefreshTokenExpiryTime`,
                 `AuthRole`,
+                `UserId`,
                 `CreatedOn`,
                 `LastModifiedOn`
                 ) VALUES (
@@ -176,6 +187,7 @@ class AuthUser(TableABC):
                     '{"NULL" if self._forgot_password_id is None else self._forgot_password_id}',
                     '{self._refresh_token_expire_time}',
                     {self._auth_role_id.value},
+                    {"NULL" if self._user_id is None else self._user_id}
                     '{self._created_at}', 
                     '{self._modified_at}'
                 )
@@ -194,6 +206,7 @@ class AuthUser(TableABC):
             `ForgotPasswordId` = '{"NULL" if self._forgot_password_id is None else self._forgot_password_id}',
             `RefreshTokenExpiryTime` = '{self._refresh_token_expire_time}',
             `AuthRole` = {self._auth_role_id.value},
+            `UserId` = {"NULL" if self._user_id is None else self._user_id},
             `LastModifiedOn` = '{self._modified_at}'
             WHERE `AuthUsers`.`Id` = {self._auth_user_id};
         """)

kdb-bot/src/bot_data/service/auth_user_repository_service.py

@@ -37,6 +37,7 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
             self._get_value_from_result(result[7]),
             self._get_value_from_result(result[8]),
             AuthRoleEnum(self._get_value_from_result(result[9])),
+            self._get_value_from_result(result[10]),
             id=self._get_value_from_result(result[0])
         )
 

kdb-bot/src/bot_data/service/user_repository_service.py

@@ -44,6 +44,21 @@ class UserRepositoryService(UserRepositoryABC):
             self._servers.get_server_by_id(result[3]),
             id=result[0]
         )
+
+    def find_user_by_id(self, id: int) -> Optional[User]:
+        self._logger.trace(__name__, f'Send SQL command: {User.get_select_by_id_string(id)}')
+        result = self._context.select(User.get_select_by_id_string(id))
+        if result is None or len(result) == 0:
+            return None
+
+        result = result[0]
+
+        return User(
+            result[1],
+            result[2],
+            self._servers.get_server_by_id(result[3]),
+            id=result[0]
+        )
     
     def get_users_by_discord_id(self, discord_id: int) -> List[User]:
         users = List(User)