More refactoring.

[plomtask] / plomtask / conditions.py

diff --git a/plomtask/conditions.py b/plomtask/conditions.py
index 337970924ab25305d64abef13afe24148b0209b1..cba606d1a71dd19a0e410677f0ee8fc528d5bdbf 100644 (file)
--- a/plomtask/conditions.py
+++ b/plomtask/conditions.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import Any
 from sqlite3 import Row
 from plomtask.db import DatabaseConnection, BaseModel
-from plomtask.misc import VersionedAttribute
+from plomtask.versioned_attributes import VersionedAttribute
 from plomtask.exceptions import HandledException
 
 
@@ -37,13 +37,20 @@ class Condition(BaseModel[int]):
         self.description.save(db_conn)
 
     def remove(self, db_conn: DatabaseConnection) -> None:
-        """Remove from DB, with dependencies."""
-        assert isinstance(self.id_, int)
+        """Remove from DB, with VersionedAttributes.
+
+        Checks for Todos and Processes that depend on Condition, prohibits
+        deletion if found.
+        """
+        if self.id_ is None:
+            raise HandledException('cannot remove unsaved item')
         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')
+        db_conn.delete_where('condition_titles', 'parent', self.id_)
+        db_conn.delete_where('condition_descriptions', 'parent', self.id_)
         super().remove(db_conn)