Merge pull request #451 from PROCOLLAB-github/flexivanov237-pro-434

Flexivanov237 pro 434

Author: sh1nkey

chats/serializers.py

@@ -44,7 +44,7 @@ class DirectChatDetailSerializer(serializers.ModelSerializer):
 
     def get_opponent(self, chat: DirectChat):
         user = self.context.get("opponent")
-        return UserDetailSerializer(
+        return UserChatSerializer(
             user, context={"request": self.context.get("request")}
         ).data
 

chats/views.py

@@ -43,16 +43,19 @@ def get(self, request, *args, **kwargs):
         chats = self.get_queryset()
         serialized_chats = []
         for chat in chats:
-            user1_id, _ = map(int, chat.id.split("_"))
-            # TODO сделать проверку на удаление профиля
-            if user1_id == request.user.id:
-                opponent = chat.users.all()[1]
-            else:
-                opponent = chat.users.first()
-
-            context = {"opponent": opponent}
-            serialized_chat = DirectChatListSerializer(chat, context=context).data
-            serialized_chats.append(serialized_chat)
+            try:
+                user1_id, _ = map(int, chat.id.split("_"))
+                # TODO сделать проверку на удаление профиля
+                if user1_id == request.user.id:
+                    opponent = chat.users.all()[1]
+                else:
+                    opponent = chat.users.first()
+
+                context = {"opponent": opponent}
+                serialized_chat = DirectChatListSerializer(chat, context=context).data
+                serialized_chats.append(serialized_chat)
+            except IndexError:
+                pass
         return Response(serialized_chats, status=status.HTTP_200_OK)
 
 
@@ -86,9 +89,8 @@ def get(self, request, *args, **kwargs) -> Response:
                 request.user.id == user1_id or request.user.id == user2_id
             ), "current user id is not present in raw id"
 
-            users = User.objects.filter(pk__in=[user1_id, user2_id])
-            user1 = users.get(pk=user1_id)
-            user2 = users.get(pk=user2_id)
+            user1 = User.objects.get(pk=user1_id)
+            user2 = User.objects.get(pk=user2_id)
 
             if user1 == request.user:
                 opponent = user2

mailing/utils.py

@@ -1,5 +1,7 @@
 from functools import singledispatch
 from typing import Dict, List, Union, Annotated
+
+from procollab import settings
 from .constants import MAILING_USERS_BATCH_SIZE
 from .models import MailingSchema
 from users.models import CustomUser
@@ -111,7 +113,9 @@ def send_mass_mail(
         template_context["user"] = user
         html_msg = template.render(Context(template_context))
         plain_msg = template.render(Context(template_context))
-        msg = EmailMultiAlternatives(subject, plain_msg, None, [user.email])
+        msg = EmailMultiAlternatives(
+            subject, plain_msg, settings.EMAIL_USER, [user.email]
+        )
         msg.attach_alternative(html_msg, "text/html")
         messages.append(msg)
 

poetry.lock

@@ -104,6 +104,7 @@
     "django_cleanup.apps.CleanupConfig",
     "django_rest_passwordreset",
     # Plugins
+    "anymail",
     "celery",
     "django_celery_beat",
     "corsheaders",
@@ -320,12 +321,22 @@
 
 SESSION_COOKIE_SECURE = False
 
-EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+EMAIL_BACKEND = "anymail.backends.unisender_go.EmailBackend"
+
+ANYMAIL = {
+    "UNISENDER_GO_API_KEY": config("UNISENDER_GO_API_KEY", cast=str),
+    "UNISENDER_GO_API_URL": "https://go1.unisender.ru/ru/transactional/api/v1/",
+    "UNISENDER_GO_SEND_DEFAULTS": {
+        "esp_extra": {
+            "global_language": "ru",
+        }
+    },
+}
+
 EMAIL_USE_TLS = True
-EMAIL_HOST = config("EMAIL_HOST", default="smtp.gmail.com", cast=str)
+
 EMAIL_PORT = config("EMAIL_PORT", default=587, cast=int)
-EMAIL_HOST_USER = config("EMAIL_USER", cast=str, default="example@mail.ru")
-EMAIL_HOST_PASSWORD = config("EMAIL_PASSWORD", cast=str, default="password")
+EMAIL_USER = config("EMAIL_USER", cast=str, default="example@mail.ru")
 
 SELECTEL_ACCOUNT_ID = config("SELECTEL_ACCOUNT_ID", cast=str, default="123456")
 SELECTEL_CONTAINER_NAME = config(

procollab/settings.py

@@ -55,6 +55,7 @@
     path("api/token/verify/", TokenVerifyView.as_view(), name="token_verify"),
     path("", include("metrics.urls", namespace="metrics")),
     path("django_prometheus/", include("django_prometheus.urls")),
+    path("anymail/", include("anymail.urls")),
 ]
 
 if settings.DEBUG:

procollab/urls.py

@@ -57,28 +57,36 @@ def vacancy_filter(cls, queryset, name, value):
 
     def filter_by_partner_program(self, queryset, name, value):
         program_id = value
+
         user = self.request.user
         try:
             program = PartnerProgram.objects.get(pk=program_id)
             program_status = program.projects_availability
             # If available to all users or request.user is an expert of this program.
-            if program_status == "all_users" or Expert.objects.filter(user=user, programs=program).exists():
+            if (
+                program_status == "all_users"
+                or Expert.objects.filter(user=user, programs=program).exists()
+            ):
                 profiles_qs = (
                     PartnerProgramUserProfile.objects.filter(
                         partner_program=program, project__isnull=False
                     )
                     .select_related("project")
                     .only("project")
                 )
-                return queryset.filter(pk__in=[profile.project.pk for profile in profiles_qs])
+                return queryset.filter(
+                    pk__in=[profile.project.pk for profile in profiles_qs]
+                )
             else:
                 return Project.objects.none()
 
         except PartnerProgram.DoesNotExist:
             return Project.objects.none()
 
     def filter_by_have_expert_rates(self, queryset, name, value):
-        rated_projects_ids = ProjectScore.objects.values_list("project_id", flat=True).distinct()
+        rated_projects_ids = ProjectScore.objects.values_list(
+            "project_id", flat=True
+        ).distinct()
         if value:
             return queryset.filter(id__in=rated_projects_ids)
         return queryset.exclude(id__in=rated_projects_ids)
@@ -95,7 +103,7 @@ def filter_by_have_expert_rates(self, queryset, name, value):
     )
     is_company = filters.BooleanFilter(
         field_name="is_company",
-        label="is_company\n`1`/`true` is company\n`0`/`false` is not company"
+        label="is_company\n`1`/`true` is company\n`0`/`false` is not company",
     )
 
     # filters by whether there are any vacancies in the project
@@ -112,7 +120,7 @@ def filter_by_have_expert_rates(self, queryset, name, value):
     )
     is_rated_by_expert = filters.BooleanFilter(
         method="filter_by_have_expert_rates",
-        label=("is_rated_by_expert\n`1`/`true` rated projects\n`0`/`false` dosn't rated")
+        label=("is_rated_by_expert\n`1`/`true` rated projects\n`0`/`false` dosn't rated"),
     )
 
     class Meta:

projects/filters.py

@@ -69,6 +69,7 @@ pandas = "^2.2.1"
 celery = "^5.4.0"
 django-celery-beat = "^2.6.0"
 weasyprint = "^62.3"
+django-anymail = "^12.0"
 
 
 [build-system]

pyproject.toml

@@ -1,3 +1,3 @@
 #!/bin/bash
 cd apps
-celery -A procollab worker --beat --loglevel=debug
+celery -A procollab worker --beat --loglevel=debug

scripts/celery.sh

@@ -196,14 +196,14 @@ class UserSkillsApproveDeclineView(APIView):
             "and `skill_pk` == `skill.id` in the query string."
         ),
         manual_parameters=[USER_PK_PARAM, SKILL_PK_PARAM],
-        responses={201: UserApproveSkillResponse}
+        responses={201: UserApproveSkillResponse},
     )
     def post(self, request, *args, **kwargs) -> Response:
         """Create confirmation of user skill by current user."""
         skill_to_object: SkillToObject = self._get_skill_to_object()
         data: dict[str, int] = {
             "skill_to_object": skill_to_object.id,
-            "confirmed_by": request.user.id
+            "confirmed_by": request.user.id,
         }
         serializer = self.serializer_class(data=data, context={"request": request})
         serializer.is_valid(raise_exception=True)
@@ -529,21 +529,21 @@ class RemoteViewSubscriptions(APIView):
 
     def get(self, request, *args, **kwargs):
         try:
-            subscriptions = self.get_response_from_remote_api()
+            subscriptions = self._get_response_from_remote_api()
             return Response(subscriptions, status=status.HTTP_200_OK)
         except requests.RequestException as e:
             return Response({"error": str(e)}, status=status.HTTP_400_BAD_REQUEST)
 
-    def get_link_to_remote_api(self) -> str:
+    def _get_link_to_remote_api(self) -> str:
         # TODO something to reuse this code
         if settings.DEBUG:
             subscriptions_url = "https://skills.dev.procollab.ru/subscription/"
         else:
             subscriptions_url = "https://api.skills.procollab.ru/subscription/"
         return subscriptions_url
 
-    def get_response_from_remote_api(self):
-        subscriptions_url = self.get_link_to_remote_api()
+    def _get_response_from_remote_api(self):
+        subscriptions_url = self._get_link_to_remote_api()
         response = requests.get(
             subscriptions_url,
             headers={
@@ -561,23 +561,23 @@ class RemoteCreatePayment(GenericAPIView):
 
     def post(self, request, *args, **kwargs):
         try:
-            subscriptions_buy_url = self.def_get_link_to_remote_api()
-            data, headers = self.get_data_to_request_remote_api()
+            subscriptions_buy_url = self._get_link_to_remote_api()
+            data, headers = self._get_data_to_request_remote_api()
             response = requests.post(subscriptions_buy_url, json=data, headers=headers)
             response.raise_for_status()
             return Response(response.json(), status=status.HTTP_200_OK)
         except requests.RequestException as e:
             return Response({"error": str(e)}, status=status.HTTP_400_BAD_REQUEST)
 
-    def def_get_link_to_remote_api(self) -> str:
+    def _get_link_to_remote_api(self) -> str:
         # TODO something to reuse this code
         if settings.DEBUG:
             subscriptions_buy_url = "https://skills.dev.procollab.ru/subscription/buy/"
         else:
             subscriptions_buy_url = "https://api.skills.procollab.ru/subscription/buy/"
         return subscriptions_buy_url
 
-    def get_data_to_request_remote_api(self) -> tuple[dict, dict]:
+    def _get_data_to_request_remote_api(self) -> tuple[dict, dict]:
         serializer = self.serializer_class(data=self.request.data)
         if serializer.is_valid():
             data = serializer.validated_data
@@ -586,6 +586,7 @@ def get_data_to_request_remote_api(self) -> tuple[dict, dict]:
                 "Authorization": self.request.META.get("HTTP_AUTHORIZATION"),
             }
             return data, headers
+
         else:
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
@@ -597,10 +598,14 @@ def get(self, request, *args, **kwargs) -> HttpResponse:
         data_preparer = UserCVDataPreparer(request.user.pk)
         user_cv_data: UserCVData = data_preparer.get_prepared_data()
 
-        html_string: str = render_to_string('users/user_CV/user_CV_template.html', user_cv_data)
+        html_string: str = render_to_string(
+            "users/user_CV/user_CV_template.html", user_cv_data
+        )
         binary_pdf_file: bytes | None = HTML(string=html_string).write_pdf()
 
-        encoded_filename: str = urllib.parse.quote(f"{request.user.first_name}_{request.user.last_name}.pdf")
+        encoded_filename: str = urllib.parse.quote(
+            f"{request.user.first_name}_{request.user.last_name}.pdf"
+        )
         response = HttpResponse(binary_pdf_file, content_type="application/pdf")
         response["Content-Disposition"] = f'attachment; filename="{encoded_filename}"'
         return response