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

shoutsSubscribed return published and unpublished shouts

Browse Source
This commit is contained in:
knst-kotov 2022-06-12 09:17:02 +03:00
parent 03c1b69bfb
commit f89cb47daf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resolvers/zine.py
View File

@ -446,13 +446,13 @@ async def shouts_subscribed(_, info, page, size):
shouts_by_topic = session.query(Shout).\ shouts_by_topic = session.query(Shout).\
join(ShoutTopic).\ join(ShoutTopic).\
join(TopicSubscription, ShoutTopic.topic == TopicSubscription.topic).\ 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).\ shouts_by_author = session.query(Shout).\
join(ShoutAuthor).\ join(ShoutAuthor).\
join(AuthorSubscription, ShoutAuthor.user == AuthorSubscription.author).\ 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).\ shouts = shouts_by_topic.union(shouts_by_author).\
order_by(desc(Shout.publishedAt)).\ order_by(desc(Shout.createdAt)).\
limit(size).\ limit(size).\
offset( (page - 1) * size) offset( (page - 1) * size)