Rebasing

[matrix-goal-bot.git] / matrix_goal_bot / db.py

diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py
index 83017333177785aec757fc20ef30e459bc646645..6a73021017b16b353b2e515b412f82ab30c245c0 100644 (file)
--- a/matrix_goal_bot/db.py
+++ b/matrix_goal_bot/db.py
@@ -197,16 +197,23 @@ class Data():
 
     def quick_add_task(self, name):
         goal_id = self._get_pref_goal_id()
-        return self.add_task(goal_id, name)
-
-    def add_task(self, goal_id, name):
-        result = self.add_with_name(Task, name)
+        task_id = self.add_with_name(Task, name)
         with Session(self.engine) as session:
-            cmd = select(Task).where(Task.name == name)
+            cmd = select(Task).where(Task.id == task_id)
             new = session.exec(cmd).first()
             new.goal_id = goal_id
             session.commit()
-        return result
+        return goal_id
+
+    def remove_task(self, task_id):
+        task_name = ''
+        with Session(self.engine) as session:
+            cmd = select(Task).where(Task.id  == task_id)
+            to_remove = session.exec(cmd).first()
+            task_name = to_remove.name
+            session.delete(to_remove)
+            session.commit()
+        return f'Removed task "{task_name}"'
 
     def assign_vision(self, goal_id, vision_id):
         '''Goals may move between visions'''