X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance2?a=blobdiff_plain;f=plomtask%2Fconditions.py;h=8d67e5a78c85b1672aaaaac133ab0422e80a6d73;hb=7b6b8d0b93b1d4dd85152e49e7105aacc647327c;hp=cd147cb79cafcfd81f4672fae0a0b6296201ff6a;hpb=c2004503dc42449f1fa129b8e56eeef0a6df4712;p=plomtask

diff --git a/plomtask/conditions.py b/plomtask/conditions.py
index cd147cb..8d67e5a 100644
--- 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,26 +24,12 @@ 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:
@@ -56,7 +42,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 +49,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: