PILOT-42 | refactor, fix bug

app/api/__init__.py

@@ -3,10 +3,14 @@
 """common class for REST API"""
 
 from .auth import token_authenticated, http_authenticated, session_authenticated, authenticated
+
+from .base import (make_empty_response, Resource, TokenRequiredResource,
+                   AdminRoleRequiredResource, jwt_authenticate, jwt_encode_payload,
+                   jwt_decode_token, jwt_load_user, jwt_make_payload)
+
+from .utils import marshal
+
 from .decorators import (anonymous_required, token_auth_required, http_auth_required,
                          session_auth_required, auth_required, permissions_accepted,
                          permissions_required, roles_required, roles_accepted, one_of, paginated,
                          marshal_with, marshal_with_data_envelope, extract_args)
-from .base import (make_empty_response, Resource, TokenRequiredResource,
-                   AdminRoleRequiredResource, jwt_authenticate, jwt_encode_payload,
-                   jwt_decode_token, jwt_load_user, jwt_make_payload, marshal)

app/api/base.py

@@ -156,18 +156,6 @@ def build_route_name(cls, method_name):
         return super(Resource, cls).build_route_name(method_name)
 
 
-def marshal(data, schema=None, envelope=None):
-    """Marshal data with marshmallow"""
-    if schema:
-        result = schema.dump(data)  # TODO(hoatle): handle error?
-        data = result.data
-
-    if envelope:
-        return {envelope: data}
-    else:
-        return data
-
-
 class TokenRequiredResource(Resource):
     """The base resource class that requires token authentication"""
 

app/api/decorators.py

@@ -17,7 +17,7 @@
 from ..pagination import OffsetPagination
 from . import (authenticated, token_authenticated, http_authenticated,
                session_authenticated)
-from .utils import extract_filters
+from .utils import extract_filters, marshal
 
 
 def anonymous_required(func):

app/api/utils.py

@@ -48,3 +48,15 @@ def extract_filters(args):
     args = extract_dict(args, ignored_keys=filter_dict.keys())
 
     return filters, args
+
+
+def marshal(data, schema=None, envelope=None):
+    """Marshal data with marshmallow"""
+    if schema:
+        result = schema.dump(data)  # TODO(hoatle): handle error?
+        data = result.data
+
+    if envelope:
+        return {envelope: data}
+    else:
+        return data