Merge pull request #230 from PROCOLLAB-github/dev

Dev

Author: yakser

projects/managers.py

@@ -4,6 +4,16 @@
 User = get_user_model()
 
 
+class CollaboratorManager(Manager):
+    def get_draft_projects_for_user(self):
+        return (
+            super()
+            .get_queryset()
+            .select_related("project")
+            .filter(project__is_draft=True)
+        )
+
+
 class ProjectManager(Manager):
     def get_projects_for_list_view(self):
         return self.get_queryset().filter(draft=False)

projects/models.py

@@ -9,7 +9,7 @@
 from files.models import UserFile
 from industries.models import Industry
 from projects.constants import VERBOSE_STEPS
-from projects.managers import AchievementManager, ProjectManager
+from projects.managers import AchievementManager, CollaboratorManager, ProjectManager
 from users.models import CustomUser
 
 User = get_user_model()
@@ -215,6 +215,8 @@ class Collaborator(models.Model):
         verbose_name="Дата изменения", null=False, auto_now=True
     )
 
+    objects = CollaboratorManager()
+
     class Meta:
         verbose_name = "Коллаборатор"
         verbose_name_plural = "Коллабораторы"

users/serializers.py

@@ -89,14 +89,13 @@ class UserDetailSerializer(serializers.ModelSerializer):
     is_online = serializers.SerializerMethodField()
     projects = serializers.SerializerMethodField()
 
-    @classmethod
-    def get_projects(cls, user: CustomUser):
+    def get_projects(self, user: CustomUser):
         return UserProjectsSerializer(
             [
                 collab.project
-                for collab in user.collaborations.select_related("project").all()
-                if not collab.project.draft
+                for collab in user.collaborations.filter(project__draft=False)
             ],
+            context={"request": self.context.get("request")},
             many=True,
         ).data
 
@@ -213,7 +212,18 @@ def update(self, instance, validated_data):
 
 class UserProjectsSerializer(serializers.ModelSerializer):
     short_description = serializers.SerializerMethodField()
-    views_count = serializers.SerializerMethodField(method_name="get_views_count")
+    views_count = serializers.SerializerMethodField()
+    collaborator = serializers.SerializerMethodField(method_name="get_collaborator")
+
+    def get_collaborator(self, project: Project):
+        # TODO: fix me, import in a functon
+        from projects.serializers import CollaboratorSerializer
+
+        user = self.context.get("request").user
+
+        return CollaboratorSerializer(
+            project.collaborator_set.get(user=user), many=False
+        ).data
 
     @classmethod
     def get_views_count(cls, project):
@@ -233,8 +243,9 @@ class Meta:
             "image_address",
             "industry",
             "views_count",
+            "collaborator",
         ]
-        read_only_fields = ["leader"]
+        read_only_fields = ["leader", "collaborator"]
 
 
 class UserListSerializer(serializers.ModelSerializer):