Merge commit 'f7ffe4dc151803acd55a7315559ed268c2ffa1e1' into fix-yihao-sprint15

Author: bazz333

app/service/auth_service.py app/auth_roles.pyapp/service/auth_service.py renamed to app/auth_roles.py

@@ -16,7 +16,7 @@
 from app.repositories.user_repository import UserRepository, get_user_repository
 import app.schemas as schemas
 from app.utils import verify_password
-from app.service.auth_service import AccessRoles
+from app.auth_roles import AccessRoles
 
 load_dotenv()
 

app/routes/auth.py

@@ -4,14 +4,12 @@
 from fastapi import Query
 from typing import Optional
 
-from app.database import get_db
-from app.repositories.chat_repository import ChatRepository
+from app.repositories.chat_repository import ChatRepository, get_chat_repository
 import app.schemas as schemas
 from app.routes.auth import (
     verify_user,
     verify_admin,
 )
-from app.repositories.chat_repository import get_chat_repository
 
 router = APIRouter(
     prefix="/chats",

app/routes/chat.py

@@ -3,8 +3,6 @@
 from bson import ObjectId
 from pymongo.errors import DuplicateKeyError
 
-from app.database import get_db
-from app.repositories.document_repository import DocumentRepository
 from app.repositories.user_repository import UserRepository
 import app.schemas as schemas
 from app.routes.auth import (
@@ -124,9 +122,6 @@ async def delete_document(
         )
 
     try:
-        print("Deleting document:", file)
-        print("AAAAAAAAAAAAAAAAAAAAA")
-        print("ObjectId:", ObjectId(file.id))
         result = await document_repository.delete_document(file_id=ObjectId(file.id))
         if result.deleted_count == 0:
             raise HTTPException(

app/routes/document.py

@@ -51,9 +51,8 @@ class UserForgotPassword(BaseModel):
     email: EmailStr
 
 
-class UserUpdatePassword(BaseModel):
+class UserUpdatePassword(UserAuth):
     password: str
-    current_password: str
 
     @field_validator("password")
     def check_password_complexity(cls, value: str):

app/schemas.py

@@ -6,7 +6,7 @@
 from app.routes.auth import router as auth_router
 from app.repositories.user_repository import UserRepository
 from app.schemas import UserUpdate
-from app.service.auth_service import AccessRoles
+from app.auth_roles import AccessRoles
 from app.utils import verify_password
 from fastapi import APIRouter, Depends, HTTPException, status
 

tests/routes/test_auth.py

@@ -9,7 +9,7 @@
     UserUpdatePassword,
     UserForgotPassword,
 )
-from app.service.auth_service import AccessRoles
+from app.auth_roles import AccessRoles
 from pymongo.errors import DuplicateKeyError
 from jose import jwt, JWTError
 from app.routes.user import (