Merge branch 'server' into feat/matchmaking

profiles/viewsets.py

@@ -11,19 +11,19 @@ from .serializers import ProfileSerializer
 from .models import ProfileModel
 
 class ProfileViewSet(viewsets.ModelViewSet):
-    queryset = ProfileModel.objects.all()
+    queryset = ProfileModel.objects.all
     serializer_class = ProfileSerializer
     parser_classes = (MultiPartParser, FormParser)
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
 
     def retrieve(self, request: HttpRequest, pk=None):
-        instance = self.get_object()
+        instance = ProfileModel.objects.get(pk=pk)
         instance.avatar_url.name = instance.avatar_url.name[instance.avatar_url.name.find("static") - 1:]
         return Response(self.serializer_class(instance).data,
                         status=status.HTTP_200_OK)
 
     def list(self, request: HttpRequest):
-        serializer = ProfileSerializer(self.queryset, many=True)
+        serializer = ProfileSerializer(self.queryset(), many=True)
         for profile in serializer.data:
             profile["avatar_url"] = profile["avatar_url"][profile["avatar_url"].find("static") - 1:]
         return Response(serializer.data)