Made corrections to backend code

Author: kevinjnev

.github/workflows/playwright.yml

@@ -75,18 +75,7 @@ jobs:
     - run: docker compose down -v --remove-orphans
     - name: Run Playwright tests
       run: docker compose run --rm playwright npx playwright test --fail-on-flaky-tests --trace=retain-on-failure --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
-      env:
-        # Required environment variables for Docker Compose
-        FIRST_SUPERUSER: [email protected]
-        FIRST_SUPERUSER_PASSWORD: changethis
-        SECRET_KEY: changethis
-        PROJECT_NAME: FastAPI Project
-        POSTGRES_SERVER: db
-        POSTGRES_PORT: 5432
-        POSTGRES_USER: postgres
-        POSTGRES_PASSWORD: changethis
-        POSTGRES_DB: app
-        ENVIRONMENT: test
+
     - run: docker compose down -v --remove-orphans
     - name: Upload blob report to GitHub Actions Artifacts
       if: ${{ !cancelled() }}

.github/workflows/test-backend.yml

@@ -32,18 +32,6 @@ jobs:
       - name: Run tests
         run: uv run bash scripts/tests-start.sh "Coverage for ${{ github.sha }}"
         working-directory: backend
-        env:
-          # Required environment variables for tests (using dummy values for CI)
-          FIRST_SUPERUSER: [email protected]
-          FIRST_SUPERUSER_PASSWORD: changethis
-          SECRET_KEY: changethis
-          PROJECT_NAME: FastAPI Project
-          POSTGRES_SERVER: db
-          POSTGRES_PORT: 5432
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: changethis
-          POSTGRES_DB: app
-          ENVIRONMENT: test
       - run: docker compose down -v --remove-orphans
       - name: Store coverage files
         uses: actions/upload-artifact@v4

backend/app/api/main.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from app.api.routes import items, login, private, users, utils, projects, galleries
+from app.api.routes import galleries, items, login, private, projects, users, utils
 from app.core.config import settings
 
 api_router = APIRouter()
@@ -14,4 +14,3 @@
 
 if settings.ENVIRONMENT == "local":
     api_router.include_router(private.router)
- 

backend/app/api/routes/galleries.py

@@ -2,18 +2,15 @@
 from typing import Any
 
 from fastapi import APIRouter, HTTPException
-from sqlmodel import func, select
 
 from app import crud
 from app.api.deps import CurrentUser, SessionDep
 from app.models import (
-    Message,
-    Gallery,
+    GalleriesPublic,
     GalleryCreate,
     GalleryPublic,
-    GalleriesPublic,
     GalleryUpdate,
-    Project,
+    Message,
 )
 
 router = APIRouter()
@@ -32,26 +29,31 @@ def read_galleries(
     Otherwise, get all galleries for the user's organization.
     """
     if not current_user.organization_id:
-        raise HTTPException(status_code=400, detail="User is not part of an organization")
-    
+        raise HTTPException(
+            status_code=400, detail="User is not part of an organization"
+        )
+
     if project_id:
         # Verify project belongs to user's organization
         project = crud.get_project(session=session, project_id=project_id)
         if not project or project.organization_id != current_user.organization_id:
             raise HTTPException(status_code=403, detail="Not enough permissions")
-        
+
         galleries = crud.get_galleries_by_project(
             session=session, project_id=project_id, skip=skip, limit=limit
         )
         count = len(galleries)  # Simple count for project galleries
     else:
         galleries = crud.get_galleries_by_organization(
-            session=session, organization_id=current_user.organization_id, skip=skip, limit=limit
+            session=session,
+            organization_id=current_user.organization_id,
+            skip=skip,
+            limit=limit,
         )
         count = crud.count_galleries_by_organization(
             session=session, organization_id=current_user.organization_id
         )
-    
+
     return GalleriesPublic(data=galleries, count=count)
 
 
@@ -63,13 +65,15 @@ def create_gallery(
     Create new gallery.
     """
     if not current_user.organization_id:
-        raise HTTPException(status_code=400, detail="User is not part of an organization")
-    
+        raise HTTPException(
+            status_code=400, detail="User is not part of an organization"
+        )
+
     # Verify project belongs to user's organization
     project = crud.get_project(session=session, project_id=gallery_in.project_id)
     if not project or project.organization_id != current_user.organization_id:
         raise HTTPException(status_code=403, detail="Not enough permissions")
-    
+
     gallery = crud.create_gallery(session=session, gallery_in=gallery_in)
     return gallery
 
@@ -82,12 +86,12 @@ def read_gallery(session: SessionDep, current_user: CurrentUser, id: uuid.UUID)
     gallery = crud.get_gallery(session=session, gallery_id=id)
     if not gallery:
         raise HTTPException(status_code=404, detail="Gallery not found")
-    
+
     # Check if gallery's project belongs to user's organization
     project = crud.get_project(session=session, project_id=gallery.project_id)
     if not project or project.organization_id != current_user.organization_id:
         raise HTTPException(status_code=403, detail="Not enough permissions")
-    
+
     return gallery
 
 
@@ -105,13 +109,15 @@ def update_gallery(
     gallery = crud.get_gallery(session=session, gallery_id=id)
     if not gallery:
         raise HTTPException(status_code=404, detail="Gallery not found")
-    
+
     # Check if gallery's project belongs to user's organization
     project = crud.get_project(session=session, project_id=gallery.project_id)
     if not project or project.organization_id != current_user.organization_id:
         raise HTTPException(status_code=403, detail="Not enough permissions")
-    
-    gallery = crud.update_gallery(session=session, db_gallery=gallery, gallery_in=gallery_in)
+
+    gallery = crud.update_gallery(
+        session=session, db_gallery=gallery, gallery_in=gallery_in
+    )
     return gallery
 
 
@@ -125,12 +131,11 @@ def delete_gallery(
     gallery = crud.get_gallery(session=session, gallery_id=id)
     if not gallery:
         raise HTTPException(status_code=404, detail="Gallery not found")
-    
+
     # Check if gallery's project belongs to user's organization
     project = crud.get_project(session=session, project_id=gallery.project_id)
     if not project or project.organization_id != current_user.organization_id:
         raise HTTPException(status_code=403, detail="Not enough permissions")
-    
+
     crud.delete_gallery(session=session, gallery_id=id)
     return Message(message="Gallery deleted successfully")
-

backend/app/api/routes/projects.py

@@ -2,18 +2,16 @@
 from typing import Any
 
 from fastapi import APIRouter, HTTPException
-from sqlmodel import func, select
 
 from app import crud
 from app.api.deps import CurrentUser, SessionDep
 from app.models import (
+    DashboardStats,
     Message,
-    Project,
     ProjectCreate,
     ProjectPublic,
     ProjectsPublic,
     ProjectUpdate,
-    DashboardStats,
 )
 
 router = APIRouter()
@@ -27,15 +25,20 @@ def read_projects(
     Retrieve projects for the current user's organization.
     """
     if not current_user.organization_id:
-        raise HTTPException(status_code=400, detail="User is not part of an organization")
-    
+        raise HTTPException(
+            status_code=400, detail="User is not part of an organization"
+        )
+
     projects = crud.get_projects_by_organization(
-        session=session, organization_id=current_user.organization_id, skip=skip, limit=limit
+        session=session,
+        organization_id=current_user.organization_id,
+        skip=skip,
+        limit=limit,
     )
     count = crud.count_projects_by_organization(
         session=session, organization_id=current_user.organization_id
     )
-    
+
     return ProjectsPublic(data=projects, count=count)
 
 
@@ -45,9 +48,13 @@ def read_dashboard_stats(session: SessionDep, current_user: CurrentUser) -> Any:
     Get dashboard statistics for the current user's organization.
     """
     if not current_user.organization_id:
-        raise HTTPException(status_code=400, detail="User is not part of an organization")
-    
-    return crud.get_dashboard_stats(session=session, organization_id=current_user.organization_id)
+        raise HTTPException(
+            status_code=400, detail="User is not part of an organization"
+        )
+
+    return crud.get_dashboard_stats(
+        session=session, organization_id=current_user.organization_id
+    )
 
 
 @router.post("/", response_model=ProjectPublic)
@@ -58,12 +65,14 @@ def create_project(
     Create new project.
     """
     if not current_user.organization_id:
-        raise HTTPException(status_code=400, detail="User is not part of an organization")
-    
+        raise HTTPException(
+            status_code=400, detail="User is not part of an organization"
+        )
+
     # Ensure the project is being created for the user's organization
     if project_in.organization_id != current_user.organization_id:
         raise HTTPException(status_code=403, detail="Not enough permissions")
-    
+
     project = crud.create_project(session=session, project_in=project_in)
     return project
 
@@ -76,11 +85,11 @@ def read_project(session: SessionDep, current_user: CurrentUser, id: uuid.UUID)
     project = crud.get_project(session=session, project_id=id)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
-    
+
     # Check if project belongs to user's organization
     if project.organization_id != current_user.organization_id:
         raise HTTPException(status_code=403, detail="Not enough permissions")
-    
+
     return project
 
 
@@ -98,12 +107,14 @@ def update_project(
     project = crud.get_project(session=session, project_id=id)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
-    
+
     # Check if project belongs to user's organization
     if project.organization_id != current_user.organization_id:
         raise HTTPException(status_code=403, detail="Not enough permissions")
-    
-    project = crud.update_project(session=session, db_project=project, project_in=project_in)
+
+    project = crud.update_project(
+        session=session, db_project=project, project_in=project_in
+    )
     return project
 
 
@@ -117,11 +128,10 @@ def delete_project(
     project = crud.get_project(session=session, project_id=id)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
-    
+
     # Check if project belongs to user's organization
     if project.organization_id != current_user.organization_id:
         raise HTTPException(status_code=403, detail="Not enough permissions")
-    
+
     crud.delete_project(session=session, project_id=id)
     return Message(message="Project deleted successfully")
-

backend/app/api/routes/utils.py

@@ -1,6 +1,8 @@
-from datetime import datetime
 import platform
 import sys
+from datetime import datetime
+from typing import Any
+
 from fastapi import APIRouter, Depends
 from pydantic.networks import EmailStr
 
@@ -35,7 +37,7 @@ async def health_check() -> bool:
 
 
 @router.get("/system-info/")
-async def get_system_info() -> dict:
+async def get_system_info() -> dict[str, Any]:
     """
     Get interesting system information including current time, platform details, and Python version.
     """
@@ -55,7 +57,7 @@ async def get_system_info() -> dict:
                 "major": sys.version_info.major,
                 "minor": sys.version_info.minor,
                 "micro": sys.version_info.micro,
-            }
+            },
         },
-        "fun_fact": "This API endpoint was created as part of CS4800 team project exercise!"
+        "fun_fact": "This API endpoint was created as part of CS4800 team project exercise!",
     }

backend/app/core/db.py

@@ -2,7 +2,7 @@
 
 from app import crud
 from app.core.config import settings
-from app.models import User, UserCreate, Organization, OrganizationCreate
+from app.models import Organization, OrganizationCreate, User, UserCreate
 
 engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI))
 
@@ -27,10 +27,11 @@ def init_db(session: Session) -> None:
     ).first()
     if not organization:
         organization_in = OrganizationCreate(
-            name="Default Organization",
-            description="Initial organization for Mosaic"
+            name="Default Organization", description="Initial organization for Mosaic"
+        )
+        organization = crud.create_organization(
+            session=session, organization_in=organization_in
         )
-        organization = crud.create_organization(session=session, organization_in=organization_in)
 
     user = session.exec(
         select(User).where(User.email == settings.FIRST_SUPERUSER)
@@ -42,7 +43,7 @@ def init_db(session: Session) -> None:
             is_superuser=True,
         )
         user = crud.create_user(session=session, user_create=user_in)
-    
+
     # Assign user to default organization if not already assigned
     if user and not user.organization_id:
         user.organization_id = organization.id