fix projects/<id>/collaborators

Author: VeryBigSad

projects/serializers.py

@@ -28,7 +28,8 @@ class Meta:
 
 
 class CollaboratorSerializer(serializers.ModelSerializer):
-    # id = serializers.IntegerField(source="user.id")
+    # specify so that there's a clear indication that it's the user's id and not collaborator's id
+    user_id = serializers.IntegerField(source="user.id")
     first_name = serializers.CharField(source="user.first_name")
     last_name = serializers.CharField(source="user.last_name")
     avatar = serializers.CharField(source="user.avatar")
@@ -41,7 +42,7 @@ def get_member_key_skills(cls, collaborator):
     class Meta:
         model = Collaborator
         fields = [
-            "id",
+            "user_id",
             "first_name",
             "last_name",
             "role",
@@ -50,6 +51,14 @@ class Meta:
         ]
 
 
+class ProjectCollaboratorSerializer(serializers.ModelSerializer):
+    collaborators = CollaboratorSerializer(source="collaborator_set", many=True)
+
+    class Meta:
+        model = Project
+        fields = ["collaborators"]
+
+
 class ProjectDetailSerializer(serializers.ModelSerializer):
     achievements = AchievementListSerializer(many=True, read_only=True)
     collaborators = CollaboratorSerializer(

projects/views.py

@@ -12,7 +12,7 @@
     AchievementListSerializer,
     ProjectListSerializer,
     AchievementDetailSerializer,
-    CollaboratorSerializer,
+    ProjectCollaboratorSerializer,
 )
 
 
@@ -79,7 +79,7 @@ class ProjectCollaborators(generics.GenericAPIView):
 
     permission_classes = [IsProjectLeaderOrReadOnly]
     queryset = Project.objects.all()
-    serializer_class = CollaboratorSerializer
+    serializer_class = ProjectCollaboratorSerializer
 
     def get(self, request, pk: int):
         """retrieve collaborators for given project"""