Skip to content

R
red-ci-cd
Commit 31e40598 authored by Ristylou Dolar's avatar Ristylou Dolar
Browse files
Options

Replaced None in message response result with []

parent f19e0065
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
api/views.py
View file @ 31e40598
......@@ -32,11 +32,11 @@ class ApplicationViewSet(viewsets.ModelViewSet):
return Response(message)
except BadRequestException as e:
message = status_message_response(400, 'failed', str(e), None)
message = status_message_response(400, 'failed', str(e), [])
return Response(message, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# SHOW LIST of Applications
......@@ -45,7 +45,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
queryset = Application.objects.filter(deleted_at__exact=None)
if not queryset.exists():
message = status_message_response(200, 'success', 'No records found', None)
message = status_message_response(200, 'success', 'No records found', [])
return Response(message)
page = self.paginate_queryset(queryset)
......@@ -60,7 +60,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
return self.get_paginated_response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# SHOW application details
......@@ -71,14 +71,14 @@ class ApplicationViewSet(viewsets.ModelViewSet):
serializer = self.get_serializer(queryset, many=True)
if not queryset.exists():
message = status_message_response(404, 'failed', 'No record found', None)
message = status_message_response(404, 'failed', 'No record found', [])
return Response(message, status=status.HTTP_404_NOT_FOUND)
else:
message = status_message_response(200, 'success', 'Application retrieved', serializer.data)
return Response(message, status=status.HTTP_200_OK)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# UPDATE Application
......@@ -96,7 +96,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
return Response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# SOFT DELETE / ARCHIVED
......@@ -105,11 +105,11 @@ class ApplicationViewSet(viewsets.ModelViewSet):
instance = self.get_object()
self.perform_destroy(instance)
message = status_message_response(200, 'success', 'Application deleted', None)
message = status_message_response(200, 'success', 'Application deleted', [])
return Response(message, status=status.HTTP_200_OK)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
......@@ -125,7 +125,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
return Response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
......@@ -136,7 +136,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
queryset = Application.objects.filter(deleted_at__isnull=False)
if not queryset.exists():
message = status_message_response(200, 'success', 'No archived applications', None)
message = status_message_response(200, 'success', 'No archived applications', [])
return Response(message)
page = self.paginate_queryset(queryset)
......@@ -151,7 +151,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
return self.get_paginated_response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# Show app services
......@@ -172,7 +172,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
return self.get_paginated_response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
......@@ -197,11 +197,11 @@ class APIServiceViewSet(viewsets.ModelViewSet):
return Response(message)
except BadRequestException as e:
message = status_message_response(400, 'failed', str(e), None)
message = status_message_response(400, 'failed', str(e), [])
return Response(message, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# SHOW LIST of services
......@@ -210,7 +210,7 @@ class APIServiceViewSet(viewsets.ModelViewSet):
queryset = APIService.objects.filter(deleted_at__exact=None)
if not queryset.exists():
message = status_message_response(200, 'success', 'No records found', None)
message = status_message_response(200, 'success', 'No records found', [])
return Response(message)
page = self.paginate_queryset(queryset)
......@@ -225,7 +225,7 @@ class APIServiceViewSet(viewsets.ModelViewSet):
return self.get_paginated_response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# SHOW service details
......@@ -236,14 +236,14 @@ class APIServiceViewSet(viewsets.ModelViewSet):
serializer = self.get_serializer(queryset, many=True)
if not queryset.exists():
message = status_message_response(404, 'failed', 'No record found', None)
message = status_message_response(404, 'failed', 'No record found', [])
return Response(message, status=status.HTTP_404_NOT_FOUND)
else:
message = status_message_response(200, 'success', 'Service retrieved', serializer.data)
return Response(message, status=status.HTTP_200_OK)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# UPDATE service
......@@ -261,7 +261,7 @@ class APIServiceViewSet(viewsets.ModelViewSet):
return Response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# SOFT DELETE / ARCHIVED
......@@ -270,11 +270,11 @@ class APIServiceViewSet(viewsets.ModelViewSet):
instance = self.get_object()
self.perform_destroy(instance)
message = status_message_response(200, 'success', 'Service deleted', None)
message = status_message_response(200, 'success', 'Service deleted', [])
return Response(message, status=status.HTTP_200_OK)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
......@@ -290,7 +290,7 @@ class APIServiceViewSet(viewsets.ModelViewSet):
return Response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
......@@ -301,7 +301,7 @@ class APIServiceViewSet(viewsets.ModelViewSet):
queryset = APIService.objects.filter(deleted_at__isnull=False)
if not queryset.exists():
message = status_message_response(200, 'success', 'No archived services', None)
message = status_message_response(200, 'success', 'No archived services', [])
return Response(message)
page = self.paginate_queryset(queryset)
......@@ -316,7 +316,7 @@ class APIServiceViewSet(viewsets.ModelViewSet):
return self.get_paginated_response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# Show service endpoints
......@@ -337,7 +337,7 @@ class APIServiceViewSet(viewsets.ModelViewSet):
return self.get_paginated_response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
......@@ -364,11 +364,11 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
return Response(message)
except BadRequestException as e:
message = status_message_response(400, 'failed', str(e), None)
message = status_message_response(400, 'failed', str(e), [])
return Response(message, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# SHOW LIST of endpoints
......@@ -377,7 +377,7 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
queryset = APIEndpoint.objects.filter(deleted_at__exact=None)
if not queryset.exists():
message = status_message_response(200, 'success', 'No records found', None)
message = status_message_response(200, 'success', 'No records found', [])
return Response(message)
page = self.paginate_queryset(queryset)
......@@ -392,7 +392,7 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
return self.get_paginated_response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# SHOW endpoint details
......@@ -403,14 +403,14 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
serializer = self.get_serializer(queryset, many=True)
if not queryset.exists():
message = status_message_response(404, 'failed', 'No record found', None)
message = status_message_response(404, 'failed', 'No record found', [])
return Response(message, status=status.HTTP_404_NOT_FOUND)
else:
message = status_message_response(200, 'success', 'Endpoint retrieved', serializer.data)
return Response(message, status=status.HTTP_200_OK)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# UPDATE endpoint
......@@ -428,7 +428,7 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
return Response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# SOFT DELETE / ARCHIVED
......@@ -437,11 +437,11 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
instance = self.get_object()
self.perform_destroy(instance)
message = status_message_response(200, 'success', 'Endpoint deleted', None)
message = status_message_response(200, 'success', 'Endpoint deleted', [])
return Response(message, status=status.HTTP_200_OK)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
......@@ -457,7 +457,7 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
return Response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
......@@ -468,7 +468,7 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
queryset = APIEndpoint.objects.filter(deleted_at__isnull=False)
if not queryset.exists():
message = status_message_response(200, 'success', 'No archived endpoints', None)
message = status_message_response(200, 'success', 'No archived endpoints', [])
return Response(message)
page = self.paginate_queryset(queryset)
......@@ -483,7 +483,7 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
return self.get_paginated_response(message)
except Exception as e:
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), None)
message = status_message_response(500, 'failed', 'Request was not able to process' + str(e), [])
return Response(message, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
......
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