code quality run

This commit is contained in:
2025-09-13 21:58:54 +02:00
parent 0dfd885847
commit 3eb18ef91e
63 changed files with 1802 additions and 1289 deletions

View File

@@ -1,11 +1,12 @@
from sqlalchemy.orm import Session
from fastapi import HTTPException
import logging
from typing import Optional, Dict, Any
from typing import Any, Dict, Optional
from fastapi import HTTPException
from sqlalchemy.orm import Session
from models.database_models import User
from models.api_models import UserRegister, UserLogin
from middleware.auth import AuthManager
from models.api_models import UserLogin, UserRegister
from models.database_models import User
logger = logging.getLogger(__name__)
@@ -36,7 +37,9 @@ class AuthService:
raise HTTPException(status_code=400, detail="Email already registered")
# Check if username already exists
existing_username = db.query(User).filter(User.username == user_data.username).first()
existing_username = (
db.query(User).filter(User.username == user_data.username).first()
)
if existing_username:
raise HTTPException(status_code=400, detail="Username already taken")
@@ -47,7 +50,7 @@ class AuthService:
username=user_data.username,
hashed_password=hashed_password,
role="user",
is_active=True
is_active=True,
)
db.add(new_user)
@@ -71,19 +74,20 @@ class AuthService:
Raises:
HTTPException: If authentication fails
"""
user = self.auth_manager.authenticate_user(db, user_credentials.username, user_credentials.password)
user = self.auth_manager.authenticate_user(
db, user_credentials.username, user_credentials.password
)
if not user:
raise HTTPException(status_code=401, detail="Incorrect username or password")
raise HTTPException(
status_code=401, detail="Incorrect username or password"
)
# Create access token
token_data = self.auth_manager.create_access_token(user)
logger.info(f"User logged in: {user.username}")
return {
"token_data": token_data,
"user": user
}
return {"token_data": token_data, "user": user}
def get_user_by_email(self, db: Session, email: str) -> Optional[User]:
"""Get user by email"""
@@ -101,7 +105,9 @@ class AuthService:
"""Check if username already exists"""
return db.query(User).filter(User.username == username).first() is not None
def authenticate_user(self, db: Session, username: str, password: str) -> Optional[User]:
def authenticate_user(
self, db: Session, username: str, password: str
) -> Optional[User]:
"""Authenticate user with username/password"""
return self.auth_manager.authenticate_user(db, username, password)