diff --git a/base/messages.py b/base/messages.py index 998a5b2..38c345d 100644 --- a/base/messages.py +++ b/base/messages.py @@ -74,7 +74,8 @@ ERROR_CODE = { "2041": "Article with given id doesn't exist.", "2042": "Article Card with given id doesn't exist.", "2043": "Article Survey with given id doesn't exist.", - "2044": "Task does not exist" + "2044": "Task does not exist", + "2045": "Invalid guardian" } """Success message code""" SUCCESS_CODE = { diff --git a/junior/views.py b/junior/views.py index 9217a0d..d67dfde 100644 --- a/junior/views.py +++ b/junior/views.py @@ -113,10 +113,12 @@ class JuniorListAPIView(viewsets.ModelViewSet): # requests.get('https://dev-api.zodqaapp.com/api/v1/top-junior/', headers=headers_token) guardian_data = Guardian.objects.filter(user__email=request.user).last() # fetch junior object - queryset = Junior.objects.filter(guardian_code__icontains=str(guardian_data.guardian_code)) - # use JuniorDetailListSerializer serializer - serializer = JuniorDetailListSerializer(queryset, many=True) - return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) + if guardian_data: + queryset = Junior.objects.filter(guardian_code__icontains=str(guardian_data.guardian_code)) + # use JuniorDetailListSerializer serializer + serializer = JuniorDetailListSerializer(queryset, many=True) + return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) + return custom_error_response(ERROR_CODE['2045'], response_status=status.HTTP_200_OK) class AddJuniorAPIView(viewsets.ModelViewSet): """Add Junior by guardian"""