Перестановка файлов

app/chat/router.py

@@ -14,8 +14,8 @@ from app.chat.shemas import (
 from app.services.chat_service import ChatService
 from app.services.message_service import MessageService
 from app.utils.unit_of_work import UnitOfWork
-from app.users.dependencies import get_verificated_user
-from app.utils.auth import AuthService
+from app.dependencies import get_verificated_user
+from app.services.auth_service import AuthService
 from app.users.schemas import SCreateInvitationLink, SUser
 
 router = APIRouter(prefix="/chat", tags=["Чат"])

app/chat/websocket.py

@@ -9,10 +9,10 @@ from app.exceptions import IncorrectDataException
 from app.chat.exceptions import UserDontHavePermissionException
 from app.services.message_service import MessageService
 from app.utils.unit_of_work import UnitOfWork
-from app.utils.auth import AuthService
+from app.services.auth_service import AuthService
 from app.chat.router import router
 from app.chat.shemas import SSendMessage, SDeleteMessage, SEditMessage, SPinMessage, SUnpinMessage, Responses
-from app.users.dependencies import get_current_user_ws, get_token, get_subprotocol_ws, get_verificated_user
+from app.dependencies import get_current_user_ws, get_token, get_subprotocol_ws, get_verificated_user
 from app.users.schemas import SUser
 
 

app/images/router.py

@@ -2,7 +2,7 @@ from fastapi import APIRouter, UploadFile, status, Depends
 
 from app.images.shemas import SImageUrl, Responses
 from app.services.image_service import ImageService
-from app.users.dependencies import get_verificated_user
+from app.dependencies import get_verificated_user
 
 router = APIRouter(prefix="/images", tags=["Загрузка картинок"])
 

app/services/chat_service.py

@@ -6,7 +6,7 @@ from app.config import settings
 from app.services.user_service import UserService
 from app.utils.unit_of_work import UnitOfWork
 from app.users.schemas import SInvitationData
-from app.utils.auth import AuthService
+from app.services.auth_service import AuthService
 
 
 class ChatService:

app/services/user_service.py

@@ -4,7 +4,7 @@ from app.tasks.tasks import generate_confirmation_code, send_confirmation_email,
 from app.utils.unit_of_work import UnitOfWork
 from app.users.exceptions import PasswordsMismatchException, WrongCodeException
 from app.users.schemas import SUser, SUsers, SUserRegister, SConfirmationData, SUserAvatars, SUserChangeData
-from app.utils.auth import AuthService
+from app.services.auth_service import AuthService
 
 
 class UserService:

app/tasks/tasks.py

@@ -13,7 +13,7 @@ from app.tasks.email_templates import (
 	create_data_change_confirmation_email,
 	create_data_change_email,
 )
-from app.utils.auth import AuthService
+from app.services.auth_service import AuthService
 from app.users.schemas import SConfirmationData
 
 

app/users/router.py

@@ -5,8 +5,8 @@ from fastapi import APIRouter, Depends, status
 from app.services.user_service import UserService
 from app.users.exceptions import UserAlreadyExistsException, PasswordAlreadyInUseException, UserNotFoundException
 from app.utils.unit_of_work import UnitOfWork
-from app.utils.auth import AuthService
-from app.users.dependencies import get_current_user
+from app.services.auth_service import AuthService
+from app.dependencies import get_current_user
 from app.users.schemas import (
 	SUserLogin,
 	SUserRegister,