Use the current site to generate absolute urls for emails

openedx/core/djangoapps/schedules/management/commands/tests/test_send_recurring_nudge.py

@@ -82,7 +82,7 @@ class TestSendRecurringNudge(CacheIsolationTestCase):
         test_time_str = serialize(test_time)
         for b in range(tasks.RECURRING_NUDGE_NUM_BINS):
             # waffle flag takes an extra query before it is cached
-            with self.assertNumQueries(2 if b == 0 else 1):
+            with self.assertNumQueries(3 if b == 0 else 2):
                 tasks.recurring_nudge_schedule_bin(
                     self.site_config.site.id, target_day_str=test_time_str, day_offset=-3, bin_num=b,
                     org_list=[schedules[0].enrollment.course.org],
@@ -103,7 +103,7 @@ class TestSendRecurringNudge(CacheIsolationTestCase):
         test_time_str = serialize(test_time)
         for b in range(tasks.RECURRING_NUDGE_NUM_BINS):
             # waffle flag takes an extra query before it is cached
-            with self.assertNumQueries(2 if b == 0 else 1):
+            with self.assertNumQueries(3 if b == 0 else 2):
                 tasks.recurring_nudge_schedule_bin(
                     self.site_config.site.id, target_day_str=test_time_str, day_offset=-3, bin_num=b,
                     org_list=[schedule.enrollment.course.org],
@@ -175,7 +175,7 @@ class TestSendRecurringNudge(CacheIsolationTestCase):
 
         test_time = datetime.datetime(2017, 8, 3, 17, tzinfo=pytz.UTC)
         test_time_str = serialize(test_time)
-        with self.assertNumQueries(2):
+        with self.assertNumQueries(3):
             tasks.recurring_nudge_schedule_bin(
                 limited_config.site.id, target_day_str=test_time_str, day_offset=-3, bin_num=0,
                 org_list=org_list, exclude_orgs=exclude_orgs,
@@ -199,7 +199,7 @@ class TestSendRecurringNudge(CacheIsolationTestCase):
 
         test_time = datetime.datetime(2017, 8, 3, 19, 44, 30, tzinfo=pytz.UTC)
         test_time_str = serialize(test_time)
-        with self.assertNumQueries(2):
+        with self.assertNumQueries(3):
             tasks.recurring_nudge_schedule_bin(
                 self.site_config.site.id, target_day_str=test_time_str, day_offset=-3,
                 bin_num=user.id % tasks.RECURRING_NUDGE_NUM_BINS,
@@ -240,7 +240,7 @@ class TestSendRecurringNudge(CacheIsolationTestCase):
             with patch.object(tasks, '_recurring_nudge_schedule_send') as mock_schedule_send:
                 mock_schedule_send.apply_async = lambda args, *_a, **_kw: sent_messages.append(args)
 
-                with self.assertNumQueries(2):
+                with self.assertNumQueries(3):
                     tasks.recurring_nudge_schedule_bin(
                         self.site_config.site.id, target_day_str=test_time_str, day_offset=day,
                         bin_num=user.id % tasks.RECURRING_NUDGE_NUM_BINS, org_list=[schedules[0].enrollment.course.org],

openedx/core/djangoapps/schedules/management/commands/tests/test_send_upgrade_reminder.py

@@ -83,7 +83,7 @@ class TestUpgradeReminder(CacheIsolationTestCase):
         test_time_str = serialize(test_time)
         for b in range(tasks.UPGRADE_REMINDER_NUM_BINS):
             # waffle flag takes an extra query before it is cached
-            with self.assertNumQueries(2 if b == 0 else 1):
+            with self.assertNumQueries(3 if b == 0 else 2):
                 tasks.upgrade_reminder_schedule_bin(
                     self.site_config.site.id, target_day_str=test_time_str, day_offset=2, bin_num=b,
                     org_list=[schedules[0].enrollment.course.org],
@@ -104,7 +104,7 @@ class TestUpgradeReminder(CacheIsolationTestCase):
         test_time_str = serialize(test_time)
         for b in range(tasks.UPGRADE_REMINDER_NUM_BINS):
             # waffle flag takes an extra query before it is cached
-            with self.assertNumQueries(2 if b == 0 else 1):
+            with self.assertNumQueries(3 if b == 0 else 2):
                 tasks.upgrade_reminder_schedule_bin(
                     self.site_config.site.id, target_day_str=test_time_str, day_offset=2, bin_num=b,
                     org_list=[schedule.enrollment.course.org],
@@ -176,7 +176,7 @@ class TestUpgradeReminder(CacheIsolationTestCase):
 
         test_time = datetime.datetime(2017, 8, 3, 17, tzinfo=pytz.UTC)
         test_time_str = serialize(test_time)
-        with self.assertNumQueries(2):
+        with self.assertNumQueries(3):
             tasks.upgrade_reminder_schedule_bin(
                 limited_config.site.id, target_day_str=test_time_str, day_offset=2, bin_num=0,
                 org_list=org_list, exclude_orgs=exclude_orgs,
@@ -200,7 +200,7 @@ class TestUpgradeReminder(CacheIsolationTestCase):
 
         test_time = datetime.datetime(2017, 8, 3, 19, 44, 30, tzinfo=pytz.UTC)
         test_time_str = serialize(test_time)
-        with self.assertNumQueries(2):
+        with self.assertNumQueries(3):
             tasks.upgrade_reminder_schedule_bin(
                 self.site_config.site.id, target_day_str=test_time_str, day_offset=2,
                 bin_num=user.id % tasks.UPGRADE_REMINDER_NUM_BINS,
@@ -241,7 +241,7 @@ class TestUpgradeReminder(CacheIsolationTestCase):
             with patch.object(tasks, '_upgrade_reminder_schedule_send') as mock_schedule_send:
                 mock_schedule_send.apply_async = lambda args, *_a, **_kw: sent_messages.append(args)
 
-                with self.assertNumQueries(2):
+                with self.assertNumQueries(3):
                     tasks.upgrade_reminder_schedule_bin(
                         self.site_config.site.id, target_day_str=test_time_str, day_offset=day,
                         bin_num=user.id % tasks.UPGRADE_REMINDER_NUM_BINS,

openedx/core/djangoapps/schedules/tasks.py

@@ -74,7 +74,12 @@ def recurring_nudge_schedule_hour(
     target_hour = deserialize(target_hour_str)
     msg_type = RecurringNudge(day)
 
-    for (user, language, context) in _recurring_nudge_schedules_for_hour(target_hour, org_list, exclude_orgs):
+    for (user, language, context) in _recurring_nudge_schedules_for_hour(
+        Site.objects.get(id=site_id),
+        target_hour,
+        org_list,
+        exclude_orgs
+    ):
         msg = msg_type.personalize(
             Recipient(
                 user.username,
@@ -99,7 +104,7 @@ def _recurring_nudge_schedule_send(site_id, msg_str):
 
 
 # TODO: delete once _recurring_nudge_schedules_for_bin is fully rolled out
-def _recurring_nudge_schedules_for_hour(target_hour, org_list, exclude_orgs=False):
+def _recurring_nudge_schedules_for_hour(site, target_hour, org_list, exclude_orgs=False):
     beginning_of_day = target_hour.replace(hour=0, minute=0, second=0)
     users = User.objects.filter(
         courseenrollment__schedule__start__gte=beginning_of_day,
@@ -144,14 +149,14 @@ def _recurring_nudge_schedules_for_hour(target_hour, org_list, exclude_orgs=Fals
             'student_name': user.profile.name,
 
             'course_name': first_schedule.enrollment.course.display_name,
-            'course_url': absolute_url(reverse('course_root', args=[str(first_schedule.enrollment.course_id)])),
+            'course_url': absolute_url(site, reverse('course_root', args=[str(first_schedule.enrollment.course_id)])),
 
             # This is used by the bulk email optout policy
             'course_ids': course_id_strs,
 
             # Platform information
             'homepage_url': encode_url(marketing_link('ROOT')),
-            'dashboard_url': absolute_url(dashboard_relative_url),
+            'dashboard_url': absolute_url(site, dashboard_relative_url),
             'template_revision': settings.EDX_PLATFORM_REVISION,
             'platform_name': settings.PLATFORM_NAME,
             'contact_mailing_address': settings.CONTACT_MAILING_ADDRESS,
@@ -168,7 +173,13 @@ def recurring_nudge_schedule_bin(
     target_day = deserialize(target_day_str)
     msg_type = RecurringNudge(abs(day_offset))
 
-    for (user, language, context) in _recurring_nudge_schedules_for_bin(target_day, bin_num, org_list, exclude_orgs):
+    for (user, language, context) in _recurring_nudge_schedules_for_bin(
+        Site.objects.get(id=site_id),
+        target_day,
+        bin_num,
+        org_list,
+        exclude_orgs
+    ):
         msg = msg_type.personalize(
             Recipient(
                 user.username,
@@ -180,7 +191,7 @@ def recurring_nudge_schedule_bin(
         _recurring_nudge_schedule_send.apply_async((site_id, str(msg)), retry=False)
 
 
-def _recurring_nudge_schedules_for_bin(target_day, bin_num, org_list, exclude_orgs=False):
+def _recurring_nudge_schedules_for_bin(site, target_day, bin_num, org_list, exclude_orgs=False):
     beginning_of_day = target_day.replace(hour=0, minute=0, second=0)
     schedules = get_schedules_with_target_date_by_bin_and_orgs(
         schedule_date_field='start',
@@ -198,12 +209,12 @@ def _recurring_nudge_schedules_for_bin(target_day, bin_num, org_list, exclude_or
         course_id_strs = [str(schedule.enrollment.course_id) for schedule in user_schedules]
 
         first_schedule = user_schedules[0]
-        template_context = get_base_template_context()
+        template_context = get_base_template_context(site)
         template_context.update({
             'student_name': user.profile.name,
 
             'course_name': first_schedule.enrollment.course.display_name,
-            'course_url': absolute_url(reverse('course_root', args=[str(first_schedule.enrollment.course_id)])),
+            'course_url': absolute_url(site, reverse('course_root', args=[str(first_schedule.enrollment.course_id)])),
 
             # This is used by the bulk email optout policy
             'course_ids': course_id_strs,
@@ -222,7 +233,13 @@ def upgrade_reminder_schedule_bin(
     target_day = deserialize(target_day_str)
     msg_type = UpgradeReminder()
 
-    for (user, language, context) in _upgrade_reminder_schedules_for_bin(target_day, bin_num, org_list, exclude_orgs):
+    for (user, language, context) in _upgrade_reminder_schedules_for_bin(
+        Site.objects.get(id=site_id),
+        target_day,
+        bin_num,
+        org_list,
+        exclude_orgs
+    ):
         msg = msg_type.personalize(
             Recipient(
                 user.username,
@@ -244,7 +261,7 @@ def _upgrade_reminder_schedule_send(site_id, msg_str):
     ace.send(msg)
 
 
-def _upgrade_reminder_schedules_for_bin(target_day, bin_num, org_list, exclude_orgs=False):
+def _upgrade_reminder_schedules_for_bin(site, target_day, bin_num, org_list, exclude_orgs=False):
     beginning_of_day = target_day.replace(hour=0, minute=0, second=0)
 
     schedules = get_schedules_with_target_date_by_bin_and_orgs(
@@ -268,7 +285,7 @@ def _upgrade_reminder_schedules_for_bin(target_day, bin_num, org_list, exclude_o
         course_id_strs = [course_id_str]
         first_schedule = schedule
 
-        template_context = get_base_template_context()
+        template_context = get_base_template_context(site)
         template_context.update({
             'student_name': user.profile.name,
             'user_personal_address': user.profile.name if user.profile.name else user.username,
@@ -282,11 +299,11 @@ def _upgrade_reminder_schedules_for_bin(target_day, bin_num, org_list, exclude_o
             ),
 
             'course_name': first_schedule.enrollment.course.display_name,
-            'course_url': absolute_url(reverse('course_root', args=[str(first_schedule.enrollment.course_id)])),
+            'course_url': absolute_url(site, reverse('course_root', args=[str(first_schedule.enrollment.course_id)])),
 
             # This is used by the bulk email optout policy
             'course_ids': course_id_strs,
-            'cert_image': absolute_url(static('course_experience/images/verified-cert.png')),
+            'cert_image': absolute_url(site, static('course_experience/images/verified-cert.png')),
         })
 
         yield (user, first_schedule.enrollment.course.language, template_context)

openedx/core/djangoapps/schedules/template_context.py

@@ -7,12 +7,12 @@ from django.utils.http import urlquote
 from edxmako.shortcuts import marketing_link
 
 
-def get_base_template_context():
+def get_base_template_context(site):
     """Dict with entries needed for all templates that use the base template"""
     return {
         # Platform information
         'homepage_url': encode_url(marketing_link('ROOT')),
-        'dashboard_url': absolute_url(reverse('dashboard')),
+        'dashboard_url': absolute_url(site, reverse('dashboard')),
         'template_revision': settings.EDX_PLATFORM_REVISION,
         'platform_name': settings.PLATFORM_NAME,
         'contact_mailing_address': settings.CONTACT_MAILING_ADDRESS,
@@ -30,10 +30,10 @@ def encode_url(url):
     return modified_url.geturl()
 
 
-def absolute_url(relative_path):
-    root = settings.LMS_ROOT_URL.rstrip('/')
+def absolute_url(site, relative_path):
+    root = site.domain.rstrip('/')
     relative_path = relative_path.lstrip('/')
-    return encode_url(u'{root}/{path}'.format(root=root, path=relative_path))
+    return encode_url(u'https://{root}/{path}'.format(root=root, path=relative_path))
 
 
 def encode_urls_in_dict(mapping):