diff --git a/django/chat/views/ask.py b/django/chat/views/ask.py index bb5a4c4..2e34020 100644 --- a/django/chat/views/ask.py +++ b/django/chat/views/ask.py @@ -5,8 +5,6 @@ from rest_framework.authentication import SessionAuthentication from chat.models import AskModel -from ..serializers.ask import AskSerializer - from notice.consumers import notice_manager from django.contrib.auth.models import User @@ -14,7 +12,6 @@ from django.contrib.auth.models import User class AskView(APIView): - serializer_class = AskSerializer permission_classes = (permissions.IsAuthenticated,) authentication_classes = (SessionAuthentication,) @@ -24,11 +21,15 @@ class AskView(APIView): asker_id = request.user.pk asked_id = data["asked"] + print("1") + if (asked_id is None): return Response(status=status.HTTP_400_BAD_REQUEST) + print("2") if AskModel().is_asked(asker_id, asked_id): return Response(status=status.HTTP_208_ALREADY_REPORTED) + print("3") AskModel(asker_id=asker_id, asked_id=asked_id).save() return Response(status=status.HTTP_201_CREATED) @@ -45,8 +46,11 @@ class AskView(APIView): if (asked_id is None): return Response(status=status.HTTP_400_BAD_REQUEST) + print(asker_id, " ", asked_id) + print(AskModel().is_asked(2, 1)) + print(AskModel().is_asked(1, 2)) if not AskModel().is_asked(asker_id, asked_id): - return Response(status=status.HTTP_404_NOT_FOUND) + return Response(status=status.HTTP_204_NO_CONTENT) # Don't need more verification, just above is enough asker = User.objects.get(pk=asker_id) @@ -57,10 +61,23 @@ class AskView(APIView): return Response(status=status.HTTP_200_OK) + def get(self, request, pk=None): + data: dict = request.data + + asker_id = request.user.pk + asked_id = pk + + if (asked_id is None): + return Response(status=status.HTTP_400_BAD_REQUEST) + + if not AskModel().is_asked(asker_id, asked_id): + return Response(status=status.HTTP_204_NO_CONTENT) + return Response(status=status.HTTP_200_OK) + + class AskAcceptView(APIView): - serializer_class = AskSerializer permission_classes = (permissions.IsAuthenticated,) authentication_classes = (SessionAuthentication,)