Fix 154

.gitignore

@@ -29,3 +29,5 @@ fill_db.log
 
 # Frontend build
 frontend/
+
+venv/

src/api/routers/administrator.py

@@ -131,6 +131,21 @@ async def get_administrators(
         await self.authentication_service.check_administrator_by_token(token)
         return await self.administrator_service.get_administrators_filter_by_role_and_status(status, role)
 
+    ###
+    @router.get(
+        "/active_administrators",
+        response_model=list[AdministratorResponse],
+        response_model_exclude_none=True,
+        status_code=HTTPStatus.OK,
+        summary="Запрос списка аутивных администраторов",
+        response_description="Список администраторов",
+    )
+    async def get_administrators_active(self, token: HTTPAuthorizationCredentials = Depends(HTTPBearer())) -> Any:
+        """Получить список активных администраторов."""
+        await self.authentication_service.check_administrator_by_token(token)
+        return await self.administrator_service.get_administrators_active()
+
+    ###
     @router.get(
         "/{administrator_id}/",
         response_model=AdministratorResponse,

src/api/routers/administrator_invitation.py

@@ -67,6 +67,20 @@ async def get_all_invitations(
         await self.authentication_service.check_administrator_by_token(token)
         return await self.administrator_invitation_service.list_all_invitations()
 
+    @router.get(
+        '/invitations_active',
+        response_model=list[AdministratorInvitationResponse],
+        status_code=HTTPStatus.OK,
+        responses=generate_error_responses(HTTPStatus.BAD_REQUEST, HTTPStatus.UNAUTHORIZED),
+        summary="Получить информацию о активынх приглашениях",
+        response_description="Информация о приглашениях",
+    )
+    async def get_all_active_invitations(
+        self, token: HTTPAuthorizationCredentials = Depends(HTTPBearer())
+    ) -> list[AdministratorInvitationResponse]:
+        await self.authentication_service.check_administrator_by_token(token)
+        return await self.administrator_invitation_service.list_all_active_invitations()
+
     @router.get(
         '/register/{token}',
         response_model=AdministratorInvitationResponse,

src/core/db/repository/administrator_invitation.py

@@ -27,3 +27,7 @@ async def get_mail_request_by_token(self, token: UUID) -> Optional[Administrator
         if result is None:
             raise exceptions.AdministratorInvitationInvalidError
         return result
+
+    async def get_active_all(self) -> list[AdministratorInvitation]:
+        statement = select(AdministratorInvitation).where(AdministratorInvitation.expired_datetime > datetime.now())
+        return (await self._session.scalars(statement)).all()

src/core/db/repository/administrator_repository.py

@@ -66,3 +66,8 @@ async def get_administrators_filter_by_role_and_status(
             .order_by(Administrator.surname, Administrator.name)
         )
         return (await self._session.scalars(statement)).all()
+
+    async def get_administrators_active(self) -> list[Administrator]:
+        """Возвращает из БД список активных администраторов."""
+        statement = select(Administrator).where(Administrator.status == "active")
+        return (await self._session.scalars(statement)).all()

src/core/services/administrator_invitation.py

@@ -49,6 +49,9 @@ async def close_invitation(self, token: UUID) -> None:
     async def list_all_invitations(self) -> list[AdministratorInvitation]:
         return await self.__administrator_mail_request_repository.get_all()
 
+    async def list_all_active_invitations(self) -> list[AdministratorInvitation]:
+        return await self.__administrator_mail_request_repository.get_active_all()
+
     async def get_invitation_by_id(self, invitation_id: UUID) -> AdministratorInvitation:
         return await self.__administrator_mail_request_repository.get(invitation_id)
 
@@ -57,15 +60,14 @@ async def deactivate_invitation(self, invitation_id: UUID) -> AdministratorInvit
         if invitation.expired_datetime < datetime.now():
             raise exceptions.InvitationAlreadyDeactivatedError
         invitation.expired_datetime = datetime.now() - settings.INVITE_LINK_EXPIRATION_TIME
-        await self.__administrator_mail_request_repository.update(invitation_id, invitation)
-        return invitation
+        return await self.__administrator_mail_request_repository.update(invitation_id, invitation)
 
     async def reactivate_invitation(self, invitation_id: UUID) -> AdministratorInvitation:
         invitation = await self.get_invitation_by_id(invitation_id)
         if invitation.expired_datetime > datetime.now():
             raise exceptions.InvitationAlreadyActivatedError
-        if self.__administrator_repository.is_administrator_exists(invitation.email):
+        if await self.__administrator_repository.is_administrator_exists(invitation.email):
             raise exceptions.InvitationAlreadyRegisteredError
         invitation.expired_datetime = datetime.now() + settings.INVITE_LINK_EXPIRATION_TIME
-        await self.__administrator_mail_request_repository.update(invitation_id, invitation)
-        return invitation
+
+        return await self.__administrator_mail_request_repository.update(invitation_id, invitation)

src/core/services/administrator_service.py

@@ -49,6 +49,10 @@ async def get_administrators_filter_by_role_and_status(
         """Получает список администраторов, опционально отфильтрованых по роли и/или статусу."""
         return await self.__administrator_repository.get_administrators_filter_by_role_and_status(status, role)
 
+    async def get_administrators_active(self) -> list[Administrator]:
+        """Получает список активных администраторов."""
+        return await self.__administrator_repository.get_administrators_active()
+
     async def restore_administrator_password(self, email: str) -> Administrator:
         """Сброс пароля администратора.