Commit 3df4dedc authored by John Red Medrano's avatar John Red Medrano

{dev bugfix} code refactor on checking of account and applications

parent d0dad250
...@@ -107,16 +107,13 @@ class rms: ...@@ -107,16 +107,13 @@ class rms:
@wraps(function) @wraps(function)
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 ('excel_code' not in payload or
payload['excel_code'].strip() == ''
):
return error_message( return error_message(
'400', "Excel code is required", '400', "Excel code is required",
'failed', status.HTTP_400_BAD_REQUEST 'failed', status.HTTP_400_BAD_REQUEST
) )
elif len(payload['excel_code'].strip()) == 0:
return error_message(
'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']
) )
...@@ -138,6 +135,13 @@ class rms: ...@@ -138,6 +135,13 @@ class rms:
@wraps(function) @wraps(function)
def wrapper(self, request, *args, **kwargs): def wrapper(self, request, *args, **kwargs):
payload = request.data payload = request.data
if 'username' not in payload or payload['username'].strip() == '':
return error_message(
'400',
f"username is required",
'failed',
status.HTTP_400_BAD_REQUEST
)
username = self.queryset.filter( username = self.queryset.filter(
username=payload['username'] username=payload['username']
) )
......
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