Fix: merge conflicts issue 130

Author: AmrajKoonar

.github/workflows/pytest_unit.yml

@@ -13,20 +13,12 @@ jobs:
         with:
           python-version: '3.13'
 
-      - uses: actions/cache@v5
-        id: cache
+      - uses: astral-sh/setup-uv@v6
         with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.*') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          enable-cache: true
 
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m venv venv
-          source ./venv/bin/activate
-          pip install ".[test]"
+        run: uv sync --extra test --locked
 
       - name: Run unit tests
-        run: PYTHONPATH=src ./venv/bin/python -m pytest ./tests/unit -v
+        run: uv run pytest ./tests/unit -v

.gitignore

@@ -16,3 +16,4 @@ wheels
 
 .venv
 .DS_Store
+.env

pyproject.toml

@@ -12,22 +12,23 @@ dependencies = [
     "asyncpg==0.31.0",
     "alembic==1.18.4",
     "google-api-python-client==2.194.0",
-
     # minor
     "xmltodict==0.13.0",
     "httpx==0.28.1",
+    "pydantic-settings==2.14.1",
+    "gtfs-realtime-bindings==2.0.0",
+    "pandas==3.0.3",
 ]
 
 [project.optional-dependencies]
 dev = [
     "ruff==0.15.12", # linting and formatter
-    "pre-commit"
+    "pre-commit",
 ]
 
 test = [
     "pytest", # test framework
     "pytest-asyncio",
-    "httpx",
 ]
 
 [project.urls]

src/alembic/env.py

@@ -14,6 +14,7 @@
 import honorary.tables
 import nominees.tables
 import officers.tables
+import translink.tables
 from alembic import context
 
 # this is the Alembic Config object, which provides

src/alembic/versions/401b254a02a5_merge_events_and_translink_branches.py

@@ -0,0 +1,26 @@
+"""Merge events and translink branches
+
+Revision ID: 401b254a02a5
+Revises: 42f855bec532, c1a70c8cfd64
+Create Date: 2026-06-07 12:25:14.294686
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '401b254a02a5'
+down_revision: Union[str, None] = ('42f855bec532', 'c1a70c8cfd64')
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

src/alembic/versions/c1a70c8cfd64_create_translink_static_schedule.py

@@ -0,0 +1,35 @@
+"""Create TransLink static schedule
+
+Revision ID: c1a70c8cfd64
+Revises: 0a2c458d1ddd
+Create Date: 2026-05-17 16:17:26.176355
+
+"""
+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 = 'c1a70c8cfd64'
+down_revision: Union[str, None] = '0a2c458d1ddd'
+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('translink_static_schedule',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('date_fetched', sa.Date(), nullable=False),
+    sa.Column('schedule', postgresql.JSONB(astext_type=sa.Text()), nullable=False),
+    sa.PrimaryKeyConstraint('id', name=op.f('pk_translink_static_schedule'))
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('translink_static_schedule')
+    # ### end Alembic commands ###

src/alembic/versions/f0c99d0db277_create_translink_realtime_cache.py

@@ -0,0 +1,36 @@
+"""Create TransLink realtime cache
+
+Revision ID: f0c99d0db277
+Revises: 401b254a02a5
+Create Date: 2026-06-26 16:54:33.26523
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "f0c99d0db277"
+down_revision: str | None = "401b254a02a5"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "translink_realtime_cache",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("fetched_at", sa.DateTime(timezone=True), nullable=False),
+        sa.Column("response_bytes", sa.LargeBinary(), nullable=False),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_translink_realtime_cache")),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("translink_realtime_cache")
+    # ### end Alembic commands ###

src/auth/urls.py

@@ -3,7 +3,6 @@
 import os
 import urllib.parse
 
-import httpx
 import xmltodict
 from fastapi import APIRouter, BackgroundTasks, HTTPException, Request, Response
 from fastapi.responses import JSONResponse, RedirectResponse

src/config.py

@@ -0,0 +1,10 @@
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class Settings(BaseSettings):
+    model_config = SettingsConfigDict(env_file=".env")
+
+    translink_api_key: str | None = None
+
+
+settings = Settings()

src/database.py

@@ -5,8 +5,7 @@
 from typing import Annotated, Any
 
 import asyncpg
-import httpx
-from fastapi import Depends, FastAPI
+from fastapi import Depends
 from sqlalchemy import MetaData
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncSession, async_sessionmaker, create_async_engine
 from sqlalchemy.orm import DeclarativeBase
@@ -100,26 +99,14 @@ async def session(self) -> AsyncGenerator[AsyncSession]:
 def setup_database():
     global sessionmanager
 
+    db_url = SQLALCHEMY_TEST_DATABASE_URL if os.environ.get("ENV") == "test" else SQLALCHEMY_DATABASE_URL
     # TODO: where is sys.stdout piped to? I want all these to go to a specific logs folder
     sessionmanager = DatabaseSessionManager(
-        SQLALCHEMY_TEST_DATABASE_URL if os.environ.get("LOCAL") else SQLALCHEMY_DATABASE_URL,
+        db_url,
         {"echo": True},
     )
 
 
-@contextlib.asynccontextmanager
-async def lifespan(app: FastAPI):
-    """
-    Handles startup and shutdown events, see https://fastapi.tiangolo.com/advanced/events/
-    """
-    app.state.http_client = httpx.AsyncClient()
-    yield
-    await app.state.http_client.aclose()
-    if sessionmanager._engine is not None:
-        # Close the DB connection
-        await sessionmanager.close()
-
-
 async def get_db_session():
     async with sessionmanager.session() as session:
         yield session