Добавлена ручка для получения проектов пользователя, где он лидер

invites/tests.py

@@ -1,7 +1,11 @@
+from datetime import timedelta
+
 from django.test import TestCase
+from django.utils import timezone
 from rest_framework.test import APIRequestFactory, force_authenticate
 
-from projects.models import Project
+from partner_programs.models import PartnerProgram, PartnerProgramProject
+from projects.models import Collaborator, Project
 from tests.constants import USER_CREATE_DATA
 
 from users.views import UserList
@@ -112,6 +116,51 @@ def test_invites_creation_with_empty_data(self):
 
         self.assertEqual(response.status_code, 400)
 
+    def test_invites_creation_for_existing_collaborator(self):
+        sender = self._user_create("sender@example.com")
+        recipient = self._user_create("recipient@example.com")
+        project = self._project_create(sender)
+        Collaborator.objects.create(user=recipient, project=project, role="Developer")
+
+        create_user = self.invite_create_data.copy()
+        create_user["user"] = recipient.id
+        create_user["project"] = project.id
+        request = self.factory.post("invites/", create_user, format="json")
+        force_authenticate(request, user=sender)
+
+        response = self.invite_list_view(request)
+
+        self.assertEqual(response.status_code, 400)
+        self.assertIn("user", response.data)
+
+    def test_invites_creation_for_non_program_member(self):
+        sender = self._user_create("sender@example.com")
+        recipient = self._user_create("recipient@example.com")
+        project = self._project_create(sender)
+        now = timezone.now()
+        program = PartnerProgram.objects.create(
+            name="Test program",
+            tag="test",
+            city="Moscow",
+            datetime_registration_ends=now + timedelta(days=1),
+            datetime_started=now,
+            datetime_finished=now + timedelta(days=30),
+        )
+        PartnerProgramProject.objects.create(
+            partner_program=program, project=project
+        )
+
+        create_user = self.invite_create_data.copy()
+        create_user["user"] = recipient.id
+        create_user["project"] = project.id
+        request = self.factory.post("invites/", create_user, format="json")
+        force_authenticate(request, user=sender)
+
+        response = self.invite_list_view(request)
+
+        self.assertEqual(response.status_code, 400)
+        self.assertIn("user", response.data)
+
     def test_accept_invite_by_intended_user(self):
         sender = self._user_create("sender@example.com")
         recipient = self._user_create("recipient@example.com")

projects/admin.py

@@ -54,14 +54,15 @@ class ProjectAdmin(admin.ModelAdmin):
         "id",
         "name",
         "draft",
+        "is_public",
         "is_company",
         "trl",
         "target_audience",
         "implementation_deadline",
     )
     list_display_links = ("id", "name")
     search_fields = ("name",)
-    list_filter = ("draft", "is_company", "trl")
+    list_filter = ("draft", "is_public", "is_company", "trl")
 
     fieldsets = (
         (
@@ -74,6 +75,7 @@ class ProjectAdmin(admin.ModelAdmin):
                     "industry",
                     "region",
                     "draft",
+                    "is_public",
                     "is_company",
                 )
             },

users/tests.py

@@ -2,15 +2,17 @@
 from rest_framework.test import APIRequestFactory, force_authenticate
 from tests.constants import USER_CREATE_DATA
 
+from projects.models import Collaborator, Project
 from users.models import CustomUser
-from users.views import UserList, UserDetail
+from users.views import UserLeaderProjectsList, UserList, UserDetail
 
 
 class UserTestCase(TestCase):
     def setUp(self):
         self.factory = APIRequestFactory()
         self.user_list_view = UserList.as_view()
         self.user_detail_view = UserDetail.as_view()
+        self.user_leader_projects_view = UserLeaderProjectsList.as_view()
 
     def test_user_creation(self):
         request = self.factory.post("auth/users/", USER_CREATE_DATA)
@@ -58,3 +60,36 @@ def test_user_update(self):
         response = self.user_detail_view(request, pk=user.pk)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data["first_name"], "Сергей")
+
+    def test_user_leader_projects_list(self):
+        leader = self._user_create("leader@example.com")
+        collaborator = self._user_create("collaborator@example.com")
+
+        leader_project = Project.objects.create(name="Leader project", leader=leader)
+        second_leader_project = Project.objects.create(
+            name="Leader project 2", leader=leader, draft=False
+        )
+        other_project = Project.objects.create(name="Other project", leader=collaborator)
+        Collaborator.objects.create(user=leader, project=other_project, role="Member")
+
+        request = self.factory.get("users/projects/leader/")
+        force_authenticate(request, user=leader)
+        response = self.user_leader_projects_view(request)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data["count"], 2)
+        returned_ids = {item["id"] for item in response.data["results"]}
+        self.assertSetEqual(
+            returned_ids, {leader_project.id, second_leader_project.id}
+        )
+
+    def _user_create(self, email):
+        tmp_create_data = USER_CREATE_DATA.copy()
+        tmp_create_data["email"] = email
+        request = self.factory.post("auth/users/", tmp_create_data)
+        response = self.user_list_view(request)
+        user_id = response.data["id"]
+        user = CustomUser.objects.get(id=user_id)
+        user.is_active = True
+        user.save()
+        return user

users/urls.py

@@ -9,6 +9,7 @@
     SpecialistsList,
     UserAdditionalRolesView,
     UserDetail,
+    UserLeaderProjectsList,
     UserProjectsList,
     UserList,
     UserTypesView,
@@ -41,6 +42,7 @@
     path("users/", UserList.as_view()),
     path('public-users/', PublicUserListView.as_view(), name='public-users'),
     path("users/projects/", UserProjectsList.as_view()),
+    path("users/projects/leader/", UserLeaderProjectsList.as_view()),
     path("users/liked/", LikedProjectList.as_view()),
     path("users/roles/", UserAdditionalRolesView.as_view()),
     path("users/types/", UserTypesView.as_view()),

users/views.py

@@ -426,6 +426,28 @@ def get(self, request):
         )
 
 
+class UserLeaderProjectsList(GenericAPIView):
+    permission_classes = [IsAuthenticated]
+    pagination_class = ProjectsPagination
+    serializer_class = UserProjectListSerializer
+
+    def get(self, request):
+        queryset = (
+            Project.objects.filter(leader_id=self.request.user.id)
+            .prefetch_related("program_links__partner_program")
+            .distinct()
+        )
+
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+        return Response(
+            {"detail": "Unable to return paginated list"},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+
+
 class LogoutView(APIView):
     permission_classes = [IsAuthenticated]