Use more meaningful variable names.

[plomtask] / plomtask / conditions.py

diff --git a/plomtask/conditions.py b/plomtask/conditions.py
index cd147cb79cafcfd81f4672fae0a0b6296201ff6a..b2ecda14cb7cef0b5bf350d1a253389ea32aabb7 100644 (file)
--- a/plomtask/conditions.py
+++ b/plomtask/conditions.py
@@ -7,7 +7,7 @@ from plomtask.misc import VersionedAttribute
 from plomtask.exceptions import NotFoundException
 
 
-class Condition(BaseModel):
+class Condition(BaseModel[int]):
     """Non Process-dependency for ProcessSteps and Todos."""
     table_name = 'conditions'
     to_save = ['is_active']
@@ -24,7 +24,6 @@ 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]):
@@ -35,12 +34,13 @@ class Condition(BaseModel):
     def all(cls, db_conn: DatabaseConnection) -> list[Condition]:
         """Collect all Conditions and their VersionedAttributes."""
         conditions = {}
-        for id_, condition in db_conn.cached_conditions.items():
+        for id_, condition in cls.cache_.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_)
+                assert isinstance(condition.id_, int)
                 conditions[condition.id_] = condition
         return list(conditions.values())
 
@@ -56,7 +56,6 @@ class Condition(BaseModel):
                 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:
@@ -64,8 +63,6 @@ class Condition(BaseModel):
         self.save_core(db_conn)
         self.title.save(db_conn)
         self.description.save(db_conn)
-        assert isinstance(self.id_, int)
-        db_conn.cached_conditions[self.id_] = self
 
 
 class ConditionsRelations: