* Cleanup

store/urls.py

@@ -5,7 +5,7 @@ from store import views
 
 router = DefaultRouter()
 
-# FIXME: renamed
+
 router.register(r'statistics', views.StatisticsAPI, basename='statistics')
 router.register(r'cdek', views.CDEKAPI, basename='cdek')
 

store/views.py

@@ -1,9 +1,8 @@
 import calendar
-import json
 
 from django.conf import settings
 from django.contrib.auth import login
-from django.db.models import F, Count, Q, Sum, Value, Subquery
+from django.db.models import F, Count, Sum
 from django.utils import timezone
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import generics, permissions, mixins, status, viewsets
@@ -43,9 +42,8 @@ class UserAPI(mixins.ListModelMixin, mixins.RetrieveModelMixin, generics.Generic
 
     # Update some data on current user
     def patch(self, request, *args, **kwargs):
-        data = json.loads(request.body)
         instance = self.request.user
-        serializer = self.get_serializer(instance, data=data, partial=True)
+        serializer = self.get_serializer(instance, data=request.data, partial=True)
         serializer.is_valid(raise_exception=True)
         serializer.save()
 
@@ -57,9 +55,7 @@ class LoginAPI(generics.GenericAPIView):
     permission_classes = (permissions.AllowAny,)
 
     def post(self, request, *args, **kwargs):
-        data = json.loads(request.body)
+        serializer = self.get_serializer(data=request.data)
-
-        serializer = self.get_serializer(data=data)
         serializer.is_valid(raise_exception=True)
         user = serializer.validated_data['user']
         login(request, user)
@@ -139,10 +135,8 @@ class YuanRateAPI(generics.GenericAPIView):
         return Response(data={'currency': yuan_rate})
 
     def patch(self, request, *args, **kwargs):
-        data = json.loads(request.body)
         instance = self.get_object()
-
+        serializer = self.get_serializer(instance, data=request.data, partial=True)
-        serializer = self.get_serializer(instance, data=data, partial=True)
         serializer.is_valid(raise_exception=True)
         serializer.save()
 
@@ -165,7 +159,7 @@ class CategoryAPI(generics.GenericAPIView):
         })
 
     def patch(self, request, *args, **kwargs):
-        data = json.loads(request.body)
+        data = request.data
         if not all(k in data for k in ("category", "chinarush")):
             raise CRMException('category and chinarush is required')
 
@@ -181,10 +175,8 @@ class PricesAPI(generics.GenericAPIView):
     serializer_class = GlobalSettingsPriceSerializer
 
     def patch(self, request, *args, **kwargs):
-        data = json.loads(request.body)
-
         instance = GlobalSettings.load()
-        serializer = self.get_serializer(instance, data=data, partial=True)
+        serializer = self.get_serializer(instance, data=request.data, partial=True)
         serializer.is_valid(raise_exception=True)
         serializer.save()
 
@@ -203,10 +195,8 @@ class PickupAPI(DisablePermissionsMixin):
         return Response(self.get_serializer(instance).data)
 
     def patch(self, request, *args, **kwargs):
-        data = json.loads(request.body)
-
         instance = GlobalSettings.load()
-        serializer = self.get_serializer(instance, data=data, partial=True)
+        serializer = self.get_serializer(instance, data=request.data, partial=True)
         serializer.is_valid(raise_exception=True)
         serializer.save()
 
@@ -228,7 +218,7 @@ class PaymentMethodsAPI(generics.GenericAPIView):
         return Response(data)
 
     def patch(self, request, *args, **kwargs):
-        data = json.loads(request.body)
+        data = request.data
         if 'type' not in data:
             raise CRMException('type is required')
 
@@ -258,7 +248,7 @@ class PromoCodeAPI(mixins.CreateModelMixin, generics.GenericAPIView):
         return self.get(request, *args, **kwargs)
 
     def delete(self, request, *args, **kwargs):
-        data = json.loads(request.body)
+        data = request.data
         if 'name' not in data:
             raise CRMException('name is required')