aliased-fix
All checks were successful
Deploy on push / deploy (push) Successful in 1m45s

This commit is contained in:
Untone 2024-02-25 13:54:28 +03:00
parent c863dda81b
commit fc0e4bb2df
2 changed files with 19 additions and 27 deletions

View File

@ -431,9 +431,7 @@ async def load_shouts_random_top(_, _info, options):
func.sum( func.sum(
case( case(
(Reaction.kind == str(ReactionKind.LIKE.value), 1), (Reaction.kind == str(ReactionKind.LIKE.value), 1),
(Reaction.kind == str(ReactionKind.AGREE.value), 1),
(Reaction.kind == str(ReactionKind.DISLIKE.value), -1), (Reaction.kind == str(ReactionKind.DISLIKE.value), -1),
(Reaction.kind == str(ReactionKind.DISAGREE.value), -1),
else_=0, else_=0,
) )
) )

View File

@ -69,40 +69,34 @@ def add_author_stat_columns(q):
def add_author_ratings(q): def add_author_ratings(q):
aliased_author = aliased(Author)
ratings_subquery = ( ratings_subquery = (
select([ select([
Author.id, aliased_author.id.label('author_id'),
func.count().filter( func.count().filter(and_(
and_( Reaction.created_by == aliased_author.id,
Reaction.created_by == Author.id,
Reaction.kind == ReactionKind.COMMENT.value, Reaction.kind == ReactionKind.COMMENT.value,
Reaction.deleted_at.is_(None), Reaction.deleted_at.is_(None),
) )).label('comments_count'),
).label('comments_count'), func.sum(case((AuthorRating.plus == true(), 1), else_=0)).label('likes_count'),
func.sum( func.sum(case((AuthorRating.plus != true(), 1), else_=0)).label('dislikes_count'),
case((AuthorRating.plus == true(), 1), else_=0) func.sum(case((and_(Reaction.kind == ReactionKind.LIKE.value, Shout.authors.any(id=aliased_author.id)), 1), else_=0)).label('shouts_likes'),
).label('likes_count'), func.sum(case((and_(Reaction.kind == ReactionKind.DISLIKE.value, Shout.authors.any(id=aliased_author.id)), 1), else_=0)).label('shouts_dislikes')
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.DISLIKE.value, Shout.authors.any(id=Author.id)), 1), else_=0)
).label('shouts_dislikes')
]) ])
.select_from(Author) .select_from(aliased_author)
.join(AuthorRating, AuthorRating.author == Author.id) .join(AuthorRating, AuthorRating.author == aliased_author.id)
.outerjoin(Shout, Shout.authors.any(id=Author.id)) .outerjoin(Shout, Shout.authors.any(id=aliased_author.id))
.filter( .filter(
Reaction.deleted_at.is_(None) Reaction.deleted_at.is_(None)
) )
.group_by(Author.id) .group_by(aliased_author.id)
.alias('ratings_subquery') .alias('ratings_subquery')
) )
return q.join(ratings_subquery, Author.id == ratings_subquery.c.author_id) q = q.join(ratings_subquery, Author.id == ratings_subquery.c.author_id)
return q
def get_with_stat(q): def get_with_stat(q):