diff --git a/src/api-engine/api/common/enums.py b/src/api-engine/api/common/enums.py index d500c7bde..c595e6d4d 100644 --- a/src/api-engine/api/common/enums.py +++ b/src/api-engine/api/common/enums.py @@ -4,17 +4,7 @@ from enum import Enum, unique, EnumMeta import inspect - -def separate_upper_class(class_name): - x = "" - i = 0 - for c in class_name: - if c.isupper() and not class_name[i - 1].isupper(): - x += " %s" % c.lower() - else: - x += c - i += 1 - return "_".join(x.strip().split(" ")) +from common.utils import separate_upper_class class ExtraEnum(Enum): diff --git a/src/api-engine/chaincode/views.py b/src/api-engine/chaincode/views.py index d8342e82d..8af4cb09f 100644 --- a/src/api-engine/chaincode/views.py +++ b/src/api-engine/chaincode/views.py @@ -9,7 +9,8 @@ from chaincode.models import Chaincode from chaincode.serializers import ChaincodeCommitBody, ChaincodeList, ChaincodeCreateBody, ChaincodeID, ChaincodeRequestBody, ChaincodeResponse, \ ChaincodeInstallBody, ChaincodeApproveBody -from common.responses import with_common_response, ok +from common.responses import ok +from api.utils.common import with_common_response from common.serializers import PageQuerySerializer diff --git a/src/api-engine/channel/views.py b/src/api-engine/channel/views.py index 4a03c38d7..5a5ec3968 100644 --- a/src/api-engine/channel/views.py +++ b/src/api-engine/channel/views.py @@ -8,7 +8,7 @@ from api.common.response import make_response_serializer from channel.models import Channel from channel.serializers import ChannelList, ChannelID, ChannelResponse, ChannelCreateBody -from common.responses import with_common_response +from api.utils.common import with_common_response from common.serializers import PageQuerySerializer diff --git a/src/api-engine/common/responses.py b/src/api-engine/common/responses.py index e6fc75b1a..7a0323454 100644 --- a/src/api-engine/common/responses.py +++ b/src/api-engine/common/responses.py @@ -1,28 +1,6 @@ -from rest_framework import status - -from api.common.serializers import BadResponseSerializer - - def ok(data): return {"data": data, "msg": None, "status": "successful"} def err(msg): return {"data": None, "msg": msg, "status": "fail"} - - -def with_common_response(responses=None): - if responses is None: - responses = {} - - responses.update( - { - status.HTTP_400_BAD_REQUEST: BadResponseSerializer, - status.HTTP_401_UNAUTHORIZED: "Permission denied", - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal Error", - status.HTTP_403_FORBIDDEN: "Authentication credentials " - "were not provided.", - } - ) - - return responses