Merge 7ff24f0 into 46884a8

authors/apps/articles/models.py

@@ -117,7 +117,7 @@ def readtime(self):
         timer = ArticleTimer(self)
         return timer.get_read_time()
 
-
+        
 class Comment(models.Model):
     """
     model for  comments
@@ -281,17 +281,22 @@ def get_articles_details(self):
             "updated_at": self.article.updated_at
         }
 
-    def ratings(self, article, user):
+    def ratings(self, article_id, user):
         """
         Model to display rating for users in an articles
         """
-
-        queryset = RatingModel.objects.filter(
-            article_id=article).first()
-        if queryset:
+        queryset1 = RatingModel.objects.filter(
+            article_id=article_id, rated_by_id=user).first()
+        queryset2 = RatingModel.objects.filter(
+            article_id=article_id).first()
+        if queryset1:
+            return {
+                "my_ratings": queryset1.rate,
+                "average_ratings": Article().average_ratings(article_id)
+            }
+        elif queryset2:
             return {
-                "my_ratings": queryset.rate,
-                "average_ratings": Article().average_ratings(article)
+                "average_ratings": Article().average_ratings(article_id)
             }
         return 0
 

authors/apps/articles/serializers.py

@@ -91,9 +91,8 @@ def get_favorites(self, obj):
         return mapped_data
 
     def get_ratings(self, obj):
-        article = self.get_likes_data()
         request = self.context.get('request', None)
-        ratings = RatingModel().ratings(article.id, request.user.id)
+        ratings = RatingModel().ratings(obj.id, request.user.id)
         return ratings
 
     def get_bookmarked(self, instance):

authors/apps/articles/views.py

@@ -132,7 +132,7 @@ def get(self, request):
                 'like_info',
                 'comments',
                 'favorites',
-                'ratings'
+                # 'ratings'
             ]
         )
         response = paginator.get_paginated_response({