Merge backend changes from other branch

Author: jgmuende

backend/README.md

@@ -21,6 +21,13 @@
 from app.models import SQLModel  # noqa
 from app.core.config import settings # noqa
 
+# Import all models to ensure they are registered with SQLModel metadata
+import app.models.user  # noqa
+import app.models.item  # noqa
+import app.models.social  # noqa
+import app.models.token  # noqa
+import app.models.workout  # noqa
+
 target_metadata = SQLModel.metadata
 
 # other values from the config, defined by the needs of env.py,

backend/app/alembic/env.py

@@ -0,0 +1,64 @@
+"""Add social models for user follows and workout posts
+
+Revision ID: 20250515_social
+Revises: 
+Create Date: 2025-05-15 15:56:00.000000
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '20250515_social'
+down_revision = 'd98dd8ec85a3'  # Updated to point to the previous migration
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Create UserFollow table
+    op.create_table(
+        'userfollow',
+        sa.Column('follower_id', postgresql.UUID(), nullable=False),
+        sa.Column('followed_id', postgresql.UUID(), nullable=False),
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.ForeignKeyConstraint(['followed_id'], ['user.id'], ),
+        sa.ForeignKeyConstraint(['follower_id'], ['user.id'], ),
+        sa.PrimaryKeyConstraint('follower_id', 'followed_id')
+    )
+    
+    # Create WorkoutPost table
+    op.create_table(
+        'workoutpost',
+        sa.Column('id', postgresql.UUID(), nullable=False),
+        sa.Column('user_id', postgresql.UUID(), nullable=False),
+        sa.Column('title', sa.String(), nullable=False),
+        sa.Column('description', sa.String(), nullable=True),
+        sa.Column('workout_type', sa.String(), nullable=False),
+        sa.Column('duration_minutes', sa.Integer(), nullable=False),
+        sa.Column('calories_burned', sa.Integer(), nullable=True),
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+        sa.PrimaryKeyConstraint('id')
+    )
+    
+    # Add indexes for better query performance
+    op.create_index(op.f('ix_workoutpost_user_id'), 'workoutpost', ['user_id'], unique=False)
+    op.create_index(op.f('ix_workoutpost_created_at'), 'workoutpost', ['created_at'], unique=False)
+    op.create_index(op.f('ix_userfollow_follower_id'), 'userfollow', ['follower_id'], unique=False)
+    op.create_index(op.f('ix_userfollow_followed_id'), 'userfollow', ['followed_id'], unique=False)
+
+
+def downgrade():
+    # Drop indexes
+    op.drop_index(op.f('ix_userfollow_followed_id'), table_name='userfollow')
+    op.drop_index(op.f('ix_userfollow_follower_id'), table_name='userfollow')
+    op.drop_index(op.f('ix_workoutpost_created_at'), table_name='workoutpost')
+    op.drop_index(op.f('ix_workoutpost_user_id'), table_name='workoutpost')
+    
+    # Drop tables
+    op.drop_table('workoutpost')
+    op.drop_table('userfollow')

backend/app/alembic/versions/20250515_add_social_models.py

@@ -0,0 +1,73 @@
+"""Add workout models for fitness tracking
+
+Revision ID: 20250520_workout
+Revises: 20250515_social
+Create Date: 2025-05-20 10:38:00.000000
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '20250520_workout'
+down_revision = '20250515_social'  # Points to the previous migration
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Create Workout table
+    op.create_table(
+        'workout',
+        sa.Column('id', postgresql.UUID(), nullable=False),
+        sa.Column('user_id', postgresql.UUID(), nullable=False),
+        sa.Column('name', sa.String(), nullable=False),
+        sa.Column('description', sa.String(), nullable=True),
+        sa.Column('scheduled_date', sa.DateTime(), nullable=True),
+        sa.Column('completed_date', sa.DateTime(), nullable=True),
+        sa.Column('duration_minutes', sa.Integer(), nullable=True),
+        sa.Column('is_completed', sa.Boolean(), nullable=False),
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('id')
+    )
+    
+    # Create Exercise table
+    op.create_table(
+        'exercise',
+        sa.Column('id', postgresql.UUID(), nullable=False),
+        sa.Column('workout_id', postgresql.UUID(), nullable=False),
+        sa.Column('name', sa.String(), nullable=False),
+        sa.Column('description', sa.String(), nullable=True),
+        sa.Column('category', sa.String(), nullable=False),
+        sa.Column('sets', sa.Integer(), nullable=True),
+        sa.Column('reps', sa.Integer(), nullable=True),
+        sa.Column('weight', sa.Float(), nullable=True),
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(['workout_id'], ['workout.id'], ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('id')
+    )
+    
+    # Add indexes for better query performance
+    op.create_index(op.f('ix_workout_user_id'), 'workout', ['user_id'], unique=False)
+    op.create_index(op.f('ix_workout_scheduled_date'), 'workout', ['scheduled_date'], unique=False)
+    op.create_index(op.f('ix_workout_is_completed'), 'workout', ['is_completed'], unique=False)
+    op.create_index(op.f('ix_exercise_workout_id'), 'exercise', ['workout_id'], unique=False)
+    op.create_index(op.f('ix_exercise_category'), 'exercise', ['category'], unique=False)
+
+
+def downgrade():
+    # Drop indexes
+    op.drop_index(op.f('ix_exercise_category'), table_name='exercise')
+    op.drop_index(op.f('ix_exercise_workout_id'), table_name='exercise')
+    op.drop_index(op.f('ix_workout_is_completed'), table_name='workout')
+    op.drop_index(op.f('ix_workout_scheduled_date'), table_name='workout')
+    op.drop_index(op.f('ix_workout_user_id'), table_name='workout')
+    
+    # Drop tables
+    op.drop_table('exercise')
+    op.drop_table('workout')

backend/app/alembic/versions/20250520_add_workout_models.py

@@ -1,13 +1,15 @@
 from fastapi import APIRouter
 
-from app.api.routes import items, login, private, users, utils
+from app.api.routes import items, login, private, social, users, utils, workouts
 from app.core.config import settings
 
 api_router = APIRouter()
 api_router.include_router(login.router)
 api_router.include_router(users.router)
 api_router.include_router(utils.router)
 api_router.include_router(items.router)
+api_router.include_router(social.router)
+api_router.include_router(workouts.router)
 
 
 if settings.ENVIRONMENT == "local":

backend/app/api/main.py

@@ -12,10 +12,22 @@
 
 @router.get("/", response_model=ItemsPublic)
 def read_items(
-    session: SessionDep, current_user: CurrentUser, skip: int = 0, limit: int = 100
+    session: SessionDep,
+    current_user: CurrentUser,
+    skip: int = 0,
+    limit: int = 100
 ) -> Any:
     """
     Retrieve items.
+    
+    This endpoint retrieves a list of items. For regular users, it returns only their own items.
+    For superusers, it returns all items in the system.
+    
+    Parameters:
+    - **skip**: Number of records to skip for pagination
+    - **limit**: Maximum number of records to return
+    
+    Returns a list of items and the total count.
     """
 
     if current_user.is_superuser:
@@ -42,9 +54,24 @@ def read_items(
 
 
 @router.get("/{id}", response_model=ItemPublic)
-def read_item(session: SessionDep, current_user: CurrentUser, id: uuid.UUID) -> Any:
+def read_item(
+    session: SessionDep,
+    current_user: CurrentUser,
+    id: uuid.UUID
+) -> Any:
     """
     Get item by ID.
+    
+    This endpoint retrieves a specific item by its ID.
+    
+    Parameters:
+    - **id**: The UUID of the item to retrieve
+    
+    Returns the item details.
+    
+    Raises:
+    - 404: If the item is not found
+    - 400: If the user doesn't have permission to access this item
     """
     item = session.get(Item, id)
     if not item:
@@ -56,10 +83,29 @@ def read_item(session: SessionDep, current_user: CurrentUser, id: uuid.UUID) ->
 
 @router.post("/", response_model=ItemPublic)
 def create_item(
-    *, session: SessionDep, current_user: CurrentUser, item_in: ItemCreate
+    *,
+    session: SessionDep,
+    current_user: CurrentUser,
+    item_in: ItemCreate
 ) -> Any:
     """
     Create new item.
+    
+    This endpoint allows users to create a new item.
+    
+    Parameters:
+    - **title**: Required. The title of the item
+    - **description**: Optional. A description of the item
+    
+    Returns the created item with its ID and owner information.
+    
+    Example request body:
+    ```json
+    {
+        "title": "My Item",
+        "description": "This is a description of my item"
+    }
+    ```
     """
     item = Item.model_validate(item_in, update={"owner_id": current_user.id})
     session.add(item)
@@ -78,6 +124,27 @@ def update_item(
 ) -> Any:
     """
     Update an item.
+    
+    This endpoint allows users to update an existing item.
+    
+    Parameters:
+    - **id**: The UUID of the item to update
+    - **title**: Optional. The updated title
+    - **description**: Optional. The updated description
+    
+    Returns the updated item.
+    
+    Raises:
+    - 404: If the item is not found
+    - 400: If the user doesn't have permission to update this item
+    
+    Example request body:
+    ```json
+    {
+        "title": "Updated Title",
+        "description": "Updated description"
+    }
+    ```
     """
     item = session.get(Item, id)
     if not item:
@@ -94,10 +161,23 @@ def update_item(
 
 @router.delete("/{id}")
 def delete_item(
-    session: SessionDep, current_user: CurrentUser, id: uuid.UUID
+    session: SessionDep,
+    current_user: CurrentUser,
+    id: uuid.UUID
 ) -> Message:
     """
     Delete an item.
+    
+    This endpoint allows users to delete an item.
+    
+    Parameters:
+    - **id**: The UUID of the item to delete
+    
+    Returns a success message upon successful deletion.
+    
+    Raises:
+    - 404: If the item is not found
+    - 400: If the user doesn't have permission to delete this item
     """
     item = session.get(Item, id)
     if not item: