Including source/collection summaries in user/org pins listing

Author: snyaggarwal

core/collections/serializers.py

@@ -225,7 +225,10 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
         params = get(kwargs, 'context.request.query_params')
-        self.query_params = params.dict() if params else dict()
+
+        self.query_params = dict()
+        if params:
+            self.query_params = params if isinstance(params, dict) else params.dict()
         self.include_summary = self.query_params.get(INCLUDE_SUMMARY) in ['true', True]
         self.include_client_configs = self.query_params.get(INCLUDE_CLIENT_CONFIGS) in ['true', True]
 

core/pins/serializers.py

@@ -3,6 +3,7 @@
 from rest_framework import serializers
 from rest_framework.fields import SerializerMethodField
 
+from core.common.constants import INCLUDE_SUMMARY
 from core.pins.models import Pin
 
 
@@ -13,10 +14,12 @@ def build_resource_data(obj):
     resource_type = resource.resource_type.lower()
     if resource_type == 'source':
         from core.sources.serializers import SourceDetailSerializer
-        return SourceDetailSerializer(resource).data
+        return SourceDetailSerializer(
+            resource, context=dict(request=dict(query_params={INCLUDE_SUMMARY: True}))).data
     if resource_type == 'collection':
         from core.collections.serializers import CollectionDetailSerializer
-        return CollectionDetailSerializer(resource).data
+        return CollectionDetailSerializer(
+            resource, context=dict(request=dict(query_params={INCLUDE_SUMMARY: True}))).data
     if resource_type == 'organization':
         from core.orgs.serializers import OrganizationDetailSerializer
         return OrganizationDetailSerializer(resource).data

core/pins/views.py

@@ -1,6 +1,7 @@
 from django.shortcuts import get_object_or_404
 from rest_framework import status
-from rest_framework.generics import RetrieveAPIView, DestroyAPIView, UpdateAPIView
+from rest_framework.generics import ListAPIView, \
+    RetrieveUpdateDestroyAPIView
 from rest_framework.permissions import IsAuthenticatedOrReadOnly
 from rest_framework.response import Response
 
@@ -16,6 +17,9 @@ class PinBaseView(BaseAPIView):
     serializer_class = PinSerializer
     permission_classes = (IsAuthenticatedOrReadOnly,)
 
+    def filter_queryset(self, queryset):
+        return queryset
+
     def get_parent_type(self):
         if self.kwargs.get('user_is_self') or 'user' in self.kwargs:
             return 'user'
@@ -47,10 +51,7 @@ def get_queryset(self):
         ).select_related('organization', 'user').prefetch_related('resource')
 
 
-class PinListView(PinBaseView):
-    def get(self, request, *args, **kwargs):  # pylint: disable=unused-argument
-        return Response(self.get_serializer(self.get_queryset(), many=True).data)
-
+class PinListView(PinBaseView, ListAPIView):
     def post(self, request, *args, **kwargs):  # pylint: disable=unused-argument
         parent = self.get_parent()
         if not parent:
@@ -69,7 +70,7 @@ def post(self, request, *args, **kwargs):  # pylint: disable=unused-argument
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
-class PinRetrieveUpdateDestroyView(PinBaseView, UpdateAPIView, RetrieveAPIView, DestroyAPIView):
+class PinRetrieveUpdateDestroyView(PinBaseView, RetrieveUpdateDestroyAPIView):
     def get_serializer_class(self):
         if self.request.method == 'PUT':
             return PinUpdateSerializer

core/sources/serializers.py

@@ -234,7 +234,10 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
         params = get(kwargs, 'context.request.query_params')
-        self.query_params = params.dict() if params else dict()
+
+        self.query_params = dict()
+        if params:
+            self.query_params = params if isinstance(params, dict) else params.dict()
         self.include_summary = self.query_params.get(INCLUDE_SUMMARY) in ['true', True]
         self.include_client_configs = self.query_params.get(INCLUDE_CLIENT_CONFIGS) in ['true', True]
         self.include_hierarchy_root = self.query_params.get(INCLUDE_HIERARCHY_ROOT) in ['true', True]