Merge branch 'master' into iva-testing

Author: Ivana-B2

.DS_Store

@@ -0,0 +1,39 @@
+"""add project invitation table
+
+Revision ID: 2025111201
+Revises: 2025110302
+Create Date: 2025-11-12
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '2025111201'
+down_revision = '2025110302'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_table(
+        'projectinvitation',
+        sa.Column('email', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=False),
+        sa.Column('role', sqlmodel.sql.sqltypes.AutoString(length=50), nullable=False),
+        sa.Column('can_comment', sa.Boolean(), nullable=False),
+        sa.Column('can_download', sa.Boolean(), nullable=False),
+        sa.Column('id', sa.Uuid(), nullable=False),
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('project_id', sa.Uuid(), nullable=False),
+        sa.ForeignKeyConstraint(['project_id'], ['project.id'], ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_projectinvitation_email'), 'projectinvitation', ['email'], unique=False)
+
+
+def downgrade():
+    op.drop_index(op.f('ix_projectinvitation_email'), table_name='projectinvitation')
+    op.drop_table('projectinvitation')
+

backend/app/alembic/versions/2025111201_add_project_invitation_table.py

@@ -3,7 +3,6 @@
 from app.api.routes import (
     galleries,
     invitations,
-    items,
     login,
     organizations,
     private,
@@ -18,14 +17,18 @@
 api_router.include_router(login.router)
 api_router.include_router(users.router)
 api_router.include_router(utils.router)
-api_router.include_router(items.router)
+
+
 api_router.include_router(
     organizations.router, prefix="/organizations", tags=["organizations"]
 )
-api_router.include_router(projects.router, prefix="/projects", tags=["projects"])
+
 api_router.include_router(
     project_access.router, prefix="/projects", tags=["project-access"]
 )
+
+api_router.include_router(projects.router, prefix="/projects", tags=["projects"])
+
 api_router.include_router(
     invitations.router, prefix="/invitations", tags=["invitations"]
 )

backend/app/api/main.py

@@ -8,15 +8,109 @@
 from app.models import (
     Message,
     ProjectAccessCreate,
-    ProjectAccessesPublic,
+    ProjectAccessInviteByEmail,
     ProjectAccessPublic,
     ProjectAccessUpdate,
+    ProjectAccessWithUser,
     User,
 )
 
 router = APIRouter()
 
 
+# AN - New endpoint to get all projects the current user has access to
+@router.get("/my-projects")
+def read_my_projects(
+    session: SessionDep,
+    current_user: CurrentUser,
+) -> Any:
+    """
+    Get all projects the current user has access to.
+    For clients: returns projects they've been invited to.
+    For team members: returns all projects in their organization.
+    """
+    if getattr(current_user, "user_type", None) == "client":
+        # Use the existing function - perfect!
+        projects = crud.get_user_accessible_projects(
+            session=session, user_id=current_user.id, skip=0, limit=1000
+        )
+        return {"data": projects, "count": len(projects)}
+    elif getattr(current_user, "user_type", None) == "team_member":
+        if not current_user.organization_id:
+            return {"data": [], "count": 0}
+        projects = crud.get_projects_by_organization(
+            session=session, 
+            organization_id=current_user.organization_id, 
+            skip=0, 
+            limit=1000
+        )
+        return {"data": projects, "count": len(projects)}
+    else:
+        return {"data": [], "count": 0}
+
+@router.post("/{project_id}/access/invite-by-email")
+def invite_client_by_email(
+    *,
+    session: SessionDep,
+    current_user: CurrentUser,
+    project_id: uuid.UUID,
+    invite_data: ProjectAccessInviteByEmail,
+) -> Any:
+    """
+    Invite a client to a project by email.
+    If user exists: grants immediate access
+    If user doesn't exist: creates a pending invitation
+    Only team members can invite clients.
+    """
+    # Check if current user is a team member
+    if getattr(current_user, "user_type", None) != "team_member":
+        raise HTTPException(
+            status_code=403,
+            detail="Only team members can invite clients to projects",
+        )
+
+    # Check if project exists and user has access to it
+    project = crud.get_project(session=session, project_id=project_id)
+    if not project:
+        raise HTTPException(status_code=404, detail="Project not found")
+
+    # Check if current user's organization owns the project
+    if (
+        not current_user.organization_id
+        or current_user.organization_id != project.organization_id
+    ):
+        raise HTTPException(
+            status_code=403,
+            detail="You don't have permission to manage this project",
+        )
+
+    # Invite client by email
+    try:
+        access, is_pending = crud.invite_client_by_email(
+            session=session,
+            project_id=project_id,
+            email=invite_data.email,
+            role=invite_data.role,
+            can_comment=invite_data.can_comment,
+            can_download=invite_data.can_download,
+        )
+
+        if is_pending:
+            return {
+                "message": "Invitation sent. Client will get access when they sign up with this email.",
+                "is_pending": True,
+                "email": invite_data.email,
+            }
+        else:
+            return {
+                "message": "Client invited successfully",
+                "is_pending": False,
+                "access": ProjectAccessPublic.model_validate(access),
+            }
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
 @router.post("/{project_id}/access", response_model=ProjectAccessPublic)
 def grant_project_access(
     *,
@@ -31,6 +125,7 @@ def grant_project_access(
     """
     Grant a user access to a project (invite a client).
     Only team members can invite clients.
+    DEPRECATED: Use /invite-by-email endpoint instead.
     """
     # Check if current user is a team member
     if getattr(current_user, "user_type", None) != "team_member":
@@ -71,7 +166,7 @@ def grant_project_access(
     return access
 
 
-@router.get("/{project_id}/access", response_model=ProjectAccessesPublic)
+@router.get("/{project_id}/access", response_model=list[ProjectAccessWithUser])
 def read_project_access_list(
     *,
     session: SessionDep,
@@ -99,7 +194,26 @@ def read_project_access_list(
             raise HTTPException(status_code=403, detail="Access denied")
 
     access_list = crud.get_project_access_list(session=session, project_id=project_id)
-    return ProjectAccessesPublic(data=access_list, count=len(access_list))
+    # Convert to ProjectAccessWithUser
+    result = []
+    for access in access_list:
+        user = session.get(User, access.user_id)
+        if user:
+            from app.models import UserPublic
+
+            result.append(
+                ProjectAccessWithUser(
+                    id=access.id,
+                    created_at=access.created_at,
+                    project_id=access.project_id,
+                    user_id=access.user_id,
+                    role=access.role,
+                    can_comment=access.can_comment,
+                    can_download=access.can_download,
+                    user=UserPublic.model_validate(user),
+                )
+            )
+    return result
 
 
 @router.delete("/{project_id}/access/{user_id}", response_model=Message)
@@ -176,3 +290,5 @@ def update_project_access_permissions(
         session=session, db_access=db_access, access_in=access_in
     )
     return access
+
+

backend/app/api/routes/items.py

@@ -2,7 +2,7 @@
 from typing import Any
 
 from fastapi import APIRouter, Depends, HTTPException
-from sqlmodel import col, delete, func, select
+from sqlmodel import func, select
 
 from app import crud
 from app.api.deps import (
@@ -13,7 +13,6 @@
 from app.core.config import settings
 from app.core.security import get_password_hash, verify_password
 from app.models import (
-    Item,
     Message,
     UpdatePassword,
     User,
@@ -197,6 +196,15 @@ def register_user(session: SessionDep, user_in: UserRegister) -> Any:
             session.commit()
 
     user = crud.create_user(session=session, user_create=user_create)
+
+    # Process any pending project invitations for clients
+    if user.user_type == "client":
+        crud.process_pending_project_invitations(
+            session=session,
+            user_id=user.id,
+            email=user.email,
+        )
+
     return user
 
 
@@ -394,8 +402,6 @@ def delete_user(
         raise HTTPException(
             status_code=403, detail="Super users are not allowed to delete themselves"
         )
-    statement = delete(Item).where(col(Item.owner_id) == user_id)
-    session.exec(statement)  # type: ignore
     session.delete(user)
     session.commit()
     return Message(message="User deleted successfully")