discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

author-stat-fix-4
All checks were successful
Deploy on push / deploy (push) Successful in 23s
Details

Browse Source
This commit is contained in:
Untone 2024-03-28 23:19:07 +03:00
parent e426a2b087
commit feede764bf
1 changed files with 51 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
resolvers/stat.py
View File

@ -1,6 +1,6 @@
import json import json
from sqlalchemy import func, distinct, select, join, and_, case, true from sqlalchemy import func, distinct, select, join, and_, case, true, or_
from sqlalchemy.orm import aliased from sqlalchemy.orm import aliased
from orm.reaction import Reaction, ReactionKind from orm.reaction import Reaction, ReactionKind
@ -83,56 +83,68 @@ def add_author_stat_columns(q, with_rating=False):
func.count(distinct(aliased_followers.follower)).label('followers_stat') func.count(distinct(aliased_followers.follower)).label('followers_stat')
) )
# Create a subquery for comments count if not with_rating:
select_list = [ # Create a subquery for comments count
Author.id, select_list = [
func.coalesce( Author.id,
func.count(case((Reaction.kind == ReactionKind.COMMENT.value, 1), else_=0)) func.coalesce(func.count(Reaction.id)).label('comments_count'),
).label('comments_count'), ]
]
sub_comments = (
select(*select_list)
.outerjoin(
Reaction,
and_(
Reaction.created_by == Author.id,
Reaction.kind == ReactionKind.COMMENT.value,
Reaction.deleted_at.is_(None),
),
)
.group_by(Author.id)
.subquery()
)
q = q.outerjoin(sub_comments, Author.id == sub_comments.c.id)
q = q.add_columns(sub_comments.c.comments_count)
q = q.group_by(Author.id, sub_comments.c.comments_count)
if with_rating: if with_rating:
select_list.extend([ # Create a subquery for ratings counters
select_list = [
func.sum(case((AuthorRating.plus == true(), 1), else_=0)).label('likes_count'), func.sum(case((AuthorRating.plus == true(), 1), else_=0)).label('likes_count'),
func.sum(case((AuthorRating.plus != true(), 1), else_=0)).label('dislikes_count'), func.sum(case((AuthorRating.plus != true(), 1), else_=0)).label('dislikes_count'),
func.sum(case((and_(Reaction.kind == ReactionKind.LIKE.value, Shout.authors.any(id=Author.id)), 1), else_=0)).label('shouts_likes'), func.sum(case((and_(Reaction.kind == ReactionKind.LIKE.value, Shout.authors.any(id=Author.id)), 1), else_=0)).label('shouts_likes'),
func.sum(case((and_(Reaction.kind == ReactionKind.DISLIKE.value, Shout.authors.any(id=Author.id)), 1), else_=0)).label('shouts_dislikes'), func.sum(case((and_(Reaction.kind == ReactionKind.DISLIKE.value, Shout.authors.any(id=Author.id)), 1), else_=0)).label('shouts_dislikes'),
]) ]
sub_comments = ( sub_rating = (
select(*select_list) select(*select_list)
.outerjoin( .outerjoin(
Reaction, Reaction,
and_( and_(
Reaction.created_by == Author.id, Reaction.created_by == Author.id,
Reaction.kind == ReactionKind.COMMENT.value, or_(Reaction.kind == ReactionKind.LIKE.value, Reaction.kind == ReactionKind.DISLIKE.value),
Reaction.deleted_at.is_(None), Reaction.deleted_at.is_(None),
), ),
)
.group_by(Author.id)
.subquery()
) )
.group_by(Author.id) q = q.outerjoin(sub_rating, Author.id == sub_rating.c.id)
.subquery()
)
q = q.outerjoin(sub_comments, Author.id == sub_comments.c.id)
if with_rating:
q = q.add_columns( q = q.add_columns(
sub_comments.c.likes_count, sub_rating.c.likes_count,
sub_comments.c.dislikes_count, sub_rating.c.dislikes_count,
sub_comments.c.shouts_likes, sub_rating.c.shouts_likes,
sub_comments.c.shouts_dislikes, sub_rating.c.shouts_dislikes,
) )
q = q.group_by( q = q.group_by(
Author.id, Author.id,
sub_comments.c.comments_count, sub_comments.c.comments_count,
sub_comments.c.likes_count, sub_rating.c.likes_count,
sub_comments.c.dislikes_count, sub_rating.c.dislikes_count,
sub_comments.c.shouts_likes, sub_rating.c.shouts_likes,
sub_comments.c.shouts_dislikes, sub_rating.c.shouts_dislikes,
) )
else:
q = q.add_columns(sub_comments.c.comments_count)
q = q.group_by(Author.id, sub_comments.c.comments_count)
return q return q
@ -157,8 +169,9 @@ def get_with_stat(q, with_rating=False):
if is_author: if is_author:
stat['comments'] = cols[4] stat['comments'] = cols[4]
if with_rating: if with_rating:
logger.debug('author, shouts, authors, followers, comments, rating, rating_shouts')
logger.debug(cols) logger.debug(cols)
stat['rating'] = cols[5] - cols[6] stat['rating'] = cols[6] - cols[6]
stat['rating_shouts'] = cols[7] - cols[8] stat['rating_shouts'] = cols[7] - cols[8]
entity.stat = stat entity.stat = stat
records.append(entity) records.append(entity)