diff --git a/server/migrations/versions/b469348df210_remove_viewer_room_url.py b/server/migrations/versions/b469348df210_remove_viewer_room_url.py new file mode 100644 index 00000000..d434ca1a --- /dev/null +++ b/server/migrations/versions/b469348df210_remove_viewer_room_url.py @@ -0,0 +1,35 @@ +"""Remove viewer room url + +Revision ID: b469348df210 +Revises: 722e93c4ab22 +Create Date: 2024-10-11 13:45:28.914902 + +""" + +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = "b469348df210" +down_revision: Union[str, None] = "722e93c4ab22" +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! ### + with op.batch_alter_table("meeting", schema=None) as batch_op: + batch_op.drop_column("viewer_room_url") + + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table("meeting", schema=None) as batch_op: + batch_op.add_column(sa.Column("viewer_room_url", sa.VARCHAR(), nullable=True)) + + # ### end Alembic commands ### diff --git a/server/reflector/db/meetings.py b/server/reflector/db/meetings.py index 7a47f834..2ed86173 100644 --- a/server/reflector/db/meetings.py +++ b/server/reflector/db/meetings.py @@ -15,7 +15,6 @@ meetings = sqlalchemy.Table( sqlalchemy.Column("room_name", sqlalchemy.String), sqlalchemy.Column("room_url", sqlalchemy.String), sqlalchemy.Column("host_room_url", sqlalchemy.String), - sqlalchemy.Column("viewer_room_url", sqlalchemy.String), sqlalchemy.Column("start_date", sqlalchemy.DateTime), sqlalchemy.Column("end_date", sqlalchemy.DateTime), sqlalchemy.Column("user_id", sqlalchemy.String), @@ -43,7 +42,6 @@ class Meeting(BaseModel): room_name: str room_url: str host_room_url: str - viewer_room_url: str start_date: datetime end_date: datetime user_id: str | None = None @@ -63,7 +61,6 @@ class MeetingController: room_name: str, room_url: str, host_room_url: str, - viewer_room_url: str, start_date: datetime, end_date: datetime, user_id: str, @@ -77,7 +74,6 @@ class MeetingController: room_name=room_name, room_url=room_url, host_room_url=host_room_url, - viewer_room_url=viewer_room_url, start_date=start_date, end_date=end_date, user_id=user_id, diff --git a/server/reflector/views/rooms.py b/server/reflector/views/rooms.py index 03a73450..bd52b9a0 100644 --- a/server/reflector/views/rooms.py +++ b/server/reflector/views/rooms.py @@ -36,7 +36,6 @@ class Meeting(BaseModel): room_name: str room_url: str host_room_url: str - viewer_room_url: str start_date: datetime end_date: datetime @@ -158,7 +157,6 @@ async def rooms_create_meeting( room_name=meeting["roomName"], room_url=meeting["roomUrl"], host_room_url=meeting["hostRoomUrl"], - viewer_room_url=meeting["viewerRoomUrl"], start_date=datetime.fromisoformat(meeting["startDate"]), end_date=datetime.fromisoformat(meeting["endDate"]), user_id=user_id, diff --git a/server/reflector/whereby.py b/server/reflector/whereby.py index 154e3771..73a2b512 100644 --- a/server/reflector/whereby.py +++ b/server/reflector/whereby.py @@ -13,7 +13,6 @@ async def create_meeting( "Authorization": f"Bearer {settings.WHEREBY_API_KEY}", } data = { - "templateType": "viewerMode", "isLocked": room.is_locked, "roomNamePrefix": room_name_prefix, "roomNamePattern": "uuid", @@ -31,6 +30,7 @@ async def create_meeting( }, "startTrigger": room.recording_trigger, }, + "fields": ["hostRoomUrl"], } async with httpx.AsyncClient() as client: diff --git a/www/app/api/schemas.gen.ts b/www/app/api/schemas.gen.ts index d0ada862..c9b5e28d 100644 --- a/www/app/api/schemas.gen.ts +++ b/www/app/api/schemas.gen.ts @@ -87,6 +87,10 @@ export const $CreateRoom = { type: "string", title: "Recording Trigger", }, + is_shared: { + type: "boolean", + title: "Is Shared", + }, }, type: "object", required: [ @@ -98,6 +102,7 @@ export const $CreateRoom = { "room_mode", "recording_type", "recording_trigger", + "is_shared", ], title: "CreateRoom", } as const; @@ -263,6 +268,9 @@ export const $GetTranscript = { ], title: "Meeting Id", }, + source_kind: { + $ref: "#/components/schemas/SourceKind", + }, room_id: { anyOf: [ { @@ -285,9 +293,6 @@ export const $GetTranscript = { ], title: "Room Name", }, - source_kind: { - $ref: "#/components/schemas/SourceKind", - }, }, type: "object", required: [ @@ -306,8 +311,6 @@ export const $GetTranscript = { "participants", "reviewed", "meeting_id", - "room_id", - "room_name", "source_kind", ], title: "GetTranscript", @@ -522,10 +525,6 @@ export const $Meeting = { type: "string", title: "Host Room Url", }, - viewer_room_url: { - type: "string", - title: "Viewer Room Url", - }, start_date: { type: "string", format: "date-time", @@ -543,7 +542,6 @@ export const $Meeting = { "room_name", "room_url", "host_room_url", - "viewer_room_url", "start_date", "end_date", ], @@ -985,6 +983,10 @@ export const $UpdateRoom = { type: "string", title: "Recording Trigger", }, + is_shared: { + type: "boolean", + title: "Is Shared", + }, }, type: "object", required: [ @@ -996,6 +998,7 @@ export const $UpdateRoom = { "room_mode", "recording_type", "recording_trigger", + "is_shared", ], title: "UpdateRoom", } as const; diff --git a/www/app/api/services.gen.ts b/www/app/api/services.gen.ts index f3e07a30..acf1b71f 100644 --- a/www/app/api/services.gen.ts +++ b/www/app/api/services.gen.ts @@ -199,24 +199,24 @@ export class DefaultService { /** * Transcripts List * @param data The data for the request. + * @param data.sourceKind * @param data.roomId * @param data.searchTerm - * @param data.sourceKind * @param data.page Page number * @param data.size Page size * @returns Page_GetTranscript_ Successful Response * @throws ApiError */ public v1TranscriptsList( - data: V1TranscriptsListData, + data: V1TranscriptsListData = {}, ): CancelablePromise { return this.httpRequest.request({ method: "GET", url: "/v1/transcripts", query: { + source_kind: data.sourceKind, room_id: data.roomId, search_term: data.searchTerm, - source_kind: data.sourceKind, page: data.page, size: data.size, }, diff --git a/www/app/api/types.gen.ts b/www/app/api/types.gen.ts index ba00e0a0..9b456648 100644 --- a/www/app/api/types.gen.ts +++ b/www/app/api/types.gen.ts @@ -23,6 +23,7 @@ export type CreateRoom = { room_mode: string; recording_type: string; recording_trigger: string; + is_shared: boolean; }; export type CreateTranscript = { @@ -52,9 +53,9 @@ export type GetTranscript = { participants: Array | null; reviewed: boolean; meeting_id: string | null; - room_id: string | null; - room_name: string | null; source_kind: SourceKind; + room_id?: string | null; + room_name?: string | null; }; export type GetTranscriptSegmentTopic = { @@ -104,7 +105,6 @@ export type Meeting = { room_name: string; room_url: string; host_room_url: string; - viewer_room_url: string; start_date: string; end_date: string; }; @@ -203,6 +203,7 @@ export type UpdateRoom = { room_mode: string; recording_type: string; recording_trigger: string; + is_shared: boolean; }; export type UpdateTranscript = { @@ -280,8 +281,8 @@ export type V1TranscriptsListData = { * Page number */ page?: number; - roomId: string | null; - searchTerm: string | null; + roomId?: string | null; + searchTerm?: string | null; /** * Page size */