Merge pull request #429 from PROCOLLAB-github/dev

Dev

Author: pavuchara

feed/views.py

@@ -1,5 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import QuerySet
+from django.db.models import QuerySet, Q
 from rest_framework.generics import CreateAPIView
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -10,6 +10,7 @@
 from news.models import News
 from .serializers import NewsFeedListSerializer
 from projects.models import Project
+from partner_programs.models import PartnerProgramUserProfile
 from vacancy.models import Vacancy
 
 
@@ -26,12 +27,22 @@ def _get_filter_data(self) -> list[str]:
             news_types.append("customuser")
         return news_types
 
+    def _get_excluded_projects_ids(self) -> list[int]:
+        """IDs for exclude projects which in Partner Program."""
+        excluded_projects = PartnerProgramUserProfile.objects.values_list("project_id", flat=True)
+        return excluded_projects
+
     def get_queryset(self) -> QuerySet[News]:
         filters = self._get_filter_data()
+        excluded_project_ids: list[int] = self._get_excluded_projects_ids()
+
         queryset = (
             News.objects.select_related("content_type")
             .prefetch_related("content_object", "files")
             .filter(content_type__model__in=filters)
+            .exclude(
+                Q(content_type__model="project") & Q(object_id__in=excluded_project_ids)
+            )
             .order_by("-datetime_created")
         )
         return queryset