Refactor in progress code

1. ruff format and fix
2. regenerate alembic revision
3. use sqlalchemy 2 syntax

Author: Tim020

server/alembic_config/versions/18660a2d5398_add_crew_table.py

@@ -0,0 +1,105 @@
+"""Add crew, props and scenery tables and allocations
+
+Revision ID: fa27b233d26c
+Revises: 01fb1d6c6b08
+Create Date: 2026-01-14 00:38:40.210710
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision: str = "fa27b233d26c"
+down_revision: Union[str, None] = "01fb1d6c6b08"
+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! ###
+    op.create_table(
+        "crew",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("show_id", sa.Integer(), nullable=False),
+        sa.Column("first_name", sa.String(), nullable=True),
+        sa.Column("last_name", sa.String(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["show_id"], ["shows.id"], name=op.f("fk_crew_show_id_shows")
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_crew")),
+    )
+    op.create_table(
+        "props",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("show_id", sa.Integer(), nullable=False),
+        sa.Column("name", sa.String(), nullable=True),
+        sa.Column("description", sa.String(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["show_id"], ["shows.id"], name=op.f("fk_props_show_id_shows")
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_props")),
+    )
+    op.create_table(
+        "scenery",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("show_id", sa.Integer(), nullable=False),
+        sa.Column("name", sa.String(), nullable=True),
+        sa.Column("description", sa.String(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["show_id"], ["shows.id"], name=op.f("fk_scenery_show_id_shows")
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_scenery")),
+    )
+    op.create_table(
+        "props_allocation",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("props_id", sa.Integer(), nullable=False),
+        sa.Column("scene_id", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["props_id"],
+            ["props.id"],
+            name=op.f("fk_props_allocation_props_id_props"),
+            ondelete="CASCADE",
+        ),
+        sa.ForeignKeyConstraint(
+            ["scene_id"],
+            ["scene.id"],
+            name=op.f("fk_props_allocation_scene_id_scene"),
+            ondelete="CASCADE",
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_props_allocation")),
+    )
+    op.create_table(
+        "scenery_allocation",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("scenery_id", sa.Integer(), nullable=False),
+        sa.Column("scene_id", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["scene_id"],
+            ["scene.id"],
+            name=op.f("fk_scenery_allocation_scene_id_scene"),
+            ondelete="CASCADE",
+        ),
+        sa.ForeignKeyConstraint(
+            ["scenery_id"],
+            ["scenery.id"],
+            name=op.f("fk_scenery_allocation_scenery_id_scenery"),
+            ondelete="CASCADE",
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_scenery_allocation")),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("scenery_allocation")
+    op.drop_table("props_allocation")
+    op.drop_table("scenery")
+    op.drop_table("props")
+    op.drop_table("crew")
+    # ### end Alembic commands ###

server/alembic_config/versions/5055c78fdf46_add_scenery_and_prop_allocations.py

@@ -11,7 +11,6 @@
 
 @ApiRoute("show/stage/crew", ApiVersion.V1)
 class CrewController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

server/alembic_config/versions/9161f286a179_add_scenery_and_props.py

@@ -11,7 +11,6 @@
 
 @ApiRoute("show/stage/props", ApiVersion.V1)
 class PropsController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

server/alembic_config/versions/fa27b233d26c_add_crew_props_and_scenery_tables_and_.py

@@ -11,7 +11,6 @@
 
 @ApiRoute("show/stage/scenery", ApiVersion.V1)
 class SceneryController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

server/controllers/api/show/stage/crew.py

@@ -13,6 +13,7 @@
     from models.mics import MicrophoneAllocation
     from models.script import ScriptLine
     from models.session import ShowSession
+    from models.stage import Crew, Props, PropsAllocation, Scenery, SceneryAllocation
 
 
 class ShowScriptType(enum.IntEnum):

server/controllers/api/show/stage/props.py

@@ -1,5 +1,5 @@
 from sqlalchemy import ForeignKey
-from sqlalchemy.orm import relationship, Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from models.models import db
 from models.show import Scene, Show
@@ -23,9 +23,7 @@ class SceneryAllocation(db.Model):
     scenery_id: Mapped[int] = mapped_column(
         ForeignKey("scenery.id", ondelete="CASCADE")
     )
-    scene_id: Mapped[int] = mapped_column(
-        ForeignKey("scene.id", ondelete="CASCADE")
-    )
+    scene_id: Mapped[int] = mapped_column(ForeignKey("scene.id", ondelete="CASCADE"))
 
     scenery: Mapped["Scenery"] = relationship(
         back_populates="scene_allocations",
@@ -41,12 +39,8 @@ class PropsAllocation(db.Model):
     __tablename__ = "props_allocation"
 
     id: Mapped[int] = mapped_column(primary_key=True)
-    props_id: Mapped[int] = mapped_column(
-        ForeignKey("props.id", ondelete="CASCADE")
-    )
-    scene_id: Mapped[int] = mapped_column(
-        ForeignKey("scene.id", ondelete="CASCADE")
-    )
+    props_id: Mapped[int] = mapped_column(ForeignKey("props.id", ondelete="CASCADE"))
+    scene_id: Mapped[int] = mapped_column(ForeignKey("scene.id", ondelete="CASCADE"))
 
     prop: Mapped["Props"] = relationship(
         back_populates="scene_allocations",