Commit 4018af13 by Clinton Blackburn Committed by Clinton Blackburn

Set time to 23:59:59 for Publisher's default upgrade deadline

The default upgrade deadline for Publisher course runs now has the time set to 23:59:59.99999 to give learners the entire day to upgrade.

LEARNER-3056
parent 5cd39185
import datetime
import json import json
import random import random
...@@ -210,7 +209,7 @@ class CourseRunViewSetTests(APITestCase): ...@@ -210,7 +209,7 @@ class CourseRunViewSetTests(APITestCase):
discovery_course_run = CourseRun.objects.get(key=publisher_course_run.lms_course_id) discovery_course_run = CourseRun.objects.get(key=publisher_course_run.lms_course_id)
DiscoverySeat.objects.get( DiscoverySeat.objects.get(
type=DiscoverySeat.VERIFIED, type=DiscoverySeat.VERIFIED,
upgrade_deadline=publisher_course_run.end - datetime.timedelta(days=PUBLISHER_UPGRADE_DEADLINE_DAYS), upgrade_deadline=verified_seat.calculated_upgrade_deadline,
price=verified_seat.price, price=verified_seat.price,
course_run=discovery_course_run course_run=discovery_course_run
) )
......
...@@ -476,8 +476,12 @@ class Seat(TimeStampedModel, ChangedByMixin): ...@@ -476,8 +476,12 @@ class Seat(TimeStampedModel, ChangedByMixin):
will be calculated based on the related course run's end date. will be calculated based on the related course run's end date.
""" """
if self.type == self.VERIFIED: if self.type == self.VERIFIED:
return self.upgrade_deadline or ( if self.upgrade_deadline:
self.course_run.end - datetime.timedelta(days=settings.PUBLISHER_UPGRADE_DEADLINE_DAYS)) return self.upgrade_deadline
deadline = self.course_run.end - datetime.timedelta(days=settings.PUBLISHER_UPGRADE_DEADLINE_DAYS)
deadline = deadline.replace(hour=23, minute=59, second=59, microsecond=99999)
return deadline
return None return None
......
...@@ -374,6 +374,7 @@ class TestSeatModel: ...@@ -374,6 +374,7 @@ class TestSeatModel:
now = datetime.datetime.utcnow() now = datetime.datetime.utcnow()
seat = factories.SeatFactory(type=Seat.VERIFIED, upgrade_deadline=None, course_run__end=now) seat = factories.SeatFactory(type=Seat.VERIFIED, upgrade_deadline=None, course_run__end=now)
expected = now - datetime.timedelta(days=settings.PUBLISHER_UPGRADE_DEADLINE_DAYS) expected = now - datetime.timedelta(days=settings.PUBLISHER_UPGRADE_DEADLINE_DAYS)
expected = expected.replace(hour=23, minute=59, second=59, microsecond=99999)
assert seat.calculated_upgrade_deadline == expected assert seat.calculated_upgrade_deadline == expected
seat = factories.SeatFactory(type=Seat.VERIFIED) seat = factories.SeatFactory(type=Seat.VERIFIED)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment