lkva/NDOJ
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix annotate query

Browse source
This commit is contained in:
Tuan-Dung Bui 2023-04-17 02:44:48 +07:00
parent c3b7d465b1
commit dfc614ac1e
7 changed files with 70 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

14
judge/comments.py
View file

@ -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