Переместил чат

app/admin/views.py

@@ -1,7 +1,7 @@
 from sqladmin import ModelView
 
 from app.users.models import Users
-from app.users.chat.models import Chats, UsersXChats, Messages
+from app.chat.models import Chats, UsersXChats, Messages
 
 
 class UsersAdmin(ModelView, model=Users):

app/chat/dao.py

@@ -3,9 +3,9 @@ from sqlalchemy import insert, select, update, delete
 from app.dao.base import BaseDAO
 from app.database import async_session_maker, engine  # noqa
 from app.exceptions import UserAlreadyInChatException, UserAlreadyPinnedChatException
-from app.users.chat.shemas import SMessage
+from app.chat.shemas import SMessage
 from app.users.models import Users
-from app.users.chat.models import Chats, Messages, UsersXChats, PinnedChats, PinnedMessages, Answers
+from app.chat.models import Chats, Messages, UsersXChats, PinnedChats, PinnedMessages, Answers
 
 
 class ChatDAO(BaseDAO):

app/chat/router.py

@@ -4,8 +4,8 @@ from fastapi import APIRouter, Depends, status
 
 from app.config import settings
 from app.exceptions import UserDontHavePermissionException, MessageNotFoundException, UserCanNotReadThisChatException
-from app.users.chat.dao import ChatDAO
+from app.chat.dao import ChatDAO
-from app.users.chat.shemas import SMessage, SLastMessages, SPinnedMessage, SPinnedChat, SDeletedUser, SChat, \
+from app.chat.shemas import SMessage, SLastMessages, SPinnedMessage, SPinnedChat, SDeletedUser, SChat, \
     SDeletedChat
 
 from app.users.dao import UserDAO

app/chat/websocket.py

@@ -3,8 +3,8 @@ from fastapi import WebSocket, WebSocketDisconnect
 from app.exceptions import IncorrectDataException, UserDontHavePermissionException
 from app.services.message_service import MessageService
 from app.users.auth import AuthService
-from app.users.chat.router import router
+from app.chat.router import router
-from app.users.chat.shemas import SSendMessage, SMessage, SDeleteMessage, SEditMessage
+from app.chat.shemas import SSendMessage, SMessage, SDeleteMessage, SEditMessage
 
 
 class ConnectionManager(WebSocket):

app/main.py

@@ -1,17 +1,14 @@
-from fastapi import FastAPI, Request
+from fastapi import FastAPI
 from sqladmin import Admin
-from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.staticfiles import StaticFiles
 from fastapi.middleware.cors import CORSMiddleware
-import sentry_sdk
 
 from app.admin.auth import authentication_backend
 from app.admin.views import UsersAdmin, ChatsAdmin, MessagesAdmin, UsersXChatsAdmin
-from app.config import settings
 from app.database import engine
 from app.users.router import router as user_router
 from app.pages.router import router as pages_router
-from app.users.chat.websocket import router as websocket_router
+from app.chat.websocket import router as websocket_router
 from app.images.router import router as image_router
 
 
@@ -21,17 +18,6 @@ from app.images.router import router as image_router
 #     profiles_sample_rate=1.0,
 # )
 
-class CustomMiddleware(BaseHTTPMiddleware):
-	async def dispatch(self, request: Request, call_next):
-		print(f"Before request: {request.body()}")
-
-		response = await call_next(request)
-
-		return response
-
-
-# Добавьте middleware в приложение FastAPI
-
 app = FastAPI(
     title="Чат BP",
     root_path="/api"
@@ -58,7 +44,6 @@ app.add_middleware(
         "Accept"
     ],
 )
-app.add_middleware(CustomMiddleware)
 
 admin = Admin(app, engine, authentication_backend=authentication_backend)
 

app/migrations/env.py

@@ -9,7 +9,7 @@ sys.path.insert(0, dirname(dirname(abspath(__file__))))
 
 from app.database import DATABASE_URL, Base
 from app.users.models import Users, UsersVerificationCodes  # noqa
-from app.users.chat.models import Chats, Messages, UsersXChats, PinnedMessages, PinnedChats  # noqa
+from app.chat.models import Chats, Messages, UsersXChats, PinnedMessages, PinnedChats  # noqa
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

app/services/message_service.py

@@ -1,5 +1,5 @@
-from app.users.chat.dao import ChatDAO
+from app.chat.dao import ChatDAO
-from app.users.chat.shemas import SMessage
+from app.chat.shemas import SMessage
 
 
 class MessageService:

app/tests/conftest.py

@@ -8,7 +8,7 @@ from httpx import AsyncClient
 from app.config import settings
 from app.database import Base, async_session_maker, engine
 from app.users.models import Users, UsersVerificationCodes
-from app.users.chat.models import Chats, UsersXChats, Messages
+from app.chat.models import Chats, UsersXChats, Messages
 from app.main import app as fastapi_app
 
 

app/users/dao.py

@@ -4,7 +4,7 @@ from sqlalchemy import update, select, insert, and_, func, text, delete
 
 from app.dao.base import BaseDAO
 from app.database import async_session_maker, engine  # noqa
-from app.users.chat.models import UsersXChats, Chats
+from app.chat.models import UsersXChats, Chats
 from app.users.models import Users, UsersVerificationCodes, UsersAvatars
 from app.users.schemas import SUser