Merge pull request #568 from PROCOLLAB-github/fix/user_invite

Скорректирована выдача приглашений согласно бизнес-логике

Author: Toksi86

invites/filters.py

@@ -19,19 +19,13 @@ 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")
+        self.data["user"] = request.user.id if request and request.user.is_authenticated else None
 
     project = filters.Filter(method=project_id_filter)
 
     class Meta:
         model = Invite
-        fields = ("project", "user")
+        fields = ("project",)

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)