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

consistent naming of database fields

Browse Source
This commit is contained in:
Igor Lobanov
2022-11-29 20:13:03 +01:00
parent c064170d24
commit 8209cc744c
20 changed files with 113 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
resolvers/zine/topics.py
View File

@@ -8,16 +8,16 @@ from orm import Shout, User
def add_topic_stat_columns(q):
q = q.outerjoin(ShoutTopic, Topic.id == ShoutTopic.topic_id).add_columns(
func.count(distinct(ShoutTopic.shout_id)).label('shouts_stat')
).outerjoin(ShoutAuthor, ShoutTopic.shout_id == ShoutAuthor.shout_id).add_columns(
func.count(distinct(ShoutAuthor.user_id)).label('authors_stat')
q = q.outerjoin(ShoutTopic, Topic.id == ShoutTopic.topicId).add_columns(
func.count(distinct(ShoutTopic.shoutId)).label('shouts_stat')
).outerjoin(ShoutAuthor, ShoutTopic.shoutId == ShoutAuthor.shoutId).add_columns(
func.count(distinct(ShoutAuthor.userId)).label('authors_stat')
).outerjoin(TopicFollower,
and_(
TopicFollower.topic_id == Topic.id,
TopicFollower.follower_id == ShoutAuthor.id
TopicFollower.topicId == Topic.id,
TopicFollower.followerId == ShoutAuthor.id
)).add_columns(
func.count(distinct(TopicFollower.follower_id)).label('followers_stat')
func.count(distinct(TopicFollower.followerId)).label('followers_stat')
)
q = q.group_by(Topic.id)
@@ -119,7 +119,7 @@ async def topic_follow(user, slug):
with local_session() as session:
topic = session.query(Topic).where(Topic.slug == slug).one()
following = TopicFollower.create(topic_id=topic.id, follower=user.id)
following = TopicFollower.create(topicId=topic.id, followerId=user.id)
session.add(following)
session.commit()
@@ -129,7 +129,7 @@ async def topic_unfollow(user, slug):
sub = (
session.query(TopicFollower).join(Topic).filter(
and_(
TopicFollower.follower_id == user.id,
TopicFollower.followerId == user.id,
Topic.slug == slug
)
).first()
@@ -145,7 +145,7 @@ async def topic_unfollow(user, slug):
async def topics_random(_, info, amount=12):
q = select(Topic)
q = add_topic_stat_columns(q)
q = q.join(Shout, ShoutTopic.shout_id == Shout.id).group_by(Topic.id).having(func.count(Shout.id) > 2)
q = q.join(Shout, ShoutTopic.shoutId == Shout.id).group_by(Topic.id).having(func.count(Shout.id) > 2)
q = q.order_by(func.random()).limit(amount)
return get_topics_from_query(q)