Merge branch 'dev' of https://github.com/PROCOLLAB-github/api into dev

Author: yakser

chats/models.py

@@ -160,7 +160,7 @@ def get_chat(cls, user1, user2) -> "DirectChat":
     def get_last_messages(self, message_count):
         return self.messages.order_by("-created_at")[:message_count]
 
-    def get_other_user(self, user):
+    def get_other_user(self, user) -> User:
         return self.users.exclude(pk=user.pk).first()
 
     @classmethod

chats/serializers.py

@@ -13,22 +13,28 @@
 class DirectChatListSerializer(serializers.ModelSerializer):
     last_message = serializers.SerializerMethodField()
     opponent = serializers.SerializerMethodField()
+    name = serializers.SerializerMethodField(read_only=True)
+    image_address = serializers.SerializerMethodField(read_only=True)
 
     def get_opponent(self, chat: DirectChat):
         user = self.context.get("opponent")
         return UserDetailSerializer(user).data
 
+    def get_name(self, chat: DirectChat):
+        user = self.context.get("opponent")
+        return user.get_full_name()
+
+    def get_image_address(self, chat: DirectChat):
+        user = self.context.get("opponent")
+        return user.avatar
+
     @classmethod
     def get_last_message(cls, chat: DirectChat):
         return DirectChatMessageListSerializer(chat.get_last_message()).data
 
     class Meta:
         model = DirectChat
-        fields = [
-            "id",
-            "opponent",
-            "last_message",
-        ]
+        fields = ["id", "opponent", "last_message", "name", "image_address"]
 
 
 class DirectChatDetailSerializer(serializers.ModelSerializer):
@@ -48,14 +54,24 @@ class Meta:
 
 class ProjectChatListSerializer(serializers.ModelSerializer):
     last_message = serializers.SerializerMethodField(read_only=True)
+    name = serializers.SerializerMethodField(read_only=True)
+    image_address = serializers.SerializerMethodField(read_only=True)
+
+    @classmethod
+    def get_image_address(cls, chat: ProjectChat):
+        return chat.project.image_address
+
+    @classmethod
+    def get_name(cls, chat: ProjectChat):
+        return chat.project.name
 
     @classmethod
     def get_last_message(cls, chat: ProjectChat):
         return ProjectChatMessageListSerializer(chat.get_last_message()).data
 
     class Meta:
         model = ProjectChat
-        fields = ["id", "project", "last_message"]
+        fields = ["id", "project", "last_message", "image_address", "name"]
 
 
 class ProjectChatDetailSerializer(serializers.ModelSerializer):

files/models.py

@@ -34,3 +34,4 @@ def __str__(self):
     class Meta:
         verbose_name = "Файл"
         verbose_name_plural = "Файлы"
+        ordering = ["datetime_uploaded"]

nginx/nginx.conf

@@ -10,6 +10,8 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $host;
         proxy_redirect off;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Upgrade $http_upgrade;
     }
 
     location /grafana {

partner_programs/admin.py

@@ -1,4 +1,9 @@
+import tablib
+
 from django.contrib import admin
+from django.http import HttpResponse
+from django.urls import path
+from django.utils import timezone
 
 from partner_programs.models import PartnerProgram, PartnerProgramUserProfile
 
@@ -28,10 +33,76 @@ class PartnerProgramAdmin(admin.ModelAdmin):
 
     filter_horizontal = ("users",)
     date_hierarchy = "datetime_started"
+    change_form_template = "partner_programs/admin/programs_change_form.html"
+
+    def get_urls(self):
+        default_urls = super(PartnerProgramAdmin, self).get_urls()
+        custom_urls = [
+            path(
+                "export/<int:object_id>/",
+                self.admin_site.admin_view(self.get_export_file_view),
+                name="export_profiles",
+            )
+        ]
+        return custom_urls + default_urls
+
+    def changeform_view(self, request, object_id=None, form_url="", extra_context=None):
+        extra_context = {"object_id": int(object_id)}
+        res = super(PartnerProgramAdmin, self).changeform_view(
+            request, object_id, extra_context=extra_context
+        )
+        return res
+
+    def get_export_file_view(self, request, object_id):
+        program = PartnerProgram.objects.get(pk=object_id)
+        return self.get_export_file(program)
+
+    def get_export_file(self, partner_program: PartnerProgram):
+        json_schema = partner_program.data_schema
+        profiles = PartnerProgramUserProfile.objects.filter(
+            partner_program=partner_program
+        )
+        to_delete_from_json_scheme = []
+        column_names = ["Имя", "Фамилия", "Отчество", "Почта", "Дата рождения"]
+        for field_key in json_schema:
+            if "name" not in json_schema[field_key]:
+                to_delete_from_json_scheme.append(field_key)
+            else:
+                column_names.append(json_schema[field_key]["name"])
+
+        for field_key in to_delete_from_json_scheme:
+            del json_schema[field_key]
+
+        response_data = tablib.Dataset(headers=column_names)
+        for profile in profiles:
+            row = [
+                profile.user.first_name,
+                profile.user.last_name,
+                profile.user.patronymic,
+                profile.user.email,
+                str(profile.user.birthday),
+            ]
+
+            json_data = profile.partner_program_data
+            for key in json_schema:
+                row.append(json_data.get(key, ""))
+            response_data.append(row)
+
+        binary_data = response_data.export("xlsx")
+        file_name = (
+            f'{partner_program.name} {timezone.now().strftime("%d-%m-%Y %H:%M:%S")}'
+        )
+        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(PartnerProgramUserProfile)
 class PartnerProgramUserProfileAdmin(admin.ModelAdmin):
+
     list_display = (
         "id",
         "user",

poetry.lock

@@ -1,6 +1,13 @@
 from django.contrib import admin
 
-from projects.models import DefaultProjectCover, Project, Achievement, Collaborator, ProjectLink, ProjectNews
+from projects.models import (
+    DefaultProjectCover,
+    Project,
+    Achievement,
+    Collaborator,
+    ProjectLink,
+    ProjectNews,
+)
 
 
 @admin.register(Project)

projects/admin.py

@@ -130,7 +130,7 @@ class Meta:
             "views_count",
             "likes_count",
             "cover",
-            "partner_programs_tags"
+            "partner_programs_tags",
         ]
         read_only_fields = [
             "leader",

projects/serializers.py

@@ -59,6 +59,7 @@ coreapi = "^2.3.3"
 webp = "^0.1.6"
 django-prometheus = "^2.3.1"
 loguru = "^0.7.1"
+tablib = {extras = ["xlsx"], version = "^3.5.0"}
 
 
 [build-system]

pyproject.toml

@@ -0,0 +1,19 @@
+{% extends "admin/change_form.html" %}
+{%  load i18n %}
+
+{% block submit_buttons_bottom  %}
+
+
+    {{ block.super }}
+    <div class="submit-row">
+        <input type="button" class="export-btn" value="Экспорт" onclick="export_profiles()"/>
+    </div>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+    <script>
+    function export_profiles(){
+        window.open("{% url 'admin:export_profiles' object_id %}", '_blank').focus()
+    }
+</script>
+
+{% endblock %}
+