Fix for add task

diff --git a/matrix_goal_bot/bot.py b/matrix_goal_bot/bot.py
index dd0a7896e94b8815c760d9ffd4bdaafb7e913261..fd8fdcad380bed6d9e23f56c694f2157958a9cca 100644 (file)
--- a/matrix_goal_bot/bot.py
+++ b/matrix_goal_bot/bot.py
@@ -79,7 +79,7 @@ async def do_goal(match):
 
     if match.command('task'):
         new = ' '.join(match.args()[1:])
 
     if match.command('task'):
         new = ' '.join(match.args()[1:])

-        result = Data().quick_add_task(new)
+        goal_id  = Data().quick_add_task(new)

         goal,tasks = Data().get_goal(goal_id)
         results = pretty_print(goal, tasks)
         return results
         goal,tasks = Data().get_goal(goal_id)
         results = pretty_print(goal, tasks)
         return results

diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py
index 83017333177785aec757fc20ef30e459bc646645..9ab3898935fb4dca3700e291e0f1b187c0218404 100644 (file)
--- a/matrix_goal_bot/db.py
+++ b/matrix_goal_bot/db.py
@@ -197,16 +197,13 @@ class Data():
 
     def quick_add_task(self, name):
         goal_id = self._get_pref_goal_id()
 
     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:
         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()
             new = session.exec(cmd).first()
             new.goal_id = goal_id
             session.commit()

-        return result
+        return goal_id

 
     def assign_vision(self, goal_id, vision_id):
         '''Goals may move between visions'''
 
     def assign_vision(self, goal_id, vision_id):
         '''Goals may move between visions'''