#24 複数のルームに参加可能にする

Author: HEKUCHAN

api/api/db/dao/room_dao.py

@@ -1,5 +1,6 @@
 import uuid
 from typing import List
+from api.db.models.associations.room_user import RoomLinkUser
 from api.db.models.room_model import RoomModel
 from api.db.models.user_model import UserModel
 from fastapi import Depends
@@ -13,12 +14,12 @@ class RoomDAO:
     def __init__(self, session: AsyncSession = Depends(get_db_session)):
         self.session = session
 
-    async def create_room(self):
+    async def create_room(self, owner_user: UserModel):
         """Add new room to the database.
 
         :returns: if succeed to create room, will return Room object.
         """
-        room = RoomModel()
+        room = RoomModel(owner_id=owner_user.id)
         self.session.add(room)
         await self.session.flush()
 
@@ -36,18 +37,30 @@ async def get_room(self, room_uuid: uuid.UUID) -> RoomModel | None:
         return user
 
     async def add_user(self, room: RoomModel, user: UserModel) -> None:
-        await self.session.refresh(room, attribute_names=["users"])
-        room.users.append(user)
+        await self.session.refresh(room, attribute_names=["users", "user_associations"])
+        if not user in room.users:
+            room.users.append(user)
+        await self.session.flush()
 
     async def leave_user(self, room: RoomModel, user: UserModel) -> None:
         await self.session.refresh(room, attribute_names=["users"])
         if user in room.users:
-            room.users = [u for u in room.users if u != user]
+            room.users.remove(user)
+        await self.session.flush()
 
     async def add_user_by_uuid(self, room_uuid: uuid.UUID, user: UserModel) -> None:
         room = await self.get_room(room_uuid)
         await self.session.refresh(room, attribute_names=["users"])
-        room.users.append(user)
+        if (room is not None) and (not user in room.users):
+            room.users.append(user)
+        await self.session.flush()
+
+    async def leave_user_by_uuid(self, room_uuid: uuid.UUID, user: UserModel):
+        room = await self.get_room(room_uuid)
+        await self.session.refresh(room, attribute_names=["users"])
+        if (room is not None) and (user in room.users):
+            room.users.remove(user)
+        await self.session.flush()
 
     async def get_users(self, room: RoomModel) -> RoomModel:
         await self.session.refresh(room, attribute_names=["users"])

api/api/db/dao/user_dao.py

@@ -1,6 +1,4 @@
 import uuid
-from typing import Optional
-from api.db.models.room_model import RoomModel
 from api.static import static
 from api.libs.jwt_token import encode_token
 
@@ -17,16 +15,12 @@ class UserDAO:
     def __init__(self, session: AsyncSession = Depends(get_db_session)):
         self.session = session
 
-    async def create_user(self, room: RoomModel, is_owner: bool = False):
+    async def create_user(self):
         """Add new user to the datebase.
 
         :returns: if succeed to create user, will return UserModel object.
         """
-        user = UserModel(
-            is_owner=is_owner,
-            room_id=room.id,
-        )
-        user.room = room
+        user = UserModel()
         self.session.add(user)
         await self.session.flush()
 
@@ -47,8 +41,7 @@ def generate_access_token(self, user_model: UserModel) -> str:
         return encode_token(
             data={
                 "token_type": "token",
-                "user_id": str(user_model.id),
-                "room_id": str(user_model.room_id),
+                "user_id": str(user_model.id)
             },
             expires_delta=static.ACCESS_TOKEN_EXPIRE_TIME,
         )
@@ -58,7 +51,6 @@ def generate_refresh_token(self, user_model: UserModel) -> str:
             data={
                 "token_type": "refresh_token",
                 "user_id": str(user_model.id),
-                "room_id": str(user_model.room_id),
             },
             expires_delta=static.REFRESH_TOKEN_EXPIRE_TIME,
         )

api/api/db/migrations/versions/2024-01-29-08-03_63ccee3c5682.py api/api/db/migrations/versions/2024-02-02-06-45_25615d348393.py

@@ -1,15 +1,15 @@
-"""empty message
+"""Add Rooms, User, RoomLinkUser Table
 
-Revision ID: 63ccee3c5682
+Revision ID: 25615d348393
 Revises: 
-Create Date: 2024-01-29 08:03:32.262861
+Create Date: 2024-02-02 06:45:34.408905
 
 """
 import sqlalchemy as sa
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = "63ccee3c5682"
+revision = "25615d348393"
 down_revision = None
 branch_labels = None
 depends_on = None
@@ -18,32 +18,48 @@
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
-        "rooms",
+        "users",
         sa.Column("id", sa.UUID(), nullable=False),
         sa.Column("created_at", sa.DateTime(timezone=True), nullable=False),
         sa.Column("updated_at", sa.DateTime(timezone=True), nullable=True),
         sa.PrimaryKeyConstraint("id"),
         sa.UniqueConstraint("id"),
     )
     op.create_table(
-        "users",
+        "rooms",
         sa.Column("id", sa.UUID(), nullable=False),
-        sa.Column("is_owner", sa.Boolean(), nullable=False),
-        sa.Column("room_id", sa.UUID(), nullable=True),
+        sa.Column("owner_id", sa.UUID(), nullable=False),
         sa.Column("created_at", sa.DateTime(timezone=True), nullable=False),
         sa.Column("updated_at", sa.DateTime(timezone=True), nullable=True),
         sa.ForeignKeyConstraint(
-            ["room_id"],
-            ["rooms.id"],
+            ["owner_id"],
+            ["users.id"],
         ),
         sa.PrimaryKeyConstraint("id"),
         sa.UniqueConstraint("id"),
     )
+    op.create_table(
+        "room_link_user",
+        sa.Column("room_id", sa.UUID(), nullable=False),
+        sa.Column("user_id", sa.UUID(), nullable=False),
+        sa.Column("created_at", sa.DateTime(timezone=True), nullable=False),
+        sa.Column("updated_at", sa.DateTime(timezone=True), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["room_id"],
+            ["rooms.id"],
+        ),
+        sa.ForeignKeyConstraint(
+            ["user_id"],
+            ["users.id"],
+        ),
+        sa.PrimaryKeyConstraint("room_id", "user_id"),
+    )
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table("users")
+    op.drop_table("room_link_user")
     op.drop_table("rooms")
+    op.drop_table("users")
     # ### end Alembic commands ###

api/api/db/migrations/versions/2024-02-02-07-05_668743a5e60c.py

@@ -0,0 +1,29 @@
+"""Add Rooms, User, RoomLinkUser Table
+
+Revision ID: 668743a5e60c
+Revises: 25615d348393
+Create Date: 2024-02-02 07:05:50.008640
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "668743a5e60c"
+down_revision = "25615d348393"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_unique_constraint(None, "rooms", ["id"])
+    op.create_unique_constraint(None, "users", ["id"])
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, "users", type_="unique")
+    op.drop_constraint(None, "rooms", type_="unique")
+    # ### end Alembic commands ###

api/api/db/migrations/versions/2024-02-02-07-12_1522526dbc9c.py

@@ -0,0 +1,27 @@
+"""Add Rooms, User, RoomLinkUser Table
+
+Revision ID: 1522526dbc9c
+Revises: 668743a5e60c
+Create Date: 2024-02-02 07:12:56.460343
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "1522526dbc9c"
+down_revision = "668743a5e60c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

api/api/db/models/associations/__init__.py

@@ -0,0 +1,21 @@
+import uuid
+from api.db.base import Base
+from typing import TYPE_CHECKING
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+if TYPE_CHECKING:
+    from api.db.models.room_model import RoomModel
+    from api.db.models.user_model import UserModel
+
+class RoomLinkUser(Base):
+    __tablename__ = "room_link_user"
+
+    room_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("rooms.id"), primary_key=True,
+    )
+    user_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("users.id"), primary_key=True,
+    )
+    room: Mapped["RoomModel"] = relationship("RoomModel", back_populates="user_associations")
+    user: Mapped["UserModel"] = relationship("UserModel", back_populates="room_associations")

api/api/db/models/associations/room_user.py

@@ -1,13 +1,16 @@
-from typing import List
 import uuid
-from api.db.models.user_model import UserModel
+from typing import List
+from api.db.models.associations.room_user import RoomLinkUser
+from typing import TYPE_CHECKING
+from sqlalchemy import ForeignKey
 
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.ext.declarative import declared_attr
 
 from api.db.base import Base
 
+if TYPE_CHECKING:
+    from api.db.models.user_model import UserModel
 
 class RoomModel(Base):
 
@@ -16,7 +19,12 @@ class RoomModel(Base):
     id: Mapped[UUID] = mapped_column(
         UUID(as_uuid=True), unique=True, primary_key=True, default=uuid.uuid4
     )
-    
-    @declared_attr
-    def users(cls):
-        return relationship(UserModel, back_populates='room')
+    owner_id: Mapped[UUID] = mapped_column(UUID(as_uuid=True), ForeignKey('users.id'))
+
+    users: Mapped[List["UserModel"]] =  relationship(
+        secondary="room_link_user",
+        back_populates="rooms",
+    )
+    user_associations: Mapped[List[RoomLinkUser]] = relationship(
+        back_populates='room',
+    )

api/api/db/models/room_model.py

@@ -1,19 +1,29 @@
+from typing import List
 import uuid
 
-from sqlalchemy import Boolean, ForeignKey
+from typing import TYPE_CHECKING
+
 from sqlalchemy.orm import Mapped, mapped_column, relationship
+from api.db.models.associations.room_user import RoomLinkUser
 from sqlalchemy.dialects.postgresql import UUID
 
 from api.db.base import Base
 
+if TYPE_CHECKING:
+    from api.db.models.room_model import RoomModel
+
 class UserModel(Base):
 
     __tablename__ = "users"
 
     id: Mapped[UUID] = mapped_column(
         UUID(as_uuid=True), unique=True, primary_key=True, default=uuid.uuid4
     )
-    is_owner: Mapped[bool] = mapped_column(Boolean, default=False)
-    room_id = mapped_column(UUID(as_uuid=True), ForeignKey("rooms.id"))
 
-UserModel.room = relationship("RoomModel", back_populates='users')
+    rooms: Mapped[List["RoomModel"]] = relationship(
+        secondary="room_link_user",
+        back_populates="users",
+    )
+    room_associations: Mapped[List[RoomLinkUser]] = relationship(
+        back_populates='user',
+    )

api/api/db/models/user_model.py

@@ -8,7 +8,8 @@ class RoomInfo(BaseModel):
     """DTO for Room model."""
 
     id: uuid.UUID
-    users: List[UserInfo]
+    owner_id: uuid.UUID
+    users: List[UserInfo] = []
     created_at: datetime
     updated_at: datetime
 

api/api/schemas/room.py

@@ -6,6 +6,5 @@ class UserInfo(BaseModel):
     """DTO for User model."""
 
     id: uuid.UUID
-    room_id: uuid.UUID
     created_at: datetime
     updated_at: datetime