Skip to content

Commit 60d1b75

Browse files
authored
Merge pull request #310 from PROCOLLAB-github/fix_scored_projects
scored projects fix
2 parents fb905e9 + 69da8be commit 60d1b75

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

project_rates/views.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from django.contrib.auth import get_user_model
2-
from django.db.models import Count
2+
from django.db.models import Count, Q
33

44
from rest_framework import generics, status
55
from rest_framework.response import Response
@@ -119,14 +119,11 @@ def get(self, request, *args, **kwargs):
119119
Project.objects.filter(
120120
partner_program_profiles__partner_program_id=program_id
121121
)
122-
.annotate(scores_count=Count("scores"))
122+
.annotate(user_scores_count=Count("scores", filter=Q(scores__user=user)))
123+
.filter(user_scores_count__lt=quantity_criterias)
123124
.distinct()
124125
)
125126

126-
unpaginated_projects = unpaginated_projects.exclude(
127-
scores_count__lt=quantity_criterias
128-
)
129-
130127
projects = self.paginate_queryset(unpaginated_projects)
131128

132129
criteria_serializer = CriteriaSerializer(data=criterias, many=True)

0 commit comments

Comments
 (0)