Enable deletion of Conditions.

[plomtask] / plomtask / conditions.py

diff --git a/plomtask/conditions.py b/plomtask/conditions.py
index cd147cb79cafcfd81f4672fae0a0b6296201ff6a..337970924ab25305d64abef13afe24148b0209b1 100644 (file)
--- a/plomtask/conditions.py
+++ b/plomtask/conditions.py
@@ -4,16 +4,16 @@ from typing import Any
 from sqlite3 import Row
 from plomtask.db import DatabaseConnection, BaseModel
 from plomtask.misc import VersionedAttribute
-from plomtask.exceptions import NotFoundException
+from plomtask.exceptions import HandledException
 
 
-class Condition(BaseModel):
-    """Non Process-dependency for ProcessSteps and Todos."""
+class Condition(BaseModel[int]):
+    """Non-Process dependency for ProcessSteps and Todos."""
     table_name = 'conditions'
     to_save = ['is_active']
 
     def __init__(self, id_: int | None, is_active: bool = False) -> None:
-        self.set_int_id(id_)
+        super().__init__(id_)
         self.is_active = is_active
         self.title = VersionedAttribute(self, 'condition_titles', 'UNNAMED')
         self.description = VersionedAttribute(self, 'condition_descriptions',
@@ -24,48 +24,27 @@ class Condition(BaseModel):
                        row: Row | list[Any]) -> Condition:
         """Build condition from row, including VersionedAttributes."""
         condition = super().from_table_row(db_conn, row)
-        assert isinstance(condition, Condition)
         for name in ('title', 'description'):
             table_name = f'condition_{name}s'
             for row_ in db_conn.row_where(table_name, 'parent', row[0]):
                 getattr(condition, name).history_from_row(row_)
         return condition
 
-    @classmethod
-    def all(cls, db_conn: DatabaseConnection) -> list[Condition]:
-        """Collect all Conditions and their VersionedAttributes."""
-        conditions = {}
-        for id_, condition in db_conn.cached_conditions.items():
-            conditions[id_] = condition
-        already_recorded = conditions.keys()
-        for id_ in db_conn.column_all('conditions', 'id'):
-            if id_ not in already_recorded:
-                condition = cls.by_id(db_conn, id_)
-                conditions[condition.id_] = condition
-        return list(conditions.values())
-
-    @classmethod
-    def by_id(cls, db_conn: DatabaseConnection, id_: int | None,
-              create: bool = False) -> Condition:
-        """Collect (or create) Condition and its VersionedAttributes."""
-        condition = None
-        if id_:
-            condition, _ = super()._by_id(db_conn, id_)
-        if not condition:
-            if not create:
-                raise NotFoundException(f'Condition not found of id: {id_}')
-            condition = cls(id_, False)
-            condition.save(db_conn)
-        assert isinstance(condition, Condition)
-        return condition
-
     def save(self, db_conn: DatabaseConnection) -> None:
         """Save self and its VersionedAttributes to DB and cache."""
         self.save_core(db_conn)
         self.title.save(db_conn)
         self.description.save(db_conn)
+
+    def remove(self, db_conn: DatabaseConnection) -> None:
+        """Remove from DB, with dependencies."""
         assert isinstance(self.id_, int)
-        db_conn.cached_conditions[self.id_] = self
+        for item in ('process', 'todo'):
+            for attr in ('conditions', 'enables', 'disables'):
+                table_name = f'{item}_{attr}'
+                for _ in db_conn.row_where(table_name, 'condition', self.id_):
+                    raise HandledException('cannot remove Condition in use')
+        super().remove(db_conn)
 
 
 class ConditionsRelations: