Merge pull request #168 from edx/aj/fix-schedules-app

Fix schedules app
mitocw · Jan 30, 2020 · 561fb8c · 561fb8c
2 parents 25baa93 + 0470e43
commit 561fb8c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/openedx/core/djangoapps/schedules/resolvers.py b/openedx/core/djangoapps/schedules/resolvers.py
@@ -116,6 +116,7 @@ def get_schedules_with_target_date_by_bin_and_orgs(
         }
         users = User.objects.filter(
             courseenrollment__is_active=True,
+            is_active=True,
             **schedule_day_equals_target_day_filter
         ).annotate(
             id_mod=self.bin_num_for_user_id(F('id'))

diff --git a/openedx/core/djangoapps/schedules/tests/test_resolvers.py b/openedx/core/djangoapps/schedules/tests/test_resolvers.py
@@ -155,3 +155,15 @@ def test_schedule_context_show_unsubscribe(self):
         resolver = self.create_resolver()
         schedules = list(resolver.schedules_for_bin())
         self.assertIn('optout', schedules[0][2]['unsubscribe_url'])
+
+    @override_waffle_flag(COURSE_UPDATE_WAFFLE_FLAG, True)
+    def test_get_schedules_with_target_date_by_bin_and_orgs_filter_inactive_users(self):
+        """Tests that schedules of inactive users are excluded"""
+        resolver = self.create_resolver()
+        schedules = resolver.get_schedules_with_target_date_by_bin_and_orgs()
+
+        self.assertEqual(schedules.count(), 1)
+        self.user.is_active = False
+        self.user.save()
+        schedules = resolver.get_schedules_with_target_date_by_bin_and_orgs()
+        self.assertEqual(schedules.count(), 0)