diff --git a/server/tests/test_multiple_active_meetings.py b/server/tests/test_multiple_active_meetings.py index 61bce0e0..34f97679 100644 --- a/server/tests/test_multiple_active_meetings.py +++ b/server/tests/test_multiple_active_meetings.py @@ -10,10 +10,11 @@ from reflector.db.rooms import rooms_controller @pytest.mark.asyncio -async def test_multiple_active_meetings_per_room(): +async def test_multiple_active_meetings_per_room(session): """Test that multiple active meetings can exist for the same room.""" # Create a room room = await rooms_controller.add( + session, name="test-room", user_id="test-user", zulip_auto_post=False, @@ -31,6 +32,7 @@ async def test_multiple_active_meetings_per_room(): # Create first meeting meeting1 = await meetings_controller.create( + session, id="meeting-1", room_name="test-meeting-1", room_url="https://whereby.com/test-1", @@ -42,6 +44,7 @@ async def test_multiple_active_meetings_per_room(): # Create second meeting for the same room (should succeed now) meeting2 = await meetings_controller.create( + session, id="meeting-2", room_name="test-meeting-2", room_url="https://whereby.com/test-2", @@ -53,7 +56,7 @@ async def test_multiple_active_meetings_per_room(): # Both meetings should be active active_meetings = await meetings_controller.get_all_active_for_room( - room=room, current_time=current_time + session, room=room, current_time=current_time ) assert len(active_meetings) == 2 @@ -62,10 +65,11 @@ async def test_multiple_active_meetings_per_room(): @pytest.mark.asyncio -async def test_get_active_by_calendar_event(): +async def test_get_active_by_calendar_event(session): """Test getting active meeting by calendar event ID.""" # Create a room room = await rooms_controller.add( + session, name="test-room", user_id="test-user", zulip_auto_post=False, @@ -86,13 +90,14 @@ async def test_get_active_by_calendar_event(): start_time=datetime.now(timezone.utc), end_time=datetime.now(timezone.utc) + timedelta(hours=1), ) - event = await calendar_events_controller.upsert(event) + event = await calendar_events_controller.upsert(session, event) current_time = datetime.now(timezone.utc) end_time = current_time + timedelta(hours=2) # Create meeting linked to calendar event meeting = await meetings_controller.create( + session, id="meeting-cal-1", room_name="test-meeting-cal", room_url="https://whereby.com/test-cal", @@ -106,7 +111,7 @@ async def test_get_active_by_calendar_event(): # Should find the meeting by calendar event found_meeting = await meetings_controller.get_active_by_calendar_event( - room=room, calendar_event_id=event.id, current_time=current_time + session, room=room, calendar_event_id=event.id, current_time=current_time ) assert found_meeting is not None @@ -115,10 +120,11 @@ async def test_get_active_by_calendar_event(): @pytest.mark.asyncio -async def test_calendar_meeting_deactivates_after_scheduled_end(): +async def test_calendar_meeting_deactivates_after_scheduled_end(session): """Test that unused calendar meetings deactivate after scheduled end time.""" # Create a room room = await rooms_controller.add( + session, name="test-room", user_id="test-user", zulip_auto_post=False, @@ -139,12 +145,13 @@ async def test_calendar_meeting_deactivates_after_scheduled_end(): start_time=datetime.now(timezone.utc) - timedelta(hours=2), end_time=datetime.now(timezone.utc) - timedelta(minutes=35), ) - event = await calendar_events_controller.upsert(event) + event = await calendar_events_controller.upsert(session, event) current_time = datetime.now(timezone.utc) # Create meeting linked to calendar event meeting = await meetings_controller.create( + session, id="meeting-unused", room_name="test-meeting-unused", room_url="https://whereby.com/test-unused", @@ -161,7 +168,7 @@ async def test_calendar_meeting_deactivates_after_scheduled_end(): # Simulate process_meetings logic for unused calendar meeting past end time if meeting.calendar_event_id and current_time > meeting.end_date: # In real code, we'd check has_had_sessions = False here - await meetings_controller.update_meeting(meeting.id, is_active=False) + await meetings_controller.update_meeting(session, meeting.id, is_active=False) - updated_meeting = await meetings_controller.get_by_id(meeting.id) + updated_meeting = await meetings_controller.get_by_id(session, meeting.id) assert updated_meeting.is_active is False # Deactivated after scheduled end