Get included resources as util

Author: bor3ham

rest_framework_json_api/renderers.py

@@ -465,12 +465,7 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
 
         serializer = getattr(serializer_data, 'serializer', None)
 
-        # Build a list of included resources
-        include_resources_param = request.query_params.get('include') if request else None
-        if include_resources_param:
-            included_resources = include_resources_param.split(',')
-        else:
-            included_resources = utils.get_default_included_resources_from_serializer(serializer)
+        included_resources = utils.get_included_resources(request, serializer)
 
         if serializer is not None:
 
@@ -508,7 +503,6 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
                 if included:
                     json_api_included.extend(included)
 
-
         # Make sure we render data in a specific order
         render_data = OrderedDict()
 

rest_framework_json_api/serializers.py

@@ -90,14 +90,12 @@ def validate_path(serializer_class, field_path, path):
                 validate_path(this_included_serializer, new_included_field_path, path)
 
         if request and view:
-            include_resources_param = request.query_params.get('include') if request else None
-            if include_resources_param:
-                included_resources = include_resources_param.split(',')
-                for included_field_name in included_resources:
-                    included_field_path = included_field_name.split('.')
-                    this_serializer_class = view.get_serializer_class()
-                    # lets validate the current path
-                    validate_path(this_serializer_class, included_field_path, included_field_name)
+            included_resources = utils.get_included_resources(request)
+            for included_field_name in included_resources:
+                included_field_path = included_field_name.split('.')
+                this_serializer_class = view.get_serializer_class()
+                # lets validate the current path
+                validate_path(this_serializer_class, included_field_path, included_field_name)
 
         super(IncludedResourcesValidationMixin, self).__init__(*args, **kwargs)
 

rest_framework_json_api/utils.py

@@ -235,11 +235,16 @@ def get_resource_type_from_serializer(serializer):
         return get_resource_type_from_model(serializer.Meta.model)
 
 
-def get_default_included_resources_from_serializer(serializer):
-    try:
-        return list(serializer.JSONAPIMeta.included_resources)
-    except AttributeError:
-        return []
+def get_included_resources(request, serializer):
+    """ Build a list of included resources. """
+    include_resources_param = request.query_params.get('include') if request else None
+    if include_resources_param:
+        return include_resources_param.split(',')
+    else:
+        try:
+            return list(serializer.JSONAPIMeta.included_resources)
+        except AttributeError:
+            return []
 
 
 def get_included_serializers(serializer):

rest_framework_json_api/views.py

@@ -16,17 +16,18 @@
 
 from rest_framework_json_api.exceptions import Conflict
 from rest_framework_json_api.serializers import ResourceIdentifierObjectSerializer
-from rest_framework_json_api.utils import get_resource_type_from_instance, OrderedDict, Hyperlink
+from rest_framework_json_api.utils import (
+    get_resource_type_from_instance,
+    OrderedDict,
+    Hyperlink,
+    get_included_resources,
+)
 
 
 class ModelViewSet(viewsets.ModelViewSet):
     def get_queryset(self, *args, **kwargs):
         qs = super().get_queryset(*args, **kwargs)
-        include_resources_param = self.request.query_params.get('include') if self.request else None
-        if include_resources_param:
-            included_resources = include_resources_param.split(',')
-        else:
-            included_resources = list()
+        included_resources = get_included_resources(self.request)
         for included in included_resources:
             if not hasattr(qs.model, included):
                 continue