rankings: basically done - some minor fixes and test changes. still need to add logic for having some sort of status taht determines when to show the intake form, when to show the intake thank you form, when to show ranking form, and when to show ranking thank you form after login as well as gating certain pages when not authed or wrong status

Author: YashK2005

.github/workflows/backend-ci.yml

@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     env:
-      POSTGRES_DATABASE_URL: postgresql://testuser:testpassword@localhost:5432/llsc_test
+        POSTGRES_TEST_DATABASE_URL: postgresql://testuser:testpassword@localhost:5432/llsc_test
 
     strategy:
       matrix:
@@ -65,13 +65,14 @@ jobs:
     - name: Set up environment variables
       working-directory: ./backend
       run: |
-        echo "POSTGRES_DATABASE_URL=postgresql://testuser:testpassword@localhost:5432/llsc_test" >> .env
+        echo "POSTGRES_TEST_DATABASE_URL=postgresql://testuser:testpassword@localhost:5432/llsc_test" >> .env
         echo "SECRET_KEY=test-secret-key-for-ci" >> .env
         echo "ENVIRONMENT=test" >> .env
         
     - name: Run database migrations
       working-directory: ./backend
       run: |
+        export POSTGRES_DATABASE_URL="$POSTGRES_TEST_DATABASE_URL"
         pdm run alembic upgrade heads
         
     - name: Run linting
@@ -118,7 +119,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     env:
-      POSTGRES_DATABASE_URL: postgresql://testuser:testpassword@localhost:5432/llsc_test
+      POSTGRES_TEST_DATABASE_URL: postgresql://testuser:testpassword@localhost:5432/llsc_test
 
     services:
       postgres:
@@ -155,7 +156,7 @@ jobs:
     - name: Set up environment variables
       working-directory: ./backend
       run: |
-        echo "POSTGRES_DATABASE_URL=postgresql://testuser:testpassword@localhost:5432/llsc_test" >> .env
+        echo "POSTGRES_TEST_DATABASE_URL=postgresql://testuser:testpassword@localhost:5432/llsc_test" >> .env
         echo "SECRET_KEY=test-secret-key-for-ci" >> .env
         echo "ENVIRONMENT=test" >> .env
         echo "TEST_SCRIPT_BACKEND_URL=http://localhost:8000" >> .env
@@ -165,6 +166,7 @@ jobs:
     - name: Run database migrations
       working-directory: ./backend
       run: |
+        export POSTGRES_DATABASE_URL="$POSTGRES_TEST_DATABASE_URL"
         pdm run alembic upgrade heads
         
     - name: Start backend server

backend/tests/unit/test_ranking_service.py

@@ -3,18 +3,19 @@
 
 import pytest
 from sqlalchemy import create_engine, text
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session, sessionmaker
 
 from app.models import Experience, Quality, Role, Treatment, User, UserData
 from app.schemas.user import UserRole
 from app.services.implementations.ranking_service import RankingService
 
 # Postgres-only configuration (migrations assumed to be applied)
-POSTGRES_DATABASE_URL = os.getenv("POSTGRES_DATABASE_URL")
+POSTGRES_DATABASE_URL = os.getenv("POSTGRES_TEST_DATABASE_URL")
 if not POSTGRES_DATABASE_URL:
     raise RuntimeError(
         "POSTGRES_DATABASE_URL is not set. Please export a Postgres URL, e.g. "
-        "postgresql+psycopg2://postgres:postgres@localhost:5432/llsc"
+        "postgresql+psycopg2://postgres:postgres@db:5432/llsc_test"
     )
 engine = create_engine(POSTGRES_DATABASE_URL)
 TestingSessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
@@ -48,6 +49,19 @@ def db_session() -> Session:
         # Qualities should have been seeded by migrations; assert presence
         assert session.query(Quality).count() >= 6
 
+        # Ensure sequences are aligned after seeding (avoid PK collisions when inserting)
+        session.execute(
+            text(
+                "SELECT setval(pg_get_serial_sequence('treatments','id'), COALESCE((SELECT MAX(id) FROM treatments), 0))"
+            )
+        )
+        session.execute(
+            text(
+                "SELECT setval(pg_get_serial_sequence('experiences','id'), COALESCE((SELECT MAX(id) FROM experiences), 0))"
+            )
+        )
+        session.commit()
+
         yield session
     finally:
         session.rollback()
@@ -84,19 +98,39 @@ def _add_user_data(
 
     def get_or_create_treatment(name: str) -> Treatment:
         t = session.query(Treatment).filter(Treatment.name == name).first()
-        if not t:
-            t = Treatment(name=name)
-            session.add(t)
-            session.flush()
-        return t
+        if t:
+            return t
+        for _ in range(2):
+            try:
+                t = Treatment(name=name)
+                session.add(t)
+                session.flush()
+                return t
+            except IntegrityError:
+                session.rollback()
+                # Sequence collision consumed an id; retry insert
+                t = session.query(Treatment).filter(Treatment.name == name).first()
+                if t:
+                    return t
+        # Final attempt to read existing
+        return session.query(Treatment).filter(Treatment.name == name).first()
 
     def get_or_create_experience(name: str) -> Experience:
         e = session.query(Experience).filter(Experience.name == name).first()
-        if not e:
-            e = Experience(name=name)
-            session.add(e)
-            session.flush()
-        return e
+        if e:
+            return e
+        for _ in range(2):
+            try:
+                e = Experience(name=name)
+                session.add(e)
+                session.flush()
+                return e
+            except IntegrityError:
+                session.rollback()
+                e = session.query(Experience).filter(Experience.name == name).first()
+                if e:
+                    return e
+        return session.query(Experience).filter(Experience.name == name).first()
 
     for n in self_treatments or []:
         data.treatments.append(get_or_create_treatment(n))
@@ -142,7 +176,7 @@ async def test_options_caregiver_without_cancer(db_session: Session):
         auth_id="auth_cg_no_cancer",
         has_blood_cancer="no",
         caring_for_someone="yes",
-        self_treatments=["Chemo Pills"],
+        self_treatments=["Oral Chemotherapy"],
         self_experiences=["Caregiver Fatigue"],
         loved_one_diagnosis="CLL",
         loved_treatments=["Immunotherapy"],
@@ -172,7 +206,7 @@ async def test_options_caregiver_with_cancer(db_session: Session):
         caring_for_someone="yes",
         diagnosis="MDS",
         loved_one_diagnosis="MM",
-        self_treatments=["Radiation"],
+        self_treatments=["Radiation Therapy"],
         self_experiences=["PTSD"],
         loved_treatments=["Watch and Wait / Active Surveillance"],
         loved_experiences=["Communication Challenges"],

backend/tests/unit/test_user.py

@@ -19,11 +19,11 @@
 from app.services.implementations.user_service import UserService
 
 # Test DB Configuration - Always require Postgres for full parity
-POSTGRES_DATABASE_URL = os.getenv("POSTGRES_DATABASE_URL")
+POSTGRES_DATABASE_URL = os.getenv("POSTGRES_TEST_DATABASE_URL")
 if not POSTGRES_DATABASE_URL:
     raise RuntimeError(
         "POSTGRES_DATABASE_URL is not set. Please export a Postgres URL, e.g. "
-        "postgresql+psycopg2://postgres:postgres@localhost:5432/llsc"
+        "postgresql+psycopg2://postgres:postgres@db:5432/llsc_test"
     )
 engine = create_engine(POSTGRES_DATABASE_URL)
 TestingSessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
@@ -533,11 +533,10 @@ async def test_update_user_by_id(db_session):
         db_session.rollback()
         raise
 
-
 # Error case tests
 @pytest.mark.asyncio
 async def test_delete_nonexistent_user_by_email(db_session):
-    """Test deleting a non-existent user by email"""
+    """Test deleting a non-existent user"""
     user_service = UserService(db_session)
     with pytest.raises(HTTPException) as exc_info:
         await user_service.delete_user_by_email("[email protected]")
@@ -546,7 +545,7 @@ async def test_delete_nonexistent_user_by_email(db_session):
 
 @pytest.mark.asyncio
 async def test_delete_nonexistent_user_by_id(db_session):
-    """Test deleting a non-existent user by ID"""
+    """Test deleting a non-existent user"""
     user_service = UserService(db_session)
     with pytest.raises(HTTPException) as exc_info:
         await user_service.delete_user_by_id("00000000-0000-0000-0000-000000000000")
@@ -563,7 +562,7 @@ async def test_get_nonexistent_user_by_id(db_session):
 
 
 def test_get_nonexistent_user_by_email(db_session):
-    """Test getting a non-existent user by email"""
+    """Test getting user by email"""
     user_service = UserService(db_session)
     with pytest.raises(ValueError) as exc_info:
         user_service.get_user_by_email("[email protected]")

frontend/src/components/ranking/caregiver-ranking-form.tsx

@@ -25,9 +25,12 @@ export function CaregiverRankingForm({
     const kind = itemKinds?.[index];
     const scope = itemScopes?.[index];
     const isLovedOneQuality = kind === 'quality' && scope === 'loved_one';
+    const isLovedOneDynamic = (kind === 'treatment' || kind === 'experience') && scope === 'loved_one';
     const prefix = isLovedOneQuality
       ? 'I would prefer a volunteer whose loved one is '
-      : 'I would prefer a volunteer with ';
+      : isLovedOneDynamic
+        ? 'I would prefer a volunteer whose loved one has '
+        : 'I would prefer a volunteer with ';
     return (
       <>
         {prefix}

frontend/src/components/ranking/volunteer-ranking-form.tsx

@@ -25,9 +25,12 @@ export function VolunteerRankingForm({
     const kind = itemKinds?.[index];
     const scope = itemScopes?.[index];
     const isLovedOneQuality = kind === 'quality' && scope === 'loved_one';
+    const isLovedOneDynamic = (kind === 'treatment' || kind === 'experience') && scope === 'loved_one';
     const prefix = isLovedOneQuality
       ? 'I would prefer a volunteer whose loved one is '
-      : 'I would prefer a volunteer with ';
+      : isLovedOneDynamic
+        ? 'I would prefer a volunteer whose loved one has '
+        : 'I would prefer a volunteer with ';
     return (
       <>
         {prefix}