Add organizations module surface

src/govoplan_organizations/backend/directory.py

@@ -8,6 +8,7 @@ from govoplan_core.core.organizations import (
     OrganizationFunctionRef,
     OrganizationUnitRef,
 )
+from govoplan_core.core.identity import IdentityDirectory
 from govoplan_core.db.session import get_database
 from govoplan_core.security.time import utc_now
 from govoplan_organizations.backend.db.models import (
@@ -27,6 +28,7 @@ def _unit_ref(item: OrganizationUnit) -> OrganizationUnitRef:
         tenant_id=item.tenant_id,
         slug=item.slug,
         name=item.name,
+        unit_type_id=item.unit_type_id,
         parent_id=item.parent_id,
         description=item.description,
         status=_status(item.is_active),  # type: ignore[arg-type]
@@ -40,6 +42,7 @@ def _function_ref(item: OrganizationFunction) -> OrganizationFunctionRef:
         organization_unit_id=item.organization_unit_id,
         slug=item.slug,
         name=item.name,
+        function_type_id=item.function_type_id,
         description=item.description,
         delegable=item.delegable,
         act_in_place_allowed=item.act_in_place_allowed,
@@ -51,8 +54,8 @@ def _assignment_ref(item: OrganizationFunctionAssignment) -> OrganizationFunctio
     return OrganizationFunctionAssignmentRef(
         id=item.id,
         tenant_id=item.tenant_id,
-        account_id=item.account_id,
         identity_id=item.identity_id,
+        account_id=item.account_id,
         function_id=item.function_id,
         organization_unit_id=item.organization_unit_id,
         applies_to_subunits=item.applies_to_subunits,
@@ -66,6 +69,9 @@ def _assignment_ref(item: OrganizationFunctionAssignment) -> OrganizationFunctio
 
 
 class SqlOrganizationDirectory(OrganizationDirectory):
+    def __init__(self, *, identity_directory: IdentityDirectory | None = None) -> None:
+        self._identity_directory = identity_directory
+
     def get_organization_unit(self, organization_unit_id: str) -> OrganizationUnitRef | None:
         with get_database().session() as session:
             item = session.get(OrganizationUnit, organization_unit_id)
@@ -126,14 +132,52 @@ class SqlOrganizationDirectory(OrganizationDirectory):
         account_id: str,
         *,
         tenant_id: str | None = None,
+    ) -> tuple[OrganizationFunctionAssignmentRef, ...]:
+        identity_ids: set[str] = set()
+        if self._identity_directory is not None:
+            identity = self._identity_directory.identity_for_account(account_id)
+            if identity is not None:
+                identity_ids.add(identity.id)
+        if not identity_ids:
+            return self._function_assignments_for_identity_ids(
+                identity_ids=(),
+                tenant_id=tenant_id,
+                fallback_account_id=account_id,
+            )
+        return self._function_assignments_for_identity_ids(
+            identity_ids=tuple(identity_ids),
+            tenant_id=tenant_id,
+            fallback_account_id=account_id,
+        )
+
+    def function_assignments_for_identity(
+        self,
+        identity_id: str,
+        *,
+        tenant_id: str | None = None,
+    ) -> tuple[OrganizationFunctionAssignmentRef, ...]:
+        return self._function_assignments_for_identity_ids(identity_ids=(identity_id,), tenant_id=tenant_id)
+
+    def _function_assignments_for_identity_ids(
+        self,
+        *,
+        identity_ids: tuple[str, ...],
+        tenant_id: str | None = None,
+        fallback_account_id: str | None = None,
     ) -> tuple[OrganizationFunctionAssignmentRef, ...]:
         now = utc_now()
         with get_database().session() as session:
+            identity_or_account_filter = OrganizationFunctionAssignment.identity_id.in_(identity_ids)
+            if fallback_account_id:
+                identity_or_account_filter = or_(
+                    identity_or_account_filter,
+                    OrganizationFunctionAssignment.account_id == fallback_account_id,
+                )
             query = (
                 session.query(OrganizationFunctionAssignment)
                 .join(OrganizationFunction, OrganizationFunction.id == OrganizationFunctionAssignment.function_id)
                 .filter(
-                    OrganizationFunctionAssignment.account_id == account_id,
+                    identity_or_account_filter,
                     OrganizationFunctionAssignment.is_active.is_(True),
                     OrganizationFunction.is_active.is_(True),
                     or_(OrganizationFunctionAssignment.valid_from.is_(None), OrganizationFunctionAssignment.valid_from <= now),