From 93f6dfa3306ed31143718318574e3f8c23f72e0c Mon Sep 17 00:00:00 2001 From: Matthew Piatetsky Date: Tue, 11 Dec 2018 14:43:46 -0500 Subject: [PATCH] Remove username from holdback key --- openedx/features/content_type_gating/models.py | 3 +-- openedx/features/course_duration_limits/config.py | 7 +++---- openedx/features/course_duration_limits/models.py | 3 +-- .../course_duration_limits/tests/test_course_expiration.py | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/openedx/features/content_type_gating/models.py b/openedx/features/content_type_gating/models.py index dbd9795059..84a6cfe820 100644 --- a/openedx/features/content_type_gating/models.py +++ b/openedx/features/content_type_gating/models.py @@ -110,14 +110,13 @@ class ContentTypeGatingConfig(StackedConfigurationModel): return cls.enabled_for_course(course_key=course_key, target_datetime=timezone.now()) else: # TODO: clean up as part of REV-100 - experiment_data_holdback_key = EXPERIMENT_DATA_HOLDBACK_KEY.format(user) is_in_holdback = False if user and (user_variable_represents_correct_user): try: holdback_value = ExperimentData.objects.get( user=user, experiment_id=EXPERIMENT_ID, - key=experiment_data_holdback_key, + key=EXPERIMENT_DATA_HOLDBACK_KEY, ).value is_in_holdback = holdback_value == 'True' except ExperimentData.DoesNotExist: diff --git a/openedx/features/course_duration_limits/config.py b/openedx/features/course_duration_limits/config.py index be58edac69..71e1ed1b2b 100644 --- a/openedx/features/course_duration_limits/config.py +++ b/openedx/features/course_duration_limits/config.py @@ -20,17 +20,16 @@ CONTENT_TYPE_GATING_FLAG = WaffleFlag( ) EXPERIMENT_ID = 11 -EXPERIMENT_DATA_HOLDBACK_KEY = 'holdback_{0}' +EXPERIMENT_DATA_HOLDBACK_KEY = 'holdback' @receiver(ENROLL_STATUS_CHANGE) def set_value_for_content_type_gating_holdback(sender, event=None, user=None, **kwargs): # pylint: disable=unused-argument - experiment_data_holdback_key = EXPERIMENT_DATA_HOLDBACK_KEY.format(user) if event == EnrollStatusChange.enroll: user_holdback_data = ExperimentData.objects.filter( user=user, experiment_id=EXPERIMENT_ID, - key=experiment_data_holdback_key, + key=EXPERIMENT_DATA_HOLDBACK_KEY, ) user_holdback_data_already_set = user_holdback_data.exists() if not user_holdback_data_already_set: @@ -45,7 +44,7 @@ def set_value_for_content_type_gating_holdback(sender, event=None, user=None, ** ExperimentData.objects.create( user=user, experiment_id=EXPERIMENT_ID, - key=experiment_data_holdback_key, + key=EXPERIMENT_DATA_HOLDBACK_KEY, value=is_in_holdback ) except (ExperimentKeyValue.DoesNotExist, AttributeError): diff --git a/openedx/features/course_duration_limits/models.py b/openedx/features/course_duration_limits/models.py index 051493e0cc..4be9d6a0b3 100644 --- a/openedx/features/course_duration_limits/models.py +++ b/openedx/features/course_duration_limits/models.py @@ -130,7 +130,6 @@ class CourseDurationLimitConfig(StackedConfigurationModel): return cls.enabled_for_course(course_key=course_key, target_datetime=timezone.now()) else: # TODO: clean up as part of REV-100 - experiment_data_holdback_key = EXPERIMENT_DATA_HOLDBACK_KEY.format(user) is_in_holdback = False no_masquerade = get_course_masquerade(user, course_key) is None student_masquerade = is_masquerading_as_specific_student(user, course_key) @@ -139,7 +138,7 @@ class CourseDurationLimitConfig(StackedConfigurationModel): holdback_value = ExperimentData.objects.get( user=user, experiment_id=EXPERIMENT_ID, - key=experiment_data_holdback_key, + key=EXPERIMENT_DATA_HOLDBACK_KEY, ).value is_in_holdback = holdback_value == 'True' except ExperimentData.DoesNotExist: diff --git a/openedx/features/course_duration_limits/tests/test_course_expiration.py b/openedx/features/course_duration_limits/tests/test_course_expiration.py index 97b059f52d..f20d3ea9e8 100644 --- a/openedx/features/course_duration_limits/tests/test_course_expiration.py +++ b/openedx/features/course_duration_limits/tests/test_course_expiration.py @@ -221,7 +221,7 @@ class CourseExpirationTestCase(ModuleStoreTestCase): ExperimentData.objects.create( user=audit_student, experiment_id=EXPERIMENT_ID, - key=EXPERIMENT_DATA_HOLDBACK_KEY.format(audit_student), + key=EXPERIMENT_DATA_HOLDBACK_KEY, value='True' ) CourseDurationLimitConfig.objects.create(