Make sure room names are unique

This commit is contained in:
2024-09-25 13:13:18 +02:00
parent 9dec492b2f
commit 83857507ea
4 changed files with 74 additions and 23 deletions

View File

@@ -1,11 +1,9 @@
from logging.config import fileConfig
from reflector.settings import settings
from reflector.db import metadata
from sqlalchemy import engine_from_config
from sqlalchemy import pool
from alembic import context
from reflector.db import metadata
from reflector.settings import settings
from sqlalchemy import engine_from_config, pool
# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
@@ -45,6 +43,7 @@ def run_migrations_offline() -> None:
target_metadata=target_metadata,
literal_binds=True,
dialect_opts={"paramstyle": "named"},
render_as_batch=True,
)
with context.begin_transaction():
@@ -67,7 +66,9 @@ def run_migrations_online() -> None:
)
with connectable.connect() as connection:
context.configure(connection=connection, target_metadata=target_metadata)
context.configure(
connection=connection, target_metadata=target_metadata, render_as_batch=True
)
with context.begin_transaction():
context.run_migrations()

View File

@@ -0,0 +1,34 @@
"""Unique room names
Revision ID: 0925da921477
Revises: 764ce6db4388
Create Date: 2024-09-24 16:12:56.944133
"""
from typing import Sequence, Union
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision: str = "0925da921477"
down_revision: Union[str, None] = "764ce6db4388"
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("room", schema=None) as batch_op:
batch_op.create_unique_constraint("uq_room_name", ["name"])
# ### end Alembic commands ###
def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table("room", schema=None) as batch_op:
batch_op.drop_constraint("uq_room_name", type_="unique")
# ### end Alembic commands ###

View File

@@ -1,4 +1,5 @@
from datetime import datetime
from sqlite3 import IntegrityError
from typing import Literal
import sqlalchemy
@@ -12,7 +13,7 @@ rooms = sqlalchemy.Table(
"room",
metadata,
sqlalchemy.Column("id", sqlalchemy.String, primary_key=True),
sqlalchemy.Column("name", sqlalchemy.String, nullable=False),
sqlalchemy.Column("name", sqlalchemy.String, nullable=False, unique=True),
sqlalchemy.Column("user_id", sqlalchemy.String, nullable=False),
sqlalchemy.Column("created_at", sqlalchemy.DateTime, nullable=False),
sqlalchemy.Column(
@@ -113,7 +114,10 @@ class RoomController:
recording_trigger=recording_trigger,
)
query = rooms.insert().values(**room.model_dump())
await database.execute(query)
try:
await database.execute(query)
except IntegrityError:
raise HTTPException(status_code=400, detail="Room name is not unique")
return room
async def update(self, room: Room, values: dict, mutate=True):
@@ -121,7 +125,11 @@ class RoomController:
Update a room fields with key/values in values
"""
query = rooms.update().where(rooms.c.id == room.id).values(**values)
await database.execute(query)
try:
await database.execute(query)
except IntegrityError:
raise HTTPException(status_code=400, detail="Room name is not unique")
if mutate:
for key, value in values.items():
setattr(room, key, value)