Refactoring code for modular approach

app/api/v1/auth.py

@@ -2,13 +2,12 @@ from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 from app.core.database import get_db
 from app.api.deps import get_current_user
+from app.services.auth_service import auth_service
 from models.api_models import UserRegister, UserLogin, UserResponse, LoginResponse
 from models.database_models import User
-from middleware.auth import AuthManager
 import logging
 
 router = APIRouter()
-auth_manager = AuthManager()
 logger = logging.getLogger(__name__)
 
 
@@ -16,52 +15,33 @@ logger = logging.getLogger(__name__)
 @router.post("/register", response_model=UserResponse)
 def register_user(user_data: UserRegister, db: Session = Depends(get_db)):
     """Register a new user"""
-    # Check if email already exists
-    existing_email = db.query(User).filter(User.email == user_data.email).first()
-    if existing_email:
-        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()
-    if existing_username:
-        raise HTTPException(status_code=400, detail="Username already taken")
-
-    # Hash password and create user
-    hashed_password = auth_manager.hash_password(user_data.password)
-    new_user = User(
-        email=user_data.email,
-        username=user_data.username,
-        hashed_password=hashed_password,
-        role="user",
-        is_active=True
-    )
-
-    db.add(new_user)
-    db.commit()
-    db.refresh(new_user)
-
-    logger.info(f"New user registered: {new_user.username}")
-    return new_user
+    try:
+        user = auth_service.register_user(db=db, user_data=user_data)
+        return UserResponse.model_validate(user)
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.error(f"Error registering user: {str(e)}")
+        raise HTTPException(status_code=500, detail="Internal server error")
 
 
 @router.post("/login", response_model=LoginResponse)
 def login_user(user_credentials: UserLogin, db: Session = Depends(get_db)):
     """Login user and return JWT token"""
-    user = auth_manager.authenticate_user(db, user_credentials.username, user_credentials.password)
-    if not user:
-        raise HTTPException(status_code=401, detail="Incorrect username or password")
+    try:
+        login_result = auth_service.login_user(db=db, user_credentials=user_credentials)
 
-    # Create access token
-    token_data = auth_manager.create_access_token(user)
-
-    logger.info(f"User logged in: {user.username}")
-
-    return LoginResponse(
-        access_token=token_data["access_token"],
-        token_type=token_data["token_type"],
-        expires_in=token_data["expires_in"],
-        user=UserResponse.model_validate(user)
-    )
+        return LoginResponse(
+            access_token=login_result["token_data"]["access_token"],
+            token_type=login_result["token_data"]["token_type"],
+            expires_in=login_result["token_data"]["expires_in"],
+            user=UserResponse.model_validate(login_result["user"])
+        )
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.error(f"Error logging in user: {str(e)}")
+        raise HTTPException(status_code=500, detail="Internal server error")
 
 
 @router.get("/me", response_model=UserResponse)