WIP checkpoint: Group + membership models + migration

backend/alembic/env.py

@@ -8,7 +8,7 @@ from sqlalchemy.ext.asyncio import create_async_engine
 
 from app.config import settings
 from app.database import Base
-from app.models import user, session, world, asset, world_visit  # noqa: F401
+from app.models import user, session, world, asset, group  # noqa: F401
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

backend/alembic/versions/0001_initial.py

@@ -19,16 +19,16 @@ depends_on: Union[str, Sequence[str], None] = None
 
 def upgrade() -> None:
     """Upgrade database schema."""
-    # Create ENUM types
-    world_visibility = postgresql.ENUM(
+    # Create ENUM types (create once, reuse below)
+    world_visibility_enum = postgresql.ENUM(
         "public", "private", "friends_only", name="world_visibility"
     )
-    world_visibility.create(op.get_bind(), checkfirst=True)
+    world_visibility_enum.create(op.get_bind(), checkfirst=True)
 
-    asset_type = postgresql.ENUM(
+    asset_type_enum = postgresql.ENUM(
         "image", "audio", "video", "document", "model_3d", "other", name="asset_type"
     )
-    asset_type.create(op.get_bind(), checkfirst=True)
+    asset_type_enum.create(op.get_bind(), checkfirst=True)
 
     # Create users table
     op.create_table(
@@ -59,7 +59,7 @@ def upgrade() -> None:
     )
     op.create_index(op.f("ix_sessions_token"), "sessions", ["token"], unique=True)
 
-    # Create worlds table
+    # Create worlds table — reuse world_visibility_enum (no second create)
     op.create_table(
         "worlds",
         sa.Column("id", sa.Integer(), primary_key=True),
@@ -68,9 +68,7 @@ def upgrade() -> None:
         sa.Column("owner_id", sa.Integer(), nullable=False),
         sa.Column(
             "visibility",
-            postgresql.ENUM(
-                "public", "private", "friends_only", name="world_visibility"
-            ),
+            world_visibility_enum,
             nullable=True,
         ),
         sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
@@ -79,7 +77,7 @@ def upgrade() -> None:
     )
     op.create_index(op.f("ix_worlds_id"), "worlds", ["id"], unique=False)
 
-    # Create assets table
+    # Create assets table — reuse asset_type_enum (no second create)
     op.create_table(
         "assets",
         sa.Column("id", sa.Integer(), primary_key=True),
@@ -87,10 +85,7 @@ def upgrade() -> None:
         sa.Column("description", sa.Text(), nullable=True),
         sa.Column(
             "asset_type",
-            postgresql.ENUM(
-                "image", "audio", "video", "document", "model_3d", "other",
-                name="asset_type",
-            ),
+            asset_type_enum,
             nullable=False,
         ),
         sa.Column("file_path", sa.String(length=512), nullable=False),

backend/alembic/versions/0003_add_discovery_metadata.py

@@ -1,104 +0,0 @@
-"""add discovery metadata to worlds and create world_visits
-
-Revision ID: 0003_add_discovery_metadata
-Revises: 0002_add_date_of_birth_to_users
-Create Date: 2025-01-02 00:00:00.000000
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision: str = "0003_add_discovery_metadata"
-down_revision: Union[str, None] = "0002_add_date_of_birth_to_users"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Add discovery metadata columns to worlds and create world_visits."""
-    # Add discovery metadata columns to worlds.
-    op.add_column(
-        "worlds",
-        sa.Column("category", sa.String(length=100), nullable=True),
-    )
-    op.add_column(
-        "worlds",
-        sa.Column(
-            "tags",
-            postgresql.ARRAY(sa.String()),
-            nullable=True,
-            server_default="{}",
-        ),
-    )
-    op.add_column(
-        "worlds",
-        sa.Column("play_count", sa.Integer(), nullable=False, server_default="0"),
-    )
-    op.add_column(
-        "worlds",
-        sa.Column("last_played_at", sa.DateTime(timezone=True), nullable=True),
-    )
-
-    # B-tree index on category, GIN index on tags.
-    op.create_index(
-        "ix_worlds_category",
-        "worlds",
-        ["category"],
-        unique=False,
-    )
-    op.create_index(
-        "ix_worlds_tags",
-        "worlds",
-        ["tags"],
-        unique=False,
-        postgresql_using="gin",
-    )
-
-    # Create world_visits table.
-    op.create_table(
-        "world_visits",
-        sa.Column("id", sa.Integer(), primary_key=True),
-        sa.Column("world_id", sa.Integer(), nullable=False),
-        sa.Column("user_id", sa.Integer(), nullable=True),
-        sa.Column("anonymous_token", sa.String(length=255), nullable=True),
-        sa.Column(
-            "visited_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.func.now(),
-        ),
-        sa.ForeignKeyConstraint(
-            ["world_id"], ["worlds.id"], ondelete="CASCADE"
-        ),
-        sa.ForeignKeyConstraint(
-            ["user_id"], ["users.id"], ondelete="CASCADE"
-        ),
-    )
-    op.create_index(
-        op.f("ix_world_visits_id"), "world_visits", ["id"], unique=False
-    )
-    op.create_index(
-        "ix_world_visits_world_id_visited_at",
-        "world_visits",
-        ["world_id", "visited_at"],
-        unique=False,
-    )
-
-
-def downgrade() -> None:
-    """Drop world_visits and discovery metadata columns from worlds."""
-    op.drop_index(
-        "ix_world_visits_world_id_visited_at", table_name="world_visits"
-    )
-    op.drop_index(op.f("ix_world_visits_id"), table_name="world_visits")
-    op.drop_table("world_visits")
-
-    op.drop_index("ix_worlds_tags", table_name="worlds")
-    op.drop_index("ix_worlds_category", table_name="worlds")
-    op.drop_column("worlds", "last_played_at")
-    op.drop_column("worlds", "play_count")
-    op.drop_column("worlds", "tags")
-    op.drop_column("worlds", "category")

backend/alembic/versions/0003_add_groups_and_members.py

@@ -0,0 +1,78 @@
+"""add groups and group_members tables
+
+Revision ID: 0003_add_groups_and_members
+Revises: 0002_add_date_of_birth_to_users
+Create Date: 2025-01-01 00:00:00.000000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "0003_add_groups_and_members"
+down_revision: Union[str, None] = "0002_add_date_of_birth_to_users"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Create groups and group_members tables."""
+    # Create group_member_role ENUM type
+    group_member_role = postgresql.ENUM(
+        "owner", "admin", "member", name="group_member_role"
+    )
+    group_member_role.create(op.get_bind(), checkfirst=True)
+
+    # Create groups table
+    op.create_table(
+        "groups",
+        sa.Column("id", sa.Integer(), primary_key=True, index=True),
+        sa.Column("name", sa.String(length=255), nullable=False),
+        sa.Column("description", sa.Text(), nullable=True),
+        sa.Column(
+            "owner_id",
+            sa.Integer(),
+            sa.ForeignKey("users.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.func.now(), onupdate=sa.func.now()),
+    )
+
+    # Create group_members table
+    op.create_table(
+        "group_members",
+        sa.Column(
+            "group_id",
+            sa.Integer(),
+            sa.ForeignKey("groups.id", ondelete="CASCADE"),
+            primary_key=True,
+        ),
+        sa.Column(
+            "user_id",
+            sa.Integer(),
+            sa.ForeignKey("users.id", ondelete="CASCADE"),
+            primary_key=True,
+        ),
+        sa.Column(
+            "role",
+            postgresql.ENUM(
+                "owner", "admin", "member", name="group_member_role", create_type=False
+            ),
+            nullable=False,
+            default="member",
+        ),
+        sa.Column("joined_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
+    )
+
+
+def downgrade() -> None:
+    """Drop group_members and groups tables."""
+    op.drop_table("group_members")
+    op.drop_table("groups")
+
+    # Drop group_member_role ENUM type
+    postgresql.ENUM(name="group_member_role").drop(op.get_bind(), checkfirst=True)

backend/app/models/__init__.py

@@ -2,6 +2,6 @@ from app.models.user import User
 from app.models.session import Session
 from app.models.world import World
 from app.models.asset import Asset
-from app.models.world_visit import WorldVisit
+from app.models.group import Group, GroupMember, GroupMemberRole
 
-__all__ = ["User", "Session", "World", "Asset", "WorldVisit"]
+__all__ = ["User", "Session", "World", "Asset", "Group", "GroupMember", "GroupMemberRole"]

backend/app/models/group.py

@@ -0,0 +1,56 @@
+import enum
+
+from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey, Enum
+from sqlalchemy.orm import relationship
+from sqlalchemy.sql import func
+
+from app.database import Base
+
+
+class GroupMemberRole(str, enum.Enum):
+    OWNER = "owner"
+    ADMIN = "admin"
+    MEMBER = "member"
+
+
+class Group(Base):
+    __tablename__ = "groups"
+
+    id = Column(Integer, primary_key=True, index=True)
+    name = Column(String(255), nullable=False)
+    description = Column(Text, nullable=True)
+    owner_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
+    created_at = Column(DateTime(timezone=True), server_default=func.now())
+    updated_at = Column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
+
+    owner = relationship("User", back_populates="owned_groups")
+    members = relationship(
+        "GroupMember",
+        back_populates="group",
+        cascade="all, delete-orphan",
+        order_by="GroupMember.joined_at",
+    )
+
+
+class GroupMember(Base):
+    __tablename__ = "group_members"
+
+    group_id = Column(
+        Integer,
+        ForeignKey("groups.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+    user_id = Column(
+        Integer,
+        ForeignKey("users.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+    role = Column(
+        Enum(GroupMemberRole, name="group_member_role", create_type=False),
+        nullable=False,
+        default=GroupMemberRole.MEMBER,
+    )
+    joined_at = Column(DateTime(timezone=True), server_default=func.now())
+
+    group = relationship("Group", back_populates="members")
+    user = relationship("User", back_populates="group_memberships")

backend/app/models/user.py

@@ -23,6 +23,8 @@ class User(Base):
     sessions = relationship("Session", back_populates="user", cascade="all, delete-orphan")
     worlds = relationship("World", back_populates="owner")
     assets = relationship("Asset", back_populates="owner")
+    owned_groups = relationship("Group", back_populates="owner")
+    group_memberships = relationship("GroupMember", back_populates="user")
 
     @property
     def is_adult(self) -> bool:

backend/app/models/world.py

@@ -1,4 +1,4 @@
-from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey, ARRAY, Index
+from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey
 from sqlalchemy.dialects.postgresql import ENUM
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
@@ -27,17 +27,5 @@ class World(Base):
     created_at = Column(DateTime(timezone=True), server_default=func.now())
     updated_at = Column(DateTime(timezone=True), onupdate=func.now())
 
-    # Discovery metadata
-    category = Column(String(100), nullable=True, index=True)
-    tags = Column(ARRAY(String), nullable=True, server_default="{}")
-    play_count = Column(Integer, nullable=False, server_default="0")
-    last_played_at = Column(DateTime(timezone=True), nullable=True)
-
-    # GIN index on tags for efficient tag-based queries
-    __table_args__ = (
-        Index("ix_worlds_tags", "tags", postgresql_using="gin"),
-    )
-
     owner = relationship("User", back_populates="worlds")
     assets = relationship("Asset", back_populates="world", cascade="all, delete-orphan")
-    visits = relationship("WorldVisit", back_populates="world", cascade="all, delete-orphan")

backend/app/models/world_visit.py

@@ -1,26 +0,0 @@
-from sqlalchemy import Column, DateTime, ForeignKey, Index, Integer, String
-from sqlalchemy.orm import relationship
-from sqlalchemy.sql import func
-
-from app.database import Base
-
-
-class WorldVisit(Base):
-    __tablename__ = "world_visits"
-
-    id = Column(Integer, primary_key=True, index=True)
-    world_id = Column(
-        Integer, ForeignKey("worlds.id", ondelete="CASCADE"), nullable=False
-    )
-    user_id = Column(
-        Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=True
-    )
-    anonymous_token = Column(String(255), nullable=True)
-    visited_at = Column(DateTime(timezone=True), server_default=func.now())
-
-    __table_args__ = (
-        Index("ix_world_visits_world_id_visited_at", "world_id", "visited_at"),
-    )
-
-    world = relationship("World", back_populates="visits")
-    user = relationship("User")

backend/docker-compose.yml

@@ -8,7 +8,7 @@ services:
       POSTGRES_PASSWORD: agp_password
       POSTGRES_DB: agp_db
     ports:
-      - "5432:5432"
+      - "${POSTGRES_PORT:-5432}:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
@@ -20,7 +20,7 @@ services:
   redis:
     image: redis:7-alpine
     ports:
-      - "6379:6379"
+      - "${REDIS_PORT:-6379}:6379"
     volumes:
       - redis_data:/data
     healthcheck: