Merge pull request #210 from PROCOLLAB-github/dev

Dev

Author: VeryBigSad

projects/managers.py

@@ -1,47 +1,15 @@
 from django.contrib.auth import get_user_model
 from django.db.models import Manager
-from django.db.models import Prefetch
-
-from industries.models import Industry
-from users.models import CustomUser
 
 User = get_user_model()
 
 
 class ProjectManager(Manager):
     def get_projects_for_list_view(self):
-        return (
-            self.get_queryset()
-            .filter(draft=False)
-            .prefetch_related(
-                Prefetch(
-                    "industry",
-                    queryset=Industry.objects.only("name").all(),
-                ),
-                Prefetch(
-                    "leader",
-                    queryset=CustomUser.objects.only("id").all(),
-                ),
-                "partner_program_profiles",
-            )
-        )
+        return self.get_queryset().filter(draft=False)
 
     def get_user_projects_for_list_view(self):
-        return (
-            self.get_queryset()
-            .prefetch_related(
-                Prefetch(
-                    "industry",
-                    queryset=Industry.objects.only("name").all(),
-                ),
-                Prefetch(
-                    "leader",
-                    queryset=CustomUser.objects.only("id").all(),
-                ),
-                Prefetch("collaborator_set"),
-            )
-            .distinct()
-        )
+        return self.get_queryset().distinct()
 
     def get_projects_for_detail_view(self):
         return (
@@ -58,10 +26,6 @@ def get_projects_for_detail_view(self):
     def get_projects_for_count_view(self):
         return self.get_queryset().only("id", "leader_id")
 
-    def check_if_owns_any_projects(self, user) -> bool:
-        # I don't think this should work but the function has no usages, so I'll let it be
-        return user.leader_projects.exists()
-
     def get_projects_from_list_of_ids(self, ids):
         return self.get_queryset().filter(id__in=ids)
 

projects/models.py

@@ -117,7 +117,11 @@ class Project(models.Model):
     objects = ProjectManager()
 
     def get_short_description(self) -> Optional[str]:
-        return self.description[:90] if self.description else None
+        return (
+            self.description[:90] + ("..." if len(self.description) > 90 else "")
+            if self.description
+            else None
+        )
 
     def get_collaborators_user_list(self) -> list[User]:
         return [collaborator.user for collaborator in self.collaborator_set.all()]

projects/serializers.py

@@ -71,7 +71,6 @@ class ProjectDetailSerializer(serializers.ModelSerializer):
     vacancies = ProjectVacancyListSerializer(many=True, read_only=True)
     short_description = serializers.SerializerMethodField()
     industry_id = serializers.IntegerField(required=False)
-    likes_count = serializers.SerializerMethodField(method_name="count_likes")
     views_count = serializers.SerializerMethodField(method_name="count_views")
     links = serializers.SerializerMethodField()
     partner_programs_tags = serializers.SerializerMethodField()
@@ -95,9 +94,6 @@ def validate(self, data):
     def get_short_description(cls, project):
         return project.get_short_description()
 
-    def count_likes(self, project):
-        return get_likes_count(project)
-
     def count_views(self, project):
         return get_views_count(project)
 
@@ -128,7 +124,6 @@ class Meta:
             "datetime_created",
             "datetime_updated",
             "views_count",
-            "likes_count",
             "cover",
             "partner_programs_tags",
         ]
@@ -141,57 +136,30 @@ class Meta:
 
 
 class ProjectListSerializer(serializers.ModelSerializer):
-    likes_count = serializers.SerializerMethodField(method_name="count_likes")
     views_count = serializers.SerializerMethodField(method_name="count_views")
-    collaborator_count = serializers.SerializerMethodField(
-        method_name="get_collaborator_count"
-    )
-    vacancies = ProjectVacancyListSerializer(many=True, read_only=True)
     short_description = serializers.SerializerMethodField()
-    partner_programs_tags = serializers.SerializerMethodField()
 
     @classmethod
-    def get_partner_programs_tags(cls, project):
-        profiles_qs = project.partner_program_profiles.select_related(
-            "partner_program"
-        ).only("partner_program__tag")
-        return [profile.partner_program.tag for profile in profiles_qs]
-
-    def count_views(self, project):
+    def count_views(cls, project):
         return get_views_count(project)
 
     @classmethod
     def get_short_description(cls, project):
         return project.get_short_description()
 
-    @classmethod
-    def get_collaborator_count(cls, obj):
-        return len(obj.collaborator_set.all())
-
-    def count_likes(self, obj):
-        return get_likes_count(obj)
-
     class Meta:
         model = Project
         fields = [
             "id",
             "name",
             "leader",
-            "description",
             "short_description",
-            "step",
             "image_address",
-            "draft",
             "industry",
-            "collaborator_count",
-            "vacancies",
-            "datetime_created",
-            "likes_count",
             "views_count",
-            "partner_programs_tags",
         ]
 
-        read_only_fields = ["leader", "views_count", "likes_count"]
+        read_only_fields = ["leader", "views_count"]
 
     def is_valid(self, *, raise_exception=False):
         return super().is_valid(raise_exception=raise_exception)

projects/tests.py

@@ -30,8 +30,9 @@ def test_project_creation(self):
         response = self.project_list_view(request)
         self.assertEqual(response.status_code, 201)
         self.assertEqual(response.data["name"], "Test")
-        self.assertEqual(response.data["description"], "Test")
+        self.assertEqual(response.data["leader"], user.pk)
         self.assertEqual(response.data["industry"], 1)
+        # self.assertEqual(response.data["description"], "Test")
 
     def test_project_creation_with_wrong_data(self):
         user = self.user_create()