Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions backend/users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,15 @@ def add_friend(self, request, **kwargs):
)
if not serializer.is_valid():
return Response(serializer.errors, status=HTTP_400_BAD_REQUEST)
if FriendsRequest.objects.filter(
from_user=to_user, to_user=from_user
).exists():
FriendsRequest.objects.filter(
from_user=to_user, to_user=from_user
).delete()

friend_request = (FriendsRequest.objects
.filter(from_user=to_user, to_user=from_user)
.first())
if friend_request is not None:
#friend_request.delete() # Удалит только одну запись
(FriendsRequest.objects
.filter(from_user=to_user, to_user=from_user)
.delete())
from_user.friends.add(to_user)
else:
FriendsRequest.objects.create(from_user=from_user, to_user=to_user)
Expand All @@ -85,12 +88,14 @@ def approve_request(self, request, **kwargs):
)
if not serializer.is_valid():
return Response(serializer.errors, status=HTTP_400_BAD_REQUEST)
if not FriendsRequest.objects.filter(
from_user=from_user, to_user=to_user
).exists():

friend_request = FriendsRequest.objects.filter(
from_user=from_user, to_user=to_user).first()
if friend_request is None:
return Response(
{"errors": "Такой заявки нет."}, status=HTTP_400_BAD_REQUEST
)
# friend_request.delete() # Удалит только одну запись
FriendsRequest.objects.filter(
from_user=from_user, to_user=to_user
).delete()
Expand All @@ -106,9 +111,11 @@ def approve_request(self, request, **kwargs):
def delete_friend(self, request, **kwargs):
current_user = request.user
friend = get_object_or_404(User, id=self.kwargs.get("id"))
if not FriendsRelationship.objects.filter(
current_user=current_user, friend=friend
).exists():

friend_relationship = (FriendsRelationship.objects
.filter(current_user=current_user,
friend=friend).first())
if friend_relationship is None:
return Response(
{"errors": "Пользователя нет в друзьях."},
status=HTTP_400_BAD_REQUEST,
Expand All @@ -125,13 +132,16 @@ def delete_friend(self, request, **kwargs):
def delete_request(self, request, **kwargs):
from_user = request.user
to_user = get_object_or_404(User, id=self.kwargs.get("id"))
if not FriendsRequest.objects.filter(
from_user=from_user, to_user=to_user
).exists():

friend_request = (FriendsRequest.objects
.filter(from_user=from_user,
to_user=to_user).first())
if friend_request is None:
return Response(
{"errors": "Такой заявки не существует."},
status=HTTP_400_BAD_REQUEST,
)
# friend_request.delete() # Удалит только одну запись
FriendsRequest.objects.filter(
from_user=from_user, to_user=to_user
).delete()
Expand Down