From acc71415a9d9a476ba68e1aa1aa90bafea99b6e6 Mon Sep 17 00:00:00 2001 From: bniwredyc Date: Sun, 12 Feb 2023 04:27:55 +0100 Subject: [PATCH 1/2] loadReactionsBy kind fix --- resolvers/zine/reactions.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resolvers/zine/reactions.py b/resolvers/zine/reactions.py index 071e5b38..3c32d3ec 100644 --- a/resolvers/zine/reactions.py +++ b/resolvers/zine/reactions.py @@ -257,7 +257,7 @@ async def load_reactions_by(_, _info, by, limit=50, offset=0): """ :param by: { :shout - filter by slug - :shouts - filer by shouts luglist + :shouts - filer by shout slug list :createdBy - to filter by author :topic - to filter by topic :search - to search by reactions' body @@ -324,6 +324,9 @@ async def load_reactions_by(_, _info, by, limit=50, offset=0): "commented": commented_stat, "reacted": reacted_stat } + + reaction.kind = reaction.kind.name + reactions.append(reaction) # ? From 1fab93ac61ef5f7919919c5578363deb41fd3155 Mon Sep 17 00:00:00 2001 From: bniwredyc Date: Sun, 12 Feb 2023 15:18:57 +0100 Subject: [PATCH 2/2] reaction rating fix --- resolvers/zine/reactions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resolvers/zine/reactions.py b/resolvers/zine/reactions.py index 3c32d3ec..afb01199 100644 --- a/resolvers/zine/reactions.py +++ b/resolvers/zine/reactions.py @@ -14,7 +14,7 @@ from orm.user import User def add_reaction_stat_columns(q): aliased_reaction = aliased(Reaction) - q = q.outerjoin(aliased_reaction).add_columns( + q = q.outerjoin(aliased_reaction, Reaction.id == aliased_reaction.replyTo).add_columns( func.sum( aliased_reaction.id ).label('reacted_stat'),