Added preliminary organizations.html component, moved some helpers to utils/role_org.py, hooked it all up

Author: chriscarrollsmith

main.py

@@ -11,7 +11,7 @@
 from utils.auth import get_authenticated_user, get_optional_user, NeedsNewTokens, get_user_from_reset_token, PasswordValidationError
 from utils.models import User
 from utils.db import get_session, set_up_db
-
+from utils.role_org import get_user_organizations, get_organization_roles
 
 logger = logging.getLogger("uvicorn.error")
 logger.setLevel(logging.DEBUG)
@@ -242,11 +242,16 @@ async def read_dashboard(
 
 @app.get("/profile")
 async def read_profile(
-    params: dict = Depends(common_authenticated_parameters)
+    params: dict = Depends(common_authenticated_parameters),
+    session: Session = Depends(get_session)
 ):
     if not params["user"]:
-        # Changed to 302
         return RedirectResponse(url="/login", status_code=status.HTTP_302_FOUND)
+
+    # Get user's organizations
+    params["organizations"] = get_user_organizations(
+        params["user"].id, session)
+
     return templates.TemplateResponse(params["request"], "users/profile.html", params)
 
 

routers/organization.py

@@ -5,10 +5,10 @@
 from sqlmodel import Session, select
 from utils.db import get_session
 from utils.auth import get_authenticated_user
-from utils.models import Organization, User, Role, UserOrganizationLink, ValidPermissions, RolePermissionLink, Permission, utc_time
+from utils.models import Organization, User, Role, UserOrganizationLink, ValidPermissions, utc_time
 from datetime import datetime
 from sqlalchemy import and_
-from typing import List
+from utils.role_org import get_organization, check_user_permission
 
 logger = getLogger("uvicorn.error")
 
@@ -102,128 +102,6 @@ async def as_form(cls, id: int = Form(...), name: str = Form(...)):
         return cls(id=id, name=name)
 
 
-# -- Helper Functions --
-
-def get_user_organizations(
-    user_id: int,
-    session: Session,
-    include_deleted: bool = False
-) -> List[Organization]:
-    """
-    Retrieve all organizations a user is a member of.
-
-    Args:
-        user_id: ID of the user
-        session: Database session
-        include_deleted: Whether to include soft-deleted organizations
-
-    Returns:
-        List of Organization objects the user belongs to
-    """
-    query = (
-        select(Organization)
-        .join(UserOrganizationLink)
-        .where(UserOrganizationLink.user_id == user_id)
-    )
-
-    if not include_deleted:
-        query = query.where(Organization.deleted == False)
-
-    return list(session.exec(query))
-
-
-def get_organization(
-    org_id: int,
-    user_id: int,
-    session: Session,
-) -> Organization:
-    """
-    Retrieve a specific organization if the user is a member.
-
-    Args:
-        org_id: ID of the organization
-        user_id: ID of the user
-        session: Database session
-
-    Returns:
-        Organization object
-
-    Raises:
-        OrganizationNotFoundError: If organization doesn't exist
-        InsufficientPermissionsError: If user is not a member
-    """
-    # Check if user is a member of the organization
-    user_org = session.exec(
-        select(UserOrganizationLink).where(
-            and_(
-                UserOrganizationLink.user_id == user_id,
-                UserOrganizationLink.organization_id == org_id
-            )
-        )
-    ).first()
-
-    if not user_org:
-        raise InsufficientPermissionsError()
-
-    db_org = session.get(Organization, org_id)
-    if not db_org or db_org.deleted:
-        raise OrganizationNotFoundError()
-
-    return db_org
-
-
-def check_user_permission(
-    user_id: int,
-    org_id: int,
-    permission: ValidPermissions,
-    session: Session,
-) -> bool:
-    """
-    Check if user has the specified permission for the organization.
-
-    Args:
-        user_id: ID of the user
-        org_id: ID of the organization
-        permission: Permission to check
-        session: Database session
-
-    Returns:
-        True if user has permission, False otherwise
-    """
-    # Get user's role in the organization
-    user_org = session.exec(
-        select(UserOrganizationLink).where(
-            and_(
-                UserOrganizationLink.user_id == user_id,
-                UserOrganizationLink.organization_id == org_id
-            )
-        )
-    ).first()
-
-    if not user_org:
-        return False
-
-    # Get permission ID
-    permission_record = session.exec(
-        select(Permission).where(Permission.name == permission)
-    ).first()
-
-    if not permission_record:
-        return False
-
-    # Check if role has the permission
-    role_permission = session.exec(
-        select(RolePermissionLink).where(
-            and_(
-                RolePermissionLink.role_id == user_org.role_id,
-                RolePermissionLink.permission_id == permission_record.id
-            )
-        )
-    ).first()
-
-    return bool(role_permission)
-
-
 # -- Routes --
 
 @router.post("/", response_class=RedirectResponse)
@@ -268,7 +146,7 @@ def create_organization(
     session.add(user_org_link)
     session.commit()
 
-    return RedirectResponse(url=f"/organizations/{db_org.id}", status_code=303)
+    return RedirectResponse(url=f"/profile", status_code=303)
 
 
 @router.put("/{org_id}", response_class=RedirectResponse)
@@ -298,7 +176,7 @@ def update_organization(
     session.commit()
     session.refresh(organization)
 
-    return RedirectResponse(url=f"/organizations/{org.id}", status_code=303)
+    return RedirectResponse(url=f"/profile", status_code=303)
 
 
 @router.delete("/{org_id}", response_class=RedirectResponse)
@@ -318,4 +196,4 @@ def delete_organization(
     session.add(organization)
     session.commit()
 
-    return RedirectResponse(url="/organizations", status_code=303)
+    return RedirectResponse(url="/profile", status_code=303)

routers/role.py

@@ -107,31 +107,6 @@ async def as_form(
         )
 
 
-# -- Helper Functions --
-
-def get_organization_roles(
-    organization_id: int,
-    session: Session,
-    include_deleted: bool = False
-) -> List[Role]:
-    """
-    Retrieve all roles for an organization.
-
-    Args:
-        organization_id: ID of the organization
-        session: Database session
-        include_deleted: Whether to include soft-deleted roles
-
-    Returns:
-        List of Role objects with their associated permissions
-    """
-    query = select(Role).where(Role.organization_id == organization_id)
-    if not include_deleted:
-        query = query.where(Role.deleted == False)
-
-    return list(session.exec(query))
-
-
 # -- Routes --
 
 
@@ -156,7 +131,7 @@ def create_role(
     session.add(db_role)
     session.commit()
 
-    return RedirectResponse(url="/roles", status_code=303)
+    return RedirectResponse(url="/profile", status_code=303)
 
 
 @router.put("/{role_id}", response_class=RedirectResponse)
@@ -186,7 +161,7 @@ def update_role(
 
     session.commit()
     session.refresh(db_role)
-    return RedirectResponse(url=f"/roles/{role.id}", status_code=303)
+    return RedirectResponse(url="/profile", status_code=303)
 
 
 @router.delete("/{role_id}", response_class=RedirectResponse)
@@ -203,4 +178,4 @@ def delete_role(
     db_role.updated_at = utc_time()
     session.add(db_role)
     session.commit()
-    return RedirectResponse(url="/roles", status_code=303)
+    return RedirectResponse(url="/profile", status_code=303)

templates/components/organizations.html

@@ -0,0 +1,44 @@
+{% macro render_organizations(organizations) %}
+<div class="card mb-4">
+    <div class="card-header d-flex justify-content-between align-items-center">
+        Organizations
+        <button type="button" class="btn btn-sm btn-primary" data-bs-toggle="collapse" data-bs-target="#newOrgForm">
+            Create Organization
+        </button>
+    </div>
+    <div class="card-body">
+        <!-- New Organization Form -->
+        <div class="collapse mb-3" id="newOrgForm">
+            <form action="/organizations/" method="post" class="border rounded p-3 bg-light">
+                <div class="mb-3">
+                    <label for="name" class="form-label">Organization Name</label>
+                    <input type="text" 
+                           class="form-control" 
+                           id="name" 
+                           name="name" 
+                           required 
+                           pattern=".{3,}"
+                           title="Organization name must be at least 3 characters long">
+                </div>
+                <button type="submit" class="btn btn-primary">Create</button>
+            </form>
+        </div>
+
+        <!-- Existing Organizations List -->
+        {% if organizations %}
+            <div class="list-group">
+                {% for org in organizations %}
+                    <a href="/organizations/{{ org.id }}" class="list-group-item list-group-item-action">
+                        <div class="d-flex w-100 justify-content-between">
+                            <h5 class="mb-1">{{ org.name }}</h5>
+                            <small>Joined {{ org.created_at.strftime('%Y-%m-%d') }}</small>
+                        </div>
+                    </a>
+                {% endfor %}
+            </div>
+        {% else %}
+            <p class="text-muted">You are not a member of any organizations.</p>
+        {% endif %}
+    </div>
+</div>
+{% endmacro %}

templates/users/profile.html

@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% from 'components/silhouette.html' import render_silhouette %}
+{% from 'components/organizations.html' import render_organizations %}
 
 {% block title %}Profile{% endblock %}
 
@@ -67,6 +68,9 @@ <h1 class="mb-4">User Profile</h1>
         </div>
     </div>
 
+    <!-- Organizations Section - Add this before the Delete Account section -->
+    {{ render_organizations(organizations) }}
+
     <!-- Delete Account -->
     <div class="card mb-4">
         <div class="card-header">