Restore local changes after git object corruption

run_tests.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+# Test runner for DB Service
+
+export ADMIN_EMAILS="admin@example.com"
+export PYTHONPATH="$(pwd):$PYTHONPATH"
+
+echo "Running DB Service Tests..."
+echo "=============================="
+
+python -m pytest tests/test_db_service.py -v --tb=short
+
+echo ""
+echo "Test run complete!"

tests/test_db_service.py

@@ -12,9 +12,8 @@ Comprehensive tests for the plug-and-play DB Service including:
 import pytest
 import os
 from datetime import datetime
-from sqlalchemy import create_async_engine, select
-from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
-from sqlalchemy.orm import declarative_base
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sessionmaker
 
 from services.db_service import (
     DBServiceConfig,
@@ -91,7 +90,9 @@ async def setup_db(engine):
 @pytest.fixture
 async def regular_user(session):
     """Create a regular test user."""
+    import uuid
     user = User(
+        user_id=str(uuid.uuid4()),
         email="user@example.com",
         name="Test User",
         credits=100
@@ -105,7 +106,9 @@ async def regular_user(session):
 @pytest.fixture
 async def admin_user(session):
     """Create an admin test user."""
+    import uuid
     user = User(
+        user_id=str(uuid.uuid4()),
         email=os.getenv("ADMIN_EMAILS", "admin@example.com").split(",")[0],
         name="Admin User",
         credits=1000
@@ -119,7 +122,9 @@ async def admin_user(session):
 @pytest.fixture
 async def other_user(session):
     """Create another test user."""
+    import uuid
     user = User(
+        user_id=str(uuid.uuid4()),
         email="other@example.com",
         name="Other User",
         credits=50
@@ -166,7 +171,14 @@ class TestPermissions:
     
     async def test_user_can_read_own_data(self, session, regular_user):
         """Test that users can read their own data."""
-        job = GeminiJob(user_id=regular_user.id, prompt="Test", status="queued")
+        import uuid
+        job = GeminiJob(
+            job_id=str(uuid.uuid4()),
+            user_id=regular_user.id,
+            job_type="text",
+            input_data={"prompt": "Test"},
+            status="queued"
+        )
         session.add(job)
         await session.commit()
         
@@ -179,7 +191,14 @@ class TestPermissions:
     async def test_user_cannot_read_others_data(self, session, regular_user, other_user):
         """Test that users cannot read other users' data."""
         # Create job for other user
-        job = GeminiJob(user_id=other_user.id, prompt="Other", status="queued")
+        import uuid
+        job = GeminiJob(
+            job_id=str(uuid.uuid4()),
+            user_id=other_user.id,
+            job_type="text",
+            input_data={"prompt": "Other"},
+            status="queued"
+        )
         session.add(job)
         await session.commit()
         
@@ -192,8 +211,21 @@ class TestPermissions:
     async def test_admin_can_read_all_data(self, session, admin_user, regular_user):
         """Test that admins can read all users' data."""
         # Create jobs for different users
-        job1 = GeminiJob(user_id=regular_user.id, prompt="User Job", status="queued")
-        job2 = GeminiJob(user_id=admin_user.id, prompt="Admin Job", status="queued")
+        import uuid
+        job1 = GeminiJob(
+            job_id=str(uuid.uuid4()),
+            user_id=regular_user.id,
+            job_type="text",
+            input_data={"prompt": "User Job"},
+            status="queued"
+        )
+        job2 = GeminiJob(
+            job_id=str(uuid.uuid4()),
+            user_id=admin_user.id,
+            job_type="text",
+            input_data={"prompt": "Admin Job"},
+            status="queued"
+        )
         session.add_all([job1, job2])
         await session.commit()
         
@@ -213,7 +245,15 @@ class TestPermissions:
     
     async def test_admin_can_access_admin_only_models(self, session, admin_user):
         """Test that admins can access admin-only models."""
-        rate_limit = RateLimit(identifier="test", endpoint="/api/test", request_count=10)
+        from datetime import datetime, timedelta
+        now = datetime.now()
+        rate_limit = RateLimit(
+            identifier="test",
+            endpoint="/api/test",
+            attempts=10,
+            window_start=now,
+            expires_at=now + timedelta(hours=1)
+        )
         session.add(rate_limit)
         await session.commit()
         
@@ -228,7 +268,7 @@ class TestPermissions:
         
         # System should be able to bypass permissions
         # (actual create would use direct SQLAlchemy, but permission check passes)
-        assert qs._is_system is True
+        assert qs.is_system is True
 
 
 #  ============================================================================
@@ -240,7 +280,14 @@ class TestSoftDeletes:
     
     async def test_soft_delete_marks_record(self, session, regular_user):
         """Test that soft delete sets deleted_at."""
-        job = GeminiJob(user_id=regular_user.id, prompt="Delete Me", status="queued")
+        import uuid
+        job = GeminiJob(
+            job_id=str(uuid.uuid4()),
+            user_id=regular_user.id,
+            job_type="text",
+            input_data={"prompt": "Delete Me"},
+            status="queued"
+        )
         session.add(job)
         await session.commit()
         
@@ -251,7 +298,14 @@ class TestSoftDeletes:
     
     async def test_soft_deleted_not_in_query(self, session, regular_user):
         """Test that soft-deleted records don't appear in queries."""
-        job = GeminiJob(user_id=regular_user.id, prompt="Delete Me", status="queued")
+        import uuid
+        job = GeminiJob(
+            job_id=str(uuid.uuid4()),
+            user_id=regular_user.id,
+            job_type="text",
+            input_data={"prompt": "Delete Me"},
+            status="queued"
+        )
         session.add(job)
         await session.commit()
         
@@ -268,7 +322,14 @@ class TestSoftDeletes:
     
     async def test_admin_can_restore(self, session, admin_user, regular_user):
         """Test that admins can restore deleted records."""
-        job = GeminiJob(user_id=regular_user.id, prompt="Restore Me", status="queued")
+        import uuid
+        job = GeminiJob(
+            job_id=str(uuid.uuid4()),
+            user_id=regular_user.id,
+            job_type="text",
+            input_data={"prompt": "Restore Me"},
+            status="queued"
+        )
         session.add(job)
         await session.commit()
         job_id = job.id
@@ -285,7 +346,14 @@ class TestSoftDeletes:
     
     async def test_user_cannot_restore(self, session, regular_user):
         """Test that regular users cannot restore records."""
-        job = GeminiJob(user_id=regular_user.id, prompt="Deleted", status="queued")
+        import uuid
+        job = GeminiJob(
+            job_id=str(uuid.uuid4()),
+            user_id=regular_user.id,
+            job_type="text",
+            input_data={"prompt": "Deleted"},
+            status="queued"
+        )
         session.add(job)
         await session.commit()
         
@@ -316,8 +384,9 @@ class TestDatabaseInitialization:
     
     async def test_reset_database_clears_data(self, engine, session, regular_user):
         """Test that reset_database clears all data."""
+        import uuid
         # Add some data
-        user = User(email="test@example.com", name="Test", credits=10)
+        user = User(user_id=str(uuid.uuid4()), email="test@example.com", name="Test", credits=10)
         session.add(user)
         await session.commit()