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

add community to shoutsSubscribed

Browse Source
This commit is contained in:
knst-kotov 2022-06-12 11:33:24 +03:00
parent 39070dc359
commit 7fd0b7e643
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resolvers/zine.py
View File

@ -1,5 +1,6 @@
from orm import Shout, ShoutAuthor, ShoutTopic, ShoutRating, ShoutViewByDay, User, Community, Resource,\ from orm import Shout, ShoutAuthor, ShoutTopic, ShoutRating, ShoutViewByDay, User, Community, Resource,\
ShoutRatingStorage, ShoutViewStorage, Comment, CommentRating, Topic ShoutRatingStorage, ShoutViewStorage, Comment, CommentRating, Topic
from orm.community import CommunitySubscription
from orm.base import local_session from orm.base import local_session
from orm.user import UserStorage, AuthorSubscription from orm.user import UserStorage, AuthorSubscription
from orm.topic import TopicSubscription from orm.topic import TopicSubscription
@ -451,7 +452,12 @@ async def shouts_subscribed(_, info, page, size):
join(ShoutAuthor).\ join(ShoutAuthor).\
join(AuthorSubscription, ShoutAuthor.user == AuthorSubscription.author).\ join(AuthorSubscription, ShoutAuthor.user == AuthorSubscription.author).\
where(AuthorSubscription.subscriber == user.slug) where(AuthorSubscription.subscriber == user.slug)
shouts_by_community = session.query(Shout).\
join(Community).\
join(CommunitySubscription).\
where(CommunitySubscription.subscriber == user.slug)
shouts = shouts_by_topic.union(shouts_by_author).\ shouts = shouts_by_topic.union(shouts_by_author).\
union(shouts_by_community).\
order_by(desc(Shout.createdAt)).\ order_by(desc(Shout.createdAt)).\
limit(size).\ limit(size).\
offset( (page - 1) * size) offset( (page - 1) * size)