Commit f19e0065 authored by Ristylou Dolar's avatar Ristylou Dolar

Modified status messages for no records

parent a740e8cf
...@@ -43,7 +43,11 @@ class ApplicationViewSet(viewsets.ModelViewSet): ...@@ -43,7 +43,11 @@ class ApplicationViewSet(viewsets.ModelViewSet):
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
try: try:
queryset = Application.objects.filter(deleted_at__exact=None) queryset = Application.objects.filter(deleted_at__exact=None)
if not queryset.exists():
message = status_message_response(200, 'success', 'No records found', None)
return Response(message)
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
if page is not None: if page is not None:
serializer = self.get_serializer(page, many=True) serializer = self.get_serializer(page, many=True)
...@@ -130,7 +134,11 @@ class ApplicationViewSet(viewsets.ModelViewSet): ...@@ -130,7 +134,11 @@ class ApplicationViewSet(viewsets.ModelViewSet):
def archived(self, request, pk=None): def archived(self, request, pk=None):
try: try:
queryset = Application.objects.filter(deleted_at__isnull=False) queryset = Application.objects.filter(deleted_at__isnull=False)
if not queryset.exists():
message = status_message_response(200, 'success', 'No archived applications', None)
return Response(message)
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
if page is not None: if page is not None:
serializer = self.get_serializer(page, many=True) serializer = self.get_serializer(page, many=True)
...@@ -200,13 +208,10 @@ class APIServiceViewSet(viewsets.ModelViewSet): ...@@ -200,13 +208,10 @@ class APIServiceViewSet(viewsets.ModelViewSet):
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
try: try:
queryset = APIService.objects.filter(deleted_at__exact=None) queryset = APIService.objects.filter(deleted_at__exact=None)
if not queryset.exists(): if not queryset.exists():
message = { message = status_message_response(200, 'success', 'No records found', None)
'code': 404, return Response(message)
'status': 'failed',
'message': 'No records found'
}
return Response(message, status=status.HTTP_404_NOT_FOUND)
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
if page is not None: if page is not None:
...@@ -295,6 +300,10 @@ class APIServiceViewSet(viewsets.ModelViewSet): ...@@ -295,6 +300,10 @@ class APIServiceViewSet(viewsets.ModelViewSet):
try: try:
queryset = APIService.objects.filter(deleted_at__isnull=False) queryset = APIService.objects.filter(deleted_at__isnull=False)
if not queryset.exists():
message = status_message_response(200, 'success', 'No archived services', None)
return Response(message)
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
if page is not None: if page is not None:
serializer = self.get_serializer(page, many=True) serializer = self.get_serializer(page, many=True)
...@@ -315,7 +324,7 @@ class APIServiceViewSet(viewsets.ModelViewSet): ...@@ -315,7 +324,7 @@ class APIServiceViewSet(viewsets.ModelViewSet):
def endpoints(self, request, pk): def endpoints(self, request, pk):
try: try:
endpoints = APIEndpoint.objects.filter(service=pk) endpoints = APIEndpoint.objects.filter(service=pk)
page = self.paginate_queryset(endpoints) page = self.paginate_queryset(endpoints)
if page is not None: if page is not None:
serializer = APIEndpointSerializer(page, many=True) serializer = APIEndpointSerializer(page, many=True)
...@@ -366,13 +375,10 @@ class APIEndpointViewSet(viewsets.ModelViewSet): ...@@ -366,13 +375,10 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
try: try:
queryset = APIEndpoint.objects.filter(deleted_at__exact=None) queryset = APIEndpoint.objects.filter(deleted_at__exact=None)
if not queryset.exists(): if not queryset.exists():
message = { message = status_message_response(200, 'success', 'No records found', None)
'code': 404, return Response(message)
'status': 'failed',
'message': 'No records found'
}
return Response(message, status=status.HTTP_404_NOT_FOUND)
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
if page is not None: if page is not None:
...@@ -461,6 +467,10 @@ class APIEndpointViewSet(viewsets.ModelViewSet): ...@@ -461,6 +467,10 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
try: try:
queryset = APIEndpoint.objects.filter(deleted_at__isnull=False) queryset = APIEndpoint.objects.filter(deleted_at__isnull=False)
if not queryset.exists():
message = status_message_response(200, 'success', 'No archived endpoints', None)
return Response(message)
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
if page is not None: if page is not None:
serializer = self.get_serializer(page, many=True) serializer = self.get_serializer(page, many=True)
......
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