profiles: serializers representation to parse avatar url
This commit is contained in:
parent
51f8dfcaa3
commit
13a078eb82
@ -25,10 +25,8 @@ class MyProfile extends Profile
|
||||
const response = await this.client._patch_file(`/api/profiles/settings`, formData);
|
||||
const responseData = await response.json();
|
||||
|
||||
if (response.ok) {
|
||||
this.avatar = responseData.avatar.substr(responseData.avatar.indexOf('static') - 1);
|
||||
if (response.ok)
|
||||
return null;
|
||||
}
|
||||
return responseData;
|
||||
}
|
||||
|
||||
@ -36,10 +34,8 @@ class MyProfile extends Profile
|
||||
const response = await this.client._delete('/api/profiles/settings');
|
||||
const responseData = await response.json();
|
||||
|
||||
if (response.ok) {
|
||||
this.avatar = responseData.avatar.substr(responseData.avatar.indexOf('static') - 1);
|
||||
if (response.ok)
|
||||
return null;
|
||||
}
|
||||
return responseData;
|
||||
}
|
||||
|
||||
|
@ -20,3 +20,9 @@ class ProfileSerializer(serializers.ModelSerializer):
|
||||
if value.size > settings.PROFILE_PICTURE_MAX_SIZE:
|
||||
raise serializers.ValidationError(_('Image is too large.'))
|
||||
return value
|
||||
|
||||
def to_representation(self, instance):
|
||||
data = super().to_representation(instance)
|
||||
data['avatar'] = data['avatar'][data['avatar'].find('/static/'):]
|
||||
print(data)
|
||||
return data
|
||||
|
@ -1,8 +1,9 @@
|
||||
from django.test import TestCase
|
||||
from django.http import HttpResponse, HttpRequest
|
||||
from django.http import HttpResponse
|
||||
from django.contrib.auth.models import User
|
||||
from rest_framework import status
|
||||
|
||||
|
||||
# Create your tests here.
|
||||
class ProfileTest(TestCase):
|
||||
def setUp(self):
|
||||
self.user: User = User.objects.create(username='bozo', password='password')
|
||||
@ -16,3 +17,17 @@ class ProfileTest(TestCase):
|
||||
response_dict: dict = eval(response.content)
|
||||
self.assertDictEqual(self.expected_response, response_dict)
|
||||
|
||||
|
||||
class BlockTest(TestCase):
|
||||
def setUp(self):
|
||||
self.blocker_password = 'hello_world'
|
||||
self.blocker: User = User.objects.create_user('blocker', password=self.blocker_passord)
|
||||
self.blocked: User = User.objects.create_user('blocked', password='password')
|
||||
self.blocker.save()
|
||||
self.blocked.save()
|
||||
|
||||
def test_normal(self):
|
||||
self.client.login(self.blocker.username, self.blocker_password)
|
||||
response: HttpResponse = self.client.post(f'/api/profiles/block/{self.blocked.pk}')
|
||||
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
|
||||
|
||||
|
@ -1,15 +1,16 @@
|
||||
from django.urls import path
|
||||
|
||||
from . import viewsets
|
||||
from .viewsets.ProfileViewSet import ProfileViewSet
|
||||
from .viewsets.MyProfileViewSet import MyProfileViewSet
|
||||
from . import views
|
||||
|
||||
urlpatterns = [
|
||||
path("settings", viewsets.MyProfileViewSet.as_view({'patch': 'partial_update', 'delete': 'delete_avatar'}), name="my_profile_page"),
|
||||
path("me", viewsets.MyProfileViewSet.as_view({'get': 'retrieve'}), name="my_profile_page"),
|
||||
path("", viewsets.ProfileViewSet.as_view({'get': 'list'}), name="profiles_list"),
|
||||
path("settings", MyProfileViewSet.as_view({'patch': 'partial_update', 'delete': 'delete_avatar'}), name="my_profile_page"),
|
||||
path("me", MyProfileViewSet.as_view({'get': 'retrieve'}), name="my_profile_page"),
|
||||
path("", ProfileViewSet.as_view({'get': 'list'}), name="profiles_list"),
|
||||
path("block", views.BlocksView.as_view(), name="block_page"),
|
||||
path("block/<int:pk>", views.BlockView.as_view(), name="block_page"),
|
||||
path("block/<int:pk>", views.BlocksView.as_view(), name="block_page"),
|
||||
path("friend", views.FriendsView.as_view(), name="friend_page"),
|
||||
path("user/<str:username>", viewsets.ProfileViewSet.as_view({'get': 'retrieve'}), name="profile_page"),
|
||||
path("id/<int:pk>", viewsets.ProfileViewSet.as_view({'get': 'retrieve_id'}), name="profile_page"),
|
||||
path("user/<str:username>", ProfileViewSet.as_view({'get': 'retrieve'}), name="profile_page"),
|
||||
path("id/<int:pk>", ProfileViewSet.as_view({'get': 'retrieve_id'}), name="profile_page"),
|
||||
]
|
||||
|
@ -1,52 +1,31 @@
|
||||
from rest_framework.views import APIView
|
||||
from rest_framework.response import Response
|
||||
from rest_framework import authentication, permissions, status
|
||||
from rest_framework import permissions, status
|
||||
from rest_framework.authentication import SessionAuthentication
|
||||
from rest_framework.renderers import JSONRenderer
|
||||
from django.core import serializers
|
||||
from django.utils.translation import gettext as _
|
||||
from .models import BlockModel, FriendModel
|
||||
|
||||
class BlockView(APIView):
|
||||
permission_classes = (permissions.IsAuthenticated,)
|
||||
authentication_classes = (SessionAuthentication,)
|
||||
|
||||
def get(self, request, pk):
|
||||
block = BlockModel.objects.filter(pk=pk)
|
||||
if (block.exists()):
|
||||
return Response(serializers.serialize("json", block), status=status.HTTP_200_OK)
|
||||
else:
|
||||
return Response("Not Found", status=status.HTTP_404_NOT_FOUND)
|
||||
|
||||
|
||||
class BlocksView(APIView):
|
||||
permission_classes = (permissions.IsAuthenticated,)
|
||||
authentication_classes = (SessionAuthentication,)
|
||||
|
||||
def get(self, request):
|
||||
blocks = BlockModel.objects.filter(blocker=request.user.pk)
|
||||
if (blocks):
|
||||
return Response({"blockeds": serializers.serialize("json", BlockModel.objects.filter(blocker=request.user.pk)), "user_id": request.user.pk}, status=status.HTTP_200_OK)
|
||||
return Response({}, status=status.HTTP_204_NO_CONTENT)
|
||||
blocked_profiles = BlockModel.objects.filter(blocker=request.user.pk)
|
||||
response_status: int = status.HTTP_204_NO_CONTENT if blocked_profiles else status.HTTP_204_NO_CONTENT
|
||||
return Response(serializers.serialize("json", blocked_profiles), response_status)
|
||||
|
||||
def post(self, request):
|
||||
data: dict = request.data
|
||||
users_id = request.data.get("users_id", None)
|
||||
def post(self, request, pk=None):
|
||||
if (pk == request.user.pk):
|
||||
return Response(_('You can\'t block yourself.'), status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
if (users_id == None):
|
||||
return Response({"Error send None"}, status=status.HTTP_400_BAD_REQUEST)
|
||||
if (BlockModel.objects.filter(blocker=request.user.pk, blocked=pk)):
|
||||
return Response(_('You already blocked this user.'), status=status.HTTP_409_CONFLICT)
|
||||
|
||||
if (users_id[0] == None or users_id[1] == None):
|
||||
return Response({"Error send blocker/ed None"}, status=status.HTTP_400_BAD_REQUEST)
|
||||
BlockModel(blocker=request.user.pk, blocked=pk).save()
|
||||
|
||||
if (BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])):
|
||||
return Response({"Already Exist"}, status=status.HTTP_409_CONFLICT)
|
||||
|
||||
new_block = BlockModel()
|
||||
new_block.blocker = users_id[0]
|
||||
new_block.blocked = users_id[1]
|
||||
new_block.save()
|
||||
|
||||
return Response({"block_id": new_block.pk}, status=status.HTTP_201_CREATED)
|
||||
return Response(status=status.HTTP_201_CREATED)
|
||||
|
||||
def delete(self, request):
|
||||
data: dict = request.data
|
||||
|
@ -1,76 +0,0 @@
|
||||
from rest_framework import permissions, status
|
||||
from rest_framework import viewsets
|
||||
from rest_framework.response import Response
|
||||
from rest_framework.authentication import SessionAuthentication
|
||||
|
||||
from django.http import HttpRequest
|
||||
from django.contrib.auth.models import User
|
||||
from django.utils.translation import gettext as _
|
||||
|
||||
from .serializers import ProfileSerializer
|
||||
from .models import ProfileModel
|
||||
|
||||
|
||||
class ProfileViewSet(viewsets.ModelViewSet):
|
||||
queryset = ProfileModel.objects.all()
|
||||
serializer_class = ProfileSerializer
|
||||
permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
|
||||
|
||||
def retrieve(self, request: HttpRequest, username=None):
|
||||
user = User.objects.filter(username=username)
|
||||
if (not user):
|
||||
return Response({"detail": _("Profile not found.")}, status=status.HTTP_404_NOT_FOUND)
|
||||
instance = self.get_queryset().get(pk=user[0].pk)
|
||||
instance.avatar.name = instance.avatar.name[instance.avatar.name.find("static") - 1:]
|
||||
return Response(self.serializer_class(instance).data,
|
||||
status=status.HTTP_200_OK)
|
||||
|
||||
def retrieve_id(self, request: HttpRequest, pk=None):
|
||||
user = User.objects.filter(pk=pk)
|
||||
if (not user):
|
||||
return Response({"detail": _("Profile not found.")}, status=status.HTTP_404_NOT_FOUND)
|
||||
instance = self.get_queryset().get(pk=user[0].pk)
|
||||
instance.avatar.name = instance.avatar.name[instance.avatar.name.find("static") - 1:]
|
||||
return Response(self.serializer_class(instance).data,
|
||||
status=status.HTTP_200_OK)
|
||||
|
||||
def list(self, request: HttpRequest):
|
||||
serializer = ProfileSerializer(self.get_queryset(), many=True)
|
||||
for profile in serializer.data:
|
||||
profile["avatar"] = profile["avatar"][profile["avatar"].find("static") - 1:]
|
||||
return Response(serializer.data)
|
||||
|
||||
|
||||
class MyProfileViewSet(viewsets.ModelViewSet):
|
||||
permission_classes = (permissions.IsAuthenticated,)
|
||||
authentication_classes = (SessionAuthentication,)
|
||||
serializer_class = ProfileSerializer
|
||||
queryset = ProfileModel.objects.all()
|
||||
|
||||
def get_object(self):
|
||||
obj = self.get_queryset().get(pk=self.request.user.pk)
|
||||
return obj
|
||||
|
||||
def perform_update(self, serializer: ProfileSerializer, pk=None):
|
||||
serializer.is_valid(raise_exception=True)
|
||||
avatar = serializer.validated_data.get('avatar')
|
||||
profile: ProfileModel = self.get_object()
|
||||
|
||||
if (avatar is not None):
|
||||
if (profile.avatar.name != "./profiles/static/avatars/default.avif"):
|
||||
profile.avatar.storage.delete(profile.avatar.name)
|
||||
serializer.save()
|
||||
|
||||
def delete_avatar(self, request, pk=None):
|
||||
profile = self.get_object()
|
||||
if (profile.avatar.name != './profiles/static/avatars/default.avif'):
|
||||
profile.avatar.storage.delete(profile.avatar.name)
|
||||
profile.avatar.name = './profiles/static/avatars/default.avif'
|
||||
profile.save()
|
||||
return Response(ProfileSerializer(profile).data)
|
||||
|
||||
def retrieve(self, request: HttpRequest, pk=None):
|
||||
instance: ProfileModel = self.get_object()
|
||||
instance.avatar.name = instance.avatar.name[instance.avatar.name.find("static") - 1:]
|
||||
return Response(self.serializer_class(instance).data,
|
||||
status=status.HTTP_200_OK)
|
39
profiles/viewsets/MyProfileViewSet.py
Normal file
39
profiles/viewsets/MyProfileViewSet.py
Normal file
@ -0,0 +1,39 @@
|
||||
from rest_framework import permissions
|
||||
from rest_framework import viewsets
|
||||
from rest_framework.response import Response
|
||||
from rest_framework.authentication import SessionAuthentication
|
||||
|
||||
from ..serializers import ProfileSerializer
|
||||
from ..models import ProfileModel
|
||||
|
||||
|
||||
class MyProfileViewSet(viewsets.ModelViewSet):
|
||||
permission_classes = (permissions.IsAuthenticated,)
|
||||
authentication_classes = (SessionAuthentication,)
|
||||
serializer_class = ProfileSerializer
|
||||
queryset = ProfileModel.objects.all()
|
||||
|
||||
def get_object(self):
|
||||
obj = self.get_queryset().get(pk=self.request.user.pk)
|
||||
return obj
|
||||
|
||||
def perform_update(self, serializer: ProfileSerializer, pk=None):
|
||||
serializer.is_valid(raise_exception=True)
|
||||
avatar = serializer.validated_data.get('avatar')
|
||||
profile: ProfileModel = self.get_object()
|
||||
|
||||
if (avatar is not None):
|
||||
if (profile.avatar.name != "./profiles/static/avatars/default.avif"):
|
||||
profile.avatar.storage.delete(profile.avatar.name)
|
||||
serializer.save()
|
||||
|
||||
def delete_avatar(self, pk=None):
|
||||
profile = self.get_object()
|
||||
if (profile.avatar.name != './profiles/static/avatars/default.avif'):
|
||||
profile.avatar.storage.delete(profile.avatar.name)
|
||||
profile.avatar.name = './profiles/static/avatars/default.avif'
|
||||
profile.save()
|
||||
return Response(ProfileSerializer(profile).data)
|
||||
|
||||
def retrieve(self, pk=None):
|
||||
return Response(self.serializer_class(self.get_object()).data)
|
36
profiles/viewsets/ProfileViewSet.py
Normal file
36
profiles/viewsets/ProfileViewSet.py
Normal file
@ -0,0 +1,36 @@
|
||||
from django.utils.translation import gettext as _
|
||||
from django.contrib.auth.models import User
|
||||
|
||||
from rest_framework import permissions, status
|
||||
from rest_framework import viewsets
|
||||
from rest_framework.response import Response
|
||||
|
||||
from ..serializers import ProfileSerializer
|
||||
from ..models import ProfileModel
|
||||
|
||||
|
||||
class ProfileViewSet(viewsets.ModelViewSet):
|
||||
queryset = ProfileModel.objects.all()
|
||||
serializer_class = ProfileSerializer
|
||||
permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
|
||||
|
||||
def retrieve(self, request, username=None):
|
||||
query = User.objects.filter(username=username)
|
||||
if (not query):
|
||||
return Response({"detail": _("Profile not found.")}, status.HTTP_404_NOT_FOUND)
|
||||
query = self.get_queryset().filter(pk=query[0].pk)
|
||||
if (not query):
|
||||
return Response({"detail": _("Profile not found.")}, status.HTTP_404_NOT_FOUND)
|
||||
instance = query[0]
|
||||
return Response(self.serializer_class(instance).data)
|
||||
|
||||
def retrieve_id(self, request, pk=None):
|
||||
query = self.get_queryset().filter(pk=pk)
|
||||
if (not query):
|
||||
return Response({"detail": _("Profile not found.")}, status.HTTP_404_NOT_FOUND)
|
||||
instance = query[0]
|
||||
return Response(self.serializer_class(instance).data)
|
||||
|
||||
def list(self, request):
|
||||
serializer = ProfileSerializer(self.get_queryset(), many=True)
|
||||
return Response(serializer.data)
|
Loading…
Reference in New Issue
Block a user