Merge pull request #532 from PROCOLLAB-github/feature/project-mospolytech-data

Расширен фильтр проектов по программам

Author: Toksi86

projects/filters.py

@@ -1,10 +1,10 @@
-from django.db.models import Count
+from django.db.models import Count, Q
 from django_filters import rest_framework as filters
 
-from users.models import Expert
-from partner_programs.models import PartnerProgram, PartnerProgramUserProfile
-from projects.models import Project
+from partner_programs.models import PartnerProgram
 from project_rates.models import ProjectScore
+from projects.models import Project
+from users.models import Expert
 
 
 class ProjectFilter(filters.FilterSet):
@@ -56,33 +56,30 @@ def vacancy_filter(cls, queryset, name, value):
         return queryset
 
     def filter_by_partner_program(self, queryset, name, value):
-        program_id = value
+        if str(value) == "0":
+            return queryset.filter(
+                partner_program_profiles__isnull=True,
+                program_links__isnull=True,
+            ).distinct()
 
         user = self.request.user
-        try:
-            program = PartnerProgram.objects.get(pk=program_id)
-            program_status = program.projects_availability
-            # If available to all users or request.user is an expert of this program.
-            if (
-                program_status == "all_users"
-                or Expert.objects.filter(user=user, programs=program).exists()
-            ):
-                profiles_qs = (
-                    PartnerProgramUserProfile.objects.filter(
-                        partner_program=program, project__isnull=False
-                    )
-                    .select_related("project")
-                    .only("project")
-                )
-                return queryset.filter(
-                    pk__in=[profile.project.pk for profile in profiles_qs]
-                )
-            else:
-                return Project.objects.none()
 
+        try:
+            program = PartnerProgram.objects.get(pk=value)
         except PartnerProgram.DoesNotExist:
             return Project.objects.none()
 
+        program_status = program.projects_availability
+        user_is_expert = Expert.objects.filter(user=user, programs=program).exists()
+
+        if program_status != "all_users" and not user_is_expert:
+            return Project.objects.none()
+
+        return queryset.filter(
+            Q(partner_program_profiles__partner_program=program)
+            | Q(program_links__partner_program=program)
+        ).distinct()
+
     def filter_by_have_expert_rates(self, queryset, name, value):
         rated_projects_ids = ProjectScore.objects.values_list(
             "project_id", flat=True
@@ -107,7 +104,9 @@ def filter_by_have_expert_rates(self, queryset, name, value):
     )
 
     # filters by whether there are any vacancies in the project
-    any_vacancies = filters.BooleanFilter(field_name="vacancies", method="vacancy_filter")
+    any_vacancies = filters.BooleanFilter(
+        field_name="vacancies", method="vacancy_filter"
+    )
     collaborator__count__gte = filters.NumberFilter(
         field_name="collaborator", method="filter_collaborator_count_gte"
     )
@@ -120,7 +119,9 @@ def filter_by_have_expert_rates(self, queryset, name, value):
     )
     is_rated_by_expert = filters.BooleanFilter(
         method="filter_by_have_expert_rates",
-        label=("is_rated_by_expert\n`1`/`true` rated projects\n`0`/`false` dosn't rated"),
+        label=(
+            "is_rated_by_expert\n`1`/`true` rated projects\n`0`/`false` dosn't rated"
+        ),
     )
 
     class Meta:

projects/serializers.py

@@ -93,6 +93,7 @@ class ProjectDetailSerializer(serializers.ModelSerializer):
     problem = serializers.CharField(required=False, allow_null=True, allow_blank=True)
     partner_program_fields = serializers.SerializerMethodField()
     partner_program_field_values = serializers.SerializerMethodField()
+    partner_program_id = serializers.SerializerMethodField()
 
     def get_partner_program_fields(self, project):
         try:
@@ -118,6 +119,13 @@ def get_partner_program_field_values(self, project):
         serializer = PartnerProgramFieldValueSerializer(values_qs, many=True)
         return serializer.data
 
+    def get_partner_program_id(self, project):
+        try:
+            link = project.program_links.select_related("partner_program").get()
+            return link.partner_program.id
+        except PartnerProgramProject.DoesNotExist:
+            return None
+
     @classmethod
     def get_partner_programs_tags(cls, project):
         profiles_qs = project.partner_program_profiles.select_related(
@@ -171,6 +179,7 @@ class Meta:
             "cover",
             "cover_image_address",
             "partner_programs_tags",
+            "partner_program_id",
             "partner_program_fields",
             "partner_program_field_values",
             "track",

projects/views.py

@@ -703,7 +703,6 @@ def post(self, request):
                 goal=original_project.goal,
                 problem=original_project.problem,
                 industry=original_project.industry,
-                presentation_address=original_project.presentation_address,
                 image_address=original_project.image_address,
                 leader=request.user,
                 draft=True,