Merge pull request #572 from PROCOLLAB-github/dev

Dev

Author: Toksi86

feed/views.py

@@ -48,6 +48,17 @@ def get_queryset(self) -> QuerySet[News]:
             )
             .order_by("-datetime_created")
         )
+
+        existing_object_filters = {
+            "project": Project.objects.values_list("id", flat=True),
+            "vacancy": Vacancy.objects.values_list("id", flat=True),
+        }
+        for model_name, ids_queryset in existing_object_filters.items():
+            queryset = queryset.exclude(
+                Q(content_type__model=model_name)
+                & ~Q(object_id__in=ids_queryset)
+            )
+
         return queryset
 
     def get(self, *args, **kwargs):

invites/filters.py

@@ -19,18 +19,14 @@ class InviteFilter(filters.FilterSet):
     """
 
     def __init__(self, *args, **kwargs):
-        """if user filter is not passed, default to request.user"""
         super().__init__(*args, **kwargs)
-        if self.data.get("user") is None:
-            # default filtering by current user
-            self.data = dict(self.data)
-            self.data["user"] = kwargs.get("request").user.id
-        # if user == "any", remove the filter
-        if self.data.get("user") == "any":
-            self.data = dict(self.data)
-            self.data.pop("user")
+        self.data = dict(self.data)
+        request = kwargs.get("request")
+        if request and request.user.is_authenticated:
+            self.data["user"] = request.user.id
 
     project = filters.Filter(method=project_id_filter)
+    user = filters.NumberFilter(field_name="user_id")
 
     class Meta:
         model = Invite

invites/serializers.py

@@ -19,6 +19,7 @@ class Meta:
             "specialization",
             "is_accepted",
         ]
+        read_only_fields = ["is_accepted"]
 
     def validate(self, attrs):
         project = attrs["project"]

invites/tests.py

@@ -29,7 +29,6 @@ def setUp(self) -> None:
             "user": None,
             "motivational_letter": "hello",
             "role": "Developer",
-            "is_accepted": False,
         }
 
         self.project_create_data = {
@@ -59,7 +58,7 @@ def test_invites_creation(self):
         )
         self.assertEqual(response.data["project"]["id"], create_user["project"])
         self.assertEqual(response.data["role"], create_user["role"])
-        self.assertEqual(response.data["is_accepted"], create_user["is_accepted"])
+        self.assertIsNone(response.data["is_accepted"])
 
     def test_invites_creation_with_empty_text(self):
         user_main = self._user_create("example@gmail.com")

invites/views.py

@@ -9,7 +9,7 @@
 
 
 class InviteList(generics.ListCreateAPIView):
-    queryset = Invite.objects.get_invite_for_list_view()
+    queryset = Invite.objects.get_invite_for_list_view().filter(is_accepted__isnull=True)
     serializer_class = InviteDetailSerializer
     permission_classes = [permissions.IsAuthenticatedOrReadOnly]
     filter_backends = (filters.DjangoFilterBackend,)
@@ -47,13 +47,30 @@ def post(self, request, *args, **kwargs):
         invite = self.get_object()  # type: Invite
         if invite.user != request.user:
             return Response(status=status.HTTP_403_FORBIDDEN)
+        if invite.is_accepted is True:
+            return Response(
+                {"detail": "Invite has already been accepted."},
+                status=status.HTTP_409_CONFLICT,
+            )
+        if invite.is_accepted is False:
+            return Response(
+                {"detail": "Invite has already been declined."},
+                status=status.HTTP_409_CONFLICT,
+            )
         # add user to project collaborators
-        Collaborator.objects.create(
+        collaborator, created = Collaborator.objects.get_or_create(
             user=invite.user,
             project=invite.project,
-            role=invite.role,
-            specialization=invite.specialization,
+            defaults={
+                "role": invite.role,
+                "specialization": invite.specialization,
+            },
         )
+        if not created:
+            return Response(
+                {"detail": "User is already a collaborator of this project."},
+                status=status.HTTP_409_CONFLICT,
+            )
         invite.is_accepted = True
         invite.save()
         return Response(status=status.HTTP_200_OK)

partner_programs/serializers.py

@@ -29,6 +29,8 @@ def count_views(self, program):
         return get_views_count(program)
 
     def get_short_description(self, program):
+        if not program.description:
+            return ""
         return program.description[:125]
 
     def get_is_user_liked(self, obj):

partner_programs/views.py

@@ -65,6 +65,24 @@ class PartnerProgramList(generics.ListCreateAPIView):
     permission_classes = [permissions.IsAuthenticatedOrReadOnly]
     pagination_class = PartnerProgramPagination
 
+    def get_queryset(self):
+        base_qs = super().get_queryset()
+        participating_flag = self.request.query_params.get("participating")
+        if not participating_flag:
+            return base_qs
+
+        if not self.request.user.is_authenticated:
+            return PartnerProgram.objects.none()
+
+        now = timezone.now()
+        return (
+            base_qs.filter(
+                partner_program_profiles__user=self.request.user,
+                datetime_finished__gte=now,
+            )
+            .distinct()
+        )
+
 
 class PartnerProgramDetail(generics.RetrieveAPIView):
     queryset = PartnerProgram.objects.prefetch_related("materials", "managers").all()

project_rates/serializers.py

@@ -61,6 +61,7 @@ class ProjectListForRateSerializer(serializers.ModelSerializer):
     views_count = serializers.SerializerMethodField()
     criterias = serializers.SerializerMethodField()
     scored = serializers.SerializerMethodField()
+    scored_expert_id = serializers.IntegerField(read_only=True, allow_null=True)
 
     class Meta:
         model = Project
@@ -75,6 +76,7 @@ class Meta:
             "region",
             "views_count",
             "scored",
+            "scored_expert_id",
             "criterias",
         ]
 

project_rates/views.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import get_user_model
-from django.db.models import QuerySet, Count
+from django.db.models import QuerySet, Count, OuterRef, Subquery, IntegerField
 
 from rest_framework import generics, status
 from rest_framework.response import Response
@@ -98,6 +98,13 @@ def get_queryset(self) -> QuerySet[Project]:
             project__isnull=False, partner_program__id=self.kwargs.get("program_id")
         ).values_list("project__id", flat=True)
         # `Count` the easiest way to check for rate exist (0 -> does not exist).
+        scored_expert_subquery = ProjectScore.objects.filter(
+            project=OuterRef("pk")
+        ).values("user_id")[:1]
+
         return Project.objects.filter(draft=False, id__in=projects_ids).annotate(
-            scored=Count("scores")
+            scored=Count("scores"),
+            scored_expert_id=Subquery(
+                scored_expert_subquery, output_field=IntegerField()
+            ),
         )

projects/managers.py

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