chore: sync GovOPlaN module split state

src/govoplan_mail/backend/mail_profiles.py

@@ -17,6 +17,7 @@ from govoplan_core.core.campaigns import (
     CampaignMailPolicyContext,
     CampaignMailPolicyContextProvider,
 )
+from govoplan_core.core.policy import policy_source_step
 from govoplan_core.core.runtime import get_registry
 from govoplan_mail.backend.db.models import MailProfilePolicy, MailServerProfile
 from govoplan_mail.backend.config import ImapConfig, SmtpConfig
@@ -280,12 +281,12 @@ def _campaign_policy_context(session: Session, *, tenant_id: str, campaign_id: s
 
 
 def _legacy_tenant_settings(session: Session, tenant_id: str) -> dict[str, Any] | None:
-    row = session.execute(text("select settings from tenants where id = :tenant_id"), {"tenant_id": tenant_id}).first()
+    row = session.execute(text("select settings from tenancy_tenants where id = :tenant_id"), {"tenant_id": tenant_id}).first()
     return _json_object(row[0]) if row else None
 
 
 def _legacy_subject_policy(session: Session, *, table_name: str, tenant_id: str, scope_id: str) -> dict[str, Any] | None:
-    if table_name not in {"users", "groups"}:
+    if table_name not in {"access_users", "access_groups"}:
         raise MailProfileError("Unsupported mail policy subject")
     row = session.execute(
         text(f"select mail_profile_policy from {table_name} where id = :scope_id and tenant_id = :tenant_id"),
@@ -303,7 +304,7 @@ def _user_exists(session: Session, *, tenant_id: str, user_id: str) -> bool:
     if directory is not None:
         user = directory.get_user(user_id)
         return bool(user and user.tenant_id == tenant_id and user.status == "active")
-    return _legacy_subject_policy(session, table_name="users", tenant_id=tenant_id, scope_id=user_id) is not None
+    return _legacy_subject_policy(session, table_name="access_users", tenant_id=tenant_id, scope_id=user_id) is not None
 
 
 def _group_exists(session: Session, *, tenant_id: str, group_id: str) -> bool:
@@ -311,7 +312,7 @@ def _group_exists(session: Session, *, tenant_id: str, group_id: str) -> bool:
     if directory is not None:
         group = directory.get_group(group_id)
         return bool(group and group.tenant_id == tenant_id and group.status == "active")
-    return _legacy_subject_policy(session, table_name="groups", tenant_id=tenant_id, scope_id=group_id) is not None
+    return _legacy_subject_policy(session, table_name="access_groups", tenant_id=tenant_id, scope_id=group_id) is not None
 
 
 def _policy_scope_key(*, tenant_id: str, scope_type: str, scope_id: str | None) -> tuple[str | None, str, str | None]:
@@ -355,10 +356,10 @@ def _legacy_mail_profile_policy(
     if not scope_id:
         return None
     if clean_scope == "user":
-        legacy = _legacy_subject_policy(session, table_name="users", tenant_id=tenant_id, scope_id=scope_id)
+        legacy = _legacy_subject_policy(session, table_name="access_users", tenant_id=tenant_id, scope_id=scope_id)
         return _policy_from_attr(legacy) if legacy is not None else None
     if clean_scope == "group":
-        legacy = _legacy_subject_policy(session, table_name="groups", tenant_id=tenant_id, scope_id=scope_id)
+        legacy = _legacy_subject_policy(session, table_name="access_groups", tenant_id=tenant_id, scope_id=scope_id)
         return _policy_from_attr(legacy) if legacy is not None else None
     try:
         context = _campaign_policy_context(session, tenant_id=tenant_id, campaign_id=scope_id)
@@ -463,13 +464,13 @@ def _mail_policy_source_policy(policy: dict[str, Any], *, baseline: bool = False
 
 
 def _mail_policy_source_step(source: str, source_id: str | None, label: str, policy: dict[str, Any], *, baseline: bool = False) -> dict[str, Any]:
-    return {
-        "scope_type": source,
-        "scope_id": source_id,
-        "label": label,
-        "applied_fields": _mail_policy_source_fields(policy, baseline=baseline),
-        "policy": _mail_policy_source_policy(policy, baseline=baseline),
-    }
+    return policy_source_step(
+        source,
+        label,
+        source_id,
+        applied_fields=_mail_policy_source_fields(policy, baseline=baseline),
+        policy=_mail_policy_source_policy(policy, baseline=baseline),
+    )
 
 
 def _merge_credential_policy(
@@ -1495,7 +1496,7 @@ def group_ids_for_user(session: Session, *, tenant_id: str, user_id: str) -> lis
     if directory is not None:
         return [group.id for group in directory.groups_for_user(user_id, tenant_id=tenant_id)]
     rows = session.execute(
-        text("select group_id from user_group_memberships where tenant_id = :tenant_id and user_id = :user_id"),
+        text("select group_id from access_user_group_memberships where tenant_id = :tenant_id and user_id = :user_id"),
         {"tenant_id": tenant_id, "user_id": user_id},
     ).all()
     return [row[0] for row in rows]