Merge pull request #569 from PROCOLLAB-github/feature/invite-filter-adjustments

Вернул фильтрацию по юзеру, из-за сломанных приглашений

Author: Toksi86

invites/filters.py

@@ -22,10 +22,12 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.data = dict(self.data)
         request = kwargs.get("request")
-        self.data["user"] = request.user.id if request and request.user.is_authenticated else None
+        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
-        fields = ("project",)
+        fields = ("project", "user")

users/views.py

@@ -407,8 +407,13 @@ class UserProjectsList(GenericAPIView):
     serializer_class = UserProjectListSerializer
 
     def get(self, request):
-        self.queryset = Project.objects.get_user_projects_for_list_view().filter(
-            Q(leader_id=self.request.user.id) | Q(collaborator__user=self.request.user)
+        self.queryset = (
+            Project.objects.filter(
+                Q(leader_id=self.request.user.id)
+                | Q(collaborator__user=self.request.user)
+            )
+            .prefetch_related("program_links__partner_program")
+            .distinct()
         )
 
         page = self.paginate_queryset(self.queryset)