Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22975 from edx/rename_start_in_schedules_intermediate

Browse Source 
Remove reads from old column
This commit is contained in:
Troy Sankey
2020-01-30 10:39:25 -05:00
committed by GitHub
parent 62d5ff49a0 35d3a285d5
commit 7127cc9231
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangoapps/schedules/tests/test_resolvers.py
View File

@@ -120,7 +120,7 @@ class TestCourseUpdateResolver(SchedulesResolverTestMixin, ModuleStoreTestCase):
return CourseUpdateResolver(
async_send_task=Mock(name='async_send_task'),
site=self.site_config.site,
target_datetime=enrollment.schedule.start,
target_datetime=enrollment.schedule.start_date,
day_offset=-7,
bin_num=CourseUpdateResolver.bin_num_for_user_id(self.user.id),
)

4
openedx/core/djangoapps/schedules/tests/test_signals.py
View File

@@ -155,7 +155,7 @@ class CreateScheduleTests(SharedModuleStoreTestCase):
mock_get_current_site.return_value = site
course = _create_course_run(self_paced=True, start_day_offset=5) # course starts in future
enrollment = CourseEnrollmentFactory(course_id=course.id, mode=CourseMode.AUDIT)
assert _strip_secs(enrollment.schedule.start) == _strip_secs(course.start)
assert _strip_secs(enrollment.schedule.start_date) == _strip_secs(course.start)
@override_waffle_flag(CREATE_SCHEDULE_WAFFLE_FLAG, True)
def test_course_already_started(self, mock_get_current_site):
@@ -167,7 +167,7 @@ class CreateScheduleTests(SharedModuleStoreTestCase):
mock_get_current_site.return_value = site
course = _create_course_run(self_paced=True, start_day_offset=-5) # course already started
enrollment = CourseEnrollmentFactory(course_id=course.id, mode=CourseMode.AUDIT)
assert _strip_secs(enrollment.schedule.start) == _strip_secs(enrollment.created)
assert _strip_secs(enrollment.schedule.start_date) == _strip_secs(enrollment.created)
@ddt.ddt

4
openedx/features/course_duration_limits/access.py
View File

@@ -109,8 +109,8 @@ def get_user_course_expiration_date(user, course):
# Content availability date is equivalent to max(enrollment date, course start date)
# for most people. Using the schedule date will provide flexibility to deal with
# more complex business rules in the future.
content_availability_date = enrollment.schedule.start
# We have anecdotally observed a case where the schedule.start was
content_availability_date = enrollment.schedule.start_date
# We have anecdotally observed a case where the schedule.start_date was
# equal to the course start, but should have been equal to the enrollment start
# https://openedx.atlassian.net/browse/PROD-58
# This section is meant to address that case

10
openedx/features/course_experience/tests/views/test_course_home.py
View File

@@ -465,7 +465,7 @@ class TestCourseHomePageAccess(CourseHomePageTestCase):
user = UserFactory.create(password=self.TEST_PASSWORD)
ScheduleFactory(
start=THREE_YEARS_AGO,
start_date=THREE_YEARS_AGO,
enrollment__mode=CourseMode.VERIFIED,
enrollment__course_id=course.id,
enrollment__user=user
@@ -499,7 +499,7 @@ class TestCourseHomePageAccess(CourseHomePageTestCase):
user = role_factory.create(password=self.TEST_PASSWORD, course_key=course.id)
ScheduleFactory(
start=THREE_YEARS_AGO,
start_date=THREE_YEARS_AGO,
enrollment__mode=CourseMode.AUDIT,
enrollment__course_id=course.id,
enrollment__user=user
@@ -555,7 +555,7 @@ class TestCourseHomePageAccess(CourseHomePageTestCase):
user = role_factory.create(password=self.TEST_PASSWORD)
ScheduleFactory(
start=THREE_YEARS_AGO,
start_date=THREE_YEARS_AGO,
enrollment__mode=CourseMode.AUDIT,
enrollment__course_id=course.id,
enrollment__user=user
@@ -587,7 +587,7 @@ class TestCourseHomePageAccess(CourseHomePageTestCase):
audit_user = UserFactory(password=self.TEST_PASSWORD)
self.client.login(username=audit_user.username, password=self.TEST_PASSWORD)
audit_enrollment = CourseEnrollment.enroll(audit_user, course.id, mode=CourseMode.AUDIT)
ScheduleFactory(start=THREE_YEARS_AGO + timedelta(days=1), enrollment=audit_enrollment)
ScheduleFactory(start_date=THREE_YEARS_AGO + timedelta(days=1), enrollment=audit_enrollment)
response = self.client.get(url)
@@ -657,7 +657,7 @@ class TestCourseHomePageAccess(CourseHomePageTestCase):
audit_user = UserFactory(password=self.TEST_PASSWORD)
self.client.login(username=audit_user.username, password=self.TEST_PASSWORD)
audit_enrollment = CourseEnrollment.enroll(audit_user, course.id, mode=CourseMode.AUDIT)
ScheduleFactory(start=THREE_YEARS_AGO, enrollment=audit_enrollment)
ScheduleFactory(start_date=THREE_YEARS_AGO, enrollment=audit_enrollment)
FBEEnrollmentExclusion.objects.create(
enrollment=audit_enrollment
)