Merge pull request #195 from PerfectFit-project/check-29-activity

check completion state of 29 activity

Author: wbaccinelli

scheduler/state_machine/controller.py

@@ -3,6 +3,7 @@
 from datetime import date, datetime, timedelta
 from state_machine.state_machine_utils import (create_new_date, get_dialog_completion_state,
                                                get_execution_week, get_intervention_component,
+                                               get_activity_completion_state,
                                                get_all_scheduled_occurrence,
                                                get_last_component_state,
                                                get_next_planned_date, get_next_scheduled_occurrence,
@@ -239,8 +240,9 @@ def on_new_day(self, current_date: date):
 
         # at day 7 activity C2.9 has to be proposed
         start_date = get_start_date(self.user_id)
-        ga_completed = get_dialog_completion_state(self.user_id, Components.GENERAL_ACTIVITY)
-        if (current_date - start_date).days >= ACTIVITY_C2_9_DAY_TRIGGER and not ga_completed:
+        choose_sport_completed = get_activity_completion_state(self.user_id, 29)
+        if ((current_date - start_date).days >= ACTIVITY_C2_9_DAY_TRIGGER
+                and not choose_sport_completed):
             plan_and_store(user_id=self.user_id,
                            dialog=Components.GENERAL_ACTIVITY,
                            phase_id=1)
@@ -332,7 +334,7 @@ def plan_execution_start_dialog(self):
         # this is the intro video to be sent the first time
         # the execution starts (not after lapse/relapse)
         quit_date = get_quit_date(self.user_id)
-        planned_date = create_new_date(start_date=quit_date)
+        planned_date = create_new_date(start_date=quit_date, minute=5)
 
         plan_and_store(user_id=self.user_id,
                        dialog=Components.EXECUTION_INTRODUCTION,

scheduler/state_machine/state_machine_utils.py

@@ -6,6 +6,7 @@
 from state_machine.const import (REDIS_URL, TIMEZONE, TRIGGER_COMPONENT,
                                  SCHEDULE_TRIGGER_COMPONENT, TRIGGER_INTENT)
 from virtual_coach_db.dbschema.models import (ClosedAnswers, DialogClosedAnswers, DialogQuestions,
+                                              InterventionActivitiesPerformed,
                                               InterventionComponents, InterventionPhases, Users,
                                               UserStateMachine, UserInterventionState)
 from virtual_coach_db.helper.definitions import Components, ComponentsTriggers, DialogQuestionsEnum
@@ -76,6 +77,40 @@ def create_new_date(start_date: date,
     return new_timedate
 
 
+def get_activity_completion_state(user_id: int, activity_id: int) -> Optional[bool]:
+    """
+    Get the completion state of an intervention activity
+    (they are completed in the general activity dialog)
+    Args:
+        user_id: the id of the user
+        activity_id: id of the activity, as reported in the intervention_activity table
+
+    Returns: True if the activity has been completed, False otherwise
+
+    """
+
+    session = get_db_session()
+
+    activities = (
+        session.query(
+            InterventionActivitiesPerformed
+        )
+        .filter(
+            InterventionActivitiesPerformed.users_nicedayuid == user_id,
+            InterventionActivitiesPerformed.intervention_activity_id == activity_id
+        )
+        .limit(1)  # get only the first result
+        .one_or_none()
+    )
+
+    if activities is not None:
+        session.close()
+        return True
+
+    session.close()
+    return False
+
+
 def get_all_scheduled_occurrence(user_id: int,
                                  intervention_component_id: int,
                                  current_date: datetime) -> Optional[UserInterventionState]: