fix annotate query

judge/comments.py

@@ -162,13 +162,15 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View):
     def get_context_data(self, **kwargs):
         context = super(CommentedDetailView, self).get_context_data(**kwargs)
         queryset = self.object.comments
-        context["replies"] = len(queryset.filter(parent=None))
+        queryset = queryset.filter(parent=None, hidden=False)
+        comment_count = len(queryset)
         queryset = (
-            queryset.filter(parent=None, hidden=False)[:10]
-            .select_related("author__user")
+            queryset.select_related("author__user")
             .defer("author__about")
-            # .annotate(count_replies=Count("replies"))
-            # .annotate(revisions=Count("versions"))
+            .annotate(
+                count_replies=Count("replies", distinct=True), 
+                revisions=Count("versions", distinct=True),
+            )[:10]
         )
         context["has_comments"] = queryset.exists()
         context["comment_lock"] = self.is_comment_locked()
@@ -190,5 +192,5 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View):
         context["comment_root_id"] = 0
         context["offset"] = 10
         context["limit"] = 10
-        
+        context["comment_count"] = comment_count
         return context

judge/models/comment.py

@@ -114,12 +114,13 @@ class Comment(MPTTModel):
         return output
     
     @cached_property
-    def get_replies(self, ):
-        return self.replies
+    def get_replies(self):
+        query = Comment.filter(parent=self)
+        return len(query)
 
     @cached_property
     def get_revisions(self):
-        return self.versions
+        return self.versions.count()
 
     @cached_property
     def page_title(self):

judge/views/comment.py

@@ -113,7 +113,7 @@ def upvote_comment(request):
 def downvote_comment(request):
     return vote_comment(request, -1)
 
-def get_comment(request, limit=10):
+def get_comments(request, limit=10):
     try:
         comment_id = int(request.GET["id"])
         page_id = int(request.GET["page"])
@@ -135,12 +135,16 @@ def get_comment(request, limit=10):
         comment_obj = None
     page_obj = BlogPost.objects.get(pk=page_id)
     queryset = page_obj.comments
-    replies =  len(queryset.filter(parent=comment_obj))
+    queryset = queryset.filter(parent=comment_obj, hidden=False)
+    comment_count = len(queryset)
     queryset = (
-            queryset.filter(parent=comment_obj, hidden=False)
+            queryset
             .select_related("author__user")
-            .defer("author__about")[offset:offset+limit]
-            # .annotate(revisions=Count("versions"), count_replies=Count("replies"))
+            .defer("author__about")
+            .annotate(
+                count_replies=Count("replies", distinct=True), 
+                revisions=Count("versions", distinct=True),
+            )[offset:offset+limit]
         )
     if request.user.is_authenticated:
         profile = request.profile
@@ -160,18 +164,18 @@ def get_comment(request, limit=10):
             "perms": PermWrapper(request.user),
             "object": page_obj,
             "offset": offset + min(len(queryset), limit), 
-            "replies": replies,
-            "limit": limit
+            "limit": limit,
+            "comment_count": comment_count
         }
     )
     
     return HttpResponse(comment_html)
 
-def get_showmore(request):
-    return get_comment(request)
+def get_show_more(request):
+    return get_comments(request)
 
-def get_reply(request):
-    return get_comment(request)
+def get_replies(request):
+    return get_comments(request)
 
 class CommentMixin(object):
     model = Comment