Agent Zero
6555655ecf
Check Cross-Plugin Imports / check (push) Has been cancelled
- Add OwnedMixin to 29 model files (78 tables that had owner_id in DB but not in model) - Add search/embedding columns to 9 model files (18 columns: search_tsv, embedding, indexed_at, content_text, content_tsv, body_tsv, company_id, deleted_at) - Fix import syntax errors in calendar/models.py, mail/models.py, notification.py, contact.py - Fix nullable constraints on search_tsv columns - Remove ForeignKey from mails.company_id (companies table not always loaded in test context) - All 36 tests pass (24 Phase J + 12 Phase K) - Models now match production DB schema
66 lines
2.5 KiB
Python
66 lines
2.5 KiB
Python
"""Group and UserGroup models for granular RBAC."""
|
||
|
||
from __future__ import annotations
|
||
|
||
import uuid
|
||
from datetime import datetime
|
||
from typing import Any
|
||
|
||
from sqlalchemy import DateTime, ForeignKey, Integer, String, UniqueConstraint, func
|
||
from sqlalchemy.dialects.postgresql import JSONB
|
||
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 Group(Base, TenantMixin, OwnedMixin):
|
||
"""Group entity with RBAC permissions and field-level permissions.
|
||
|
||
Groups are tenant-scoped. Users can be members of multiple groups.
|
||
Effective permissions = (role.permissions ∪ Σ(group.permissions)) − denied.
|
||
"""
|
||
|
||
__tablename__ = "groups"
|
||
__table_args__ = (
|
||
UniqueConstraint("tenant_id", "name", name="uq_groups_tenant_name"),
|
||
)
|
||
|
||
id: Mapped[uuid.UUID] = mapped_column(
|
||
PGUUID(as_uuid=True), primary_key=True, default=uuid.uuid4
|
||
)
|
||
name: Mapped[str] = mapped_column(String(100), nullable=False)
|
||
description: Mapped[str] = mapped_column(String(500), nullable=True, default=None)
|
||
permissions: Mapped[dict[str, Any]] = mapped_column(JSONB, nullable=False, default=dict)
|
||
denied_permissions: Mapped[list[str]] = mapped_column(
|
||
JSONB, nullable=False, default=list
|
||
)
|
||
field_permissions: Mapped[dict[str, Any]] = mapped_column(JSONB, default=dict, nullable=False)
|
||
permission_version: Mapped[int] = mapped_column(
|
||
Integer, nullable=False, default=1, server_default="1"
|
||
)
|
||
|
||
|
||
class UserGroup(Base):
|
||
"""N:M association — user membership in groups (per tenant)."""
|
||
|
||
__tablename__ = "user_groups"
|
||
deleted_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
||
__table_args__ = (
|
||
UniqueConstraint("user_id", "group_id", "tenant_id", name="uq_user_groups_user_group_tenant"),
|
||
)
|
||
|
||
user_id: Mapped[uuid.UUID] = mapped_column(
|
||
PGUUID(as_uuid=True), ForeignKey("users.id", ondelete="CASCADE"), primary_key=True
|
||
)
|
||
group_id: Mapped[uuid.UUID] = mapped_column(
|
||
PGUUID(as_uuid=True), ForeignKey("groups.id", ondelete="CASCADE"), primary_key=True
|
||
)
|
||
tenant_id: Mapped[uuid.UUID] = mapped_column(
|
||
PGUUID(as_uuid=True), ForeignKey("tenants.id", ondelete="CASCADE"), nullable=False, index=True
|
||
)
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|