follow-unfollow-2
This commit is contained in:
parent
df55b68a5a
commit
4898e43f57
|
@ -69,7 +69,6 @@ async def follow(_, info, what, slug):
|
||||||
return {'error': str(e)}
|
return {'error': str(e)}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@mutation.field('unfollow')
|
@mutation.field('unfollow')
|
||||||
@login_required
|
@login_required
|
||||||
async def unfollow(_, info, what, slug):
|
async def unfollow(_, info, what, slug):
|
||||||
|
|
|
@ -33,7 +33,7 @@ def add_topic_stat_columns(q):
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
# Create a subquery for comments count
|
# Create a subquery for comments count
|
||||||
sub_comments = (
|
_sub_comments = (
|
||||||
select(
|
select(
|
||||||
Shout.id, func.coalesce(func.count(Reaction.id), 0).label('comments_count')
|
Shout.id, func.coalesce(func.count(Reaction.id), 0).label('comments_count')
|
||||||
)
|
)
|
||||||
|
@ -49,10 +49,10 @@ def add_topic_stat_columns(q):
|
||||||
.subquery()
|
.subquery()
|
||||||
)
|
)
|
||||||
|
|
||||||
q = q.outerjoin(sub_comments, aliased_shout_topic.shout == sub_comments.c.id)
|
# q = q.outerjoin(sub_comments, aliased_shout_topic.shout == sub_comments.c.id)
|
||||||
q = q.add_columns(
|
# q = q.add_columns(
|
||||||
func.coalesce(func.sum(sub_comments.c.comments_count), 0).label('comments_stat')
|
# func.coalesce(func.sum(sub_comments.c.comments_count), 0).label('comments_stat')
|
||||||
)
|
# )
|
||||||
|
|
||||||
q = q.group_by(Topic.id)
|
q = q.group_by(Topic.id)
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ def add_author_stat_columns(q):
|
||||||
q = q.add_columns(sub_comments.c.comments_stat)
|
q = q.add_columns(sub_comments.c.comments_stat)
|
||||||
|
|
||||||
# Create a subquery for topics
|
# Create a subquery for topics
|
||||||
sub_topics = (
|
_sub_topics = (
|
||||||
select(
|
select(
|
||||||
ShoutAuthor.author,
|
ShoutAuthor.author,
|
||||||
func.count(distinct(ShoutTopic.topic)).label('topics_stat'),
|
func.count(distinct(ShoutTopic.topic)).label('topics_stat'),
|
||||||
|
@ -111,10 +111,10 @@ def add_author_stat_columns(q):
|
||||||
.subquery()
|
.subquery()
|
||||||
)
|
)
|
||||||
|
|
||||||
q = q.outerjoin(sub_topics, Author.id == sub_topics.c.author)
|
# q = q.outerjoin(sub_topics, Author.id == sub_topics.c.author)
|
||||||
q = q.add_columns(sub_topics.c.topics_stat)
|
# q = q.add_columns(sub_topics.c.topics_stat)
|
||||||
|
|
||||||
q = q.group_by(Author.id, sub_comments.c.comments_stat, sub_topics.c.topics_stat)
|
q = q.group_by(Author.id, sub_comments.c.comments_stat) #, sub_topics.c.topics_stat)
|
||||||
|
|
||||||
return q
|
return q
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user