diff --git a/server/migrations/versions/20251217000000_add_skip_consent_to_room_and_meeting.py b/server/migrations/versions/20251217000000_add_skip_consent_to_room_and_meeting.py deleted file mode 100644 index d22e3f4a..00000000 --- a/server/migrations/versions/20251217000000_add_skip_consent_to_room_and_meeting.py +++ /dev/null @@ -1,48 +0,0 @@ -"""add skip_consent to room and meeting - -Revision ID: 20251217000000 -Revises: 05f8688d6895 -Create Date: 2025-12-17 00:00:00.000000 - -""" - -from typing import Sequence, Union - -import sqlalchemy as sa -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = "20251217000000" -down_revision: Union[str, None] = "05f8688d6895" -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - with op.batch_alter_table("room", schema=None) as batch_op: - batch_op.add_column( - sa.Column( - "skip_consent", - sa.Boolean(), - nullable=False, - server_default=sa.text("false"), - ) - ) - - with op.batch_alter_table("meeting", schema=None) as batch_op: - batch_op.add_column( - sa.Column( - "skip_consent", - sa.Boolean(), - nullable=False, - server_default=sa.text("false"), - ) - ) - - -def downgrade() -> None: - with op.batch_alter_table("meeting", schema=None) as batch_op: - batch_op.drop_column("skip_consent") - - with op.batch_alter_table("room", schema=None) as batch_op: - batch_op.drop_column("skip_consent") diff --git a/server/reflector/db/meetings.py b/server/reflector/db/meetings.py index 1657d4a8..8a80e756 100644 --- a/server/reflector/db/meetings.py +++ b/server/reflector/db/meetings.py @@ -63,12 +63,6 @@ meetings = sa.Table( nullable=False, server_default=assert_equal(WHEREBY_PLATFORM, "whereby"), ), - sa.Column( - "skip_consent", - sa.Boolean, - nullable=False, - server_default=sa.false(), - ), sa.Index("idx_meeting_room_id", "room_id"), sa.Index("idx_meeting_calendar_event", "calendar_event_id"), ) @@ -116,7 +110,6 @@ class Meeting(BaseModel): calendar_event_id: str | None = None calendar_metadata: dict[str, Any] | None = None platform: Platform = WHEREBY_PLATFORM - skip_consent: bool = False class MeetingController: @@ -147,7 +140,6 @@ class MeetingController: calendar_event_id=calendar_event_id, calendar_metadata=calendar_metadata, platform=room.platform, - skip_consent=room.skip_consent, ) query = meetings.insert().values(**meeting.model_dump()) await get_database().execute(query) diff --git a/server/reflector/views/rooms.py b/server/reflector/views/rooms.py index 1a4413e9..09b5cfec 100644 --- a/server/reflector/views/rooms.py +++ b/server/reflector/views/rooms.py @@ -73,7 +73,6 @@ class Meeting(BaseModel): calendar_event_id: str | None = None calendar_metadata: dict[str, Any] | None = None platform: Platform - skip_consent: bool = False class CreateRoom(BaseModel): diff --git a/www/app/[roomName]/components/DailyRoom.tsx b/www/app/[roomName]/components/DailyRoom.tsx index f626f314..bbd59ed7 100644 --- a/www/app/[roomName]/components/DailyRoom.tsx +++ b/www/app/[roomName]/components/DailyRoom.tsx @@ -15,12 +15,14 @@ import { useRoomJoinMeeting } from "../../lib/apiHooks"; import { assertExists } from "../../lib/utils"; type Meeting = components["schemas"]["Meeting"]; +type Room = components["schemas"]["RoomDetails"]; interface DailyRoomProps { meeting: Meeting; + room: Room; } -export default function DailyRoom({ meeting }: DailyRoomProps) { +export default function DailyRoom({ meeting, room }: DailyRoomProps) { const router = useRouter(); const params = useParams(); const auth = useAuth(); @@ -164,7 +166,7 @@ export default function DailyRoom({ meeting }: DailyRoomProps) { {meeting.recording_type && recordingTypeRequiresConsent(meeting.recording_type) && meeting.id && - (meeting.skip_consent ? ( + (room.skip_consent ? ( ) : ( diff --git a/www/app/[roomName]/components/RoomContainer.tsx b/www/app/[roomName]/components/RoomContainer.tsx index bfcd82f7..4023cc69 100644 --- a/www/app/[roomName]/components/RoomContainer.tsx +++ b/www/app/[roomName]/components/RoomContainer.tsx @@ -192,9 +192,9 @@ export default function RoomContainer(details: RoomDetails) { switch (platform) { case "daily": - return ; + return ; case "whereby": - return ; + return ; default: { const _exhaustive: never = platform; return ( diff --git a/www/app/[roomName]/components/WherebyRoom.tsx b/www/app/[roomName]/components/WherebyRoom.tsx index 87e0f975..508e3ed0 100644 --- a/www/app/[roomName]/components/WherebyRoom.tsx +++ b/www/app/[roomName]/components/WherebyRoom.tsx @@ -14,9 +14,11 @@ import { } from "../../lib/consent"; type Meeting = components["schemas"]["Meeting"]; +type Room = components["schemas"]["RoomDetails"]; interface WherebyRoomProps { meeting: Meeting; + room: Room; } function WherebyConsentDialogButton({ @@ -49,7 +51,7 @@ function WherebyConsentDialogButton({ return ; } -export default function WherebyRoom({ meeting }: WherebyRoomProps) { +export default function WherebyRoom({ meeting, room }: WherebyRoomProps) { const wherebyLoaded = useWhereby(); const wherebyRef = useRef(null); const router = useRouter(); @@ -92,7 +94,7 @@ export default function WherebyRoom({ meeting }: WherebyRoomProps) { {recordingType && recordingTypeRequiresConsent(recordingType) && meetingId && - (meeting.skip_consent ? ( + (room.skip_consent ? ( ) : (