Merge branch 'master' into dev-to-master

Author: sh1nkey

.github/workflows/release-ci.yml

@@ -3,6 +3,7 @@ name: 'Build and Deploy server'
 on:
   release:
     types: [ published ]
+  workflow_dispatch:
 
 jobs:
   test:

chats/views.py

@@ -94,8 +94,9 @@ 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"
 
-            user1 = User.objects.get(pk=user1_id)
-            user2 = User.objects.get(pk=user2_id)
+            users = User.objects.filter(pk__in=[user1_id, user2_id])
+            user1 = users.get(pk=user1_id)
+            user2 = users.get(pk=user2_id)
 
             if user1 == request.user:
                 opponent = user2
@@ -117,7 +118,9 @@ def get(self, request, *args, **kwargs) -> Response:
         except ValueError:
             return Response(
                 status=status.HTTP_400_BAD_REQUEST,
-                data={"detail": "processed id must contain two integers separated by underscore"},
+                data={
+                    "detail": "processed id must contain two integers separated by underscore"
+                },
             )
         except AssertionError as e:
             return Response(status=status.HTTP_400_BAD_REQUEST, data={"detail": str(e)})
@@ -223,10 +226,16 @@ def get(self, request, *args, **kwargs):
         project_chats = user.get_project_chats().prefetch_related("messages")
 
         has_direct_messages_unread = (
-            direct_messages.filter(messages__is_read=False).distinct().exists()
+            direct_messages.filter(messages__is_read=False)
+            .exclude(messages__is_deleted=True)
+            .distinct()
+            .exists()
         )
         has_project_messages_unread = (
-            project_chats.filter(messages__is_read=False).distinct().exists()
+            project_chats.filter(messages__is_read=False)
+            .exclude(messages__is_deleted=True)
+            .distinct()
+            .exists()
         )
         return Response(
             {"has_unreads": has_direct_messages_unread or has_project_messages_unread}

feed/serializers.py

@@ -1,7 +1,68 @@
 from rest_framework import serializers
-from feed import constants
 
+from core.services import get_views_count, get_likes_count
+from feed.mapping import CONTENT_OBJECT_MAPPING, CONTENT_OBJECT_SERIALIZER_MAPPING
+from files.serializers import UserFileSerializer
+from news.mapping import NewsMapping
+from news.models import News
+from projects.models import Project
+from users.models import CustomUser
 
-class FeedItemSerializer(serializers.Serializer):
-    type_model = serializers.ChoiceField(choices=constants.FeedItemType, required=True)
-    content = serializers.JSONField(required=True)
+
+class NewsFeedListSerializer(serializers.ModelSerializer):
+    name = serializers.SerializerMethodField()
+    image_address = serializers.SerializerMethodField()
+    is_user_liked = serializers.SerializerMethodField()
+    files = UserFileSerializer(many=True)
+    views_count = serializers.SerializerMethodField()
+    likes_count = serializers.SerializerMethodField()
+    content_object = serializers.SerializerMethodField()
+    type_model = serializers.SerializerMethodField()
+
+    def get_type_model(self, obj) -> str:
+        model_type = CONTENT_OBJECT_MAPPING[obj.content_type.model]
+        if obj.text != "" and model_type == "project":
+            return "news"
+        return model_type
+
+    def get_content_object(self, obj) -> dict:
+        type_model = obj.content_type.model
+        if obj.text != "" and self.get_type_model(obj) == "project":
+            type_model = "news"
+        serializer = CONTENT_OBJECT_SERIALIZER_MAPPING[type_model](obj.content_object)
+        return serializer.data
+
+    def get_views_count(self, obj):
+        return get_views_count(obj)
+
+    def get_likes_count(self, obj):
+        return get_likes_count(obj)
+
+    def get_name(self, obj):
+        if obj.content_type.model == CustomUser.__name__.lower():
+            return f"{obj.content_object.first_name} {obj.content_object.last_name}"
+        elif obj.text != "" and obj.content_type.model == Project.__name__.lower():
+            return f"{obj.content_object.name}"
+
+    def get_image_address(self, obj):
+        return NewsMapping.get_image_address(obj.content_object)
+
+    def get_is_user_liked(self, obj):
+        return obj.id in self.context.get("liked_news")
+
+    class Meta:
+        model = News
+        fields = [
+            "id",
+            "name",
+            "image_address",
+            "text",
+            "datetime_created",
+            "views_count",
+            "likes_count",
+            "files",
+            "is_user_liked",
+            "content_object",
+            "type_model",
+        ]
+        read_only_fields = ["views_count", "likes_count", "type_model"]

feed/services.py

@@ -1,16 +1,29 @@
 from django.contrib.contenttypes.models import ContentType
 
+from core.models import Like
 from feed.constants import SIGNALS_MODELS
 from news.models import News
+from users.models import CustomUser
 
 
+def get_liked_news(user: CustomUser, queryset: list[News]) -> list[int]:
+    obj_type = ContentType.objects.get_for_model(News)
+    liked_news = Like.objects.filter(
+        content_type=obj_type, object_id__in=[news.id for news in queryset], user=user
+    ).values_list("object_id", flat=True)
+    return liked_news
+
+
+# signals services
 def delete_news_for_model(instance: SIGNALS_MODELS):
     content_type = ContentType.objects.get_for_model(instance)
-    obj = News.objects.filter(content_type=content_type, object_id=instance.id).first()
+    obj = News.objects.filter(
+        text="", content_type=content_type, object_id=instance.id
+    ).first()
     if obj:
         obj.delete()
 
 
 def create_news_for_model(instance: SIGNALS_MODELS):
     content_type = ContentType.objects.get_for_model(instance)
-    News.objects.get_or_create(content_type=content_type, object_id=instance.id)
+    News.objects.get_or_create(text="", content_type=content_type, object_id=instance.id)

feed/views.py

@@ -4,9 +4,10 @@
 from rest_framework.views import APIView
 
 from feed.pagination import FeedPagination
+from feed.services import get_liked_news
 
 from news.models import News
-from news.serializers import NewsFeedListSerializer
+from .serializers import NewsFeedListSerializer
 from projects.models import Project
 from vacancy.models import Vacancy
 
@@ -38,7 +39,12 @@ def get(self, *args, **kwargs):
         paginator = self.pagination_class()
         paginated_data = paginator.paginate_queryset(self.get_queryset(), self.request)
         serializer = NewsFeedListSerializer(
-            paginated_data, context={"user": self.request.user}, many=True
+            paginated_data,
+            context={
+                "user": self.request.user,
+                "liked_news": get_liked_news(self.request.user, paginated_data),
+            },
+            many=True,
         )
 
         new_data = []

news/serializers.py

@@ -2,13 +2,10 @@
 from rest_framework import serializers
 
 from core.services import is_fan, get_likes_count, get_views_count
-from feed.mapping import CONTENT_OBJECT_MAPPING, CONTENT_OBJECT_SERIALIZER_MAPPING
 from files.serializers import UserFileSerializer
 from news.mapping import NewsMapping
 from news.models import News
 
-from projects.models import Project
-from users.models import CustomUser
 
 User = get_user_model()
 
@@ -63,7 +60,8 @@ class Meta:
         ]
 
 
-class NewsFeedListSerializer(serializers.ModelSerializer[News]):
+
+class NewsFeedListSerializer(serializers.ModelSerializer):
     name = serializers.SerializerMethodField()
     image_address = serializers.SerializerMethodField()
     is_user_liked = serializers.SerializerMethodField()
@@ -125,7 +123,9 @@ class Meta:
         read_only_fields = ["views_count", "likes_count", "type_model"]
 
 
-class NewsDetailSerializer(serializers.ModelSerializer[News]):
+
+
+class NewsDetailSerializer(serializers.ModelSerializer):
     views_count = serializers.SerializerMethodField()
     likes_count = serializers.SerializerMethodField()
     name = serializers.SerializerMethodField()

projects/signals.py

@@ -2,7 +2,9 @@
 from django.dispatch import receiver
 
 from chats.models import ProjectChat
+from feed.services import delete_news_for_model, create_news_for_model
 from projects.models import Collaborator, Project
+from vacancy.models import Vacancy
 
 
 @receiver(post_save, sender=Project)
@@ -18,3 +20,21 @@ def create_project(sender, instance, created, **kwargs):
         Collaborator.objects.create(
             user=instance.leader, project=instance, role="Основатель"
         )
+
+
+@receiver(post_save, sender=Project)
+def update_vacancy(sender, instance, created, **kwargs):
+    vacancies = Vacancy.objects.filter(project=instance)
+    old_values = vacancies.values_list("is_active", flat=True)
+    vacancies.update(is_active=False if instance.draft else True)
+    new_values = vacancies.values_list("is_active", flat=True)
+
+    vacancies_list = list(vacancies)
+
+    for i in range(len(new_values)):
+        old = old_values[i]
+        new = new_values[i]
+        if old != new and new is False:
+            delete_news_for_model(vacancies_list[i])
+        elif old != new and new is True:
+            create_news_for_model(vacancies_list[i])

templates/users/admin/users_change_list.html

@@ -0,0 +1,15 @@
+{% extends "admin/change_list.html" %}
+{% load i18n %}
+
+{% block object-tools-items %}
+    {{ block.super }}
+    <a href="#" class="addlink" previewlistener="true" onclick="get_users()">
+      Выгрузка ФИО|Email всех пользователей
+    </a>
+
+    <script>
+        function get_users() {
+            window.open("{% url 'admin:users_email_excel' %}", '_blank').focus();
+        }
+    </script>
+{% endblock %}

templates/vacancies/vacancies_change_list.html

@@ -0,0 +1,15 @@
+{% extends "admin/change_list.html" %}
+{% load i18n %}
+
+{% block object-tools-items %}
+    {{ block.super }}
+    <a href="#" class="addlink" previewlistener="true" onclick="get_emails_vacancies()">
+      Emal лидеров у проектов с вакансиями
+    </a>
+
+    <script>
+        function get_emails_vacancies() {
+            window.open("{% url 'admin:vacancy_leaders_email' %}", '_blank').focus();
+        }
+    </script>
+{% endblock %}

users/admin.py

@@ -1,5 +1,7 @@
+import tablib
 from django.conf import settings
 from django.contrib import admin
+from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.urls import path
 
@@ -119,6 +121,7 @@ class CustomUserAdmin(admin.ModelAdmin):
 
     readonly_fields = ("ordering_score",)
     change_form_template = "users/admin/users_change_form.html"
+    change_list_template = "users/admin/users_change_list.html"
 
     def save_model(self, request, obj, form, change):
         # if user_type changed, then delete all related fields
@@ -177,13 +180,22 @@ def get_urls(self):
                 self.admin_site.admin_view(self.mass_mail),
                 name="user_mass_mail",
             ),
+            path(
+                "all-users-email-excel/",
+                self.admin_site.admin_view(self.all_users_email_excel),
+                name="users_email_excel",
+            ),
         ]
         return custom_urls + default_urls
 
     def mass_mail(self, request):
         users = CustomUser.objects.all()
         return MailingTemplateRender().render_template(request, None, users, None)
 
+    def all_users_email_excel(self, request):
+        users = CustomUser.objects.only("first_name", "last_name", "email").iterator()
+        return self.get_export_users_emails(users)
+
     def mailing(self, request, user_object):
         user = CustomUser.objects.get(pk=user_object)
         users = [user]
@@ -194,6 +206,21 @@ def force_verify(self, request, object_id):
         force_verify_user(user)
         return redirect("admin:users_customuser_change", object_id)
 
+    def get_export_users_emails(self, users):
+        response_data = tablib.Dataset(headers=["ФИО", "Email"])
+
+        for user in users:
+            response_data.append([user.first_name + " " + user.last_name, user.email])
+
+        binary_data = response_data.export("xlsx")
+        file_name = "all_users_names_emails"
+        response = HttpResponse(
+            content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            headers={"Content-Disposition": f'attachment; filename="{file_name}.xlsx"'},
+        )
+        response.write(binary_data)
+        return response
+
 
 @admin.register(UserAchievement)
 class UserAchievementAdmin(admin.ModelAdmin):