From fce78df5490ce73f758fd700abbe64816f920b58 Mon Sep 17 00:00:00 2001 From: Untone Date: Tue, 23 Jul 2024 17:35:45 +0300 Subject: [PATCH] group_by-fix --- resolvers/__init__.py | 2 +- resolvers/reaction.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/resolvers/__init__.py b/resolvers/__init__.py index e30e21e2..ddd1efef 100644 --- a/resolvers/__init__.py +++ b/resolvers/__init__.py @@ -39,7 +39,7 @@ from resolvers.reader import ( load_shouts_search, load_shouts_unrated, load_shouts_coauthored, - load_shouts_discussed + load_shouts_discussed, ) from resolvers.topic import ( get_topic, diff --git a/resolvers/reaction.py b/resolvers/reaction.py index dd247016..ca08d890 100644 --- a/resolvers/reaction.py +++ b/resolvers/reaction.py @@ -37,8 +37,6 @@ def add_reaction_stat_columns(q, aliased_reaction): return q - - def is_featured_author(session, author_id): """checks if author has at least one featured publication""" return ( @@ -521,7 +519,6 @@ async def load_shouts_followed_by(_, info, slug: str, limit=50, offset=0) -> Lis return [] - @query.field("load_shout_ratings") async def load_shout_ratings(_, info, shout: int, limit=100, offset=0): """ @@ -585,7 +582,7 @@ async def load_shout_comments(_, info, shout: int, limit=50, offset=0): # filter, group, order, limit, offset q = q.filter(and_(Reaction.deleted_at.is_(None), Reaction.shout == shout, Reaction.body.is_not(None))) - q = q.group_by(Reaction.id) + q = q.group_by(Reaction.id, Author.user, Shout.id) q = q.order_by(desc(Reaction.created_at)) q = q.limit(limit).offset(offset)