feat(automation): wire SQLAlchemy relationships on both sides

surfsense_backend/app/automations/persistence/models/automation.py

@@ -14,6 +14,7 @@ from sqlalchemy import (
     Text,
 )
 from sqlalchemy.dialects.postgresql import JSONB, UUID
+from sqlalchemy.orm import relationship
 
 from app.db import BaseModel, TimestampMixin
 
@@ -59,3 +60,18 @@ class Automation(BaseModel, TimestampMixin):
         onupdate=lambda: datetime.now(UTC),
         index=True,
     )
+
+    search_space = relationship("SearchSpace", back_populates="automations")
+    created_by = relationship("User", back_populates="automations")
+    triggers = relationship(
+        "AutomationTrigger",
+        back_populates="automation",
+        cascade="all, delete-orphan",
+        passive_deletes=True,
+    )
+    runs = relationship(
+        "AutomationRun",
+        back_populates="automation",
+        cascade="all, delete-orphan",
+        passive_deletes=True,
+    )

surfsense_backend/app/automations/persistence/models/run.py

@@ -10,6 +10,7 @@ from sqlalchemy import (
     Integer,
 )
 from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import relationship
 
 from app.db import BaseModel, TimestampMixin
 
@@ -55,3 +56,6 @@ class AutomationRun(BaseModel, TimestampMixin):
 
     started_at = Column(TIMESTAMP(timezone=True), nullable=True)
     finished_at = Column(TIMESTAMP(timezone=True), nullable=True)
+
+    automation = relationship("Automation", back_populates="runs")
+    trigger = relationship("AutomationTrigger", back_populates="runs")

surfsense_backend/app/automations/persistence/models/trigger.py

@@ -11,6 +11,7 @@ from sqlalchemy import (
     Integer,
 )
 from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import relationship
 
 from app.db import BaseModel, TimestampMixin
 
@@ -44,3 +45,10 @@ class AutomationTrigger(BaseModel, TimestampMixin):
     )
 
     last_fired_at = Column(TIMESTAMP(timezone=True), nullable=True)
+
+    automation = relationship("Automation", back_populates="triggers")
+    runs = relationship(
+        "AutomationRun",
+        back_populates="trigger",
+        passive_deletes=True,
+    )

surfsense_backend/app/db.py

@@ -1533,6 +1533,14 @@ class SearchSpace(BaseModel, TimestampMixin):
         cascade="all, delete-orphan",
     )
 
+    automations = relationship(
+        "Automation",
+        back_populates="search_space",
+        order_by="Automation.id",
+        cascade="all, delete-orphan",
+        passive_deletes=True,
+    )
+
     # RBAC relationships
     roles = relationship(
         "SearchSpaceRole",
@@ -2125,6 +2133,13 @@ if config.AUTH_TYPE == "GOOGLE":
             passive_deletes=True,
         )
 
+        # Automations created by this user
+        automations = relationship(
+            "Automation",
+            back_populates="created_by",
+            passive_deletes=True,
+        )
+
         # Incentive tasks completed by this user
         incentive_tasks = relationship(
             "UserIncentiveTask",
@@ -2257,6 +2272,13 @@ else:
             passive_deletes=True,
         )
 
+        # Automations created by this user
+        automations = relationship(
+            "Automation",
+            back_populates="created_by",
+            passive_deletes=True,
+        )
+
         # Incentive tasks completed by this user
         incentive_tasks = relationship(
             "UserIncentiveTask",
@@ -2560,6 +2582,16 @@ class RefreshToken(Base, TimestampMixin):
         return not self.is_expired and not self.is_revoked
 
 
+# Register model packages that live outside this file so their classes
+# are present in Base.metadata before configure_mappers() resolves any
+# string-based relationship() references.
+from app.automations.persistence import (  # noqa: E402, F401
+    Automation,
+    AutomationRun,
+    AutomationTrigger,
+)
+
+
 engine = create_async_engine(
     DATABASE_URL,
     pool_size=30,