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

alias-fix
Some checks failed
Deploy to core / deploy (push) Failing after 1m9s
Details

Browse Source
This commit is contained in:
Untone 2024-02-22 22:56:58 +03:00
parent 078e8ab7d1
commit 5303aef4f0
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
resolvers/follower.py
View File

@ -91,18 +91,23 @@ def query_follows(user_id: str):
topics = [] topics = []
authors = [] authors = []
with local_session() as session: with local_session() as session:
aliased_author = aliased(Author) author = session.query(Author).filter(Author.user == user_id).first()
author = (
session.query(aliased_author).filter(aliased_author.user == user_id).first()
)
if isinstance(author, Author): if isinstance(author, Author):
author_id = author.id author_id = author.id
aliased_author = aliased(Author)
authors_query = ( authors_query = (
select(Author) session.query(aliased_author, AuthorFollower)
.join(AuthorFollower, AuthorFollower.follower == author_id) .join(AuthorFollower, AuthorFollower.follower == author_id)
.filter(AuthorFollower.author == Author.id) .filter(AuthorFollower.author == aliased_author.id)
)
topics_query = (
session.query(Topic, TopicFollower)
.join(TopicFollower, TopicFollower.follower == author_id)
.filter(TopicFollower.topic == Topic.id)
) )
authors_query = add_author_stat_columns(authors_query) authors_query = add_author_stat_columns(authors_query)
topics_query = add_topic_stat_columns(topics_query)
authors = [ authors = [
{ {
'id': author_id, 'id': author_id,
@ -110,10 +115,12 @@ def query_follows(user_id: str):
'slug': author.slug, 'slug': author.slug,
'pic': author.pic, 'pic': author.pic,
'bio': author.bio, 'bio': author.bio,
'last_seen': author.last_seen or int(time.time()),
'stat': { 'stat': {
'shouts': shouts_stat, 'shouts': shouts_stat,
'followers': followers_stat, 'followers': followers_stat,
'followings': followings_stat, 'followings': followings_stat, # TODO: rename to authors to
# TODO: use graphql to reserve universal type Stat { authors shouts followers views comments }
}, },
} }
for [ for [
@ -124,12 +131,6 @@ def query_follows(user_id: str):
] in session.execute(authors_query) ] in session.execute(authors_query)
] ]
topics_query = (
select(Topic)
.join(TopicFollower, TopicFollower.follower == author_id)
.filter(TopicFollower.topic == Topic.id)
)
topics_query = add_topic_stat_columns(topics_query)
topics = [ topics = [
{ {
'id': topic.id, 'id': topic.id,
@ -150,8 +151,6 @@ def query_follows(user_id: str):
] in session.execute(topics_query) ] in session.execute(topics_query)
] ]
# TODO: Include other queries (e.g., shouts_query) if needed
return { return {
'topics': topics, 'topics': topics,
'authors': authors, 'authors': authors,