Merge pull request #570 from PROCOLLAB-github/feature/add-scored-expert-id

Добавлен ID эксперта в данные об оценённых проектах

Author: Toksi86

project_rates/serializers.py

@@ -61,6 +61,7 @@ class ProjectListForRateSerializer(serializers.ModelSerializer):
     views_count = serializers.SerializerMethodField()
     criterias = serializers.SerializerMethodField()
     scored = serializers.SerializerMethodField()
+    scored_expert_id = serializers.IntegerField(read_only=True, allow_null=True)
 
     class Meta:
         model = Project
@@ -75,6 +76,7 @@ class Meta:
             "region",
             "views_count",
             "scored",
+            "scored_expert_id",
             "criterias",
         ]
 

project_rates/views.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import get_user_model
-from django.db.models import QuerySet, Count
+from django.db.models import QuerySet, Count, OuterRef, Subquery, IntegerField
 
 from rest_framework import generics, status
 from rest_framework.response import Response
@@ -98,6 +98,13 @@ def get_queryset(self) -> QuerySet[Project]:
             project__isnull=False, partner_program__id=self.kwargs.get("program_id")
         ).values_list("project__id", flat=True)
         # `Count` the easiest way to check for rate exist (0 -> does not exist).
+        scored_expert_subquery = ProjectScore.objects.filter(
+            project=OuterRef("pk")
+        ).values("user__expert__id")[:1]
+
         return Project.objects.filter(draft=False, id__in=projects_ids).annotate(
-            scored=Count("scores")
+            scored=Count("scores"),
+            scored_expert_id=Subquery(
+                scored_expert_subquery, output_field=IntegerField()
+            ),
         )