Skip to content

fix: correct fallback handling for email opt-in report #38410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ajayakkalasetti wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: correct fallback handling for email opt-in report #38410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openedx/core/djangoapps/user_api/management/commands/email_opt_in_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ def _write_email_opt_in_prefs(self, file_handle, org_aliases, courses):
if pref_set_datetime:
pref_set_datetime = timezone.make_aware(pref_set_datetime, dt_timezone.utc) # noqa: UP017
else:
pref_set_datetime = self.DEFAULT_DATETIME_STR
pref_set_datetime = ""

if not full_name:
full_name = ""
Expand All @@ -257,7 +257,7 @@ def _write_email_opt_in_prefs(self, file_handle, org_aliases, courses):
# of ECOM-1995.
"full_name": full_name,
"course_id": course_id,
"is_opted_in_for_email": is_opted_in if is_opted_in else "True",
"is_opted_in_for_email": is_opted_in if is_opted_in else "",
"preference_set_datetime": pref_set_datetime,
})
row_count += 1
Expand Down
10 changes: 5 additions & 5 deletions openedx/core/djangoapps/user_api/management/tests/test_email_opt_in_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def test_enrolled_no_pref(self):
output = self._run_command(self.TEST_ORG)

# By default, if no preference is set by the user is enrolled, opt in
self._assert_output(output, (self.user, self.courses[0].id, True))
self._assert_output(output, (self.user, self.courses[0].id, ""))

def test_enrolled_pref_opted_in(self):
self._create_courses_and_enrollments((self.TEST_ORG, True))
Expand Down Expand Up @@ -107,7 +107,7 @@ def test_exclude_non_org_courses(self):
output = self._run_command(self.TEST_ORG)
self._assert_output(
output,
(self.user, self.courses[0].id, True),
(self.user, self.courses[0].id, ""),
expect_pref_datetime=False
)

Expand Down Expand Up @@ -355,7 +355,7 @@ def _latest_pref_set_datetime(self, user):

"""
pref = UserOrgTag.objects.filter(user=user).order_by("-modified")
return pref[0].modified.isoformat(' ') if len(pref) > 0 else self.DEFAULT_DATETIME_STR
return pref[0].modified.isoformat(' ') if len(pref) > 0 else ""

def _run_command(self, org, other_names=None, only_courses=None, query_interval=None, chunk_size=None):
"""Execute the management command to generate the email opt-in list.
Expand Down Expand Up @@ -439,7 +439,7 @@ def _assert_output(self, output, *args, **kwargs):
assert {'user_id': str(user.id), 'username': user.username, 'email': user.email,
'full_name': (user.profile.name if hasattr(user, 'profile') else ''),
'course_id': str(course_id),
'is_opted_in_for_email': str(opt_in_pref),
'is_opted_in_for_email': str(opt_in_pref) if isinstance(opt_in_pref, bool) else opt_in_pref,
'preference_set_datetime':
(self._latest_pref_set_datetime(self.user) if kwargs.get('expect_pref_datetime', True) else
self.DEFAULT_DATETIME_STR)} in output[1:]
"")} in output[1:]
Loading