add category title

authors/apps/articles/serializers.py

@@ -12,9 +12,11 @@
 class ArticleSerializer(TaggitSerializer, serializers.ModelSerializer):
     """Serializer for articles."""
     author = serializers.ReadOnlyField(source='author.username')
+    category_title = serializers.ReadOnlyField(source='category.title')
     read_time = serializers.ReadOnlyField(source='read')
     tags = TagListSerializerField()
     is_published = serializers.ReadOnlyField()
+
     class Meta:
         model = Article
         """ List all of the fields that could possibly be included in a request
@@ -24,7 +26,7 @@ class Meta:
             'author', 'title', 'slug', 'description', 'body', 'created_at', 
             'updated_at', 'read_time', 'average_rating', 'likes', 'dislikes', 
             'tags', 'category', 'favorites_count', 'image', 'published_on',
-            'is_published',)
+            'is_published', 'category_title')
         read_only_fields = ('slug', 'author_id', 'is_published')
 
 

authors/apps/authentication/views.py

@@ -7,6 +7,7 @@
 from rest_framework.permissions import AllowAny, IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.views import APIView
+from django.shortcuts import redirect
 
 from authors.apps.authentication.backends import JWTAuthentication
 from authors.apps.authentication.models import User
@@ -45,14 +46,15 @@ def sendEmailVerification(self, user, request, user_data):
         username = user['username']
         subject = "Ah haven Account Verification"
         body = "Hello {}, Thank you for creating an account with us, kindly click on the link below to activate your account! \n\n \
-                {}/api/users/verify_account/{}/" .format(username,request.get_host(), user_data['token'])
+                {}/api/users/verify_account/{}/" .format(username, request.get_host(), user_data['token'])
         to_email = [user["email"]]
         email = EmailMessage(subject, body, to=to_email,)
         email.send()
         user_data.update({
             'message': 'A verification link has been sent to your Email, please visit your Email and activate your account'
                     })
 
+
 class LoginAPIView(APIView):
 
     """
@@ -110,24 +112,24 @@ def update(self, request, *args, **kwargs):
 
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-class UserAccountVerifyView(APIView,JWTAuthentication):
+
+class UserAccountVerifyView(APIView, JWTAuthentication):
     """
     get user email:
     send verification link to the user email.
 
     """
     renderer_classes = (UserJSONRenderer,)
     serializer_class = UserSerializer
+
     def get(self, request, token):
 
         try:
             user, user_token = self.authenticate_credentials(request, token)
             if not user.is_verified:
-                user.is_verified=True
+                user.is_verified = True
                 user.save()
-                return Response({
-                    'message': 'Your Account has been verified, continue to login',
-                    }, status=status.HTTP_200_OK)
+                return redirect('https://ah-frontend-lannister.herokuapp.com/login')
 
             raise serializers.ValidationError(
                 'Activation link invalid or expired'
@@ -137,12 +139,12 @@ def get(self, request, token):
                 'Activation link invalid or expired'
             )
 
+
 class UserPasswordReset(RetrieveUpdateAPIView):
     permission_classes = (AllowAny,)
     renderer_classes = (UserJSONRenderer,)
     serializer_class = PasswordResetSerializer
 
-
     def post(self, request):
         user = request.data.get('user', {})
         # check data with serializer
@@ -152,12 +154,12 @@ def post(self, request):
         # send email method
         email = data_from_serializer.data['email']
         token = data_from_serializer.data['token']
-        host='http://'+request.get_host()+'/api/users/password_reset/confirm/'
-        url=user.get('url',host)+token
-        response = send_gridmail(email,url)
+        host = 'http://'+request.get_host()+'/api/users/password_reset/confirm/'
+        url = user.get('url', host)+token
+        response = send_gridmail(email, url)
         return Response(response, status=status.HTTP_200_OK)
 
-    def retrieve(self, request,token, *args, **kwargs):
+    def retrieve(self, request, token, *args, **kwargs):
         url = request.get_host()
         #validate url here if its valid ie token
         # else send them invalid token message

authors/apps/comments/serializers.py

@@ -58,8 +58,7 @@ class Meta:
 
 
 class CommentChildSerializer(serializers.ModelSerializer):
-    author = serializers.ReadOnlyField(source='author.username')
-
+    author = serializers.SerializerMethodField()
     class Meta:
         model = Comment
         fields = ('id', 'body', 'author', 'created_at', 'updated_at', 'parent')
@@ -71,6 +70,10 @@ def validate(self, data):
                 'Please insert the body of the comment'
             )
         return data
+
+    def get_author(self, obj):
+        x = get_object_or_404(Profile, user=obj.author)
+        return ProfileSerializer(x).data
 
 
 class CommentHistorySerializer(serializers.ModelSerializer):

authors/apps/comments/views.py

@@ -27,7 +27,7 @@ class CommentListCreateView(generics.ListCreateAPIView):
 
     """
     serializer_class = CommentSerializer
-    permission_classes = (IsAuthenticated,)
+    permission_classes = (IsAuthenticatedOrReadOnly,)
     renderer_classes = (CommentJSONRenderer,)
     queryset = Comment.objects.all().filter(parent=None)
     lookup_field = 'slug'
@@ -95,7 +95,7 @@ def notify_follower_reciever(sender, instance, created, **kwargs):
 
 class CommentsView(generics.RetrieveUpdateDestroyAPIView):
     serializer_class = CommentSerializer
-    permission_classes = (IsAuthenticated,)
+    permission_classes = (IsAuthenticatedOrReadOnly,)
     renderer_classes = (CommentJSONRenderer,)
     lookup_fields = 'id', 'slug'
     queryset = Comment.objects.all().filter(parent__isnull=True)
@@ -132,7 +132,7 @@ def get_object(self):
 
 
 class CommentThreadListCreateView(generics.ListCreateAPIView):
-    permission_classes = (IsAuthenticated,)
+    permission_classes = (IsAuthenticatedOrReadOnly,)
     serializer_class = CommentChildSerializer
     renderer_classes = (CommentThreadJSONRenderer,)
     lookup_fields = 'id', 'slug'

tests/test_authentication/test_account_verification.py

@@ -28,8 +28,7 @@ def test_verify_account(self):
         user1 = User.objects.get(email='kfddfssss@andela.com')
         res = user1.is_verified
         self.assertTrue(res)
-        self.assertIn("message", str(respond.data))
-        self.assertEqual(status.HTTP_200_OK,respond.status_code)
+        self.assertEqual(status.HTTP_302_FOUND, respond.status_code)
 
     def test_failed_verify_account(self):
         self.user = User.objects.get(email=self.email)