fix: sync all models with production DB schema
Check Cross-Plugin Imports / check (push) Has been cancelled
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
This commit is contained in:
@@ -19,6 +19,8 @@ from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.core.db import Base, TenantMixin
|
||||
from app.models.owned_mixin import OwnedMixin
|
||||
from sqlalchemy.dialects.postgresql import TSVECTOR
|
||||
from pgvector.sqlalchemy import Vector
|
||||
|
||||
|
||||
class Calendar(Base, TenantMixin, OwnedMixin):
|
||||
@@ -42,6 +44,9 @@ class CalendarEntry(Base, TenantMixin, OwnedMixin):
|
||||
"""Calendar entry — appointment or task, tenant-scoped, soft-deletable."""
|
||||
|
||||
__tablename__ = "calendar_entries"
|
||||
indexed_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
||||
embedding: Mapped[Any] = mapped_column(Vector(768), nullable=True)
|
||||
search_tsv: Mapped[Any] = mapped_column(TSVECTOR, nullable=True)
|
||||
__table_args__ = (
|
||||
Index("ix_entries_tenant_cal", "tenant_id", "calendar_id"),
|
||||
Index("ix_entries_tenant_start", "tenant_id", "start_at"),
|
||||
@@ -76,7 +81,7 @@ class CalendarEntry(Base, TenantMixin, OwnedMixin):
|
||||
deleted_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
||||
|
||||
|
||||
class CalendarEntryLink(Base, TenantMixin):
|
||||
class CalendarEntryLink(Base, TenantMixin, OwnedMixin):
|
||||
"""Link between a calendar entry and an entity (contact)."""
|
||||
|
||||
__tablename__ = "calendar_entry_links"
|
||||
@@ -94,7 +99,7 @@ class CalendarEntryLink(Base, TenantMixin):
|
||||
entity_id: Mapped[uuid.UUID] = mapped_column(PGUUID(as_uuid=True), nullable=False)
|
||||
|
||||
|
||||
class CalendarShare(Base, TenantMixin):
|
||||
class CalendarShare(Base, TenantMixin, OwnedMixin):
|
||||
"""Calendar sharing — user or group with read/write permission."""
|
||||
|
||||
__tablename__ = "calendar_shares"
|
||||
@@ -150,7 +155,7 @@ class Subtask(Base, TenantMixin, OwnedMixin):
|
||||
completed: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
|
||||
|
||||
|
||||
class Resource(Base, TenantMixin):
|
||||
class Resource(Base, TenantMixin, OwnedMixin):
|
||||
"""Bookable resource — room or equipment."""
|
||||
|
||||
__tablename__ = "resources"
|
||||
@@ -163,7 +168,7 @@ class Resource(Base, TenantMixin):
|
||||
type: Mapped[str] = mapped_column(String(50), nullable=False)
|
||||
|
||||
|
||||
class ResourceBooking(Base, TenantMixin):
|
||||
class ResourceBooking(Base, TenantMixin, OwnedMixin):
|
||||
"""Booking of a resource for a calendar entry."""
|
||||
|
||||
__tablename__ = "resource_bookings"
|
||||
|
||||
Reference in New Issue
Block a user