Реализована возможность добавлять партнёрские материалы: файлы, ссылки, название гиперссылки

Toksi86 · Toksi86 · commit e2f34d6dcf6c · 2025-07-22T13:06:39.000+05:00
diff --git a/partner_programs/admin.py b/partner_programs/admin.py
@@ -1,22 +1,35 @@
-import tablib
 import re
 import urllib.parse
+
+import tablib
 from django.contrib import admin
 from django.db.models import QuerySet
-from django.http import HttpResponse, HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.urls import path
 from django.utils import timezone
 
-from mailing.views import MailingTemplateRender
 from core.utils import XlsxFileToExport
-from partner_programs.models import PartnerProgram, PartnerProgramUserProfile
+from mailing.views import MailingTemplateRender
+from partner_programs.models import (
+    PartnerProgram,
+    PartnerProgramMaterial,
+    PartnerProgramUserProfile,
+)
+from partner_programs.services import ProjectScoreDataPreparer
 from project_rates.models import Criteria, ProjectScore
 from projects.models import Project
-from partner_programs.services import ProjectScoreDataPreparer
+
+
+class PartnerProgramMaterialInline(admin.StackedInline):
+    model = PartnerProgramMaterial
+    extra = 1
+    fields = ("title", "url", "file")
+    readonly_fields = ("datetime_created", "datetime_updated")
 
 
 @admin.register(PartnerProgram)
 class PartnerProgramAdmin(admin.ModelAdmin):
+    inlines = [PartnerProgramMaterialInline]
     list_display = ("id", "name", "tag", "city", "datetime_created")
     list_display_links = (
         "id",
@@ -54,7 +67,9 @@ def change_view(self, request, object_id, form_url="", extra_context=None):
                 "partner_programs/admin/program_manager_change_form.html"
             )
         else:
-            self.change_form_template = "partner_programs/admin/programs_change_form.html"
+            self.change_form_template = (
+                "partner_programs/admin/programs_change_form.html"
+            )
 
         return super().change_view(request, object_id, form_url, extra_context)
 
@@ -145,7 +160,7 @@ def get_export_file(self, partner_program: PartnerProgram):
 
         binary_data = response_data.export("xlsx")
         file_name = (
-            f'{partner_program.name} {timezone.now().strftime("%d-%m-%Y %H:%M:%S")}'
+            f"{partner_program.name} {timezone.now().strftime('%d-%m-%Y %H:%M:%S')}"
         )
         response = HttpResponse(
             content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
@@ -155,22 +170,26 @@ def get_export_file(self, partner_program: PartnerProgram):
         return response
 
     def get_export_rates_view(self, request, object_id):
-        rates_data_to_write: list[dict] = self._get_prepared_rates_data_for_export(object_id)
+        rates_data_to_write: list[dict] = self._get_prepared_rates_data_for_export(
+            object_id
+        )
 
         xlsx_file_writer = XlsxFileToExport()
         xlsx_file_writer.write_data_to_xlsx(rates_data_to_write)
         binary_data_to_export: bytes = xlsx_file_writer.get_binary_data_from_self_file()
         xlsx_file_writer.delete_self_xlsx_file_from_local_machine()
 
         encoded_file_name: str = urllib.parse.quote(
-            f'{PartnerProgram.objects.get(pk=object_id).name}_оценки {timezone.now().strftime("%d-%m-%Y %H:%M:%S")}'
+            f"{PartnerProgram.objects.get(pk=object_id).name}_оценки {timezone.now().strftime('%d-%m-%Y %H:%M:%S')}"
             f".xlsx"
         )
         response = HttpResponse(
             binary_data_to_export,
             content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         )
-        response["Content-Disposition"] = f'attachment; filename*=UTF-8\'\'{encoded_file_name}'
+        response["Content-Disposition"] = (
+            f"attachment; filename*=UTF-8''{encoded_file_name}"
+        )
         return response
 
     def _get_prepared_rates_data_for_export(self, program_id: int) -> list[dict]:
@@ -179,19 +198,22 @@ def _get_prepared_rates_data_for_export(self, program_id: int) -> list[dict]:
         Columns example:
             ФИО|Email|Регион_РФ|Учебное_заведение|Название_учебного_заведения|Класс_курс|Фамилия эксперта|**criteria
         """
-        criterias = Criteria.objects.filter(partner_program__id=program_id).select_related("partner_program")
+        criterias = Criteria.objects.filter(
+            partner_program__id=program_id
+        ).select_related("partner_program")
         scores = (
-            ProjectScore.objects
-            .filter(criteria__in=criterias)
+            ProjectScore.objects.filter(criteria__in=criterias)
             .select_related("user", "criteria", "project")
             .order_by("project", "criteria")
         )
-        user_programm_profiles = (
-            PartnerProgramUserProfile.objects
-            .filter(partner_program__id=program_id)
-            .select_related("user")
+        user_programm_profiles = PartnerProgramUserProfile.objects.filter(
+            partner_program__id=program_id
+        ).select_related("user")
+        projects = (
+            Project.objects.filter(scores__in=scores)
+            .select_related("leader")
+            .distinct()
         )
-        projects = Project.objects.filter(scores__in=scores).select_related("leader").distinct()
 
         # To reduce the number of DB requests.
         user_profiles_dict: dict[int, PartnerProgramUserProfile] = {
@@ -203,7 +225,9 @@ def _get_prepared_rates_data_for_export(self, program_id: int) -> list[dict]:
 
         prepared_projects_rates_data: list[dict] = []
         for project in projects:
-            project_data_preparer = ProjectScoreDataPreparer(user_profiles_dict, scores_dict, project.id, program_id)
+            project_data_preparer = ProjectScoreDataPreparer(
+                user_profiles_dict, scores_dict, project.id, program_id
+            )
             full_project_rates_data: dict = {
                 **project_data_preparer.get_project_user_info(),
                 **project_data_preparer.get_project_expert_info(),
@@ -242,3 +266,23 @@ def get_form(self, request, obj=None, **kwargs):
         form = super().get_form(request, obj, **kwargs)
         form.base_fields["project"].required = False
         return form
+
+
+@admin.register(PartnerProgramMaterial)
+class PartnerProgramMaterialAdmin(admin.ModelAdmin):
+    list_display = ("title", "program", "short_url", "has_file", "datetime_created")
+    list_filter = ("program",)
+    search_fields = ("title", "program__name")
+
+    readonly_fields = ("datetime_created", "datetime_updated")
+
+    def short_url(self, obj):
+        return obj.url[:60] if obj.url else "—"
+
+    short_url.short_description = "Ссылка"
+
+    def has_file(self, obj):
+        return bool(obj.file)
+
+    has_file.boolean = True
+    has_file.short_description = "Файл"
diff --git a/partner_programs/migrations/0007_partnerprogrammaterial.py b/partner_programs/migrations/0007_partnerprogrammaterial.py
@@ -0,0 +1,72 @@
+# Generated by Django 4.2.11 on 2025-07-21 09:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("files", "0007_auto_20230929_1727"),
+        ("partner_programs", "0006_partnerprogram_projects_availability"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PartnerProgramMaterial",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "title",
+                    models.CharField(
+                        help_text="Например, 'Кейс Сбера'",
+                        max_length=255,
+                        verbose_name="Название материала",
+                    ),
+                ),
+                (
+                    "url",
+                    models.URLField(
+                        blank=True,
+                        help_text="Укажите ссылку вручную или прикрепите файл",
+                        null=True,
+                        verbose_name="Ссылка на материал",
+                    ),
+                ),
+                ("datetime_created", models.DateTimeField(auto_now_add=True)),
+                ("datetime_updated", models.DateTimeField(auto_now=True)),
+                (
+                    "file",
+                    models.ForeignKey(
+                        blank=True,
+                        help_text="Если указан файл, ссылка берётся из него",
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to="files.userfile",
+                        verbose_name="Файл",
+                    ),
+                ),
+                (
+                    "program",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="materials",
+                        to="partner_programs.partnerprogram",
+                        verbose_name="Программа",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Материал программы",
+                "verbose_name_plural": "Материалы программ",
+            },
+        ),
+    ]
diff --git a/partner_programs/models.py b/partner_programs/models.py
@@ -1,6 +1,8 @@
 from django.contrib.auth import get_user_model
+from django.core.exceptions import ValidationError
 from django.db import models
 
+from files.models import UserFile
 from partner_programs.constants import get_default_data_schema
 from projects.models import Project
 
@@ -26,6 +28,7 @@ class PartnerProgram(models.Model):
         datetime_created: A DateTimeField indicating date of creation.
         datetime_updated: A DateTimeField indicating date of update.
     """
+
     PROJECTS_AVAILABILITY_CHOISES = [
         ("all_users", "Всем пользователям"),
         ("experts_only", "Только экспертам"),
@@ -96,7 +99,9 @@ class PartnerProgram(models.Model):
     datetime_created = models.DateTimeField(
         verbose_name="Дата создания", auto_now_add=True
     )
-    datetime_updated = models.DateTimeField(verbose_name="Дата изменения", auto_now=True)
+    datetime_updated = models.DateTimeField(
+        verbose_name="Дата изменения", auto_now=True
+    )
 
     class Meta:
         verbose_name = "Программа"
@@ -148,3 +153,62 @@ class Meta:
 
     def __str__(self):
         return f"PartnerProgramUserProfile<{self.pk}> - {self.user} {self.project} {self.partner_program}"
+
+
+class PartnerProgramMaterial(models.Model):
+    """
+    Материал для программы: прямая ссылка или ссылка на прикреплённый файл.
+    """
+
+    program = models.ForeignKey(
+        PartnerProgram,
+        on_delete=models.CASCADE,
+        related_name="materials",
+        verbose_name="Программа",
+    )
+
+    title = models.CharField(
+        max_length=255,
+        verbose_name="Название материала",
+        help_text="Укажите текст для гиперссылки",
+    )
+
+    url = models.URLField(
+        blank=True,
+        null=True,
+        verbose_name="Ссылка на материал",
+        help_text="Укажите ссылку вручную или прикрепите файл",
+    )
+
+    file = models.ForeignKey(
+        UserFile,
+        on_delete=models.SET_NULL,
+        blank=True,
+        null=True,
+        verbose_name="Файл",
+        help_text="Если указан файл, ссылка берётся из него",
+    )
+
+    datetime_created = models.DateTimeField(auto_now_add=True)
+    datetime_updated = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        verbose_name = "Материал программы"
+        verbose_name_plural = "Материалы программ"
+
+    def clean(self):
+        if self.file and not self.url:
+            self.url = self.file.link
+
+        if not self.file and not self.url:
+            raise ValidationError("Необходимо указать либо файл, либо ссылку.")
+
+        if self.file and self.url and self.url != self.file.link:
+            raise ValidationError("Укажите либо файл, либо ссылку, но не оба сразу.")
+
+    def save(self, *args, **kwargs):
+        self.full_clean()
+        super().save(*args, **kwargs)
+
+    def __str__(self):
+        return f"{self.title} для программы {self.program.name}"
diff --git a/partner_programs/serializers.py b/partner_programs/serializers.py
@@ -2,7 +2,7 @@
 from rest_framework import serializers
 
 from core.services import get_likes_count, get_links, get_views_count, is_fan
-from partner_programs.models import PartnerProgram
+from partner_programs.models import PartnerProgram, PartnerProgramMaterial
 
 User = get_user_model()
 
@@ -49,7 +49,18 @@ class Meta:
         )
 
 
-class PartnerProgramForMemberSerializer(serializers.ModelSerializer):
+class PartnerProgramWithMaterialsMixin(serializers.ModelSerializer):
+    materials = serializers.SerializerMethodField()
+
+    def get_materials(self, program):
+        materials = program.materials.all()
+        return PartnerProgramMaterialSerializer(materials, many=True).data
+
+    class Meta:
+        abstract = True
+
+
+class PartnerProgramForMemberSerializer(PartnerProgramWithMaterialsMixin):
     """Serializer for PartnerProgram model for member of this program"""
 
     views_count = serializers.SerializerMethodField(method_name="count_views")
@@ -79,6 +90,7 @@ class Meta:
             "description",
             "city",
             "links",
+            "materials",
             "image_address",
             "cover_image_address",
             "presentation_address",
@@ -87,7 +99,7 @@ class Meta:
         )
 
 
-class PartnerProgramForUnregisteredUserSerializer(serializers.ModelSerializer):
+class PartnerProgramForUnregisteredUserSerializer(PartnerProgramWithMaterialsMixin):
     """Serializer for PartnerProgram model for unregistered users in the program"""
 
     class Meta:
@@ -97,6 +109,7 @@ class Meta:
             "name",
             "tag",
             "city",
+            "materials",
             "image_address",
             "cover_image_address",
             "advertisement_image_address",
@@ -138,3 +151,9 @@ class Meta:
             "name",
             "tag",
         ]
+
+
+class PartnerProgramMaterialSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = PartnerProgramMaterial
+        fields = ("title", "url")
