From 2e4e479f4f1c0813c187e2b025dc7fdad99580ed Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Tue, 17 Oct 2017 22:58:06 -0400 Subject: [PATCH] Move get_schedules_with_target_date_by_bin_and_orgs closer to its eventual home --- .../core/djangoapps/schedules/resolvers.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/openedx/core/djangoapps/schedules/resolvers.py b/openedx/core/djangoapps/schedules/resolvers.py index 35b16f884d..2a66d7dc2f 100644 --- a/openedx/core/djangoapps/schedules/resolvers.py +++ b/openedx/core/djangoapps/schedules/resolvers.py @@ -117,18 +117,6 @@ class BinnedSchedulesBaseResolver(PrefixedDebugLoggerMixin, RecipientResolver): return exclude_orgs, org_list -class ScheduleStartResolver(BinnedSchedulesBaseResolver): - """ - Send a message to all users whose schedule started at ``self.current_date`` + ``day_offset``. - """ - num_bins = RECURRING_NUDGE_NUM_BINS - enqueue_config_var = 'enqueue_recurring_nudge' - - def __init__(self, *args, **kwargs): - super(ScheduleStartResolver, self).__init__(*args, **kwargs) - self.log_prefix = 'Scheduled Nudge' - - def get_schedules_with_target_date_by_bin_and_orgs(schedule_date_field, current_datetime, target_datetime, bin_num, num_bins=DEFAULT_NUM_BINS, org_list=None, exclude_orgs=False, order_by='enrollment__user__id'): @@ -198,6 +186,18 @@ def get_schedules_with_target_date_by_bin_and_orgs(schedule_date_field, current_ return schedules +class ScheduleStartResolver(BinnedSchedulesBaseResolver): + """ + Send a message to all users whose schedule started at ``self.current_date`` + ``day_offset``. + """ + num_bins = RECURRING_NUDGE_NUM_BINS + enqueue_config_var = 'enqueue_recurring_nudge' + + def __init__(self, *args, **kwargs): + super(ScheduleStartResolver, self).__init__(*args, **kwargs) + self.log_prefix = 'Scheduled Nudge' + + def _recurring_nudge_schedules_for_bin(site, current_datetime, target_datetime, bin_num, org_list, exclude_orgs=False): schedules = get_schedules_with_target_date_by_bin_and_orgs(