Merge pull request #566 from PROCOLLAB-github/feature/addotinal_fields_for_programm

Расширена информация о программах в проектах

Author: Toksi86

projects/managers.py

@@ -16,10 +16,18 @@ def get_draft_projects_for_user(self):
 
 class ProjectManager(Manager):
     def get_projects_for_list_view(self):
-        return self.get_queryset().filter(draft=False).prefetch_related("program_links")
+        return (
+            self.get_queryset()
+            .filter(draft=False)
+            .prefetch_related("program_links__partner_program")
+        )
 
     def get_user_projects_for_list_view(self):
-        return self.get_queryset().distinct()
+        return (
+            self.get_queryset()
+            .prefetch_related("program_links__partner_program")
+            .distinct()
+        )
 
     def get_projects_for_detail_view(self):
         return (

projects/serializers.py

@@ -334,7 +334,7 @@ class Meta:
 class ProjectListSerializer(serializers.ModelSerializer):
     views_count = serializers.SerializerMethodField(method_name="count_views")
     short_description = serializers.SerializerMethodField()
-    partner_program_id = serializers.SerializerMethodField()
+    partner_program = serializers.SerializerMethodField()
 
     @classmethod
     def count_views(cls, project):
@@ -345,12 +345,23 @@ def get_short_description(cls, project):
         return project.get_short_description()
 
     @staticmethod
-    def get_partner_program_id(project):
+    def _get_program_link(project):
         links_cache = getattr(project, "_prefetched_objects_cache", {}).get(
             "program_links"
         )
-        link = links_cache[0] if links_cache else project.program_links.first()
-        return link.partner_program_id if link else None
+        if links_cache:
+            return links_cache[0]
+        return project.program_links.select_related("partner_program").first()
+
+    @classmethod
+    def get_partner_program(cls, project):
+        link = cls._get_program_link(project)
+        if link and link.partner_program:
+            return {
+                "id": link.partner_program_id,
+                "name": link.partner_program.name,
+            }
+        return None
 
     class Meta:
         model = Project
@@ -363,10 +374,15 @@ class Meta:
             "industry",
             "views_count",
             "is_company",
-            "partner_program_id",
+            "partner_program",
         ]
 
-        read_only_fields = ["leader", "views_count", "is_company", "partner_program_id"]
+        read_only_fields = [
+            "leader",
+            "views_count",
+            "is_company",
+            "partner_program",
+        ]
 
     def is_valid(self, *, raise_exception=False):
         return super().is_valid(raise_exception=raise_exception)

users/serializers.py

@@ -940,6 +940,7 @@ class ResendVerifyEmailSerializer(serializers.Serializer):
 class UserProjectListSerializer(serializers.ModelSerializer[Project]):
     views_count = serializers.SerializerMethodField(method_name="count_views")
     short_description = serializers.SerializerMethodField()
+    partner_program = serializers.SerializerMethodField()
 
     @classmethod
     def count_views(cls, project):
@@ -949,6 +950,21 @@ def count_views(cls, project):
     def get_short_description(cls, project):
         return project.get_short_description()
 
+    @staticmethod
+    def get_partner_program(project):
+        links_cache = getattr(project, "_prefetched_objects_cache", {}).get(
+            "program_links"
+        )
+        link = links_cache[0] if links_cache else project.program_links.select_related(
+            "partner_program"
+        ).first()
+        if link and link.partner_program:
+            return {
+                "id": link.partner_program_id,
+                "name": link.partner_program.name,
+            }
+        return None
+
     class Meta:
         model = Project
         fields = [
@@ -961,9 +977,10 @@ class Meta:
             "views_count",
             "draft",
             "is_company",
+            "partner_program",
         ]
 
-        read_only_fields = ["leader", "views_count", "is_company"]
+        read_only_fields = ["leader", "views_count", "is_company", "partner_program"]
 
     def is_valid(self, *, raise_exception=False):
         return super().is_valid(raise_exception=raise_exception)