From f89cb47daf19947fca23f7a7e930cba25985180b Mon Sep 17 00:00:00 2001 From: knst-kotov Date: Sun, 12 Jun 2022 09:17:02 +0300 Subject: [PATCH] shoutsSubscribed return published and unpublished shouts --- resolvers/zine.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resolvers/zine.py b/resolvers/zine.py index 9f7c934a..2b96c8ee 100644 --- a/resolvers/zine.py +++ b/resolvers/zine.py @@ -446,13 +446,13 @@ async def shouts_subscribed(_, info, page, size): shouts_by_topic = session.query(Shout).\ join(ShoutTopic).\ join(TopicSubscription, ShoutTopic.topic == TopicSubscription.topic).\ - where(and_(Shout.publishedAt != None, TopicSubscription.subscriber == user.slug)) + where(TopicSubscription.subscriber == user.slug) shouts_by_author = session.query(Shout).\ join(ShoutAuthor).\ join(AuthorSubscription, ShoutAuthor.user == AuthorSubscription.author).\ - where(and_(Shout.publishedAt != None, AuthorSubscription.subscriber == user.slug)) + where(AuthorSubscription.subscriber == user.slug) shouts = shouts_by_topic.union(shouts_by_author).\ - order_by(desc(Shout.publishedAt)).\ + order_by(desc(Shout.createdAt)).\ limit(size).\ offset( (page - 1) * size)