refactored

resolvers/admin.py

@@ -17,14 +17,14 @@ from orm.draft import DraftTopic
 from orm.reaction import Reaction
 from orm.shout import Shout, ShoutTopic
 from orm.topic import Topic, TopicFollower
+from rbac.api import update_all_communities_permissions
 from resolvers.editor import delete_shout, update_shout
 from resolvers.topic import invalidate_topic_followers_cache, invalidate_topics_cache
 from services.admin import AdminService
-from services.common_result import handle_error
-from services.db import local_session
-from services.rbac import update_all_communities_permissions
-from services.redis import redis
-from services.schema import mutation, query
+from utils.common_result import handle_error
+from storage.db import local_session
+from storage.redis import redis
+from storage.schema import mutation, query
 from utils.logger import root_logger as logger
 
 admin_service = AdminService()

resolvers/auth.py

@@ -8,7 +8,7 @@ from graphql import GraphQLResolveInfo
 from starlette.responses import JSONResponse
 
 from services.auth import auth_service
-from services.schema import mutation, query, type_author
+from storage.schema import mutation, query, type_author
 from settings import SESSION_COOKIE_NAME
 from utils.logger import root_logger as logger
 

resolvers/author.py

@@ -21,10 +21,10 @@ from orm.community import Community, CommunityAuthor, CommunityFollower
 from orm.shout import Shout, ShoutAuthor
 from resolvers.stat import get_with_stat
 from services.auth import login_required
-from services.common_result import CommonResult
-from services.db import local_session
-from services.redis import redis
-from services.schema import mutation, query
+from utils.common_result import CommonResult
+from storage.db import local_session
+from storage.redis import redis
+from storage.schema import mutation, query
 from utils.logger import root_logger as logger
 
 DEFAULT_COMMUNITIES = [1]
@@ -450,9 +450,7 @@ async def load_authors_search(_: None, info: GraphQLResolveInfo, **kwargs: Any)
     return []
 
 
-def get_author_id_from(
-    slug: str | None = None, user: str | None = None, author_id: int | None = None
-) -> int | None:
+def get_author_id_from(slug: str | None = None, user: str | None = None, author_id: int | None = None) -> int | None:
     """Get author ID from different identifiers"""
     try:
         if author_id:

resolvers/bookmark.py

@@ -7,9 +7,9 @@ from auth.orm import AuthorBookmark
 from orm.shout import Shout
 from resolvers.reader import apply_options, get_shouts_with_links, query_with_stat
 from services.auth import login_required
-from services.common_result import CommonResult
-from services.db import local_session
-from services.schema import mutation, query
+from utils.common_result import CommonResult
+from storage.db import local_session
+from storage.schema import mutation, query
 
 
 @query.field("load_shouts_bookmarked")

resolvers/collab.py

@@ -4,8 +4,8 @@ from auth.orm import Author
 from orm.invite import Invite, InviteStatus
 from orm.shout import Shout
 from services.auth import login_required
-from services.db import local_session
-from services.schema import mutation
+from storage.db import local_session
+from storage.schema import mutation
 
 
 @mutation.field("accept_invite")

resolvers/collection.py

@@ -6,9 +6,9 @@ from sqlalchemy.orm import joinedload
 from auth.decorators import editor_or_admin_required
 from auth.orm import Author
 from orm.collection import Collection, ShoutCollection
-from services.db import local_session
-from services.rbac import require_any_permission
-from services.schema import mutation, query, type_collection
+from rbac.api import require_any_permission
+from storage.db import local_session
+from storage.schema import mutation, query, type_collection
 from utils.logger import root_logger as logger
 
 

resolvers/community.py

@@ -7,15 +7,15 @@ from sqlalchemy import distinct, func
 from auth.orm import Author
 from orm.community import Community, CommunityAuthor, CommunityFollower
 from orm.shout import Shout, ShoutAuthor
-from services.db import local_session
-from services.rbac import (
+from rbac.api import (
     RBACError,
     get_user_roles_from_context,
     require_any_permission,
     require_permission,
     roles_have_permission,
 )
-from services.schema import mutation, query, type_community
+from storage.db import local_session
+from storage.schema import mutation, query, type_community
 from utils.logger import root_logger as logger
 
 

resolvers/draft.py

@@ -12,9 +12,9 @@ from cache.cache import (
 from orm.draft import Draft, DraftAuthor, DraftTopic
 from orm.shout import Shout, ShoutAuthor, ShoutTopic
 from services.auth import login_required
-from services.db import local_session
+from storage.db import local_session
 from services.notify import notify_shout
-from services.schema import mutation, query
+from storage.schema import mutation, query
 from services.search import search_service
 from utils.extract_text import extract_text
 from utils.logger import root_logger as logger

resolvers/editor.py

@@ -19,10 +19,10 @@ from orm.topic import Topic
 from resolvers.follower import follow
 from resolvers.stat import get_with_stat
 from services.auth import login_required
-from services.common_result import CommonResult
-from services.db import local_session
+from utils.common_result import CommonResult
+from storage.db import local_session
 from services.notify import notify_shout
-from services.schema import mutation, query
+from storage.schema import mutation, query
 from services.search import search_service
 from utils.extract_text import extract_text
 from utils.logger import root_logger as logger

resolvers/feed.py

@@ -13,8 +13,8 @@ from resolvers.reader import (
     query_with_stat,
 )
 from services.auth import login_required
-from services.db import local_session
-from services.schema import query
+from storage.db import local_session
+from storage.schema import query
 from utils.logger import root_logger as logger
 
 

resolvers/follower.py

@@ -16,10 +16,10 @@ from orm.community import Community, CommunityFollower
 from orm.shout import Shout, ShoutReactionsFollower
 from orm.topic import Topic, TopicFollower
 from services.auth import login_required
-from services.db import local_session
+from storage.db import local_session
 from services.notify import notify_follower
-from services.redis import redis
-from services.schema import mutation, query
+from storage.redis import redis
+from storage.schema import mutation, query
 from utils.logger import root_logger as logger
 
 

resolvers/notifier.py

@@ -17,8 +17,8 @@ from orm.notification import (
 )
 from orm.shout import Shout
 from services.auth import login_required
-from services.db import local_session
-from services.schema import mutation, query
+from storage.db import local_session
+from storage.schema import mutation, query
 from utils.logger import root_logger as logger
 
 

resolvers/proposals.py

@@ -3,7 +3,7 @@ from sqlalchemy import and_
 from orm.rating import is_negative, is_positive
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout
-from services.db import local_session
+from storage.db import local_session
 from utils.diff import apply_diff, get_diff
 
 

resolvers/rating.py

@@ -8,8 +8,8 @@ from auth.orm import Author, AuthorRating
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout, ShoutAuthor
 from services.auth import login_required
-from services.db import local_session
-from services.schema import mutation, query
+from storage.db import local_session
+from storage.schema import mutation, query
 from utils.logger import root_logger as logger
 
 

resolvers/reaction.py

@@ -21,9 +21,9 @@ from resolvers.follower import follow
 from resolvers.proposals import handle_proposing
 from resolvers.stat import update_author_stat
 from services.auth import add_user_role, login_required
-from services.db import local_session
+from storage.db import local_session
 from services.notify import notify_reaction
-from services.schema import mutation, query
+from storage.schema import mutation, query
 from utils.logger import root_logger as logger
 
 

resolvers/reader.py

@@ -10,8 +10,8 @@ from auth.orm import Author
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout, ShoutAuthor, ShoutTopic
 from orm.topic import Topic
-from services.db import json_array_builder, json_builder, local_session
-from services.schema import query
+from storage.db import json_array_builder, json_builder, local_session
+from storage.schema import query
 from services.search import SearchService, search_text
 from services.viewed import ViewedStorage
 from utils.logger import root_logger as logger

resolvers/stat.py

@@ -13,7 +13,7 @@ from orm.community import Community, CommunityFollower
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout, ShoutAuthor, ShoutTopic
 from orm.topic import Topic, TopicFollower
-from services.db import local_session
+from storage.db import local_session
 from utils.logger import root_logger as logger
 
 # Type alias for queries
@@ -434,9 +434,7 @@ def get_following_count(entity_type: str, entity_id: int) -> int:
         return 0
 
 
-def get_shouts_count(
-    author_id: int | None = None, topic_id: int | None = None, community_id: int | None = None
-) -> int:
+def get_shouts_count(author_id: int | None = None, topic_id: int | None = None, community_id: int | None = None) -> int:
     """Получает количество публикаций"""
     try:
         with local_session() as session:

resolvers/topic.py

@@ -18,11 +18,11 @@ from orm.draft import DraftTopic
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout, ShoutAuthor, ShoutTopic
 from orm.topic import Topic, TopicFollower
+from rbac.api import require_any_permission, require_permission
 from resolvers.stat import get_with_stat
-from services.db import local_session
-from services.rbac import require_any_permission, require_permission
-from services.redis import redis
-from services.schema import mutation, query
+from storage.db import local_session
+from storage.redis import redis
+from storage.schema import mutation, query
 from utils.logger import root_logger as logger