Merge c28cf93 into 4e92b8b

authors/apps/articles/models.py

@@ -29,6 +29,7 @@ class Article(models.Model):
     like = models.ManyToManyField(User, blank=True, related_name='like')
     dislike = models.ManyToManyField(User, blank=True, related_name='dislike')
 
+
     favorite = models.ManyToManyField(User, blank=True, related_name='favorite')
 
     def __str__(self):

authors/apps/articles/serializers.py

@@ -91,34 +91,34 @@ class ArticleAuthorSerializer(serializers.ModelSerializer):
     body = serializers.CharField()
     author = UserSerializer(read_only = True)
     tags = serializers.SerializerMethodField(method_name='show_tags')
-
+    like = serializers.SerializerMethodField(method_name='like_article')
+    dislike = serializers.SerializerMethodField(method_name='dislike_article')
+
 
     def show_tags(self, instance):
         """
         Show tag details.
         """
         return instance.tags.names()
-
 
-    def likes(self, instance):
+
+    def like_article(self, instance):
         """method to return a user who has liked an article"""
         request = self.context.get('request')
         liked = False
+
         if request is not None and request.user.is_authenticated:
             user_id = request.user.id
-            liked = instance.likes.all().filter(id=user_id).count() == 1
-        return {'likes': instance.likes.count(), 'User': liked}
+        return {'likeCount': instance.like.count()}
 
-    def dislikes(self, instance):
+    def dislike_article(self, instance):
         """method to return a user who has disliked an article"""
         request = self.context.get('request')
         disliked = False
         if request is not None and request.user.is_authenticated:
             user_id = request.user.id
-            disliked = instance.dislikes.all().filter(id=user_id).count() == 1
-        return {'dislikes': instance.dislikes.count(), 'User': disliked}
+        return {'dislikeCount': instance.dislike.count()}
 
-    favorite = serializers.SerializerMethodField(read_only=True)
 
     def favorite(self, instance):
         """favorite an article"""

authors/apps/articles/views/articles.py

@@ -183,6 +183,10 @@ def update(self, request, slug):
             return Response(message, status.HTTP_200_OK)
 
         # if like is false, the article is liked
+        disliked = bool(user in article.dislike.all())
+        if disliked is True:
+            article.dislike.remove(user.id)
+
         article.like.add(user.id)
         message = {"article": "You have liked this article"}
         return Response(message, status.HTTP_200_OK)
@@ -192,10 +196,10 @@ class DislikeArticle(UpdateAPIView):
     """Class for disliking and  un-disliking an article"""
 
     def update(self, request, slug):
-        """This method updates the liking of an article"""
-        LikeArticle.update(self, request, slug)
-        article = Article.objects.filter(article_slug=slug).first()
-        if article is None:
+        """This method updates the disliking of an article"""
+        try:
+            article = Article.objects.get(article_slug=slug)
+        except Article.DoesNotExist:
             return Response({
                 'Error': 'Article does not exist'
             }, status.HTTP_404_NOT_FOUND)
@@ -210,6 +214,10 @@ def update(self, request, slug):
             return Response(message, status.HTTP_200_OK)
 
         # if disike is false, the article is disliked
+        liked = bool(user in article.like.all())
+        if liked is True:
+            article.like.remove(user.id)
+
         article.dislike.add(user.id)
         message = {"article": "You have disliked this article"}
         return Response(message, status.HTTP_200_OK)