phase 13

backend/tests/api/test_auth.py

@@ -1,6 +1,5 @@
 """Integration tests for authentication endpoints."""
 
-import pytest
 from fastapi import status
 from fastapi.testclient import TestClient
 

backend/tests/api/test_bulk_operations.py

@@ -1,14 +1,15 @@
 """Integration tests for bulk image operations."""
 
+from uuid import uuid4
+
 import pytest
 from httpx import AsyncClient
 from sqlalchemy.ext.asyncio import AsyncSession
-from uuid import uuid4
 
-from app.database.models.user import User
 from app.database.models.board import Board
-from app.database.models.image import Image
 from app.database.models.board_image import BoardImage
+from app.database.models.image import Image
+from app.database.models.user import User
 
 
 @pytest.mark.asyncio
@@ -26,7 +27,7 @@ async def test_bulk_update_position_delta(client: AsyncClient, test_user: User,
     # Create images
     images = []
     board_images = []
-    
+
     for i in range(3):
         image = Image(
             id=uuid4(),

backend/tests/api/test_groups.py

@@ -0,0 +1,289 @@
+"""Integration tests for group endpoints."""
+
+from uuid import uuid4
+
+import pytest
+from httpx import AsyncClient
+from sqlalchemy.orm import Session
+
+from app.database.models.board import Board
+from app.database.models.board_image import BoardImage
+from app.database.models.image import Image
+from app.database.models.user import User
+
+pytestmark = pytest.mark.asyncio
+
+
+async def test_create_group(client: AsyncClient, test_user: User, db: Session):
+    """Test creating a group with images."""
+    # Create board
+    board = Board(
+        id=uuid4(),
+        user_id=test_user.id,
+        title="Test Board",
+        viewport_state={"x": 0, "y": 0, "zoom": 1.0, "rotation": 0},
+    )
+    db.add(board)
+
+    # Create images
+    images = []
+    for i in range(3):
+        image = Image(
+            id=uuid4(),
+            user_id=test_user.id,
+            filename=f"test{i}.jpg",
+            storage_path=f"{test_user.id}/test{i}.jpg",
+            file_size=1024,
+            mime_type="image/jpeg",
+            width=800,
+            height=600,
+            metadata={"format": "jpeg", "checksum": f"abc{i}"},
+        )
+        db.add(image)
+        images.append(image)
+
+        board_image = BoardImage(
+            id=uuid4(),
+            board_id=board.id,
+            image_id=image.id,
+            position={"x": 100, "y": 100},
+            transformations={"scale": 1.0, "rotation": 0, "opacity": 1.0},
+            z_order=i,
+        )
+        db.add(board_image)
+
+    db.commit()
+
+    # Create group
+    response = await client.post(
+        f"/api/boards/{board.id}/groups",
+        json={
+            "name": "Test Group",
+            "color": "#FF5733",
+            "annotation": "Group annotation",
+            "image_ids": [str(img.id) for img in images[:2]],
+        },
+    )
+
+    assert response.status_code == 201
+    data = response.json()
+    assert data["name"] == "Test Group"
+    assert data["color"] == "#FF5733"
+    assert data["annotation"] == "Group annotation"
+    assert data["member_count"] == 2
+
+
+async def test_list_groups(client: AsyncClient, test_user: User, db: Session):
+    """Test listing groups on a board."""
+    from app.database.models.group import Group
+
+    board = Board(
+        id=uuid4(),
+        user_id=test_user.id,
+        title="Test Board",
+        viewport_state={"x": 0, "y": 0, "zoom": 1.0, "rotation": 0},
+    )
+    db.add(board)
+
+    # Create groups
+    for i in range(3):
+        group = Group(
+            id=uuid4(),
+            board_id=board.id,
+            name=f"Group {i}",
+            color=f"#FF573{i}",
+            annotation=f"Annotation {i}",
+        )
+        db.add(group)
+
+    db.commit()
+
+    # List groups
+    response = await client.get(f"/api/boards/{board.id}/groups")
+
+    assert response.status_code == 200
+    data = response.json()
+    assert len(data) == 3
+    assert data[0]["name"] == "Group 2"  # Most recent first
+
+
+async def test_get_group(client: AsyncClient, test_user: User, db: Session):
+    """Test getting a specific group."""
+    from app.database.models.group import Group
+
+    board = Board(
+        id=uuid4(),
+        user_id=test_user.id,
+        title="Test Board",
+        viewport_state={"x": 0, "y": 0, "zoom": 1.0, "rotation": 0},
+    )
+    db.add(board)
+
+    group = Group(
+        id=uuid4(),
+        board_id=board.id,
+        name="Test Group",
+        color="#FF5733",
+        annotation="Test annotation",
+    )
+    db.add(group)
+    db.commit()
+
+    # Get group
+    response = await client.get(f"/api/boards/{board.id}/groups/{group.id}")
+
+    assert response.status_code == 200
+    data = response.json()
+    assert data["name"] == "Test Group"
+    assert data["color"] == "#FF5733"
+
+
+async def test_update_group(client: AsyncClient, test_user: User, db: Session):
+    """Test updating group metadata."""
+    from app.database.models.group import Group
+
+    board = Board(
+        id=uuid4(),
+        user_id=test_user.id,
+        title="Test Board",
+        viewport_state={"x": 0, "y": 0, "zoom": 1.0, "rotation": 0},
+    )
+    db.add(board)
+
+    group = Group(
+        id=uuid4(),
+        board_id=board.id,
+        name="Original Name",
+        color="#FF5733",
+        annotation="Original annotation",
+    )
+    db.add(group)
+    db.commit()
+
+    # Update group
+    response = await client.patch(
+        f"/api/boards/{board.id}/groups/{group.id}",
+        json={
+            "name": "Updated Name",
+            "color": "#00FF00",
+            "annotation": "Updated annotation",
+        },
+    )
+
+    assert response.status_code == 200
+    data = response.json()
+    assert data["name"] == "Updated Name"
+    assert data["color"] == "#00FF00"
+    assert data["annotation"] == "Updated annotation"
+
+
+async def test_delete_group(client: AsyncClient, test_user: User, db: Session):
+    """Test deleting a group."""
+    from app.database.models.group import Group
+
+    board = Board(
+        id=uuid4(),
+        user_id=test_user.id,
+        title="Test Board",
+        viewport_state={"x": 0, "y": 0, "zoom": 1.0, "rotation": 0},
+    )
+    db.add(board)
+
+    # Create image
+    image = Image(
+        id=uuid4(),
+        user_id=test_user.id,
+        filename="test.jpg",
+        storage_path=f"{test_user.id}/test.jpg",
+        file_size=1024,
+        mime_type="image/jpeg",
+        width=800,
+        height=600,
+        metadata={"format": "jpeg", "checksum": "abc"},
+    )
+    db.add(image)
+
+    # Create group
+    group = Group(
+        id=uuid4(),
+        board_id=board.id,
+        name="Test Group",
+        color="#FF5733",
+    )
+    db.add(group)
+
+    # Add image to board and group
+    board_image = BoardImage(
+        id=uuid4(),
+        board_id=board.id,
+        image_id=image.id,
+        position={"x": 100, "y": 100},
+        transformations={"scale": 1.0, "rotation": 0, "opacity": 1.0},
+        z_order=0,
+        group_id=group.id,
+    )
+    db.add(board_image)
+    db.commit()
+
+    # Delete group
+    response = await client.delete(f"/api/boards/{board.id}/groups/{group.id}")
+
+    assert response.status_code == 204
+
+    # Verify image is ungrouped
+    db.refresh(board_image)
+    assert board_image.group_id is None
+
+
+async def test_group_unauthorized_board(client: AsyncClient, test_user: User, db: Session):
+    """Test that users can't create groups on boards they don't own."""
+    # Create another user
+    other_user = User(id=uuid4(), email="other@example.com", password_hash="hashed")
+    db.add(other_user)
+
+    # Create board owned by other user
+    board = Board(
+        id=uuid4(),
+        user_id=other_user.id,
+        title="Other Board",
+        viewport_state={"x": 0, "y": 0, "zoom": 1.0, "rotation": 0},
+    )
+    db.add(board)
+    db.commit()
+
+    # Try to create group
+    response = await client.post(
+        f"/api/boards/{board.id}/groups",
+        json={
+            "name": "Test Group",
+            "color": "#FF5733",
+            "image_ids": [str(uuid4())],
+        },
+    )
+
+    assert response.status_code == 404  # Board not found (for security)
+
+
+async def test_invalid_color_format(client: AsyncClient, test_user: User, db: Session):
+    """Test that invalid color formats are rejected."""
+    board = Board(
+        id=uuid4(),
+        user_id=test_user.id,
+        title="Test Board",
+        viewport_state={"x": 0, "y": 0, "zoom": 1.0, "rotation": 0},
+    )
+    db.add(board)
+    db.commit()
+
+    # Try with invalid color
+    response = await client.post(
+        f"/api/boards/{board.id}/groups",
+        json={
+            "name": "Test Group",
+            "color": "red",  # Invalid: not hex
+            "image_ids": [str(uuid4())],
+        },
+    )
+
+    assert response.status_code == 422
+

backend/tests/api/test_image_delete.py

@@ -1,14 +1,15 @@
 """Integration tests for image deletion endpoints."""
 
+from uuid import uuid4
+
 import pytest
 from httpx import AsyncClient
 from sqlalchemy.ext.asyncio import AsyncSession
-from uuid import uuid4
 
-from app.database.models.user import User
 from app.database.models.board import Board
-from app.database.models.image import Image
 from app.database.models.board_image import BoardImage
+from app.database.models.image import Image
+from app.database.models.user import User
 
 
 @pytest.mark.asyncio

backend/tests/api/test_image_position.py

@@ -1,14 +1,15 @@
 """Integration tests for image position update endpoint."""
 
+from uuid import uuid4
+
 import pytest
 from httpx import AsyncClient
 from sqlalchemy.ext.asyncio import AsyncSession
-from uuid import uuid4
 
-from app.database.models.user import User
 from app.database.models.board import Board
-from app.database.models.image import Image
 from app.database.models.board_image import BoardImage
+from app.database.models.image import Image
+from app.database.models.user import User
 
 
 @pytest.mark.asyncio
@@ -441,11 +442,11 @@ async def test_update_preserves_other_fields(client: AsyncClient, test_user: Use
 
     assert response.status_code == 200
     data = response.json()
-    
+
     # Position should be updated
     assert data["position"]["x"] == 200
     assert data["position"]["y"] == 200
-    
+
     # Other fields should be preserved
     assert data["transformations"]["scale"] == 1.5
     assert data["transformations"]["rotation"] == 45

backend/tests/api/test_images.py

@@ -1,7 +1,7 @@
 """Integration tests for image upload endpoints."""
 
 import io
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import patch
 
 import pytest
 from fastapi import status

backend/tests/api/test_z_order.py

@@ -1,14 +1,15 @@
 """Integration tests for Z-order persistence."""
 
+from uuid import uuid4
+
 import pytest
 from httpx import AsyncClient
 from sqlalchemy.ext.asyncio import AsyncSession
-from uuid import uuid4
 
-from app.database.models.user import User
 from app.database.models.board import Board
-from app.database.models.image import Image
 from app.database.models.board_image import BoardImage
+from app.database.models.image import Image
+from app.database.models.user import User
 
 
 @pytest.mark.asyncio

backend/tests/auth/test_jwt.py

@@ -3,7 +3,6 @@
 from datetime import datetime, timedelta
 from uuid import UUID, uuid4
 
-import pytest
 from jose import jwt
 
 from app.auth.jwt import create_access_token, decode_access_token

backend/tests/auth/test_security.py

@@ -1,6 +1,5 @@
 """Unit tests for password hashing and validation."""
 
-import pytest
 
 from app.auth.security import hash_password, validate_password_strength, verify_password
 

backend/tests/conftest.py

@@ -1,7 +1,6 @@
 """Pytest configuration and fixtures for all tests."""
 
-import os
-from typing import Generator
+from collections.abc import Generator
 
 import pytest
 from fastapi.testclient import TestClient

backend/tests/images/test_processing.py

@@ -3,7 +3,6 @@
 import io
 from uuid import uuid4
 
-import pytest
 from PIL import Image as PILImage
 
 from app.images.processing import generate_thumbnails

backend/tests/images/test_transformations.py

@@ -44,7 +44,7 @@ def test_transformation_scale_bounds():
     """Test scale bounds validation."""
     # Valid scales
     valid_scales = [0.01, 0.5, 1.0, 5.0, 10.0]
-    
+
     for scale in valid_scales:
         data = BoardImageUpdate(transformations={"scale": scale})
         assert data.transformations["scale"] == scale
@@ -54,7 +54,7 @@ def test_transformation_rotation_bounds():
     """Test rotation bounds (any value allowed, normalized client-side)."""
     # Various rotation values
     rotations = [0, 45, 90, 180, 270, 360, 450, -90]
-    
+
     for rotation in rotations:
         data = BoardImageUpdate(transformations={"rotation": rotation})
         assert data.transformations["rotation"] == rotation
@@ -64,7 +64,7 @@ def test_transformation_opacity_bounds():
     """Test opacity bounds."""
     # Valid opacity values
     valid_opacities = [0.0, 0.25, 0.5, 0.75, 1.0]
-    
+
     for opacity in valid_opacities:
         data = BoardImageUpdate(transformations={"opacity": opacity})
         assert data.transformations["opacity"] == opacity

backend/tests/images/test_validation.py

@@ -1,7 +1,6 @@
 """Tests for file validation."""
 
-import io
-from unittest.mock import AsyncMock, Mock
+from unittest.mock import AsyncMock
 
 import pytest
 from fastapi import HTTPException, UploadFile