Merge pull request #647 from PROCOLLAB-github/refactor/modules

fix: исправлены выявленные прорблемы после рефакторинга

Author: Toksi86

deploy/nginx/host/dev/dev.procollab.ru

@@ -2,6 +2,7 @@ server {
     listen 80;
     server_name dev.procollab.ru;
     server_tokens off;
+    client_max_body_size 100M;
 
     location ^~ /.well-known/acme-challenge/ {
         root /var/www/certbot;
@@ -24,6 +25,8 @@ server {
     ssl_certificate     /etc/letsencrypt/live/dev.procollab.ru-0001/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/dev.procollab.ru-0001/privkey.pem;
 
+    client_max_body_size 100M;
+
     location ~ ^/(admin|api-auth|files|industries|news|projects|vacancies|core|invites|auth|chats|events|programs|courses|rate-project|feed|api|anymail|ws)(/|$) {
         include /etc/nginx/procollab/includes/proxy_app.inc;
     }

invites/filters.py

@@ -2,7 +2,6 @@
 from rest_framework.exceptions import PermissionDenied
 
 from invites.models import Invite
-from vacancy.filters import project_id_filter
 
 
 def _first_filter_value(value):
@@ -40,6 +39,12 @@ def __init__(self, *args, **kwargs):
             if user_value is None and project_value in (None, ""):
                 self.data["user"] = request.user.id
 
+    def filter_project(self, queryset, name, value):
+        value = _first_filter_value(value)
+        if value in (None, ""):
+            return queryset
+        return queryset.filter(project_id=value)
+
     def filter_user(self, queryset, name, value):
         value = _first_filter_value(value)
         if value == "any":
@@ -51,7 +56,7 @@ def filter_user(self, queryset, name, value):
             return queryset
         return queryset.filter(user_id=value)
 
-    project = filters.Filter(method=project_id_filter)
+    project = filters.Filter(method="filter_project")
     user = filters.Filter(method="filter_user")
 
     class Meta:

invites/tests/test_invite_api.py

@@ -1,7 +1,10 @@
+from types import SimpleNamespace
+
 from django.test import TestCase
 from rest_framework import status
 from rest_framework.test import APIClient
 
+from invites.filters import InviteFilter
 from invites.models import Invite
 from invites.tests.helpers import (
     add_collaborator,
@@ -224,6 +227,40 @@ def test_project_leader_can_list_project_invites_by_project_filter(self):
             {first_invite.id, second_invite.id},
         )
 
+    def test_project_leader_can_list_invite_after_creating_via_api(self):
+        leader = create_user(prefix="leader")
+        recipient = create_user(prefix="recipient")
+        project = create_project(leader=leader)
+        self.client.force_authenticate(leader)
+
+        create_response = self.client.post(
+            "/invites/",
+            invite_payload(project, recipient),
+            format="json",
+        )
+        list_response = self.client.get("/invites/", {"project": project.id})
+
+        self.assertEqual(create_response.status_code, status.HTTP_201_CREATED)
+        self.assertEqual(list_response.status_code, status.HTTP_200_OK)
+        self.assertEqual(
+            [item["id"] for item in list_response.data],
+            [create_response.data["id"]],
+        )
+
+    def test_project_filter_handles_scalar_multi_digit_project_id(self):
+        leader = create_user(prefix="leader")
+        projects = [create_project(leader=leader) for _ in range(12)]
+        target_project = projects[-1]
+        invite = create_invite(project=target_project)
+
+        filtered = InviteFilter(
+            data={"project": str(target_project.id)},
+            queryset=Invite.objects.all(),
+            request=SimpleNamespace(user=leader),
+        ).qs
+
+        self.assertEqual(list(filtered), [invite])
+
     def test_project_leader_cannot_use_user_any_filter(self):
         leader = create_user(prefix="leader")
         project = create_project(leader=leader)

partner_programs/migrations/0017_alter_partnerprogramproject_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.11 on 2026-06-10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("partner_programs", "0016_partnerprogram_is_distributed_evaluation"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="partnerprogramproject",
+            options={
+                "verbose_name": "Проект",
+                "verbose_name_plural": "Проекты",
+            },
+        ),
+    ]

partner_programs/models.py

@@ -307,8 +307,8 @@ def can_edit(self, user: User) -> bool:
 
     class Meta:
         unique_together = ("partner_program", "project")
-        verbose_name = "Проект участующий в программе"
-        verbose_name_plural = "Проекеты участвующие в программах"
+        verbose_name = "Проект"
+        verbose_name_plural = "Проекты"
 
     def __str__(self):
         return f"{self.project} в программе {self.partner_program}"