update match schema

- comment out ensure_ses_templates

- create migration file

Author: sunbagel

backend/alembic.ini

@@ -77,10 +77,10 @@ version_path_separator = os  # Use os.pathsep. Default configuration used for ne
 # black.options = -l 79 REVISION_SCRIPT_FILENAME
 
 # lint with attempts to fix using "ruff" - use the exec runner, execute a binary
-hooks = ruff
-ruff.type = exec
-ruff.executable = %(here)s/.venv/bin/ruff
-ruff.options = check --fix REVISION_SCRIPT_FILENAME
+; hooks = ruff
+; ruff.type = exec
+; ruff.executable = %(here)s/.venv/bin/ruff
+; ruff.options = check --fix REVISION_SCRIPT_FILENAME
 
 # Logging configuration
 # Every time you want to define a new sub-logger, you need to add it to loggers or it won't show up.

backend/app/models/Match.py

@@ -0,0 +1,45 @@
+import enum
+
+from sqlalchemy import Column, DateTime, ForeignKey, Integer
+from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.orm import relationship
+from sqlalchemy.sql import func
+
+from .Base import Base
+
+
+class Match(Base):
+    __tablename__ = "matches"
+
+    id = Column(Integer, primary_key=True)
+
+    participant_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
+    volunteer_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
+
+    # the chosen time block
+    chosen_time_block_id = Column(Integer, ForeignKey("time_blocks.id"), nullable=True)
+
+    match_status_id = Column(
+        Integer, ForeignKey("match_status.id"), nullable=False, default=1
+    )
+
+    created_at = Column(DateTime(timezone=True), server_default=func.now())
+    updated_at = Column(
+        DateTime(timezone=True), server_default=func.now(), onupdate=func.now()
+    )
+
+    match_status = relationship("MatchStatus")
+
+    participant = relationship(
+        "User", foreign_keys=[participant_id], back_populates="matches"
+    )
+    volunteer = relationship(
+        "User", foreign_keys=[volunteer_id], back_populates="matches"
+    )
+
+    confirmed_time = relationship(
+        "TimeBlock", back_populates="confirmed_match", uselist=False
+    )
+    suggested_time_blocks = relationship(
+        "TimeBlock", back_populates="suggested_matches"
+    )

backend/app/models/ScheduleStatus.py backend/app/models/MatchStatus.pybackend/app/models/ScheduleStatus.py renamed to backend/app/models/MatchStatus.py

@@ -3,7 +3,7 @@
 from .Base import Base
 
 
-class ScheduleStatus(Base):
-    __tablename__ = "schedule_status"
+class MatchStatus(Base):
+    __tablename__ = "match_status"
     id = Column(Integer, primary_key=True)
     name = Column(String(80), nullable=False)

backend/app/models/Matches.py

@@ -22,3 +22,7 @@ class User(Base):
     availability = relationship(
         "TimeBlock", secondary="available_times", back_populates="users"
     )
+
+    participant_matches = relationship("Match", back_populates="participant")
+
+    volunteer_matches = relationship("Match", back_populates="volunteer")

backend/app/models/Schedule.py

@@ -5,17 +5,30 @@
 
 from app.utilities.constants import LOGGER_NAME
 
+from .AvailableTime import available_times
+
 # Make sure all models are here to reflect all current models
 # when autogenerating new migration
 from .Base import Base
+from .Match import Match
+from .MatchStatus import MatchStatus
 from .Role import Role
-from .Schedule import Schedule
-from .ScheduleStatus import ScheduleStatus
+from .SuggestedTime import suggested_times
 from .TimeBlock import TimeBlock
 from .User import User
 
 # Used to avoid import errors for the models
-__all__ = ["Base", "User", "Role", "Schedule", "ScheduleStatus", "TimeBlock"]
+__all__ = [
+    "Base",
+    "User",
+    "Role",
+    "TimeBlock",
+    "Match",
+    "MatchStatus",
+    "User",
+    "available_times",
+    "suggested_times",
+]
 
 log = logging.getLogger(LOGGER_NAME("models"))
 

backend/app/models/User.py

@@ -6,10 +6,10 @@
 from fastapi import FastAPI
 
 from . import models
-from .routes import schedule, send_email, user
+from .routes import send_email, user
 from .utilities.constants import LOGGER_NAME
 from .utilities.firebase_init import initialize_firebase
-from .utilities.ses.ses_init import ensure_ses_templates
+# from .utilities.ses.ses_init import ensure_ses_templates
 
 load_dotenv()
 
@@ -19,7 +19,7 @@
 @asynccontextmanager
 async def lifespan(_: FastAPI):
     log.info("Starting up...")
-    ensure_ses_templates()
+    # ensure_ses_templates()
     models.run_migrations()
     initialize_firebase()
     yield
@@ -30,8 +30,8 @@ async def lifespan(_: FastAPI):
 # running-alembic-migrations-on-fastapi-startup
 app = FastAPI(lifespan=lifespan)
 app.include_router(user.router)
-app.include_router(schedule.router)
-app.include_router(send_email.router)
+# app.include_router(schedule.router)
+# app.include_router(send_email.router)
 
 
 @app.get("/")

backend/app/models/__init__.py

@@ -0,0 +1,105 @@
+"""add Match, MatchStatus, SuggestedTime, AvailableTime. delete Schedule, ScheduleStatus
+
+Revision ID: d6ee93e07a70
+Revises: df571b763807
+Create Date: 2025-03-11 21:11:38.464490
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = 'd6ee93e07a70'
+down_revision: Union[str, None] = 'df571b763807'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('match_status',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('name', sa.String(length=80), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.bulk_insert(
+        sa.table(
+            "match_status",
+            sa.Column("id", sa.Integer(), nullable=False),
+            sa.Column("name", sa.String(length=80), nullable=False),
+        ),
+        [
+            {"id": 1, "name": "PENDING_ADMIN_APPROVAL"},
+            {"id": 2, "name": "APPROVED"},
+            {"id": 3, "name": "REJECTED"},
+            {"id": 4, "name": "PENDING_PARTICIPANT_RESPONSE"},
+            {"id": 5, "name": "PENDING_VOLUNTEER_RESPONSE"},
+            {"id": 6, "name": "SCHEDULED"},
+            {"id": 7, "name": "DECLINED"},
+            {"id": 8, "name": "CANCELLED"},
+            {"id": 9, "name": "COMPLETED"},
+        ],
+    )
+    op.create_table('available_times',
+    sa.Column('time_block_id', sa.Integer(), nullable=False),
+    sa.Column('user_id', sa.UUID(), nullable=False),
+    sa.ForeignKeyConstraint(['time_block_id'], ['time_blocks.id'], ),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('time_block_id', 'user_id')
+    )
+    op.create_table('matches',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('participant_id', sa.UUID(), nullable=False),
+    sa.Column('volunteer_id', sa.UUID(), nullable=False),
+    sa.Column('chosen_time_block_id', sa.Integer(), nullable=True),
+    sa.Column('match_status_id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
+    sa.ForeignKeyConstraint(['chosen_time_block_id'], ['time_blocks.id'], ),
+    sa.ForeignKeyConstraint(['match_status_id'], ['match_status.id'], ),
+    sa.ForeignKeyConstraint(['participant_id'], ['users.id'], ),
+    sa.ForeignKeyConstraint(['volunteer_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('suggested_times',
+    sa.Column('match_id', sa.Integer(), nullable=False),
+    sa.Column('time_block_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['match_id'], ['matches.id'], ),
+    sa.ForeignKeyConstraint(['time_block_id'], ['time_blocks.id'], ),
+    sa.PrimaryKeyConstraint('match_id', 'time_block_id')
+    )
+    op.drop_table('schedules')
+    op.drop_table('schedule_status')
+    op.drop_constraint('time_blocks_schedule_id_fkey', 'time_blocks', type_='foreignkey')
+    op.drop_column('time_blocks', 'schedule_id')
+    op.drop_column('time_blocks', 'end_time')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('time_blocks', sa.Column('end_time', postgresql.TIMESTAMP(), autoincrement=False, nullable=True))
+    op.add_column('time_blocks', sa.Column('schedule_id', sa.INTEGER(), autoincrement=False, nullable=False))
+    op.create_foreign_key('time_blocks_schedule_id_fkey', 'time_blocks', 'schedules', ['schedule_id'], ['id'])
+    op.create_table('schedule_status',
+    sa.Column('id', sa.INTEGER(), server_default=sa.text("nextval('schedule_status_id_seq'::regclass)"), autoincrement=True, nullable=False),
+    sa.Column('name', sa.VARCHAR(length=80), autoincrement=False, nullable=False),
+    sa.PrimaryKeyConstraint('id', name='schedule_status_pkey'),
+    postgresql_ignore_search_path=False
+    )
+    op.create_table('schedules',
+    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
+    sa.Column('scheduled_time', postgresql.TIMESTAMP(), autoincrement=False, nullable=True),
+    sa.Column('duration', postgresql.INTERVAL(), autoincrement=False, nullable=True),
+    sa.Column('status_id', sa.INTEGER(), autoincrement=False, nullable=False),
+    sa.ForeignKeyConstraint(['status_id'], ['schedule_status.id'], name='schedules_status_id_fkey'),
+    sa.PrimaryKeyConstraint('id', name='schedules_pkey')
+    )
+    op.drop_table('suggested_times')
+    op.drop_table('matches')
+    op.drop_table('available_times')
+    op.drop_table('match_status')
+    # ### end Alembic commands ###