From 7804d831441c92f8aaa9544b42b5089f76f7728e Mon Sep 17 00:00:00 2001
From: Sergey Klyuykov <onegreyonewhite@mail.ru>
Date: Tue, 20 Dec 2022 11:43:09 +0400
Subject: [PATCH] Release 5.2.6

#### Changelog:
* Fix(backend): Passthrough ReturnDict/ReturnList on identical serializers with @Action.
---
 vstutils/__init__.py    |  2 +-
 vstutils/api/actions.py | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index efbb67c6..783d0be4 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.2.5'
+__version__: str = '5.2.6'
diff --git a/vstutils/api/actions.py b/vstutils/api/actions.py
index 18ba5659..22b14622 100644
--- a/vstutils/api/actions.py
+++ b/vstutils/api/actions.py
@@ -5,6 +5,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.decorators import action
+from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList
 from drf_yasg.utils import swagger_auto_schema
 
 from .responses import HTTP_200_OK, HTTP_201_CREATED, HTTP_204_NO_CONTENT
@@ -153,13 +154,23 @@ def action_method(
                 **kwargs,
         ) -> _t.Union[Response, FileResponse]:
 
-            result_serializer_class = self.result_serializer_class or view.get_serializer_class()
+            result_serializer_class: _t.Type[serializers.Serializer] = self.result_serializer_class  # type: ignore
+            identical = False
+            if result_serializer_class is None:
+                result_serializer_class = view.get_serializer_class()  # type: ignore
+                identical = True
+
             result = method(view, request, *args, **kwargs)
             response_class = self.method_response_mapping[_t.cast(_t.Text, request.method)]
 
             if issubclass(result_serializer_class, serializers.Serializer):
-                serializer = result_serializer_class(result, many=self.is_list, context=view.get_serializer_context())
-                result = serializer.data
+                if not (isinstance(result, (ReturnDict, ReturnList)) and identical):
+                    serializer = result_serializer_class(
+                        result,
+                        many=self.is_list,
+                        context=view.get_serializer_context()
+                    )
+                    result = serializer.data
             elif isinstance(result, FileResponse):
                 return result