Merge pull request #454 from PROCOLLAB-github/flexivanov237-pro-473

new email feature

Author: sh1nkey

partner_programs/views.py

@@ -20,7 +20,7 @@
 )
 from vacancy.mapping import (
     MessageTypeEnum,
-    UserProgramRegisterParamsDict,
+    UserProgramRegisterParams,
 )
 from vacancy.tasks import send_email
 
@@ -130,7 +130,7 @@ def post(self, request, *args, **kwargs):
             )
 
         send_email.delay(
-            UserProgramRegisterParamsDict(
+            UserProgramRegisterParams(
                 message_type=MessageTypeEnum.REGISTERED_PROGRAM_USER.value,
                 user_id=user.id,
                 program_name=program.name,
@@ -172,7 +172,7 @@ def post(self, request, *args, **kwargs):
             added_user_profile.save()
 
             send_email.delay(
-                UserProgramRegisterParamsDict(
+                UserProgramRegisterParams(
                     message_type=MessageTypeEnum.REGISTERED_PROGRAM_USER.value,
                     user_id=user_to_add.id,
                     program_name=program.name,

project_rates/views.py

@@ -17,6 +17,8 @@
 )
 from users.models import Expert
 from users.permissions import IsExpert, IsExpertPost
+from vacancy.mapping import ProjectRatedParams, MessageTypeEnum
+from vacancy.tasks import send_email
 
 User = get_user_model()
 
@@ -59,6 +61,18 @@ def create(self, request, *args, **kwargs) -> Response:
                 unique_fields=["criteria", "user", "project"],
             )
 
+            project = Project.objects.select_related("leader").get(id=data[0]["project"])
+
+            send_email.delay(
+                ProjectRatedParams(
+                    message_type=MessageTypeEnum.PROJECT_RATED.value,
+                    user_id=project.leader.name,
+                    project_name=project.name,
+                    project_id=project.id,
+                    schema_id=2,
+                )
+            )
+
             return Response({"success": True}, status=status.HTTP_201_CREATED)
         except Expert.DoesNotExist:
             return Response(
@@ -78,12 +92,9 @@ class ProjectListForRate(generics.ListAPIView):
 
     def get_queryset(self) -> QuerySet[Project]:
         projects_ids = PartnerProgramUserProfile.objects.filter(
-            project__isnull=False,
-            partner_program__id=self.kwargs.get("program_id")
+            project__isnull=False, partner_program__id=self.kwargs.get("program_id")
         ).values_list("project__id", flat=True)
         # `Count` the easiest way to check for rate exist (0 -> does not exist).
-        return (
-            Project.objects
-            .filter(draft=False, id__in=projects_ids)
-            .annotate(scored=Count("scores"))
+        return Project.objects.filter(draft=False, id__in=projects_ids).annotate(
+            scored=Count("scores")
         )

vacancy/mapping.py

@@ -2,7 +2,7 @@
 from typing import Literal, TypeAlias, TypedDict, Annotated
 
 EmailTextTypes: TypeAlias = Literal[
-    "accepted", "outdated", "responded", "rejected", "registered_program"
+    "accepted", "outdated", "responded", "rejected", "registered_program", "project_rated"
 ]
 
 
@@ -14,30 +14,43 @@ class MessageTypeEnum(Enum):
 
     REGISTERED_PROGRAM_USER = "registered_program"
 
+    PROJECT_RATED = "project_rated"
 
-class BaseEmailCeleryParamsDict(TypedDict):
+
+class BaseEmailCeleryParams(TypedDict):
     message_type: EmailTextTypes
     user_id: int
     schema_id: int  # = 2
 
 
-class CeleryEmailParamsDict(BaseEmailCeleryParamsDict):
+class CeleryEmailParams(BaseEmailCeleryParams):
     project_name: str
     project_id: int
     vacancy_role: str
 
 
-class UserProgramRegisterParamsDict(BaseEmailCeleryParamsDict):
+class UserProgramRegisterParams(BaseEmailCeleryParams):
     program_name: str
     program_id: int
 
 
+class ProjectRatedParams(BaseEmailCeleryParams):
+    program_name: str
+    project_name: str
+    project_id: int
+
+
+EmailParamsType: TypeAlias = (
+    CeleryEmailParams | ProjectRatedParams | UserProgramRegisterParams
+)
+
 message_type_to_button_text: dict[Annotated[str, EmailTextTypes], str] = {
     MessageTypeEnum.ACCEPTED.value: "Посмотреть на проект",
     MessageTypeEnum.RESPONDED.value: "Посмотреть на отклики",
     MessageTypeEnum.OUTDATED.value: "Посмотреть на вакансию",
     MessageTypeEnum.REJECTED.value: "Посмотреть на проект",
     MessageTypeEnum.REGISTERED_PROGRAM_USER.value: "Посмотреть на программу",
+    MessageTypeEnum.PROJECT_RATED.value: "Посмотреть на проект",
 }
 
 message_type_to_title: dict[Annotated[str, EmailTextTypes], str] = {
@@ -49,7 +62,7 @@ class UserProgramRegisterParamsDict(BaseEmailCeleryParamsDict):
 }
 
 
-def get_link(data: CeleryEmailParamsDict | UserProgramRegisterParamsDict):
+def get_link(data: EmailParamsType):
     match data["message_type"]:
         case MessageTypeEnum.ACCEPTED.value:
             return f"https://app.procollab.ru/office/projects/{data['project_id']}"
@@ -61,13 +74,15 @@ def get_link(data: CeleryEmailParamsDict | UserProgramRegisterParamsDict):
             return f"https://app.procollab.ru/office/projects/{data['project_id']}/edit"
         case MessageTypeEnum.REJECTED.value:
             return f"https://app.procollab.ru/office/projects/{data['project_id']}"
+
         case MessageTypeEnum.REGISTERED_PROGRAM_USER.value:
             return f"https://app.procollab.ru/office/program/{data['program_id']}"
 
+        case MessageTypeEnum.PROJECT_RATED.value:
+            return f"https://app.procollab.ru/office/projects/{data['project_id']}"
+
 
-def create_text_for_email(
-    data: CeleryEmailParamsDict | UserProgramRegisterParamsDict,
-) -> str:
+def create_text_for_email(data: EmailParamsType) -> str:
     match data["message_type"]:
         case MessageTypeEnum.ACCEPTED.value:
             return f"""
@@ -90,3 +105,8 @@ def create_text_for_email(
             return f"""
             Вы успешно зарегистрировались на программу {data['program_name']}
     """
+        case MessageTypeEnum.PROJECT_RATED.value:
+            return f"""
+                Ваш проект '{data["project_name"]}' был оценён экспертом по программе '{data["program_name"]}'!
+                Скоро будут результаты.
+    """

vacancy/tasks.py

@@ -4,7 +4,7 @@
 from mailing.utils import send_mass_mail, prepare_mail_data
 from procollab.celery import app
 from vacancy.mapping import (
-    CeleryEmailParamsDict,
+    CeleryEmailParams,
     create_text_for_email,
     message_type_to_button_text,
     get_link,
@@ -15,7 +15,7 @@
 
 
 @app.task
-def send_email(data: CeleryEmailParamsDict):
+def send_email(data: CeleryEmailParams):
     context_data = ContextDataDict(
         text=create_text_for_email(data),
         title=message_type_to_title[data["message_type"]],
@@ -44,7 +44,7 @@ def email_notificate_vacancy_outdated():
 
     for vacancy in outdated_active_vacancies:
         project = vacancy.project
-        data_to_send = CeleryEmailParamsDict(
+        data_to_send = CeleryEmailParams(
             message_type=MessageTypeEnum.OUTDATED.value,
             user_id=project.leader.id,
             project_name=project.name,

vacancy/views.py

@@ -10,7 +10,7 @@
 
 from projects.models import Collaborator, Project
 from vacancy.filters import VacancyFilter
-from vacancy.mapping import CeleryEmailParamsDict, MessageTypeEnum
+from vacancy.mapping import CeleryEmailParams, MessageTypeEnum
 from vacancy.models import Vacancy, VacancyResponse
 from vacancy.pagination import VacancyPagination
 from vacancy.permissions import (
@@ -107,7 +107,7 @@ def post(self, request, vacancy_id):
         project = queryset.vacancy.project
 
         send_email.delay(
-            CeleryEmailParamsDict(
+            CeleryEmailParams(
                 message_type=MessageTypeEnum.RESPONDED.value,
                 user_id=project.leader.id,
                 project_name=project.name,
@@ -158,7 +158,7 @@ def post(self, request, pk):
         )
 
         send_email.delay(
-            CeleryEmailParamsDict(
+            CeleryEmailParams(
                 message_type=MessageTypeEnum.ACCEPTED.value,
                 user_id=user_to_add.id,
                 project_name=project_add_in.name,
@@ -192,7 +192,7 @@ def post(self, request, pk):
 
         project = vacancy_request.vacancy.project
         send_email.delay(
-            CeleryEmailParamsDict(
+            CeleryEmailParams(
                 message_type=MessageTypeEnum.REJECTED.value,
                 user_id=project.leader.id,
                 project_name=project.name,