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

merge-fix-7

Browse Source
This commit is contained in:
Untone 2023-10-11 13:07:49 +03:00
parent eca3de7579
commit 09d77bb1d1
6 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
base/redis.py
View File

0
base/resolvers.py
View File

1
main.py
View File

@ -15,6 +15,7 @@ from auth.authenticate import JWTAuthenticate
from auth.oauth import oauth_login, oauth_authorize from auth.oauth import oauth_login, oauth_authorize
from resolvers.auth import confirm_email_handler from resolvers.auth import confirm_email_handler
from resolvers.upload import upload_handler from resolvers.upload import upload_handler
from services.redis import redis
from settings import DEV_SERVER_PID_FILE_NAME, SENTRY_DSN, SESSION_SECRET_KEY from settings import DEV_SERVER_PID_FILE_NAME, SENTRY_DSN, SESSION_SECRET_KEY
from services.search import SearchService from services.search import SearchService
from services.viewed import ViewedStorage from services.viewed import ViewedStorage

0
migration/tables/content_items.py
View File

0
migration/tables/users.py
View File

3
resolvers/profile.py
View File

@ -7,7 +7,7 @@ from auth.authenticate import login_required
from auth.credentials import AuthCredentials from auth.credentials import AuthCredentials
from services.db import local_session from services.db import local_session
from services.schema import mutation, query from services.schema import mutation, query
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 orm.user import AuthorFollower, Role, User, UserRating, UserRole from orm.user import AuthorFollower, Role, User, UserRating, UserRole
@ -21,7 +21,6 @@ def add_author_stat_columns(q, full=False):
author_followers = aliased(AuthorFollower) author_followers = aliased(AuthorFollower)
author_following = aliased(AuthorFollower) author_following = aliased(AuthorFollower)
shout_author_aliased = aliased(ShoutAuthor) shout_author_aliased = aliased(ShoutAuthor)
# user_rating_aliased = aliased(UserRating)
q = q.outerjoin(shout_author_aliased).add_columns( q = q.outerjoin(shout_author_aliased).add_columns(
func.count(distinct(shout_author_aliased.shout)).label("shouts_stat") func.count(distinct(shout_author_aliased.shout)).label("shouts_stat")