Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions src/api-engine/api/common/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion src/api-engine/chaincode/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion src/api-engine/channel/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
22 changes: 0 additions & 22 deletions src/api-engine/common/responses.py
Original file line number Diff line number Diff line change
@@ -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"}
Comment on lines 1 to 6


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
Loading