fix: migration files and lints

Author: amandazhuyilan

migrations/versions/9c2ebbf62acd_merge_admin_revoke_heads.py

@@ -0,0 +1,27 @@
+"""merge admin revoke heads
+
+Revision ID: 9c2ebbf62acd
+Revises: 08a3d0593418, 2a0012a7fb99
+Create Date: 2025-09-28 19:01:32.548044
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel
+
+
+# revision identifiers, used by Alembic.
+revision: str = '9c2ebbf62acd'
+down_revision: Union[str, None] = ('08a3d0593418', '2a0012a7fb99')
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

migrations/versions/f6ac5209b871_admin_approve_revoke.py

@@ -0,0 +1,31 @@
+"""admin_approve_revoke
+
+Revision ID: f6ac5209b871
+Revises: 9c2ebbf62acd
+Create Date: 2025-09-28 19:02:14.392051
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'f6ac5209b871'
+down_revision: Union[str, None] = '9c2ebbf62acd'
+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! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

routers/admin.py

@@ -5,7 +5,6 @@
 
 from fastapi import APIRouter, Depends, HTTPException, Path
 from fastapi.params import Query
-from sqlalchemy import alias, false, func, or_
 from pydantic import BaseModel, Field, ValidationError, field_validator
 from sqlalchemy import alias, false, func, or_
 from sqlmodel import Session, select

tests/test_admin.py

@@ -4,7 +4,7 @@
 import pytest
 from fastapi import HTTPException
 from freezegun import freeze_time
-from sqlmodel import select, Session
+from sqlmodel import Session, select
 
 from auth.management import get_management_token
 from auth.validator import get_current_user, user_is_admin
@@ -15,6 +15,7 @@
 from routers.admin import PaginationParams
 from tests.datagen import (
     AccessTokenPayloadFactory,
+    Auth0UserDataFactory,
     EmailVerificationResponseFactory,
     SessionUserFactory,
 )