From 09d77bb1d1f874405eb65065c7e575d9ccea218c Mon Sep 17 00:00:00 2001 From: Untone Date: Wed, 11 Oct 2023 13:07:49 +0300 Subject: [PATCH] merge-fix-7 --- base/redis.py | 0 base/resolvers.py | 0 main.py | 1 + migration/tables/content_items.py | 0 migration/tables/users.py | 0 resolvers/profile.py | 3 +-- 6 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 base/redis.py delete mode 100644 base/resolvers.py delete mode 100644 migration/tables/content_items.py delete mode 100644 migration/tables/users.py diff --git a/base/redis.py b/base/redis.py deleted file mode 100644 index e69de29b..00000000 diff --git a/base/resolvers.py b/base/resolvers.py deleted file mode 100644 index e69de29b..00000000 diff --git a/main.py b/main.py index cc2687f7..f32862c6 100644 --- a/main.py +++ b/main.py @@ -15,6 +15,7 @@ from auth.authenticate import JWTAuthenticate from auth.oauth import oauth_login, oauth_authorize from resolvers.auth import confirm_email_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 services.search import SearchService from services.viewed import ViewedStorage diff --git a/migration/tables/content_items.py b/migration/tables/content_items.py deleted file mode 100644 index e69de29b..00000000 diff --git a/migration/tables/users.py b/migration/tables/users.py deleted file mode 100644 index e69de29b..00000000 diff --git a/resolvers/profile.py b/resolvers/profile.py index 5091e6c5..f89f833a 100644 --- a/resolvers/profile.py +++ b/resolvers/profile.py @@ -7,7 +7,7 @@ from auth.authenticate import login_required from auth.credentials import AuthCredentials from services.db import local_session 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.topic import Topic 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_following = aliased(AuthorFollower) shout_author_aliased = aliased(ShoutAuthor) - # user_rating_aliased = aliased(UserRating) q = q.outerjoin(shout_author_aliased).add_columns( func.count(distinct(shout_author_aliased.shout)).label("shouts_stat")