- Add OwnedMixin to 15 models (contact_folder, user_preference, workspace, mcp_server_config, agent_definition, automation_definition, report_template, report_instance, entity_link, comm_conversation, proactive_suggestion, ai_agent, ai_chat_session, tag, share_link) - Migration 0102: Add owner_id column to 15 tables with backfill from user_id - Fix EntityPermission Registry: remove notification, add entity_attachment, entity_history, subtask, calendar, folder; fix wrong class names (DmsFile→File, CalendarEvent→CalendarEntry, Mailbox→MailAccount) - Add apply_visibility_filter to list endpoints in tags, tasks, mcp_client, automation, report_generator, ai_assistant routes - Add owner_id to create handlers for all new OwnedMixin models - Patch tasks/services.py and automation/services.py list methods with user_id and is_system_admin parameters
This commit is contained in:
@@ -9,9 +9,10 @@ from sqlalchemy.dialects.postgresql import UUID as PGUUID
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.core.db import Base, TenantMixin
|
||||
from app.models.owned_mixin import OwnedMixin
|
||||
|
||||
|
||||
class ReportTemplate(Base, TenantMixin):
|
||||
class ReportTemplate(Base, TenantMixin, OwnedMixin):
|
||||
"""Report template entity — Jinja2 or SQL template, tenant-scoped, soft-deletable."""
|
||||
|
||||
__tablename__ = "report_templates"
|
||||
@@ -35,7 +36,7 @@ class ReportTemplate(Base, TenantMixin):
|
||||
created_by: Mapped[uuid.UUID] = mapped_column(PGUUID(as_uuid=True), nullable=False)
|
||||
|
||||
|
||||
class ReportInstance(Base, TenantMixin):
|
||||
class ReportInstance(Base, TenantMixin, OwnedMixin):
|
||||
"""Report instance entity — a generated report, tenant-scoped."""
|
||||
|
||||
__tablename__ = "report_instances"
|
||||
|
||||
@@ -16,6 +16,7 @@ from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.models.contact import Contact
|
||||
from app.core.visibility import apply_visibility_filter
|
||||
from app.models.audit import AuditLog
|
||||
|
||||
from app.core.db import get_db, set_tenant_context
|
||||
@@ -292,12 +293,16 @@ async def list_templates(
|
||||
):
|
||||
"""List all report templates for the current tenant."""
|
||||
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||
result = await db.execute(
|
||||
select(ReportTemplate).where(
|
||||
ReportTemplate.tenant_id == tenant_id,
|
||||
ReportTemplate.deleted_at.is_(None),
|
||||
)
|
||||
user_id = uuid.UUID(current_user["user_id"])
|
||||
is_system_admin = current_user.get("is_system_admin", False)
|
||||
query = select(ReportTemplate).where(
|
||||
ReportTemplate.tenant_id == tenant_id,
|
||||
ReportTemplate.deleted_at.is_(None),
|
||||
)
|
||||
query = await apply_visibility_filter(
|
||||
db, query, "report_template", ReportTemplate, user_id, tenant_id, is_system_admin
|
||||
)
|
||||
result = await db.execute(query)
|
||||
templates = result.scalars().all()
|
||||
return [_template_to_response(t).model_dump() for t in templates]
|
||||
|
||||
@@ -319,6 +324,7 @@ async def create_template(
|
||||
content=body.content,
|
||||
output_format=body.output_format,
|
||||
created_by=user_id,
|
||||
owner_id=user_id,
|
||||
)
|
||||
db.add(template)
|
||||
await db.flush()
|
||||
|
||||
Reference in New Issue
Block a user