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

commented-fix
All checks were successful
deploy / deploy (push) Successful in 1m29s
Details

Browse Source
This commit is contained in:
Untone 2023-12-24 20:46:50 +03:00
parent 8c67438d01
commit f9abe421aa
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
resolvers/author.py
View File

@ -6,7 +6,7 @@ from sqlalchemy.orm import aliased
from orm.author import Author, AuthorFollower, AuthorRating from orm.author import Author, AuthorFollower, AuthorRating
from orm.community import Community from orm.community import Community
from orm.reaction import Reaction from orm.reaction import Reaction, ReactionKind
from orm.shout import ShoutAuthor, ShoutTopic from orm.shout import ShoutAuthor, ShoutTopic
from orm.topic import Topic from orm.topic import Topic
from resolvers.community import followed_communities from resolvers.community import followed_communities
@ -34,13 +34,6 @@ def add_author_stat_columns(q):
func.count(distinct(followers_table.author)).label("followings_stat") func.count(distinct(followers_table.author)).label("followings_stat")
) )
comments_table = aliased(Reaction)
q = q.outerjoin(comments_table, comments_table.created_by == Author.id).add_columns(
func.count()
.filter(and_(comments_table.kind == "COMMENT", comments_table.deleted_at.is_(None)))
.label("commented_stat")
)
q = q.group_by(Author.id) q = q.group_by(Author.id)
return q return q
@ -48,12 +41,11 @@ def add_author_stat_columns(q):
def get_authors_from_query(q): def get_authors_from_query(q):
authors = [] authors = []
with local_session() as session: with local_session() as session:
for [author, shouts_stat, followers_stat, followings_stat, commented_stat] in session.execute(q): for [author, shouts_stat, followers_stat, followings_stat] in session.execute(q):
author.stat = { author.stat = {
"shouts": shouts_stat, "shouts": shouts_stat,
"followers": followers_stat, "followers": followers_stat,
"followings": followings_stat, "followings": followings_stat,
"commented": commented_stat,
} }
authors.append(author) authors.append(author)
# print(f"[resolvers.author] get_authors_from_query {authors}") # print(f"[resolvers.author] get_authors_from_query {authors}")
@ -140,7 +132,14 @@ async def get_author(_, _info, slug="", author_id=None):
q = add_author_stat_columns(q) q = add_author_stat_columns(q)
authors = get_authors_from_query(q) authors = get_authors_from_query(q)
if authors: if authors:
return authors[0] author = authors[0]
with local_session() as session:
comments_count = (
session.query(Reaction)
.where(and_(Reaction.createdBy == author.id, Reaction.kind == ReactionKind.COMMENT.value))
.count()
)
author.stat["commented"] = comments_count
else: else:
return {"error": "cant find author"} return {"error": "cant find author"}

3
services/db.py
View File

@ -1,3 +1,4 @@
import math
import time import time
import logging import logging
@ -27,7 +28,7 @@ def before_cursor_execute(conn, cursor, statement, parameters, context, executem
@event.listens_for(Engine, "after_cursor_execute") @event.listens_for(Engine, "after_cursor_execute")
def after_cursor_execute(conn, cursor, statement, parameters, context, executemany): def after_cursor_execute(conn, cursor, statement, parameters, context, executemany):
total = time.time() - conn.info["query_start_time"].pop(-1) total = time.time() - conn.info["query_start_time"].pop(-1)
logger.debug(f" Finished in {total*1000} ms ") logger.debug(f" Finished in {math.floor(total*10000)/10} ms ")
engine = create_engine(DB_URL, echo=False, pool_size=10, max_overflow=20) engine = create_engine(DB_URL, echo=False, pool_size=10, max_overflow=20)