add new subscriber to notify about new comment

Author: Daniil-Solo

src/app.py

@@ -8,7 +8,8 @@
 from src.handlers import basics_router, complaint_router, other_router, github_binding_router, statistics_router
 from src.bootstrap import get_bootstrap
 from src.infrastructure.faststream.events import COMPLAINT_ANSWER_TOPIC, COMPLAINT_ANSWER_CONSUMER_GROUP, \
-    ComplaintAnswerEventSchema
+    ComplaintAnswerEventSchema, CommentCreatedEventSchema, COMMENT_CREATED_TOPIC, COMMENT_CREATED_CONSUMER_GROUP
+from src.services.student import StudentService, APIStudentService
 from src.settings import app_settings
 
 bot = Bot(token=app_settings.BOT_TOKEN)
@@ -18,13 +19,22 @@
 
 
 TelegramBot = Annotated[Bot, Depends(lambda: bot)]
+StudentService = Annotated[StudentService, Depends(lambda: APIStudentService())]
 
 @broker.subscriber(COMPLAINT_ANSWER_TOPIC, group_id=COMPLAINT_ANSWER_CONSUMER_GROUP, auto_commit=False)
 async def handle_new_submission(data: ComplaintAnswerEventSchema, telegram_bot: TelegramBot) -> None:
     text = f"*Ответ преподавателя:*\n\n{data.answer}"
     await telegram_bot.send_message(data.student_telegram_user_id, text, parse_mode='Markdown')
 
 
+@broker.subscriber(COMMENT_CREATED_TOPIC, group_id=COMMENT_CREATED_CONSUMER_GROUP, auto_commit=False)
+async def handle_comment_created(data: CommentCreatedEventSchema, telegram_bot: TelegramBot, student_service: StudentService) -> None:
+    student = await student_service.get_student_by_github_username(data.username)
+    text = f"*Комментарий к работе:*"
+    text += f"\n\nПожалуйста проверьте комментарий к вашей работе: {data.pull_request_link}"
+    await telegram_bot.send_message(student.telegram_user_id, text, parse_mode='Markdown')
+
+
 async def stop_bot():
     await broker.close()
 

src/infrastructure/faststream/events.py

@@ -7,3 +7,12 @@
 class ComplaintAnswerEventSchema(BaseModel):
     student_telegram_user_id: int = Field(examples=[524234231])
     answer: str = Field(examples=["Попробуйте перезагрузить компьютер"])
+
+
+COMMENT_CREATED_TOPIC = "comment_created"
+COMMENT_CREATED_CONSUMER_GROUP = "comment_created_group"
+
+
+class CommentCreatedEventSchema(BaseModel):
+    username: str = Field(examples=["octocat"])
+    pull_request_link: str = Field(examples=["/pull_request/1"])

src/services/__init__.py

@@ -1,4 +1,4 @@
-from src.services.student import StudentService, TestStudentService
+from src.services.student import StudentService, TestStudentService, APIStudentService
 from src.services.task import TaskService, TestTaskService
 from src.services.github import GitHubService, HTTPGitHubService
 from src.services.stats import StatisticsService, TestStatisticsService

src/services/exceptions.py

@@ -8,18 +8,18 @@ def message(self) -> str:
 
 
 class StudentAlreadyExistsError(ServiceError):
-    def __init__(self, telegram_user_id: int) -> None:
-        self.telegram_user_id = telegram_user_id
+    def __init__(self, telegram_user: int | str) -> None:
+        self.telegram_user = telegram_user
 
     @property
     def message(self) -> str:
-        return f"Пользователь с id={self.telegram_user_id} уже существует"
+        return f"Пользователь с id={self.telegram_user} уже существует"
 
 
 class StudentNotFoundError(ServiceError):
-    def __init__(self, telegram_user_id: int) -> None:
-        self.telegram_user_id = telegram_user_id
+    def __init__(self, telegram_user: int | str) -> None:
+        self.telegram_user = telegram_user
 
     @property
     def message(self) -> str:
-        return f"Пользователь с id={self.telegram_user_id} уже существует"
+        return f"Пользователь с id={self.telegram_user} не существует"

src/services/student.py

@@ -27,6 +27,10 @@ async def create_student(self, telegram_user_id: int, telegram_username: str) ->
     async def get_student_by_telegram_user_id(self, telegram_user_id: int) -> StudentDTO:
         raise NotImplementedError
 
+    @abstractmethod
+    async def get_student_by_github_username(self, github_username: str) -> StudentDTO:
+        raise NotImplementedError
+
     @abstractmethod
     async def set_github_username(self, telegram_user_id: int, github_username: str) -> None:
         raise NotImplementedError
@@ -73,21 +77,44 @@ async def create_student(self, telegram_user_id: int, telegram_username: str) ->
                 print(content)
 
     async def get_student_by_telegram_user_id(self, telegram_user_id: int) -> StudentDTO:
-        get_student_endpoint = f"{self._endpoint}/api/students/{telegram_user_id}"
+        get_student_endpoint = f"{self._endpoint}/api/students/telegram/{telegram_user_id}"
         async with aiohttp.ClientSession() as session:
             async with session.get(get_student_endpoint) as res:
                 if res.status == 404:
                     raise StudentNotFoundError(telegram_user_id)
                 content = await res.text(encoding="utf-8")
-                print(content)
+                data = json.loads(content)
+                return StudentDTO(
+                    telegram_user_id=data["telegramUserId"],
+                    telegram_username=data["telegramUsername"],
+                    github_username=data["githubUsername"],
+                    joined_at=data["registeredAt"],
+                    has_enabled_notifications=True
+                )
+
+    async def get_student_by_github_username(self, github_username: str) -> StudentDTO:
+        get_student_endpoint = f"{self._endpoint}/api/students/github/{github_username}"
+        async with aiohttp.ClientSession() as session:
+            async with session.get(get_student_endpoint) as res:
+                if res.status == 404:
+                    raise StudentNotFoundError(github_username)
+                content = await res.text(encoding="utf-8")
+                data = json.loads(content)
+                return StudentDTO(
+                    telegram_user_id=data["telegramUserId"],
+                    telegram_username=data["telegramUsername"],
+                    github_username=data["githubUsername"],
+                    joined_at=data["registeredAt"],
+                    has_enabled_notifications=True
+                )
 
     async def set_github_username(self, telegram_user_id: int, github_username: str) -> None:
         set_student_github_endpoint = f"{self._endpoint}/api/students/{telegram_user_id}"
         async with aiohttp.ClientSession() as session:
             data = {
                 "githubUsername": github_username
             }
-            async with session.post(set_student_github_endpoint, json=data) as res:
+            async with session.put(set_student_github_endpoint, json=data) as res:
                 if res.status == 404:
                     raise StudentNotFoundError(telegram_user_id)
                 content = await res.text(encoding="utf-8")