refactor/cleaned users endpoint file

server/pin_sphere/users/endpoint.py

@@ -8,12 +8,8 @@
 from core.database.session_manager import get_async_session
 from core.models import User
 from core.types import FileContentType
-from pin_sphere.users.service import get_user_by_username
 
-from . import service
-from .filters import SettingsFilter
-from .schemas import UserResponse, UserUpdate
-from .service import delete_user, get_user, get_users, update_user
+from . import filters, schemas, service
 
 # Create an API router for users-related endpoints
 router = APIRouter(
@@ -24,169 +20,218 @@
 
 @router.get(
     "/me",
-    response_model=UserResponse,
-    summary="Get current user",
+    response_model=schemas.UserResponse,
+    summary="Get current user profile",
+    description="Retrieve the profile information of the currently authenticated user.",
     tags=["Account Operations"],
 )
 async def get_me(
     current_user: User = Depends(auth.get_current_user),
     session: AsyncSession = Depends(get_async_session),
 ):
-    return await get_user(session, current_user.username)
+    """Get current authenticated user's profile"""
+    return await service.get_user(session, current_user.username)
 
 
-# Fetch all users with optional pagination
 @router.get(
     "",
-    response_model=list[UserResponse],
-    summary="Fetch all users",
+    response_model=list[schemas.UserResponse],
+    summary="List all users",
+    description="Fetch a paginated list of all users in the system.",
     tags=["Account Operations"],
+    dependencies=[Depends(auth.get_current_user)],
 )
 async def read_users(
     skip: int = 0,
     limit: int = 10,
     db: AsyncSession = Depends(get_async_session),
-    current_user: User = Depends(auth.get_current_user),
 ):
     """
     Fetch a list of users with optional pagination.
 
     - **skip**: Number of records to skip (default: 0)
     - **limit**: Maximum number of records to return (default: 10)
     """
-    users = await get_users(db, skip=skip, limit=limit)
+    # Fetch users with pagination
+    users = await service.get_users(db, skip=skip, limit=limit)
     return users
 
 
 @router.get(
     "/check-username/{username}",
-    summary="Check if a username is available",
+    summary="Check username availability",
+    description="Verify if a username is available for registration.",
     tags=["Account Operations"],
+    dependencies=[Depends(auth.get_current_user)],
 )
 async def check_username_availability(
     username: str,
     db: AsyncSession = Depends(get_async_session),
-    current_user: User = Depends(auth.get_current_user),
 ):
     """
     Check if the provided username is available for registration.
 
-    - **username**: The username to check.
+    - **username**: The username to check for availability
+
+    Returns success message if available, otherwise raises 400 error.
     """
-    existing_user = await get_user_by_username(db, username=username)
+    # Check if username already exists
+    existing_user = await service.get_user_by_username(db, username=username)
 
     if existing_user:
         raise HTTPException(status_code=400, detail="Username already taken")
     return {"message": "Username is available"}
 
 
-# Account deletion route
 @router.delete(
     "/{username}",
-    response_model=UserResponse,
-    summary="Delete an account by username",
+    response_model=schemas.UserResponse,
+    summary="Delete user account",
+    description="Delete a user account by username. Returns the deleted user information.",
     tags=["Account Operations"],
+    dependencies=[Depends(auth.get_current_user)],
 )
 async def delete_account(
     username: str,
     db: AsyncSession = Depends(get_async_session),
-    current_user: User = Depends(auth.get_current_user),
 ):
     """
-    Delete the users account by their username.
+    Delete a user account by their username.
+
+    - **username**: The username of the user to delete
 
-    - **username**: The username of the users to delete.
+    Returns the deleted user data or 404 if user not found.
     """
-    user = await delete_user(db, username=username)
+    # Attempt to delete user
+    user = await service.delete_user(db, username=username)
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
     return user
 
 
 @router.get(
-    "/upload_url", summary="Upload URL for profile photo", tags=["Account Operations"]
+    "/upload_url",
+    summary="Get profile photo upload URL",
+    description="Generate a pre-signed URL for uploading profile photos. Supports PNG and JPEG formats.",
+    tags=["Account Operations"],
 )
-async def retrive_upload_url(
+async def retrieve_upload_url(
     ext: Literal["image/png", "image/jpeg"],
     current_user: User = Depends(auth.get_current_user),
 ):
+    """
+    Generate upload URL for profile photo.
+
+    - **ext**: Image format (image/png or image/jpeg)
+    """
+    # Convert extension and generate upload URL
     ext_ = FileContentType(ext)
     return service.get_upload_url(current_user, ext=ext_)
 
 
-# Fetch a specific users by username
+@router.get(
+    "/settings",
+    summary="Get user settings",
+    description="Retrieve the current user's account settings and preferences.",
+    tags=["Account Operations"],
+    response_model=filters.SettingsFilter,
+)
+async def get_settings(
+    current_user: User = Depends(auth.get_current_user),
+    session: AsyncSession = Depends(get_async_session),
+):
+    """Get current user's settings"""
+    return await service.get_settings(session, current_user)
+
+
+@router.put(
+    "/settings",
+    status_code=status.HTTP_204_NO_CONTENT,
+    summary="Update user settings",
+    description="Update the current user's account settings and preferences.",
+)
+async def update_settings(
+    current_user: User = Depends(auth.get_current_user),
+    settings: filters.SettingsFilter = Depends(),
+    session: AsyncSession = Depends(get_async_session),
+):
+    """Update current user's settings"""
+    await service.update_settings(current_user, settings, session)
+
+
 @router.get(
     "/{username}",
-    response_model=UserResponse,
-    summary="Fetch a users by username",
+    response_model=schemas.UserResponse,
+    summary="Get user by username",
+    description="Retrieve a specific user's profile information by their username.",
     tags=["Account Operations"],
 )
 async def read_user(
     username: str,
     db: AsyncSession = Depends(get_async_session),
 ):
     """
-    Fetch a single users by their unique username.
+    Fetch a single user by their unique username.
 
-    - **username**: The username of the users to retrieve.
+    - **username**: The username of the user to retrieve
+
+    Returns user data or 404 if user not found.
     """
-    user = await get_user(db, username=username)
+    # Fetch user by username
+    user = await service.get_user(db, username=username)
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
     return user
 
 
-@router.put("/settings", status_code=status.HTTP_204_NO_CONTENT)
-async def update_settings(
-    current_user: User = Depends(auth.get_current_user),
-    settings: SettingsFilter = Depends(),
-    session: AsyncSession = Depends(get_async_session),
-):
-    await service.update_settings(current_user, settings, session)
-
-
-# Update an existing users
 @router.put(
     "",
-    response_model=UserResponse,
-    summary="Update a user",
+    response_model=schemas.UserResponse,
+    summary="Update current user",
+    description="Update the current authenticated user's profile information (name, email, etc.).",
     tags=["Account Operations"],
 )
 async def update_existing_user(
-    user_update: UserUpdate,
+    user_update: schemas.UserUpdate,
     db: AsyncSession = Depends(get_async_session),
     current_user: User = Depends(auth.get_current_user),
 ):
     """
-    Update an existing users by their unique username.
+    Update the current user's profile information.
+
+    - **user_update**: JSON payload containing the fields to update (name, email, etc.)
 
-    - **username**: The username of the users to update.
-    - **user_update**: JSON payload containing the fields to update (name, email).
+    Returns updated user data or 404 if user not found.
     """
-    user = await update_user(db, current_user, user_update=user_update)
+    # Update current user's information
+    user = await service.update_user(db, current_user, user_update=user_update)
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
     return user
 
 
-# Delete a users by username
+# Note: Duplicate delete endpoint - consider removing one of the delete methods
 @router.delete(
     "/{username}",
-    response_model=UserResponse,
-    summary="Delete a users",
+    response_model=schemas.UserResponse,
+    summary="Delete user by username",
+    description="Delete a user account by username. This is a duplicate endpoint.",
     tags=["Account Operations"],
+    dependencies=[Depends(auth.get_current_user)],
 )
 async def delete_existing_user(
     username: str,
     db: AsyncSession = Depends(get_async_session),
-    current_user: User = Depends(auth.get_current_user),
 ):
     """
-    Delete a users by their unique username.
+    Delete a user by their unique username.
+
+    - **username**: The username of the user to delete
 
-    - **username**: The username of the users to delete.
+    Returns deleted user data or 404 if user not found.
     """
-    user = await delete_user(db, username=username)
+    # Delete user by username
+    user = await service.delete_user(db, username=username)
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
     return user

server/pin_sphere/users/service.py

@@ -130,3 +130,15 @@ async def update_settings(user: User, settings: SettingsFilter, session: AsyncSe
         .values(settings=old_settings)
     )
     await session.commit()
+
+
+async def get_settings(session: AsyncSession, current_user: User):
+    return (
+        (
+            await session.execute(
+                select(User.settings).filter(User.username == current_user.username)
+            )
+        )
+        .scalars()
+        .one()
+    )