profiles: use of OneToOneField to access profile through user
This commit is contained in:
@ -4,8 +4,8 @@ from rest_framework import permissions, status
|
||||
from rest_framework.authentication import SessionAuthentication
|
||||
from rest_framework.request import Request
|
||||
|
||||
from django.contrib.auth.models import User
|
||||
from django.utils.translation import gettext as _
|
||||
from django.shortcuts import get_object_or_404
|
||||
|
||||
from ..models import BlockModel, ProfileModel
|
||||
from ..serializers.ProfileSerializer import ProfileSerializer
|
||||
@ -16,7 +16,7 @@ class GetBlocksView(APIView):
|
||||
authentication_classes = (SessionAuthentication,)
|
||||
|
||||
def get(self, request: Request):
|
||||
blocks = BlockModel.objects.filter(blocker=ProfileModel.objects.filter(user=request.user).first())
|
||||
blocks = BlockModel.objects.filter(blocker=request.user.profilemodel)
|
||||
bloked_profiles = [block.blocked for block in blocks]
|
||||
|
||||
return Response(ProfileSerializer(bloked_profiles, many=True).data)
|
||||
@ -26,32 +26,32 @@ class EditBlocksView(APIView):
|
||||
permission_classes = (permissions.IsAuthenticated,)
|
||||
authentication_classes = (SessionAuthentication,)
|
||||
|
||||
def get_object(self):
|
||||
return self.request.user.profilemodel
|
||||
|
||||
def post(self, request, pk=None):
|
||||
if (pk == request.user.pk):
|
||||
user_profile = self.get_object()
|
||||
blocked_profile = get_object_or_404(ProfileModel, pk=pk)
|
||||
|
||||
if user_profile.pk == pk:
|
||||
return Response(_('You can\'t block yourself.'), status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
blocked = User.objects.filter(pk=pk)
|
||||
if (not blocked.exists()):
|
||||
return Response(_('This user doesn\'t exist.'), status.HTTP_404_NOT_FOUND)
|
||||
if BlockModel.objects.filter(blocker=user_profile, blocked=blocked_profile):
|
||||
return Response(_('You already blocked this user.'), status.HTTP_409_CONFLICT)
|
||||
|
||||
if (BlockModel.objects.filter(blocker=request.user, blocked=pk)):
|
||||
return Response(_('You already blocked this user.'), status=status.HTTP_409_CONFLICT)
|
||||
|
||||
BlockModel(blocker=request.user, blocked=blocked[0]).save()
|
||||
|
||||
return Response(status=status.HTTP_201_CREATED)
|
||||
BlockModel(blocker=user_profile, blocked=blocked_profile).save()
|
||||
return Response(_('User successfully blocked.'), status.HTTP_201_CREATED)
|
||||
|
||||
def delete(self, request, pk=None):
|
||||
if (pk == request.user.pk):
|
||||
user_profile = self.get_object()
|
||||
blocked_profile = get_object_or_404(ProfileModel, pk=pk)
|
||||
|
||||
if user_profile.pk == pk:
|
||||
return Response(_('You can\'t unblock yourself.'), status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
blocked = User.objects.filter(pk=pk)
|
||||
if (not blocked.exists()):
|
||||
return Response(_('This user doesn\'t exist.'), status.HTTP_404_NOT_FOUND)
|
||||
block_record = BlockModel.objects.filter(blocker=user_profile, blocked=blocked_profile).first()
|
||||
if not block_record:
|
||||
return Response(_('This user is not blocked.'), status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
block = BlockModel.objects.filter(blocker=request.user, blocked=blocked[0])
|
||||
if (not block):
|
||||
return Response(_('This user isn\'t blocked.'), status.HTTP_400_NOT_FOUND)
|
||||
|
||||
block.delete()
|
||||
return Response(status=status.HTTP_200_OK)
|
||||
block_record.delete()
|
||||
return Response(_('User successfully unblocked.'), status.HTTP_200_OK)
|
||||
|
@ -4,7 +4,6 @@ from rest_framework import permissions, status
|
||||
from rest_framework.authentication import SessionAuthentication
|
||||
|
||||
from django.utils.translation import gettext as _
|
||||
from django.db.models import Q
|
||||
from django.shortcuts import get_object_or_404
|
||||
|
||||
from ..models import ProfileModel, FriendModel
|
||||
@ -16,11 +15,7 @@ class GetFriendsView(APIView):
|
||||
authentication_classes = (SessionAuthentication,)
|
||||
|
||||
def get(self, request):
|
||||
query = ProfileModel.objects.filter(user=request.user)
|
||||
if not query.exists():
|
||||
return Response(status=status.HTTP_400_BAD_REQUEST)
|
||||
friends = query[0].get_friends()
|
||||
return Response(ProfileSerializer(friends, many=True).data)
|
||||
return Response(ProfileSerializer(request.user.profilemodel.get_friends(), many=True).data)
|
||||
|
||||
|
||||
class EditFriendView(APIView):
|
||||
@ -28,7 +23,7 @@ class EditFriendView(APIView):
|
||||
authentication_classes = (SessionAuthentication,)
|
||||
|
||||
def get_object(self):
|
||||
return ProfileModel.objects.get(pk=self.request.user.pk)
|
||||
return self.request.user.profilemodel
|
||||
|
||||
def post(self, request, pk=None):
|
||||
user_profile = self.get_object()
|
||||
|
Reference in New Issue
Block a user