task1_attempt1

.gitignore

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

src/core/db/repository/administrator_invitation.py

@@ -3,12 +3,12 @@
 from uuid import UUID
 
 from fastapi import Depends
-from sqlalchemy import and_, select
+from sqlalchemy import and_, not_, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.core import exceptions
 from src.core.db.db import get_session
-from src.core.db.models import AdministratorInvitation
+from src.core.db.models import Administrator, AdministratorInvitation
 from src.core.db.repository import AbstractRepository
 
 
@@ -27,3 +27,10 @@ async def get_mail_request_by_token(self, token: UUID) -> Optional[Administrator
         if result is None:
             raise exceptions.AdministratorInvitationInvalidError
         return result
+
+    async def get_all_invitations(self):
+        """Возвращает из БД список приглашений, email которых не состоят в списке администраторов."""
+        statement = select(AdministratorInvitation).where(
+            not_(AdministratorInvitation.email.in_(select(Administrator.email)))
+        )
+        return (await self._session.scalars(statement)).all()

src/core/services/administrator_invitation.py

@@ -47,7 +47,7 @@ async def close_invitation(self, token: UUID) -> None:
         await self.__administrator_mail_request_repository.update(invitation.id, invitation)
 
     async def list_all_invitations(self) -> list[AdministratorInvitation]:
-        return await self.__administrator_mail_request_repository.get_all()
+        return await self.__administrator_mail_request_repository.get_all_invitations()
 
     async def get_invitation_by_id(self, invitation_id: UUID) -> AdministratorInvitation:
         return await self.__administrator_mail_request_repository.get(invitation_id)