Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into development

core/serializers.py

@@ -1,19 +1,21 @@
 from rest_framework import serializers
-
+from django.contrib.auth import get_user_model
 from . import models
 
+User = get_user_model()
+
 
 class CustomUserSerializer(serializers.ModelSerializer):
 
     class Meta:
-        model = models.CustomUser
+        model = User
         fields = ('email', 'full_name', 'role', 'is_active')
 
 
 class CustomUserReadSerializer(serializers.ModelSerializer):
 
     class Meta:
-        model = models.CustomUser
+        model = User
         fields = ('id', 'email', 'full_name', 'role', 'is_active', 'provider', 'notify')
 
 

core/views.py

@@ -7,7 +7,6 @@ import datetime
 from django.shortcuts import render
 from django.http import HttpResponse
 from django.contrib.auth import get_user_model
-from django.core import serializers
 from django.utils.http import urlsafe_base64_decode
 from django.utils.encoding import force_text
 from django.db import IntegrityError
@@ -161,8 +160,9 @@ def create_company_user(request):
 @permission_classes([IsAuthenticated,])
 def my_user(request):
       qs = User.objects.filter(email=request.user.email)
-      data = serializers.serialize('json', qs)
-      return Response(data=data)
+      user_serializer = core_serializers.CustomUserReadSerializer(qs, many=True)
+      return Response(data=user_serializer.data)
+
 
 @api_view(['POST',])
 @permission_classes([IsAdminUser,])