Merge pull request #564 from PROCOLLAB-github/dev

Dev

Author: Toksi86

core/serializers.py

@@ -3,6 +3,10 @@
 from .models import SkillToObject, SkillCategory, Skill
 
 
+class EmptySerializer(serializers.Serializer):
+    pass
+
+
 class SetLikedSerializer(serializers.Serializer):
     is_liked = serializers.BooleanField()
 

docker-compose.dev-ci.yml

@@ -13,8 +13,8 @@ services:
       - .env
     environment:
       HOST: 0.0.0.0
-    expose:
-      - 8000
+    ports:
+      - "127.0.0.1:8000:8000" 
 
   grafana:
     image: grafana/grafana:latest
@@ -37,13 +37,13 @@ services:
       - prom-data:/prometheus
       - ./prometheus:/etc/prometheus
 
-  nginx:
-    restart: unless-stopped
-    build: ./nginx
-    depends_on:
-      - web
-    ports:
-      - 8000:80
+  #nginx:
+  #  restart: unless-stopped
+  #  build: ./nginx
+  #  depends_on:
+  #    - web
+  #  ports:
+  #    - 8000:80
 
   loki:
     image: grafana/loki:2.9.0

feed/views.py

@@ -1,18 +1,19 @@
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import QuerySet, Q
+from django.db.models import Q, QuerySet
 from rest_framework.generics import CreateAPIView
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
+from core.serializers import EmptySerializer
 from feed.pagination import FeedPagination
 from feed.services import get_liked_news
-
 from news.models import News
-from .serializers import NewsFeedListSerializer
-from projects.models import Project
 from partner_programs.models import PartnerProgramUserProfile
+from projects.models import Project
 from vacancy.models import Vacancy
 
+from .serializers import NewsFeedListSerializer
+
 
 class NewSimpleFeed(APIView):
     serializator_class = NewsFeedListSerializer
@@ -29,11 +30,9 @@ def _get_filter_data(self) -> list[str]:
 
     def _get_excluded_projects_ids(self) -> list[int]:
         """IDs for exclude projects which in Partner Program."""
-        excluded_projects = (
-            PartnerProgramUserProfile.objects
-            .values_list("project_id", flat=True)
-            .exclude(project_id__isnull=True)
-        )
+        excluded_projects = PartnerProgramUserProfile.objects.values_list(
+            "project_id", flat=True
+        ).exclude(project_id__isnull=True)
         return excluded_projects
 
     def get_queryset(self) -> QuerySet[News]:
@@ -80,6 +79,8 @@ def get(self, *args, **kwargs):
 
 
 class DevScript(CreateAPIView):
+    serializer_class = EmptySerializer
+
     def create(self, request):
         content_type_project = ContentType.objects.filter(model="project").first()
         for project in Project.objects.filter(draft=False):

invites/serializers.py

@@ -1,6 +1,8 @@
+from django.apps import apps
 from rest_framework import serializers
 
 from invites.models import Invite
+from projects.models import Collaborator
 from projects.serializers import ProjectListSerializer
 from users.serializers import UserDetailSerializer
 
@@ -18,6 +20,48 @@ class Meta:
             "is_accepted",
         ]
 
+    def validate(self, attrs):
+        project = attrs["project"]
+        user = attrs["user"]
+
+        if project.leader_id == user.id:
+            raise serializers.ValidationError(
+                {"user": "Пользователь уже является лидером проекта."}
+            )
+
+        if Collaborator.objects.filter(project=project, user=user).exists():
+            raise serializers.ValidationError(
+                {"user": "Пользователь уже состоит в проекте."}
+            )
+
+        if Invite.objects.filter(
+            project=project, user=user, is_accepted__isnull=True
+        ).exists():
+            raise serializers.ValidationError(
+                {"user": "У пользователя уже есть активное приглашение в этот проект."}
+            )
+
+        link = project.program_links.select_related("partner_program").first()
+        if link:
+            PartnerProgramUserProfile = apps.get_model(
+                "partner_programs", "PartnerProgramUserProfile"
+            )
+            is_participant = PartnerProgramUserProfile.objects.filter(
+                user_id=user.id,
+                partner_program_id=link.partner_program_id,
+            ).exists()
+            if not is_participant:
+                raise serializers.ValidationError(
+                    {
+                        "user": (
+                            "Нельзя пригласить пользователя: проект относится к программе, "
+                            "а пользователь не является её участником."
+                        )
+                    }
+                )
+
+        return attrs
+
 
 class InviteDetailSerializer(serializers.ModelSerializer[Invite]):
     user = UserDetailSerializer(many=False, read_only=True)

invites/tests.py

@@ -36,7 +36,6 @@ def setUp(self) -> None:
             "name": "Test",
             "description": "Test",
             "industry": Industry.objects.create(name="Test").id,
-            "step": 1,
             "draft": False,
         }
 

news/mapping.py

@@ -14,7 +14,7 @@ class NewsMapping:
     @classmethod
     def get_name(cls, content_object) -> str:
         if isinstance(content_object, User):
-            f"{content_object.first_name} {content_object.last_name}"
+            return f"{content_object.first_name} {content_object.last_name}"
         if isinstance(content_object, Project) or isinstance(
             content_object, PartnerProgram
         ):

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",
@@ -80,9 +81,7 @@ class PartnerProgramForMemberSerializer(PartnerProgramBaseSerializerMixin):
 
     views_count = serializers.SerializerMethodField(method_name="count_views")
     links = serializers.SerializerMethodField(method_name="get_links")
-    is_user_manager = serializers.SerializerMethodField(
-        method_name="get_is_user_manager"
-    )
+    is_user_manager = serializers.SerializerMethodField(method_name="get_is_user_manager")
 
     def count_views(self, program):
         return get_views_count(program)
@@ -112,6 +111,7 @@ class Meta:
             "image_address",
             "cover_image_address",
             "presentation_address",
+            "registration_link",
             "views_count",
             "datetime_registration_ends",
             "is_user_manager",
@@ -133,6 +133,7 @@ class Meta:
             "cover_image_address",
             "advertisement_image_address",
             "presentation_address",
+            "registration_link",
             "datetime_registration_ends",
             "is_user_manager",
         )