
- Set up SQLite database configuration and directory structure - Configure Alembic for proper SQLite migrations - Add initial model schemas and API endpoints - Fix OAuth2 authentication - Implement proper code formatting with Ruff
121 lines
2.5 KiB
Python
121 lines
2.5 KiB
Python
from typing import Optional
|
|
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.core.security import get_password_hash
|
|
from app.models.user import User
|
|
from app.schemas.user import UserCreate, UserUpdate
|
|
|
|
|
|
def get(db: Session, user_id: int) -> Optional[User]:
|
|
"""
|
|
Get a user by ID.
|
|
|
|
Args:
|
|
db: Database session
|
|
user_id: User ID
|
|
|
|
Returns:
|
|
User object if found, None otherwise
|
|
"""
|
|
return db.query(User).filter(User.id == user_id).first()
|
|
|
|
|
|
def get_by_email(db: Session, email: str) -> Optional[User]:
|
|
"""
|
|
Get a user by email.
|
|
|
|
Args:
|
|
db: Database session
|
|
email: User email
|
|
|
|
Returns:
|
|
User object if found, None otherwise
|
|
"""
|
|
return db.query(User).filter(User.email == email).first()
|
|
|
|
|
|
def get_by_username(db: Session, username: str) -> Optional[User]:
|
|
"""
|
|
Get a user by username.
|
|
|
|
Args:
|
|
db: Database session
|
|
username: Username
|
|
|
|
Returns:
|
|
User object if found, None otherwise
|
|
"""
|
|
return db.query(User).filter(User.username == username).first()
|
|
|
|
|
|
def create(db: Session, obj_in: UserCreate) -> User:
|
|
"""
|
|
Create a new user.
|
|
|
|
Args:
|
|
db: Database session
|
|
obj_in: User creation data
|
|
|
|
Returns:
|
|
Created user object
|
|
"""
|
|
db_obj = User(
|
|
email=obj_in.email,
|
|
username=obj_in.username,
|
|
hashed_password=get_password_hash(obj_in.password),
|
|
is_active=obj_in.is_active,
|
|
)
|
|
|
|
db.add(db_obj)
|
|
db.commit()
|
|
db.refresh(db_obj)
|
|
|
|
return db_obj
|
|
|
|
|
|
def update(db: Session, db_obj: User, obj_in: UserUpdate) -> User:
|
|
"""
|
|
Update a user.
|
|
|
|
Args:
|
|
db: Database session
|
|
db_obj: User object to update
|
|
obj_in: User update data
|
|
|
|
Returns:
|
|
Updated user object
|
|
"""
|
|
update_data = obj_in.dict(exclude_unset=True)
|
|
|
|
if "password" in update_data:
|
|
update_data["hashed_password"] = get_password_hash(update_data.pop("password"))
|
|
|
|
for field, value in update_data.items():
|
|
setattr(db_obj, field, value)
|
|
|
|
db.add(db_obj)
|
|
db.commit()
|
|
db.refresh(db_obj)
|
|
|
|
return db_obj
|
|
|
|
|
|
def delete(db: Session, user_id: int) -> Optional[User]:
|
|
"""
|
|
Delete a user.
|
|
|
|
Args:
|
|
db: Database session
|
|
user_id: User ID
|
|
|
|
Returns:
|
|
Deleted user object if found, None otherwise
|
|
"""
|
|
user = db.query(User).filter(User.id == user_id).first()
|
|
|
|
if user:
|
|
db.delete(user)
|
|
db.commit()
|
|
|
|
return user |