Updated reset_notification_timer.py and timer.py to update timer hours, minutes, and seconds to zero (#188)

Author: shafqatfarhan

edx_notifications/management/commands/reset_notification_timer.py

@@ -68,6 +68,11 @@ def cancel_old_notification_timers(self):
                 self.store.save_notification_timer(timer)
 
     def reset_digest_notification_timer(self):
+        """
+        Gets old timers of daily and weekly digests and update callback_at value with current
+        UTC datetime and add timedelta and last_ran value with current UTC datetime to avoid
+        sending old notification digest emails to users.
+        """
         context = {
             'last_ran': datetime.now(pytz.UTC),
         }
@@ -81,6 +86,8 @@ def reset_digest_notification_timer(self):
                                if digest_timer.periodicity_min
                                else const.MINUTES_IN_A_DAY)
                 digest_timer.callback_at = datetime.now(pytz.UTC) + timedelta(minutes=rerun_delta)
+                digest_timer.callback_at = digest_timer.callback_at.replace(hour=0, minute=0,
+                                                                            second=0, microsecond=0)
                 digest_timer.context.update(context)
 
                 self.store.save_notification_timer(digest_timer)
@@ -96,6 +103,8 @@ def reset_digest_notification_timer(self):
                                if digest_timer.periodicity_min
                                else const.MINUTES_IN_A_WEEK)
                 digest_timer.callback_at = datetime.now(pytz.UTC) + timedelta(minutes=rerun_delta)
+                digest_timer.callback_at = digest_timer.callback_at.replace(hour=0, minute=0,
+                                                                            second=0, microsecond=0)
                 digest_timer.context.update(context)
 
                 self.store.save_notification_timer(digest_timer)

edx_notifications/tests/test_timer.py

@@ -588,6 +588,6 @@ def test_purge_timer_rescheduling(self):
 
             # allow for some slight time arthimetic skew
             expected_callback_at = purge_notifications_timer.callback_at.replace(second=0, microsecond=0)
-            actual_callback_at = (reset_time + timedelta(days=1)).replace(second=0, microsecond=0)
+            actual_callback_at = (reset_time + timedelta(days=1)).replace(hour=0, second=0, microsecond=0)
 
             self.assertEqual(expected_callback_at, actual_callback_at)

edx_notifications/timer.py

@@ -70,6 +70,9 @@ def poll_and_execute_timers(**kwargs):  # pylint: disable=unused-argument
                 if timer.callback_at < datetime.now(pytz.UTC):
                     timer.callback_at = datetime.now(pytz.UTC) + timedelta(minutes=rerun_delta)
 
+                timer.callback_at = timer.callback_at.replace(hour=0, minute=0, second=0,
+                                                              microsecond=0)
+
                 timer.executed_at = None  # need to reset this or it won't get picked up again
 
             if results.get('errors'):

setup.py

@@ -34,7 +34,7 @@ def load_requirements(*requirements_paths):
 
 setup(
     name='edx-notifications',
-    version='0.8.2',
+    version='0.8.3',
     description='Notification subsystem for Open edX',
     long_description=open('README.md').read(),
     author='edX',