Merge pull request #228 from PROCOLLAB-github/dev

yet another release

Author: VeryBigSad

chats/views.py

@@ -219,14 +219,14 @@ def get(self, request, *args, **kwargs):
         user = request.user
         # get all user chats
         direct_messages = user.direct_chats.all().prefetch_related("messages")
-        project_messages = user.get_project_chats().prefetch_related("messages")
-
-        has_direct_messages_unread = direct_messages.filter(
-            messages__is_read=False
-        ).exists()
-        has_project_messages_unread = project_messages.filter(
-            messages__is_read=False
-        ).exists()
+        project_chats = user.get_project_chats().prefetch_related("messages")
+
+        has_direct_messages_unread = (
+            direct_messages.filter(messages__is_read=False).distinct().exists()
+        )
+        has_project_messages_unread = (
+            project_chats.filter(messages__is_read=False).distinct().exists()
+        )
         return Response(
             {"has_unreads": has_direct_messages_unread or has_project_messages_unread}
         )

projects/pagination.py

@@ -13,3 +13,17 @@ class ProjectNewsPagination(pagination.LimitOffsetPagination):
     default_limit = 5
     limit_query_param = "limit"
     offset_query_param = "offset"
+
+
+class ProjectsPagination(pagination.LimitOffsetPagination):
+    """
+    Pagination for Users
+
+    For example:
+        /projects/?limit=10&offset=10
+        gets the next 10 news after the first 10 news.
+    """
+
+    default_limit = 10
+    limit_query_param = "limit"
+    offset_query_param = "offset"

projects/views.py

@@ -18,7 +18,7 @@
     update_partner_program,
 )
 from projects.models import Project, Achievement, ProjectNews
-from projects.pagination import ProjectNewsPagination
+from projects.pagination import ProjectNewsPagination, ProjectsPagination
 from projects.permissions import (
     IsProjectLeaderOrReadOnlyForNonDrafts,
     HasInvolvementInProjectOrReadOnly,
@@ -48,6 +48,7 @@ class ProjectList(generics.ListCreateAPIView):
     permission_classes = [IsAuthenticated, permissions.IsAuthenticatedOrReadOnly]
     filter_backends = (filters.DjangoFilterBackend,)
     filterset_class = ProjectFilter
+    pagination_class = ProjectsPagination
 
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)

templates/users/admin/users_change_form.html

@@ -0,0 +1,20 @@
+{% extends "admin/change_form.html" %}
+{% load i18n %}
+
+{% block submit_buttons_bottom %}
+
+
+    {{ block.super }}
+    <div class="submit-row">
+        <input type="button" class="mailing-btn" value="Рассылка" onclick="mailing()"/>
+    </div>
+    <script>
+        function mailing() {
+            {% if object_id %}
+                window.open("{% url 'admin:user_mailing' object_id %}", '_blank').focus()
+            {% endif %}
+        }
+    </script>
+
+{% endblock %}
+

users/admin.py

@@ -1,6 +1,8 @@
 from django.conf import settings
 from django.contrib import admin
+from django.urls import path
 
+from mailing.views import MailingTemplateRender
 from .helpers import send_verification_completed_email
 from .models import (
     CustomUser,
@@ -106,6 +108,7 @@ class CustomUserAdmin(admin.ModelAdmin):
     )
 
     readonly_fields = ("ordering_score",)
+    change_form_template = "users/admin/users_change_form.html"
 
     def save_model(self, request, obj, form, change):
         # if user_type changed, then delete all related fields
@@ -146,6 +149,22 @@ def save_model(self, request, obj, form, change):
 
         super().save_model(request, obj, form, change)
 
+    def get_urls(self):
+        default_urls = super(CustomUserAdmin, self).get_urls()
+        custom_urls = [
+            path(
+                "mailing/<int:user_object>/",
+                self.admin_site.admin_view(self.mailing),
+                name="user_mailing",
+            ),
+        ]
+        return custom_urls + default_urls
+
+    def mailing(self, request, user_object):
+        user = CustomUser.objects.get(pk=user_object)
+        users = [user]
+        return MailingTemplateRender().render_template(request, None, users, None)
+
 
 @admin.register(UserAchievement)
 class UserAchievementAdmin(admin.ModelAdmin):

users/models.py

@@ -1,5 +1,6 @@
 from django.contrib.auth.models import AbstractUser
 from django.db import models
+from django.db.models import QuerySet
 
 from users.constants import (
     ADMIN,
@@ -133,14 +134,11 @@ def calculate_ordering_score(self) -> int:
             score += 7
         return score
 
-    def get_project_chats(self) -> list:
-        collaborations = self.collaborations.prefetch_related(
-            "project__project_chats"
-        ).all()
-        projects = []
-        for collaboration in collaborations:
-            projects.extend(list(collaboration.project.project_chats.all()))
-        return projects
+    def get_project_chats(self) -> QuerySet:
+        from chats.models import ProjectChat
+
+        user_project_ids = self.collaborations.all().values_list("project_id", flat=True)
+        return ProjectChat.objects.filter(project__in=user_project_ids)
 
     def get_key_skills(self) -> list[str]:
         return [skill.strip() for skill in self.key_skills.split(",") if skill.strip()]