Update later command to act on entire visions

diff --git a/matrix_goal_bot/bot.py b/matrix_goal_bot/bot.py
index d62d1881f6d74a061445dae84a3adfd7af5636f2..04313617802dc2f4191715d7684f17f708119143 100644 (file)
--- a/matrix_goal_bot/bot.py
+++ b/matrix_goal_bot/bot.py
@@ -21,7 +21,7 @@ More commands:
     add.vision - add a new vision (collection of goals)
     close.vision ID - mark vision as complete by ID
     dump - dump the full data set - BEWARE - so many messages
     add.vision - add a new vision (collection of goals)
     close.vision ID - mark vision as complete by ID
     dump - dump the full data set - BEWARE - so many messages

-    later GOAL_ID - put off goal for 14 days
+    later VISION_ID - put off all goals in VISION for 14 days

     list.later - list all 'later' goals
     print.vision ID - print a vision and all goals
     set.vision GOAL_ID VISION_ID- associate GOAL_ID with VISION_ID
     list.later - list all 'later' goals
     print.vision ID - print a vision and all goals
     set.vision GOAL_ID VISION_ID- associate GOAL_ID with VISION_ID


@@ -197,8 +197,8 @@ class GoalBot():
             return results
 
         if match.command('later'):
             return results
 
         if match.command('later'):

-            goal_id = int(match.args()[1])
-            vision_id = self.data.put_off_goal(goal_id)
+            vision_id = int(match.args()[1])
+            self.data.put_off_goal(vision_id)

             vision,goals = self.data.get_vision(vision_id)
             results = pretty_print(vision, goals)
             return results
             vision,goals = self.data.get_vision(vision_id)
             results = pretty_print(vision, goals)
             return results

diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py
index 9676cc3202c3679fb8a63cd46d95c216d811d4b2..22dca51b66a62e1136691c6698abb547bfb166f8 100644 (file)
--- a/matrix_goal_bot/db.py
+++ b/matrix_goal_bot/db.py
@@ -224,15 +224,13 @@ class Data():
         return vision_id
 
 
         return vision_id
 
 

-    def put_off_goal(self, goal_id):
-        vision_id = -1
+    def put_off_vision(self, vision_id):

         with Session(self.engine) as session:
         with Session(self.engine) as session:

-            cmd = select(Goal).where(Goal.id == goal_id)
+            cmd = select(Goal).where(Vision.id == vision_id)

             goal = session.exec(cmd).first()
             goal.start_date = dt.today() + timedelta(days=14)
             goal = session.exec(cmd).first()
             goal.start_date = dt.today() + timedelta(days=14)

-            vision_id = goal.vision_id

             session.commit()
             session.commit()

-        return vision_id
+        return True

 
     def start_goal(self, goal_id):
         vision = None
 
     def start_goal(self, goal_id):
         vision = None