Improve the frontend and fix TODOs
This commit is contained in:
Urtzi Alfaro
@@ -11,7 +11,7 @@ from datetime import datetime, timezone
|
||||
|
||||
from app.core.database import get_db, get_background_db_session
|
||||
from app.schemas.auth import UserResponse, PasswordChange
|
||||
from app.schemas.users import UserUpdate
|
||||
from app.schemas.users import UserUpdate, BatchUserRequest, OwnerUserCreate
|
||||
from app.services.user_service import UserService
|
||||
from app.models.users import User
|
||||
|
||||
@@ -251,11 +251,11 @@ async def preview_user_deletion(
|
||||
):
|
||||
"""
|
||||
Preview what data would be deleted for an admin user.
|
||||
|
||||
|
||||
This endpoint provides a dry-run preview of the deletion operation
|
||||
without actually deleting any data.
|
||||
"""
|
||||
|
||||
|
||||
try:
|
||||
uuid.UUID(user_id)
|
||||
except ValueError:
|
||||
@@ -263,9 +263,9 @@ async def preview_user_deletion(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Invalid user ID format"
|
||||
)
|
||||
|
||||
|
||||
deletion_service = AdminUserDeleteService(db)
|
||||
|
||||
|
||||
# Get user info
|
||||
user_info = await deletion_service._validate_admin_user(user_id)
|
||||
if not user_info:
|
||||
@@ -273,23 +273,256 @@ async def preview_user_deletion(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail=f"Admin user {user_id} not found"
|
||||
)
|
||||
|
||||
|
||||
# Get tenant associations
|
||||
tenant_info = await deletion_service._get_user_tenant_info(user_id)
|
||||
|
||||
|
||||
# Build preview
|
||||
preview = {
|
||||
"user": user_info,
|
||||
"tenant_associations": tenant_info,
|
||||
"estimated_deletions": {
|
||||
"training_models": "All models for associated tenants",
|
||||
"forecasts": "All forecasts for associated tenants",
|
||||
"forecasts": "All forecasts for associated tenants",
|
||||
"notifications": "All user notification data",
|
||||
"tenant_memberships": tenant_info['total_tenants'],
|
||||
"owned_tenants": f"{tenant_info['owned_tenants']} (will be transferred or deleted)"
|
||||
},
|
||||
"warning": "This operation is irreversible and will permanently delete all associated data"
|
||||
}
|
||||
|
||||
|
||||
return preview
|
||||
|
||||
|
||||
@router.get(route_builder.build_base_route("users/{user_id}", include_tenant_prefix=False), response_model=UserResponse)
|
||||
async def get_user_by_id(
|
||||
user_id: str = Path(..., description="User ID"),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Get user information by user ID.
|
||||
|
||||
This endpoint is for internal service-to-service communication.
|
||||
It returns user details needed by other services (e.g., tenant service for enriching member data).
|
||||
"""
|
||||
try:
|
||||
# Validate UUID format
|
||||
try:
|
||||
uuid.UUID(user_id)
|
||||
except ValueError:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Invalid user ID format"
|
||||
)
|
||||
|
||||
# Fetch user from database
|
||||
from app.repositories import UserRepository
|
||||
user_repo = UserRepository(User, db)
|
||||
user = await user_repo.get_by_id(user_id)
|
||||
|
||||
if not user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail=f"User {user_id} not found"
|
||||
)
|
||||
|
||||
logger.debug("Retrieved user by ID", user_id=user_id, email=user.email)
|
||||
|
||||
return UserResponse(
|
||||
id=str(user.id),
|
||||
email=user.email,
|
||||
full_name=user.full_name,
|
||||
is_active=user.is_active,
|
||||
is_verified=user.is_verified,
|
||||
phone=user.phone,
|
||||
language=user.language or "es",
|
||||
timezone=user.timezone or "Europe/Madrid",
|
||||
created_at=user.created_at,
|
||||
last_login=user.last_login,
|
||||
role=user.role,
|
||||
tenant_id=None
|
||||
)
|
||||
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logger.error("Get user by ID error", user_id=user_id, error=str(e))
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||
detail="Failed to get user information"
|
||||
)
|
||||
|
||||
|
||||
@router.post(route_builder.build_base_route("users/create-by-owner", include_tenant_prefix=False), response_model=UserResponse)
|
||||
async def create_user_by_owner(
|
||||
user_data: OwnerUserCreate,
|
||||
current_user: Dict[str, Any] = Depends(get_current_user_dep),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Create a new user account (owner/admin only - for pilot phase).
|
||||
|
||||
This endpoint allows tenant owners to directly create user accounts
|
||||
with passwords during the pilot phase. In production, this will be
|
||||
replaced with an invitation-based flow.
|
||||
|
||||
**Permissions:** Owner or Admin role required
|
||||
**Security:** Password is hashed server-side before storage
|
||||
"""
|
||||
try:
|
||||
# Verify caller has admin or owner privileges
|
||||
# In pilot phase, we allow 'admin' role from auth service
|
||||
user_role = current_user.get("role", "user")
|
||||
if user_role not in ["admin", "super_admin", "manager"]:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Only administrators can create users directly"
|
||||
)
|
||||
|
||||
# Validate email uniqueness
|
||||
from app.repositories import UserRepository
|
||||
user_repo = UserRepository(User, db)
|
||||
|
||||
existing_user = await user_repo.get_by_email(user_data.email)
|
||||
if existing_user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"User with email {user_data.email} already exists"
|
||||
)
|
||||
|
||||
# Hash password
|
||||
from app.core.security import SecurityManager
|
||||
hashed_password = SecurityManager.hash_password(user_data.password)
|
||||
|
||||
# Create user
|
||||
create_data = {
|
||||
"email": user_data.email,
|
||||
"full_name": user_data.full_name,
|
||||
"hashed_password": hashed_password,
|
||||
"phone": user_data.phone,
|
||||
"role": user_data.role,
|
||||
"language": user_data.language or "es",
|
||||
"timezone": user_data.timezone or "Europe/Madrid",
|
||||
"is_active": True,
|
||||
"is_verified": False # Can be verified later if needed
|
||||
}
|
||||
|
||||
new_user = await user_repo.create_user(create_data)
|
||||
|
||||
logger.info(
|
||||
"User created by owner",
|
||||
created_user_id=str(new_user.id),
|
||||
created_user_email=new_user.email,
|
||||
created_by=current_user.get("user_id"),
|
||||
created_by_email=current_user.get("email")
|
||||
)
|
||||
|
||||
# Return user response
|
||||
return UserResponse(
|
||||
id=str(new_user.id),
|
||||
email=new_user.email,
|
||||
full_name=new_user.full_name,
|
||||
is_active=new_user.is_active,
|
||||
is_verified=new_user.is_verified,
|
||||
phone=new_user.phone,
|
||||
language=new_user.language,
|
||||
timezone=new_user.timezone,
|
||||
created_at=new_user.created_at,
|
||||
last_login=new_user.last_login,
|
||||
role=new_user.role,
|
||||
tenant_id=None # Will be set when added to tenant
|
||||
)
|
||||
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logger.error(
|
||||
"Failed to create user by owner",
|
||||
email=user_data.email,
|
||||
error=str(e),
|
||||
created_by=current_user.get("user_id")
|
||||
)
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||
detail="Failed to create user account"
|
||||
)
|
||||
|
||||
|
||||
@router.post(route_builder.build_base_route("users/batch", include_tenant_prefix=False), response_model=Dict[str, Any])
|
||||
async def get_users_batch(
|
||||
request: BatchUserRequest,
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Get multiple users by their IDs in a single request.
|
||||
|
||||
This endpoint is for internal service-to-service communication.
|
||||
It efficiently fetches multiple user records needed by other services
|
||||
(e.g., tenant service for enriching member lists).
|
||||
|
||||
Returns a dict mapping user_id -> user data, with null for non-existent users.
|
||||
"""
|
||||
try:
|
||||
# Validate all UUIDs
|
||||
validated_ids = []
|
||||
for user_id in request.user_ids:
|
||||
try:
|
||||
uuid.UUID(user_id)
|
||||
validated_ids.append(user_id)
|
||||
except ValueError:
|
||||
logger.warning(f"Invalid user ID format in batch request: {user_id}")
|
||||
continue
|
||||
|
||||
if not validated_ids:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="No valid user IDs provided"
|
||||
)
|
||||
|
||||
# Fetch users from database
|
||||
from app.repositories import UserRepository
|
||||
user_repo = UserRepository(User, db)
|
||||
|
||||
# Build response map
|
||||
user_map = {}
|
||||
for user_id in validated_ids:
|
||||
user = await user_repo.get_by_id(user_id)
|
||||
|
||||
if user:
|
||||
user_map[user_id] = {
|
||||
"id": str(user.id),
|
||||
"email": user.email,
|
||||
"full_name": user.full_name,
|
||||
"is_active": user.is_active,
|
||||
"is_verified": user.is_verified,
|
||||
"phone": user.phone,
|
||||
"language": user.language or "es",
|
||||
"timezone": user.timezone or "Europe/Madrid",
|
||||
"created_at": user.created_at.isoformat() if user.created_at else None,
|
||||
"last_login": user.last_login.isoformat() if user.last_login else None,
|
||||
"role": user.role
|
||||
}
|
||||
else:
|
||||
user_map[user_id] = None
|
||||
|
||||
logger.debug(
|
||||
"Batch user fetch completed",
|
||||
requested_count=len(request.user_ids),
|
||||
found_count=sum(1 for v in user_map.values() if v is not None)
|
||||
)
|
||||
|
||||
return {
|
||||
"users": user_map,
|
||||
"requested_count": len(request.user_ids),
|
||||
"found_count": sum(1 for v in user_map.values() if v is not None)
|
||||
}
|
||||
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logger.error("Batch user fetch error", error=str(e))
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||
detail="Failed to fetch users"
|
||||
)
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ User schemas
|
||||
"""
|
||||
|
||||
from pydantic import BaseModel, EmailStr, Field, validator
|
||||
from typing import Optional
|
||||
from typing import Optional, List
|
||||
from datetime import datetime
|
||||
|
||||
from shared.utils.validation import validate_spanish_phone
|
||||
@@ -17,7 +17,7 @@ class UserUpdate(BaseModel):
|
||||
phone: Optional[str] = None
|
||||
language: Optional[str] = Field(None, pattern="^(es|en)$")
|
||||
timezone: Optional[str] = None
|
||||
|
||||
|
||||
@validator('phone')
|
||||
def validate_phone(cls, v):
|
||||
"""Validate phone number"""
|
||||
@@ -40,3 +40,24 @@ class UserProfile(BaseModel):
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
class BatchUserRequest(BaseModel):
|
||||
"""Request schema for batch user fetch"""
|
||||
user_ids: List[str] = Field(..., description="List of user IDs to fetch", min_items=1, max_items=100)
|
||||
|
||||
class OwnerUserCreate(BaseModel):
|
||||
"""Schema for owner-created users (pilot phase)"""
|
||||
email: EmailStr = Field(..., description="User email address")
|
||||
full_name: str = Field(..., min_length=2, max_length=100, description="Full name of the user")
|
||||
password: str = Field(..., min_length=8, max_length=128, description="Initial password for the user")
|
||||
phone: Optional[str] = Field(None, description="Phone number")
|
||||
role: str = Field("user", pattern="^(user|admin|manager)$", description="User role in the system")
|
||||
language: Optional[str] = Field("es", pattern="^(es|en|eu)$", description="Preferred language")
|
||||
timezone: Optional[str] = Field("Europe/Madrid", description="User timezone")
|
||||
|
||||
@validator('phone')
|
||||
def validate_phone_number(cls, v):
|
||||
"""Validate phone number"""
|
||||
if v and not validate_spanish_phone(v):
|
||||
raise ValueError('Invalid Spanish phone number format')
|
||||
return v
|
||||
|
||||
Reference in New Issue
Block a user