Merge daa6113 into 3358d41

authors/apps/articles/views.py

@@ -32,6 +32,7 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from authors.apps.notifications.models import notify_follower
+from authors.apps.comments.views import CommentListCreateView as Paginator
 
 class TagListAPIView(generics.ListAPIView):
     """ List all tags  """
@@ -152,9 +153,8 @@ def list(self, request, *args, **kwargs):
         if queryset.count() == 0:
             return Response({"msg": "you have no articles"})
         else:
-            page = self.paginate_queryset(queryset)
-            if page is not None:
-                serializer = self.get_serializer(page, many=True)
+            serializer=Paginator.paginate(self,queryset)
+            if serializer:
                 return self.get_paginated_response(serializer.data)
 
 

authors/apps/comments/views.py

@@ -14,7 +14,7 @@
                        CommentThreadJSONRenderer)
 from .serializers import (CommentChildSerializer, CommentHistorySerializer,
                           CommentSerializer, LikeCommentSerializer)
-                          
+
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from authors.apps.profiles.models import Profile
@@ -30,7 +30,6 @@ class CommentListCreateView(generics.ListCreateAPIView):
     permission_classes = (IsAuthenticated,)
     renderer_classes = (CommentJSONRenderer,)
     queryset = Comment.objects.all().filter(parent=None)
-    queryset = Comment.objects.all()
     lookup_field = 'slug'
 
     def post(self, request, *args, **kwargs):
@@ -64,8 +63,19 @@ def get(self, request, *args, **kwargs):
         article_slug = self.kwargs['slug']
         slug = get_object_or_404(Article, slug=article_slug)
         comment = self.queryset.filter(slug=article_slug)
-        serializer = self.serializer_class(comment, many=True)
-        return self.list(request, *args, **kwargs)
+        queryset = self.filter_queryset(comment)
+        serializer=self.paginate(queryset)
+        if serializer:
+            return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
+
+    def paginate(self, queryset):
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+        return serializer
 
 
 @receiver(post_save, sender=Comment)
@@ -77,8 +87,8 @@ def notify_follower_reciever(sender, instance, created, **kwargs):
         message = (instance.author.username +
                    " has commented on an article that you favorited.")
         #import pdb;pdb.set_trace()
-        
-        article_id=instance.slug.id
+
+        article_id = instance.slug.id
 
         notify_comment_follower(article_id, message, instance)
 
@@ -143,8 +153,14 @@ def get(self, request, *args, **kwargs):
         slug = get_object_or_404(Article, slug=article_slug)
         comment = self.queryset.filter(
             slug=article_slug, parent=self.kwargs['id'])
-        serializer = self.serializer_class(comment, many=True)
-        return self.list(request, *args, **kwargs)
+        queryset = self.filter_queryset(comment)
+
+        serializer=CommentListCreateView.paginate(self,queryset)
+        if serializer:
+            return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
 
 
 class CommentHistoryView(generics.ListAPIView):

authors/apps/social_auth/views.py

@@ -12,11 +12,13 @@
 from authors.apps.authentication.serializers import RegistrationSerializer,LoginSerializer
 from .serializers import FbRegisterSerializer
 import json
+from authors.apps.authentication.renderers import UserJSONRenderer
 
 class FacebookLogin(SocialLoginView):
     adapter_class = FacebookOAuth2Adapter
     client_class = OAuth2Client
     FbRegSerializer_class=FbRegisterSerializer
+    renderer_classes = (UserJSONRenderer,)
 
     def post(self, request):
         data=request.data
@@ -29,30 +31,25 @@ def post(self, request):
 
         data={
                 "password": 'Ah123456789@',
-                "username": i['name'],
-                "email": i['email'],
+                "username": i.get('name'),
+                "email": i.get('email'),
                 }
-
-
-        if not User.objects.filter(email=i['email']).exists():
+        if not User.objects.filter(email=i.get('email')).exists():
 
             serializer=self.FbRegSerializer_class(data=data)
             serializer.is_valid(raise_exception=True)
             serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
 
-        else:
-            loginserializer=LoginSerializer(data=data)
-            loginserializer.is_valid(raise_exception=True)
-            import pdb; pdb.set_trace()
-            return Response("logged in")
+        loginserializer=LoginSerializer(data=data)
+        loginserializer.is_valid(raise_exception=True)
+        return Response(loginserializer.data)
 
-        return Response(i, status=status.HTTP_200_OK)
 
 
 class GoogleLogin(SocialLoginView):
     adapter_class = GoogleOAuth2Adapter
     client_class = OAuth2Client
-    callback_url = 'localhost:8000'
 
 
 class TwitterLogin(SocialLoginView):