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

DO NOT MERGE - NEED FAKE - Rename start in schedule 5/5 (#22392)

Browse Source 
* Remove start field in Schedules

Co-authored-by: hunytalk <ahannan@edx.org>
Co-authored-by: Cory Lee <cory@edx.org>
This commit is contained in:
Abdul Hannan
2020-03-13 00:40:19 +05:00
committed by GitHub
parent c988456f0c
commit fa6633ba4e
11 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/djangoapps/student/tests/test_views.py
View File

@@ -783,12 +783,9 @@ class StudentDashboardTests(SharedModuleStoreTestCase, MilestonesTestCaseMixin,
user=self.user,
course_id=course.id
)
startdate = self.THREE_YEARS_AGO + timedelta(days=1)
schedule = ScheduleFactory(
start=startdate,
start_date=startdate,
enrollment=enrollment
)
# pylint: disable=unused-variable
schedule = ScheduleFactory(start_date=self.THREE_YEARS_AGO + timedelta(days=1), enrollment=enrollment)
response = self.client.get(reverse('dashboard'))
dashboard_html = self._remove_whitespace_from_response(response)

1
common/djangoapps/util/tests/test_db.py
View File

@@ -196,7 +196,6 @@ class MigrationTests(TestCase):
"""
Tests for migrations.
"""
@unittest.skip(
"Need to skip as part of renaming a field in schedules app. This will be unskipped in DE-1825."
)

1
lms/djangoapps/mobile_api/users/tests.py
View File

@@ -281,7 +281,6 @@ class TestUserEnrollmentApi(UrlResetMixin, MobileAPITestCase, MobileAuthUserTest
course_id=course.id
)
ScheduleFactory(
start=self.THREE_YEARS_AGO + datetime.timedelta(days=1),
start_date=self.THREE_YEARS_AGO + datetime.timedelta(days=1),
enrollment=enrollment
)

5
openedx/core/djangoapps/schedules/management/commands/setup_models_to_send_test_emails.py
View File

@@ -26,7 +26,6 @@ class ThreeDayNudgeSchedule(ScheduleFactory):
"""
A ScheduleFactory that creates a Schedule set up for a 3-day nudge email.
"""
start = factory.Faker('date_time_between', start_date='-3d', end_date='-3d', tzinfo=pytz.UTC)
start_date = factory.Faker('date_time_between', start_date='-3d', end_date='-3d', tzinfo=pytz.UTC)
@@ -34,7 +33,6 @@ class TenDayNudgeSchedule(ScheduleFactory):
"""
A ScheduleFactory that creates a Schedule set up for a 10-day nudge email.
"""
start = factory.Faker('date_time_between', start_date='-10d', end_date='-10d', tzinfo=pytz.UTC)
start_date = factory.Faker('date_time_between', start_date='-10d', end_date='-10d', tzinfo=pytz.UTC)
@@ -42,7 +40,6 @@ class UpgradeReminderSchedule(ScheduleFactory):
"""
A ScheduleFactory that creates a Schedule set up for a 2-days-remaining upgrade reminder.
"""
start = factory.Faker('past_datetime', tzinfo=pytz.UTC)
start_date = factory.Faker('past_datetime', tzinfo=pytz.UTC)
upgrade_deadline = factory.Faker('date_time_between', start_date='+2d', end_date='+2d', tzinfo=pytz.UTC)
@@ -51,7 +48,6 @@ class ContentHighlightSchedule(ScheduleFactory):
"""
A ScheduleFactory that creates a Schedule set up for a course highlights email.
"""
start = factory.Faker('date_time_between', start_date='-7d', end_date='-7d', tzinfo=pytz.UTC)
start_date = factory.Faker('date_time_between', start_date='-7d', end_date='-7d', tzinfo=pytz.UTC)
experience = factory.RelatedFactory(ScheduleExperienceFactory, 'schedule', experience_type=ScheduleExperience.EXPERIENCES.course_updates)
@@ -74,7 +70,6 @@ class Command(BaseCommand):
CourseFactory.reset_sequence(max_org_sequence_id + 1, force=True)
course = CourseFactory.create(
start=datetime.datetime.today() - datetime.timedelta(days=30),
start_date=datetime.datetime.today() - datetime.timedelta(days=30),
end=datetime.datetime.today() + datetime.timedelta(days=30),
number=factory.Sequence('schedules_test_course_{}'.format),
display_name=factory.Sequence(u'Schedules Test Course {}'.format),

1
openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
View File

@@ -136,7 +136,6 @@ class ScheduleSendEmailTestMixin(FilteredQueryCountMixin):
def _schedule_factory(self, offset=None, **factory_kwargs):
_, _, target_day, upgrade_deadline = self._get_dates(offset=offset)
factory_kwargs.setdefault('start', target_day)
factory_kwargs.setdefault('start_date', target_day)
factory_kwargs.setdefault('upgrade_deadline', upgrade_deadline)
factory_kwargs.setdefault('enrollment__course__self_paced', True)

1
openedx/core/djangoapps/schedules/management/commands/tests/test_send_course_update.py
View File

@@ -75,7 +75,6 @@ class TestSendCourseUpdate(ScheduleUpsellTestMixin, ScheduleSendEmailTestMixin,
self.assertEqual(enrollment.schedule.get_experience_type(), ScheduleExperience.EXPERIENCES.course_updates)
_, offset, target_day, _ = self._get_dates(offset=self.expected_offsets[0])
enrollment.schedule.start = target_day
enrollment.schedule.start_date = target_day
enrollment.schedule.save()

19
openedx/core/djangoapps/schedules/migrations/0016_remove_start_from_schedules.py Normal file
View File

@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.27 on 2020-01-07 18:46
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('schedules', '0015_schedules_start_nullable'),
]
operations = [
migrations.RemoveField(
model_name='schedule',
name='start',
),
]

7
openedx/core/djangoapps/schedules/models.py
View File

@@ -19,17 +19,12 @@ class Schedule(TimeStampedModel):
default=True,
help_text=_('Indicates if this schedule is actively used')
)
# TODO Delete this field during last stage of rolling out field renames
start = models.DateTimeField(
start_date = models.DateTimeField(
db_index=True,
help_text=_('Date this schedule went into effect'),
null=True,
default=None
)
start_date = models.DateTimeField(
db_index=True,
help_text=_('Date this schedule went into effect')
)
upgrade_deadline = models.DateTimeField(
blank=True,
db_index=True,

2
openedx/core/djangoapps/schedules/signals.py
View File

@@ -210,8 +210,6 @@ def _create_schedule(enrollment, enrollment_created):
schedule = Schedule.objects.create(
enrollment=enrollment,
# TODO remove 'start' field in removing writes from old field step in column renaming release
start=content_availability_date,
start_date=content_availability_date,
upgrade_deadline=upgrade_deadline
)

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

@@ -22,8 +22,6 @@ class ScheduleFactory(factory.DjangoModelFactory):
class Meta(object):
model = models.Schedule
# TODO drop 'start' when removing this field in column renaming release
start = factory.Faker('future_datetime', tzinfo=pytz.UTC)
start_date = factory.Faker('future_datetime', tzinfo=pytz.UTC)
upgrade_deadline = factory.Faker('future_datetime', tzinfo=pytz.UTC)
enrollment = factory.SubFactory(CourseEnrollmentFactory)

4
openedx/features/course_duration_limits/tests/test_course_expiration.py
View File

@@ -338,7 +338,7 @@ class CourseExpirationTestCase(ModuleStoreTestCase):
expired_staff = role_factory.create(password=TEST_PASSWORD, course_key=self.course.id)
ScheduleFactory(
start=self.THREE_YEARS_AGO,
start_date=self.THREE_YEARS_AGO,
enrollment__mode=CourseMode.AUDIT,
enrollment__course_id=self.course.id,
enrollment__user=expired_staff
@@ -386,7 +386,7 @@ class CourseExpirationTestCase(ModuleStoreTestCase):
role.users.add(expired_staff)
ScheduleFactory(
start=self.THREE_YEARS_AGO,
start_date=self.THREE_YEARS_AGO,
enrollment__mode=CourseMode.AUDIT,
enrollment__course_id=self.course.id,
enrollment__user=expired_staff