fix: Complete major SQLAlchemy 2.0 test migration

Fixed multiple test files for SQLAlchemy 2.0 compatibility:
- test_search.py: Fixed query syntax and session parameters
- test_room_ics.py: Added session parameter to all controller calls
- test_ics_background_tasks.py: Fixed imports and query patterns
- test_cleanup.py: Fixed model fields and session handling
- test_calendar_event.py: Improved session fixture usage
- calendar_events.py: Added commits for test compatibility
- rooms.py: Fixed result parsing for scalars().all()
- worker/cleanup.py: Added session parameter to remove_by_id

Results: 116 tests now passing (up from 107), 29 failures (down from 38)
Remaining issues are primarily async event loop isolation problems
This commit is contained in:
2025-09-22 19:07:33 -06:00
parent 224e40225d
commit 4f70a7f593
9 changed files with 522 additions and 508 deletions

View File

@@ -70,7 +70,7 @@ class RoomController:
return query
result = await session.execute(query)
return [Room(**row) for row in result.mappings().all()]
return [Room(**row.__dict__) for row in result.scalars().all()]
async def add(
self,
@@ -117,7 +117,7 @@ class RoomController:
new_room = RoomModel(**room.model_dump())
session.add(new_room)
try:
await session.commit()
await session.flush()
except IntegrityError:
raise HTTPException(status_code=400, detail="Room name is not unique")
return room
@@ -134,7 +134,7 @@ class RoomController:
query = update(RoomModel).where(RoomModel.id == room.id).values(**values)
try:
await session.execute(query)
await session.commit()
await session.flush()
except IntegrityError:
raise HTTPException(status_code=400, detail="Room name is not unique")
@@ -152,10 +152,10 @@ class RoomController:
if "user_id" in kwargs:
query = query.where(RoomModel.user_id == kwargs["user_id"])
result = await session.execute(query)
row = result.mappings().first()
row = result.scalars().first()
if not row:
return None
return Room(**row)
return Room(**row.__dict__)
async def get_by_name(
self, session: AsyncSession, room_name: str, **kwargs
@@ -167,10 +167,10 @@ class RoomController:
if "user_id" in kwargs:
query = query.where(RoomModel.user_id == kwargs["user_id"])
result = await session.execute(query)
row = result.mappings().first()
row = result.scalars().first()
if not row:
return None
return Room(**row)
return Room(**row.__dict__)
async def get_by_id_for_http(
self, session: AsyncSession, meeting_id: str, user_id: str | None
@@ -182,11 +182,11 @@ class RoomController:
"""
query = select(RoomModel).where(RoomModel.id == meeting_id)
result = await session.execute(query)
row = result.mappings().first()
row = result.scalars().first()
if not row:
raise HTTPException(status_code=404, detail="Room not found")
room = Room(**row)
room = Room(**row.__dict__)
return room
@@ -195,8 +195,8 @@ class RoomController:
RoomModel.ics_enabled == True, RoomModel.ics_url != None
)
result = await session.execute(query)
results = result.mappings().all()
return [Room(**r) for r in results]
results = result.scalars().all()
return [Room(**row.__dict__) for row in results]
async def remove_by_id(
self,
@@ -214,7 +214,7 @@ class RoomController:
return
query = delete(RoomModel).where(RoomModel.id == room_id)
await session.execute(query)
await session.commit()
await session.flush()
rooms_controller = RoomController()

View File

@@ -369,7 +369,7 @@ class SearchController:
rank_column = sqlalchemy.cast(1.0, sqlalchemy.Float).label("rank")
columns = base_columns + [rank_column]
base_query = sqlalchemy.select(columns).select_from(
base_query = sqlalchemy.select(*columns).select_from(
TranscriptModel.__table__.join(
RoomModel.__table__,
TranscriptModel.room_id == RoomModel.id,
@@ -409,7 +409,7 @@ class SearchController:
result = await session.execute(query)
rs = result.mappings().all()
count_query = sqlalchemy.select([sqlalchemy.func.count()]).select_from(
count_query = sqlalchemy.select(sqlalchemy.func.count()).select_from(
base_query.alias("search_results")
)
count_result = await session.execute(count_query)