Merge pull request #563 from PROCOLLAB-github/release/minor_fixes

Расширена модель программы, в выдачу данных о проектах добавлено дополнительное поле

Author: Toksi86

partner_programs/admin.py

@@ -2,6 +2,7 @@
 import urllib.parse
 
 import tablib
+from django import forms
 from django.contrib import admin
 from django.db.models import QuerySet
 from django.http import HttpRequest, HttpResponse
@@ -37,7 +38,19 @@ class PartnerProgramFieldInline(admin.TabularInline):
 
 @admin.register(PartnerProgram)
 class PartnerProgramAdmin(admin.ModelAdmin):
+    class PartnerProgramAdminForm(forms.ModelForm):
+        class Meta:
+            model = PartnerProgram
+            fields = "__all__"
+            widgets = {
+                "name": forms.TextInput(attrs={"size": 80}),
+                "tag": forms.TextInput(attrs={"size": 80}),
+                "description": forms.Textarea(attrs={"rows": 4, "cols": 82}),
+                "city": forms.TextInput(attrs={"size": 80}),
+            }
+
     inlines = [PartnerProgramMaterialInline, PartnerProgramFieldInline]
+    form = PartnerProgramAdminForm
     list_display = ("id", "name", "tag", "city", "datetime_created")
     list_display_links = (
         "id",
@@ -53,8 +66,39 @@ class PartnerProgramAdmin(admin.ModelAdmin):
     )
     list_filter = ("city",)
 
-    filter_horizontal = ("users", "managers")
+    filter_horizontal = ("managers",)
     date_hierarchy = "datetime_started"
+    readonly_fields = ("datetime_created", "datetime_updated")
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "name",
+                    "tag",
+                    "description",
+                    "city",
+                    "is_competitive",
+                    "projects_availability",
+                    "draft",
+                    (
+                        "datetime_started",
+                        "datetime_registration_ends",
+                        "datetime_finished",
+                    ),
+                    (
+                        "image_address",
+                        "cover_image_address",
+                        "advertisement_image_address",
+                    ),
+                    ("presentation_address", "registration_link"),
+                    "data_schema",
+                )
+            },
+        ),
+        ("Менеджеры программы", {"fields": ("managers",)}),
+        ("Служебная информация", {"fields": ("datetime_created", "datetime_updated")}),
+    )
 
     def get_queryset(self, request: HttpRequest) -> QuerySet[PartnerProgram]:
         qs = super().get_queryset(request)

partner_programs/migrations/0012_partnerprogram_registration_link.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.24 on 2025-10-31 10:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('partner_programs', '0011_partnerprogram_is_competitive_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='partnerprogram',
+            name='registration_link',
+            field=models.URLField(blank=True, help_text='Адрес страницы регистрации (например, на Tilda)', null=True, verbose_name='Ссылка на регистрацию'),
+        ),
+    ]

partner_programs/models.py

@@ -73,6 +73,12 @@ class PartnerProgram(models.Model):
         blank=True,
         verbose_name="Ссылка на презентацию",
     )
+    registration_link = models.URLField(
+        null=True,
+        blank=True,
+        verbose_name="Ссылка на регистрацию",
+        help_text="Адрес страницы регистрации (например, на Tilda)",
+    )
     data_schema = models.JSONField(
         verbose_name="Схема данных в формате JSON",
         help_text="Ключи - имена полей, значения - тип поля ввода",

partner_programs/serializers.py

@@ -45,6 +45,7 @@ class Meta:
             "name",
             "image_address",
             "short_description",
+            "registration_link",
             "datetime_registration_ends",
             "datetime_started",
             "datetime_finished",
@@ -110,6 +111,7 @@ class Meta:
             "image_address",
             "cover_image_address",
             "presentation_address",
+            "registration_link",
             "views_count",
             "datetime_registration_ends",
             "is_user_manager",
@@ -131,6 +133,7 @@ class Meta:
             "cover_image_address",
             "advertisement_image_address",
             "presentation_address",
+            "registration_link",
             "datetime_registration_ends",
             "is_user_manager",
         )

projects/managers.py

@@ -16,7 +16,7 @@ def get_draft_projects_for_user(self):
 
 class ProjectManager(Manager):
     def get_projects_for_list_view(self):
-        return self.get_queryset().filter(draft=False)
+        return self.get_queryset().filter(draft=False).prefetch_related("program_links")
 
     def get_user_projects_for_list_view(self):
         return self.get_queryset().distinct()

projects/serializers.py

@@ -334,6 +334,7 @@ class Meta:
 class ProjectListSerializer(serializers.ModelSerializer):
     views_count = serializers.SerializerMethodField(method_name="count_views")
     short_description = serializers.SerializerMethodField()
+    partner_program_id = serializers.SerializerMethodField()
 
     @classmethod
     def count_views(cls, project):
@@ -343,6 +344,14 @@ def count_views(cls, project):
     def get_short_description(cls, project):
         return project.get_short_description()
 
+    @staticmethod
+    def get_partner_program_id(project):
+        links_cache = getattr(project, "_prefetched_objects_cache", {}).get(
+            "program_links"
+        )
+        link = links_cache[0] if links_cache else project.program_links.first()
+        return link.partner_program_id if link else None
+
     class Meta:
         model = Project
         fields = [
@@ -354,9 +363,10 @@ class Meta:
             "industry",
             "views_count",
             "is_company",
+            "partner_program_id",
         ]
 
-        read_only_fields = ["leader", "views_count", "is_company"]
+        read_only_fields = ["leader", "views_count", "is_company", "partner_program_id"]
 
     def is_valid(self, *, raise_exception=False):
         return super().is_valid(raise_exception=raise_exception)