Updated galleries with more features

Changed a few other files like docker-compose due to having issues in building backend twice.

Author: Ivana-B2

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

@@ -12,7 +12,8 @@
 
 # revision identifiers, used by Alembic.
 revision = '2025111201'
-down_revision = '2025110302'
+# changed from '2025110302' to '2025111101' 
+down_revision = '2025111101'
 branch_labels = None
 depends_on = None
 

backend/app/api/routes/projects.py

@@ -1,7 +1,10 @@
+import os
 import uuid
+from pathlib import Path
 from typing import Any
 
 from fastapi import APIRouter, HTTPException
+from sqlmodel import select
 
 from app import crud
 from app.api.deps import CurrentUser, SessionDep
@@ -18,6 +21,15 @@
 router = APIRouter()
 
 
+def _gallery_storage_root() -> Path:
+    """Return the root directory where gallery photos are stored.
+
+    Mirrors the logic in app.api.routes.galleries.STORAGE_ROOT without importing it
+    directly here to avoid any circular import issues at app startup.
+    """
+    return Path(os.getenv("GALLERY_STORAGE_ROOT", "app_data/galleries")).resolve()
+
+
 @router.get("/", response_model=ProjectsPublic)
 def read_projects(
     session: SessionDep, current_user: CurrentUser, skip: int = 0, limit: int = 100
@@ -190,5 +202,36 @@ def delete_project(
     if project.organization_id != current_user.organization_id:
         raise HTTPException(status_code=403, detail="Not enough permissions")
 
+    # Before deleting the project from DB, remove gallery folders & photos from storage.
+    from app.models import Gallery
+
+    storage_root = _gallery_storage_root()
+
+    # Find all galleries for this project
+    statement = select(Gallery).where(Gallery.project_id == id)
+    galleries = session.exec(statement).all()
+
+    for gallery in galleries:
+        gallery_dir = storage_root / str(gallery.id)
+        if gallery_dir.exists() and gallery_dir.is_dir():
+            # Best-effort recursive delete of all files and subdirs
+            for root, dirs, files in os.walk(gallery_dir, topdown=False):
+                for name in files:
+                    try:
+                        (Path(root) / name).unlink()
+                    except OSError:
+                        pass
+                for name in dirs:
+                    try:
+                        (Path(root) / name).rmdir()
+                    except OSError:
+                        pass
+            try:
+                gallery_dir.rmdir()
+            except OSError:
+                # If something remains locked, ignore; DB rows will still be removed
+                pass
+
+    # Delete the project. DB-level cascading will remove galleries & photos.
     crud.delete_project(session=session, project_id=id)
     return Message(message="Project deleted successfully")

backend/app/core/config.py

@@ -26,7 +26,7 @@ def parse_cors(v: Any) -> list[str] | str:
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(
         # Use top level .env file (one level above ./backend/)
-        env_file="../.env",
+        #env_file="../.env",   
         env_ignore_empty=True,
         extra="ignore",
     )

backend/app/core/db.py

@@ -1,9 +1,13 @@
+import logging
+
 from sqlmodel import Session, create_engine, select
 
 from app import crud
 from app.core.config import settings
 from app.models import OrganizationCreate, User, UserCreate
 
+logger = logging.getLogger(__name__)
+
 engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI))
 
 
@@ -21,25 +25,34 @@ def init_db(session: Session) -> None:
     # This works because the models are already imported and registered from app.models
     # SQLModel.metadata.create_all(engine)
 
-    # Check if superuser exists
-    user = session.exec(
-        select(User).where(User.email == settings.FIRST_SUPERUSER)
-    ).first()
-
-    if not user:
-        # Create the superuser's organization
-        organization_in = OrganizationCreate(
-            name="Admin Organization", description="Organization for admin user"
-        )
-        organization = crud.create_organization(
-            session=session, organization_in=organization_in
-        )
-
-        # Create superuser and assign to their organization
-        user_in = UserCreate(
-            email=settings.FIRST_SUPERUSER,
-            password=settings.FIRST_SUPERUSER_PASSWORD,
-            is_superuser=True,
-            organization_id=organization.id,
-        )
-        user = crud.create_user(session=session, user_create=user_in)
+    try:
+        # Check if superuser exists
+        user = session.exec(
+            select(User).where(User.email == settings.FIRST_SUPERUSER)
+        ).first()
+
+        if not user:
+            logger.info(f"Creating superuser: {settings.FIRST_SUPERUSER}")
+            # Create the superuser's organization
+            organization_in = OrganizationCreate(
+                name="Admin Organization", description="Organization for admin user"
+            )
+            organization = crud.create_organization(
+                session=session, organization_in=organization_in
+            )
+            logger.info(f"Created organization: {organization.name} (id: {organization.id})")
+
+            # Create superuser and assign to their organization
+            user_in = UserCreate(
+                email=settings.FIRST_SUPERUSER,
+                password=settings.FIRST_SUPERUSER_PASSWORD,
+                is_superuser=True,
+                organization_id=organization.id,
+            )
+            user = crud.create_user(session=session, user_create=user_in)
+            logger.info(f"Created superuser: {user.email} (id: {user.id})")
+        else:
+            logger.info(f"Superuser already exists: {user.email}")
+    except Exception as e:
+        logger.error(f"Error creating superuser: {e}", exc_info=True)
+        raise

backend/app/crud.py

@@ -12,8 +12,8 @@
     GalleryUpdate,
     Photo,
     PhotoCreate,
-    Item,
-    ItemCreate,
+    #Item,
+    #ItemCreate,
     Organization,
     OrganizationCreate,
     OrganizationUpdate,
@@ -22,6 +22,7 @@
     ProjectAccessCreate,
     ProjectAccessUpdate,
     ProjectCreate,
+    ProjectInvitation,
     ProjectUpdate,
     User,
     UserCreate,
@@ -68,7 +69,7 @@ def authenticate(*, session: Session, email: str, password: str) -> User | None:
     return db_user
 
 
-def create_item(*, session: Session, item_in: ItemCreate, owner_id: uuid.UUID) -> Item:
+#def create_item(*, session: Session, item_in: ItemCreate, owner_id: uuid.UUID) -> Item:
     db_item = Item.model_validate(item_in, update={"owner_id": owner_id})
     session.add(db_item)
     session.commit()
@@ -252,6 +253,87 @@ def delete_gallery(*, session: Session, gallery_id: uuid.UUID) -> None:
         session.commit()
 
 
+def create_photo(*, session: Session, photo_in: PhotoCreate) -> Photo:
+    """Create a new photo record for a gallery and keep gallery.photo_count in sync."""
+    db_obj = Photo.model_validate(photo_in)
+    session.add(db_obj)
+    session.commit()
+    session.refresh(db_obj)
+
+    # Update gallery photo_count
+    gallery = session.get(Gallery, photo_in.gallery_id)
+    if gallery is not None:
+        # Recalculate from DB to avoid drift
+        gallery.photo_count = count_photos_in_gallery(
+            session=session, gallery_id=gallery.id
+        )
+        session.add(gallery)
+        session.commit()
+        session.refresh(gallery)
+
+    return db_obj
+
+
+def delete_photos(
+    *, session: Session, gallery_id: uuid.UUID, photo_ids: list[uuid.UUID]
+) -> int:
+    """Delete photos by ID for a gallery and update gallery.photo_count.
+
+    Returns the number of Photo rows deleted.
+    """
+    if not photo_ids:
+        return 0
+
+    # Only delete photos that belong to this gallery
+    from app.models import Photo  # local import to avoid circulars in some tools
+
+    statement = select(Photo).where(
+        Photo.gallery_id == gallery_id, Photo.id.in_(photo_ids)  # type: ignore[arg-type]
+    )
+    photos = list(session.exec(statement).all())
+    deleted_count = 0
+
+    for photo in photos:
+        session.delete(photo)
+        deleted_count += 1
+
+    # Update gallery photo_count after deletions
+    gallery = session.get(Gallery, gallery_id)
+    if gallery is not None:
+        gallery.photo_count = max(
+            0, count_photos_in_gallery(session=session, gallery_id=gallery.id)
+        )
+        session.add(gallery)
+
+    session.commit()
+
+    return deleted_count
+
+
+def get_photos_by_gallery(
+    *, session: Session, gallery_id: uuid.UUID, skip: int = 0, limit: int = 100
+) -> list[Photo]:
+    """Get photos belonging to a specific gallery."""
+    statement = (
+        select(Photo)
+        .where(Photo.gallery_id == gallery_id)
+        .offset(skip)
+        .limit(limit)
+        .order_by(desc(Photo.created_at))
+    )
+    return list(session.exec(statement).all())
+
+
+def count_photos_in_gallery(*, session: Session, gallery_id: uuid.UUID) -> int:
+    """Count how many photos are in a gallery."""
+    statement = (
+        select(func.count())
+        .select_from(Photo)
+        .where(Photo.gallery_id == gallery_id)
+    )
+    return session.exec(statement).one()
+
+
 # ============================================================================
 # PROJECT ACCESS CRUD
 # ============================================================================
@@ -369,6 +451,113 @@ def user_has_project_access(
     return count > 0
 
 
+def invite_client_by_email(
+    *,
+    session: Session,
+    project_id: uuid.UUID,
+    email: str,
+    role: str = "viewer",
+    can_comment: bool = True,
+    can_download: bool = True,
+) -> tuple[ProjectAccess | None, bool]:
+    """
+    Invite a client to a project by email.
+    If user exists: grants immediate access and returns (access, False)
+    If user doesn't exist: creates a pending ProjectInvitation and returns (None, True)
+    """
+    # Check if user exists
+    user = get_user_by_email(session=session, email=email)
+    
+    if user:
+        # User exists - grant immediate access
+        # Check if access already exists
+        existing_access = get_project_access(
+            session=session, project_id=project_id, user_id=user.id
+        )
+        if existing_access:
+            # Update existing access
+            existing_access.role = role
+            existing_access.can_comment = can_comment
+            existing_access.can_download = can_download
+            session.add(existing_access)
+            session.commit()
+            session.refresh(existing_access)
+            return existing_access, False
+        
+        # Create new access
+        access_in = ProjectAccessCreate(
+            project_id=project_id,
+            user_id=user.id,
+            role=role,
+            can_comment=can_comment,
+            can_download=can_download,
+        )
+        access = create_project_access(session=session, access_in=access_in)
+        return access, False
+    else:
+        # User doesn't exist - create pending invitation
+        # Check if invitation already exists
+        existing_invitation = session.exec(
+            select(ProjectInvitation).where(
+                ProjectInvitation.project_id == project_id,
+                ProjectInvitation.email == email,
+            )
+        ).first()
+        
+        if existing_invitation:
+            # Update existing invitation
+            existing_invitation.role = role
+            existing_invitation.can_comment = can_comment
+            existing_invitation.can_download = can_download
+            session.add(existing_invitation)
+            session.commit()
+            session.refresh(existing_invitation)
+            return None, True
+        
+        # Create new invitation
+        invitation = ProjectInvitation(
+            project_id=project_id,
+            email=email,
+            role=role,
+            can_comment=can_comment,
+            can_download=can_download,
+        )
+        session.add(invitation)
+        session.commit()
+        session.refresh(invitation)
+        return None, True
+
+
+def process_pending_project_invitations(
+    *, session: Session, user_id: uuid.UUID, email: str
+) -> None:
+    """
+    Process pending project invitations for a newly created client user.
+    Finds all ProjectInvitation records for the email, creates ProjectAccess for each,
+    and deletes the invitations.
+    """
+    # Find all pending invitations for this email
+    statement = select(ProjectInvitation).where(ProjectInvitation.email == email)
+    invitations = session.exec(statement).all()
+
+    for invitation in invitations:
+        # Create project access
+        access_in = ProjectAccessCreate(
+            project_id=invitation.project_id,
+            user_id=user_id,
+            role=invitation.role,
+            can_comment=invitation.can_comment,
+            can_download=invitation.can_download,
+        )
+        create_project_access(session=session, access_in=access_in)
+        
+        # Delete the invitation
+        session.delete(invitation)
+    
+    # Commit all changes
+    session.commit()
+
+
 # ============================================================================
 # DASHBOARD STATS
 # ============================================================================