Merge pull request #115 from Promptly-Technologies-LLC/57-fully-implement-and-test-the-templatesuserorganizationhtml-page

Working organization page

Author: chriscarrollsmith

README.md

@@ -164,7 +164,7 @@ Make sure the development database is running and tables and default
 permissions/roles are created first.
 
 ``` bash
-uv run uvicorn main:app --host 0.0.0.0 --port 8000 --reload
+uv run python -m uvicorn main:app --host 0.0.0.0 --port 8000 --reload
 ```
 
 Navigate to http://localhost:8000/

docs/static/documentation.txt

@@ -129,7 +129,7 @@ docker compose up -d
 Make sure the development database is running and tables and default permissions/roles are created first.
 
 ``` bash
-uv run uvicorn main:app --host 0.0.0.0 --port 8000 --reload
+uv run python -m uvicorn main:app --host 0.0.0.0 --port 8000 --reload
 ```
 
 Navigate to http://localhost:8000/

docs/templates.qmd

@@ -44,12 +44,11 @@ def __init__(self):
         )
 
 
-# TODO: Consolidate these two into a single validation error
-class EmptyOrganizationNameError(HTTPException):
-    def __init__(self):
+class OrganizationSetupError(HTTPException):
+    def __init__(self, message: str = "Organization setup failed"):
         super().__init__(
-            status_code=400,
-            detail="Organization name cannot be empty"
+            status_code=500,
+            detail=message
         )
 
 
@@ -69,6 +68,22 @@ def __init__(self):
         )
 
 
+class UserNotFoundError(HTTPException):
+    def __init__(self):
+        super().__init__(
+            status_code=404,
+            detail="User not found"
+        )
+
+
+class UserAlreadyMemberError(HTTPException):
+    def __init__(self):
+        super().__init__(
+            status_code=400,
+            detail="User is already a member of this organization"
+        )
+
+
 class InvalidPermissionError(HTTPException):
     """Raised when a user attempts to assign an invalid permission to a role"""
 

exceptions/http_exceptions.py

@@ -131,7 +131,7 @@ docker compose up -d
 Make sure the development database is running and tables and default permissions/roles are created first.
 
 ``` bash
-uv run uvicorn main:app --host 0.0.0.0 --port 8000 --reload
+uv run python -m uvicorn main:app --host 0.0.0.0 --port 8000 --reload
 ```
 
 Navigate to http://localhost:8000/

index.qmd

@@ -5,7 +5,8 @@
 from fastapi.responses import RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
-from fastapi.exceptions import RequestValidationError, StarletteHTTPException
+from fastapi.exceptions import RequestValidationError
+from starlette.exceptions import HTTPException as StarletteHTTPException
 from routers import account, dashboard, organization, role, user, static_pages
 from utils.dependencies import (
     get_optional_user