✨ Trip multi-users - BETA

Author: itskovacs

backend/trip/alembic/versions/26c89b7466f2_trip_multi_users.py

@@ -0,0 +1,91 @@
+"""Trip multi-users
+
+Revision ID: 26c89b7466f2
+Revises: 60a9bb641d8a
+Create Date: 2025-08-18 23:19:37.457354
+
+"""
+
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "26c89b7466f2"
+down_revision = "60a9bb641d8a"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_table(
+        "tripmember",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("user", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+        sa.Column("invited_by", sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+        sa.Column("invited_at", sa.DateTime(), nullable=False),
+        sa.Column("joined_at", sa.DateTime(), nullable=True),
+        sa.Column("trip_id", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["invited_by"],
+            ["user.username"],
+            name=op.f("fk_tripmember_invited_by_user"),
+            ondelete="SET NULL",
+        ),
+        sa.ForeignKeyConstraint(
+            ["trip_id"], ["trip.id"], name=op.f("fk_tripmember_trip_id_trip"), ondelete="CASCADE"
+        ),
+        sa.ForeignKeyConstraint(
+            ["user"], ["user.username"], name=op.f("fk_tripmember_user_user"), ondelete="CASCADE"
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_tripmember")),
+    )
+    with op.batch_alter_table("tripchecklistitem", schema=None) as batch_op:
+        batch_op.drop_constraint(batch_op.f("fk_tripchecklistitem_user_user"), type_="foreignkey")
+        batch_op.drop_column("user")
+
+    with op.batch_alter_table("trippackinglistitem", schema=None) as batch_op:
+        batch_op.drop_constraint(batch_op.f("fk_trippackinglistitem_user_user"), type_="foreignkey")
+        batch_op.drop_column("user")
+
+    with op.batch_alter_table("tripitem", schema=None) as batch_op:
+        batch_op.drop_constraint(batch_op.f("fk_tripitem_day_id_tripday"), type_="foreignkey")
+
+    with op.batch_alter_table("tripday", schema=None) as batch_op:
+        batch_op.drop_constraint(batch_op.f("fk_tripday_user_user"), type_="foreignkey")
+        batch_op.drop_column("user")
+
+    with op.batch_alter_table("tripitem", schema=None) as batch_op:
+        batch_op.create_foreign_key(
+            batch_op.f("fk_tripitem_day_id_tripday"),
+            "tripday",
+            ["day_id"],
+            ["id"],
+            ondelete="CASCADE",
+        )
+
+
+def downgrade():
+    with op.batch_alter_table("trippackinglistitem", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("user", sa.VARCHAR(), nullable=False))
+        batch_op.create_foreign_key(
+            batch_op.f("fk_trippackinglistitem_user_user"),
+            "user",
+            ["user"],
+            ["username"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("tripday", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("user", sa.VARCHAR(), nullable=False))
+        batch_op.create_foreign_key(
+            batch_op.f("fk_tripday_user_user"), "user", ["user"], ["username"], ondelete="CASCADE"
+        )
+
+    with op.batch_alter_table("tripchecklistitem", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("user", sa.VARCHAR(), nullable=False))
+        batch_op.create_foreign_key(
+            batch_op.f("fk_tripchecklistitem_user_user"), "user", ["user"], ["username"], ondelete="CASCADE"
+        )
+
+    op.drop_table("tripmember")

backend/trip/models/models.py

@@ -261,6 +261,7 @@ class Trip(TripBase, table=True):
     shares: list["TripShare"] = Relationship(back_populates="trip", cascade_delete=True)
     packing_items: list["TripPackingListItem"] = Relationship(back_populates="trip", cascade_delete=True)
     checklist_items: list["TripChecklistItem"] = Relationship(back_populates="trip", cascade_delete=True)
+    memberships: list["TripMember"] = Relationship(back_populates="trip", cascade_delete=True)
 
 
 class TripCreate(TripBase):
@@ -279,6 +280,7 @@ class TripReadBase(TripBase):
     image: str | None
     image_id: int | None
     days: int
+    collaborators: list["TripMemberRead"]
 
     @classmethod
     def serialize(cls, obj: Trip) -> "TripRead":
@@ -289,6 +291,7 @@ def serialize(cls, obj: Trip) -> "TripRead":
             image=_prefix_assets_url(obj.image.filename) if obj.image else None,
             image_id=obj.image_id,
             days=len(obj.days),
+            collaborators=[TripMemberRead.serialize(m) for m in obj.memberships],
         )
 
 
@@ -298,6 +301,7 @@ class TripRead(TripBase):
     image_id: int | None
     days: list["TripDayRead"]
     places: list["PlaceRead"]
+    collaborators: list["TripMemberRead"]
 
     @classmethod
     def serialize(cls, obj: Trip) -> "TripRead":
@@ -309,17 +313,49 @@ def serialize(cls, obj: Trip) -> "TripRead":
             image_id=obj.image_id,
             days=[TripDayRead.serialize(day) for day in obj.days],
             places=[PlaceRead.serialize(place) for place in obj.places],
+            collaborators=[TripMemberRead.serialize(m) for m in obj.memberships],
         )
 
 
+class TripMember(SQLModel, table=True):
+    id: int | None = Field(default=None, primary_key=True)
+    user: str = Field(foreign_key="user.username", ondelete="CASCADE")
+    invited_by: str | None = Field(default=None, foreign_key="user.username", ondelete="SET NULL")
+    invited_at: datetime = Field(default_factory=lambda: datetime.now(UTC))
+    joined_at: datetime | None = None
+
+    trip_id: int = Field(foreign_key="trip.id", ondelete="CASCADE")
+    trip: Trip | None = Relationship(back_populates="memberships")
+
+
+class TripMemberCreate(BaseModel):
+    user: str
+
+
+class TripMemberRead(BaseModel):
+    user: str
+    invited_by: str | None = None
+    invited_at: datetime | None = None
+    joined_at: datetime | None = None
+
+    @classmethod
+    def serialize(cls, obj: TripMember) -> "TripMemberRead":
+        return cls(
+            user=obj.user, invited_by=obj.invited_by, invited_at=obj.invited_at, joined_at=obj.joined_at
+        )
+
+
+class TripInvitationRead(TripReadBase):
+    invited_by: str | None = None
+    invited_at: datetime
+
+
 class TripDayBase(SQLModel):
     label: str
 
 
 class TripDay(TripDayBase, table=True):
     id: int | None = Field(default=None, primary_key=True)
-    user: str = Field(foreign_key="user.username", ondelete="CASCADE")
-
     trip_id: int = Field(foreign_key="trip.id", ondelete="CASCADE")
     trip: Trip | None = Relationship(back_populates="days")
 
@@ -420,7 +456,6 @@ class TripPackingListItemBase(SQLModel):
 
 class TripPackingListItem(TripPackingListItemBase, table=True):
     id: int | None = Field(default=None, primary_key=True)
-    user: str = Field(foreign_key="user.username", ondelete="CASCADE")
 
     trip_id: int = Field(foreign_key="trip.id", ondelete="CASCADE")
     trip: Trip | None = Relationship(back_populates="packing_items")