refactor(files): centralize connector visibility

src/govoplan_files/backend/router.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import json
 import os
 import tempfile
-from dataclasses import replace
 from datetime import datetime
 from io import BytesIO
 from typing import Any, Literal
@@ -131,11 +130,11 @@ from govoplan_files.backend.storage.connector_profile_store import (
     connector_profile_from_row,
     create_connector_profile_row,
     get_connector_profile_row,
-    list_database_connector_profiles,
     update_connector_profile_row,
 )
-from govoplan_files.backend.storage.connector_profiles import ConnectorProfile, connector_profiles_from_settings
+from govoplan_files.backend.storage.connector_profiles import ConnectorProfile
 from govoplan_files.backend.storage.connector_providers import connector_provider_descriptors
+from govoplan_files.backend.storage.connector_visibility import visible_connector_profiles_for_actor
 from govoplan_files.backend.storage.connector_spaces import (
     connector_space_owner_id,
     create_connector_space,
@@ -455,35 +454,6 @@ def _enforce_connector_policy(source_provenance_json: str | None, connector_poli
     ensure_connector_policy_allows(request, sources)
 
 
-def _connector_profile_visible(
-    session: Session,
-    principal: ApiPrincipal,
-    profile: ConnectorProfile,
-    *,
-    campaign_id: str | None,
-    group_ids: set[str],
-) -> bool:
-    if profile.scope_type == "system":
-        return True
-    if profile.scope_type == "tenant":
-        return profile.scope_id == principal.tenant_id
-    if profile.scope_type == "user":
-        return profile.scope_id == principal.user.id
-    if profile.scope_type == "group":
-        return bool(profile.scope_id and profile.scope_id in group_ids)
-    if profile.scope_type == "campaign":
-        if not profile.scope_id:
-            return False
-        if campaign_id and profile.scope_id != campaign_id:
-            return False
-        try:
-            _ensure_campaign_file_access(session, principal, profile.scope_id)
-        except HTTPException:
-            return False
-        return True
-    return False
-
-
 def _visible_connector_profiles(
     session: Session,
     principal: ApiPrincipal,
@@ -494,30 +464,33 @@ def _visible_connector_profiles(
     include_admin_scopes: bool = False,
     include_effective_policy: bool = True,
 ) -> list[ConnectorProfile]:
-    provider_norm = provider.strip().casefold() if provider else None
-    group_ids = set(user_group_ids(session, tenant_id=principal.tenant_id, user_id=principal.user.id, include_admin_groups=_is_admin(principal)))
-    database_profiles = list_database_connector_profiles(
+    group_ids = user_group_ids(
         session,
         tenant_id=principal.tenant_id,
-        include_disabled=include_disabled,
+        user_id=principal.user.id,
+        include_admin_groups=_is_admin(principal),
+    )
+
+    def campaign_visible(profile_campaign_id: str) -> bool:
+        try:
+            _ensure_campaign_file_access(session, principal, profile_campaign_id)
+        except HTTPException:
+            return False
+        return True
+
+    return visible_connector_profiles_for_actor(
+        session,
+        tenant_id=principal.tenant_id,
+        user_id=principal.user.id,
+        group_ids=group_ids,
+        settings=settings,
+        provider=provider,
+        campaign_id=campaign_id,
+        campaign_visible=campaign_visible,
+        include_disabled=include_disabled,
+        include_admin_scopes=include_admin_scopes,
+        include_effective_policy=include_effective_policy,
     )
-    env_profiles = connector_profiles_from_settings(settings)
-    profiles_by_id: dict[str, ConnectorProfile] = {}
-    for profile in [*database_profiles, *env_profiles]:
-        if profile.id not in profiles_by_id:
-            profiles_by_id[profile.id] = profile
-    profiles = list(profiles_by_id.values())
-    visible: list[ConnectorProfile] = []
-    for profile in profiles:
-        if not (profile.enabled or include_disabled):
-            continue
-        if provider_norm is not None and profile.provider != provider_norm:
-            continue
-        admin_scope_visible = include_admin_scopes and profile.scope_type in {"user", "group", "campaign"}
-        if not admin_scope_visible and not _connector_profile_visible(session, principal, profile, campaign_id=campaign_id, group_ids=group_ids):
-            continue
-        visible.append(_with_effective_connector_policy(session, principal, profile) if include_effective_policy else profile)
-    return visible
 
 
 def _webdav_discovery_candidates(payload: FileConnectorDiscoveryRequest) -> list[str]:
@@ -641,18 +614,6 @@ def _visible_connector_profile(
     raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Connector profile not found")
 
 
-def _with_effective_connector_policy(session: Session, principal: ApiPrincipal, profile: ConnectorProfile) -> ConnectorProfile:
-    sources = effective_connector_policy_sources(
-        session,
-        tenant_id=principal.tenant_id,
-        scope_type=profile.scope_type,
-        scope_id=profile.scope_id,
-    )
-    if not sources:
-        return profile
-    return replace(profile, policy_sources=tuple([*sources, *profile.policy_sources]))
-
-
 def _require_connector_profile_write(principal: ApiPrincipal, scope_type: str) -> None:
     clean_scope = scope_type.strip().casefold()
     if clean_scope == "system":