Improve consistency of DB column names.

[plomtask] / plomtask / processes.py

diff --git a/plomtask/processes.py b/plomtask/processes.py
index 45de9dbe8e879f3ec06aae5575305e980df8c0d4..9c5c824376ccad12b73892023d924a04e95b7ce8 100644 (file)
--- a/plomtask/processes.py
+++ b/plomtask/processes.py
@@ -1,6 +1,5 @@
 """Collecting Processes and Process-related items."""
 from __future__ import annotations
-from sqlite3 import Row
 from typing import Any, Set
 from plomtask.db import DatabaseConnection, BaseModel
 from plomtask.misc import VersionedAttribute
@@ -24,14 +23,6 @@ class Process(BaseModel):
         self.fulfills: list[Condition] = []
         self.undoes: list[Condition] = []
 
-    @classmethod
-    def from_table_row(cls, db_conn: DatabaseConnection, row: Row) -> Process:
-        """Make Process from database row, with empty VersionedAttributes."""
-        process = cls(row[0])
-        assert isinstance(process.id_, int)
-        db_conn.cached_processes[process.id_] = process
-        return process
-
     @classmethod
     def all(cls, db_conn: DatabaseConnection) -> list[Process]:
         """Collect all Processes and their connected VersionedAttributes."""
@@ -49,30 +40,24 @@ class Process(BaseModel):
     def by_id(cls, db_conn: DatabaseConnection, id_: int | None,
               create: bool = False) -> Process:
         """Collect Process, its VersionedAttributes, and its child IDs."""
-        if id_ in db_conn.cached_processes.keys():
-            process = db_conn.cached_processes[id_]
-            assert isinstance(process, Process)
-            return process
         process = None
-        for row in db_conn.exec('SELECT * FROM processes '
-                                'WHERE id = ?', (id_,)):
-            process = cls(row[0])
-            break
+        if id_:
+            process, _ = super()._by_id(db_conn, id_)
         if not process:
             if not create:
                 raise NotFoundException(f'Process not found of id: {id_}')
             process = Process(id_)
         for row in db_conn.exec('SELECT * FROM process_titles '
-                                'WHERE parent_id = ?', (process.id_,)):
+                                'WHERE parent = ?', (process.id_,)):
             process.title.history[row[1]] = row[2]
         for row in db_conn.exec('SELECT * FROM process_descriptions '
-                                'WHERE parent_id = ?', (process.id_,)):
+                                'WHERE parent = ?', (process.id_,)):
             process.description.history[row[1]] = row[2]
         for row in db_conn.exec('SELECT * FROM process_efforts '
-                                'WHERE parent_id = ?', (process.id_,)):
+                                'WHERE parent = ?', (process.id_,)):
             process.effort.history[row[1]] = row[2]
         for row in db_conn.exec('SELECT * FROM process_steps '
-                                'WHERE owner_id = ?', (process.id_,)):
+                                'WHERE owner = ?', (process.id_,)):
             process.explicit_steps += [ProcessStep.from_table_row(db_conn,
                                                                   row)]
         for row in db_conn.exec('SELECT condition FROM process_conditions '
@@ -90,8 +75,8 @@ class Process(BaseModel):
     def used_as_step_by(self, db_conn: DatabaseConnection) -> list[Process]:
         """Return Processes using self for a ProcessStep."""
         owner_ids = set()
-        for owner_id in db_conn.exec('SELECT owner_id FROM process_steps WHERE'
-                                     ' step_process_id = ?', (self.id_,)):
+        for owner_id in db_conn.exec('SELECT owner FROM process_steps WHERE'
+                                     ' step_process = ?', (self.id_,)):
             owner_ids.add(owner_id[0])
         return [self.__class__.by_id(db_conn, id_) for id_ in owner_ids]
 
@@ -189,7 +174,7 @@ class Process(BaseModel):
             assert isinstance(step.id_, int)
             del db_conn.cached_process_steps[step.id_]
         self.explicit_steps = []
-        db_conn.exec('DELETE FROM process_steps WHERE owner_id = ?',
+        db_conn.exec('DELETE FROM process_steps WHERE owner = ?',
                      (self.id_,))
         for step_tuple in steps:
             self._add_step(db_conn, step_tuple[0],
@@ -217,7 +202,7 @@ class Process(BaseModel):
             db_conn.exec('INSERT INTO process_undoes VALUES (?,?)',
                          (self.id_, condition.id_))
         assert isinstance(self.id_, int)
-        db_conn.exec('DELETE FROM process_steps WHERE owner_id = ?',
+        db_conn.exec('DELETE FROM process_steps WHERE owner = ?',
                      (self.id_,))
         for step in self.explicit_steps:
             step.save(db_conn)
@@ -236,25 +221,13 @@ class ProcessStep(BaseModel):
         self.step_process_id = step_process_id
         self.parent_step_id = parent_step_id
 
-    @classmethod
-    def from_table_row(cls, db_conn: DatabaseConnection,
-                       row: Row) -> ProcessStep:
-        """Make ProcessStep from database row, store in DB cache."""
-        step = cls(row[0], row[1], row[2], row[3])
-        assert isinstance(step.id_, int)
-        db_conn.cached_process_steps[step.id_] = step
-        return step
-
     @classmethod
     def by_id(cls, db_conn: DatabaseConnection, id_: int) -> ProcessStep:
         """Retrieve ProcessStep by id_, or throw NotFoundException."""
-        if id_ in db_conn.cached_process_steps.keys():
-            step = db_conn.cached_process_steps[id_]
+        step, _ = super()._by_id(db_conn, id_)
+        if step:
             assert isinstance(step, ProcessStep)
             return step
-        for row in db_conn.exec('SELECT * FROM process_steps '
-                                'WHERE step_id = ?', (id_,)):
-            return cls.from_table_row(db_conn, row)
         raise NotFoundException(f'found no ProcessStep of ID {id_}')
 
     def save(self, db_conn: DatabaseConnection) -> None: