Commit 7926698f authored by John Red Medrano's avatar John Red Medrano

{dev bugfix} added a function that return will retun error message

parent 4c3e4a87
...@@ -15,6 +15,16 @@ from app.businesslayer.changerequest.change_request_template import ( ...@@ -15,6 +15,16 @@ from app.businesslayer.changerequest.change_request_template import (
) )
def error_message(code, message, status, status_code):
return Response(
{
"code": code,
"message": message,
"status": status
},
status=status_code
)
def error_safe(function): def error_safe(function):
def wrap(request, *args, **kwargs): def wrap(request, *args, **kwargs):
stat = status.HTTP_500_INTERNAL_SERVER_ERROR stat = status.HTTP_500_INTERNAL_SERVER_ERROR
...@@ -103,19 +113,22 @@ class rms: ...@@ -103,19 +113,22 @@ class rms:
def wrapper(self, request, *args, **kwargs): def wrapper(self, request, *args, **kwargs):
payload = request.data payload = request.data
if not 'excel_code' in payload: if not 'excel_code' in payload:
return Response( return error_message(
{"message": "Excel code is required"} '400', "Excel code is required",
'failed', status.HTTP_400_BAD_REQUEST
) )
elif len(payload['excel_code'].strip()) == 0: elif len(payload['excel_code'].strip()) == 0:
return Response( return error_message(
{"message": "Excel code is may not be blank"} '400', "Excel code is may not be blank",
'failed', status.HTTP_400_BAD_REQUEST
) )
is_excel_code_exist = self.queryset.filter( is_excel_code_exist = self.queryset.filter(
excel_code=payload['excel_code'] excel_code=payload['excel_code']
) )
if is_excel_code_exist: if is_excel_code_exist:
return Response( return error_message(
{"message": "This excel code is already exists"} '400', "This excel code is already exists",
'failed', status.HTTP_400_BAD_REQUEST
) )
return function(self, request, *args, **kwargs) return function(self, request, *args, **kwargs)
return wrapper return wrapper
...@@ -128,14 +141,12 @@ class rms: ...@@ -128,14 +141,12 @@ class rms:
payload = request.data payload = request.data
username = self.queryset.filter(username=payload['username']) username = self.queryset.filter(username=payload['username'])
if username.count() >= 1: if username.count() >= 1:
return Response( return error_message(
{ '400',
"message": f"username {username.first().username} is already taken" f"username {username.first().username} is already taken",
}, 'failed',
status=status.HTTP_400_BAD_REQUEST status.HTTP_400_BAD_REQUEST
) )
# rms.user_create(self, request, *args, **kwargs)
return function(self, request, *args, **kwargs) return function(self, request, *args, **kwargs)
return wrapper return wrapper
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment