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

Merge pull request #18693 from edx/bmedx/PLAT-2267

Browse Source 
Fix timezone issues in retirements_by_status_and_date
This commit is contained in:
Brian Mesick
2018-07-31 15:25:07 -04:00
committed by GitHub
parent e5521d9ec2 a0e9ddcf8c
commit a24d612c47
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openedx/core/djangoapps/user_api/accounts/views.py
View File

@@ -695,9 +695,9 @@ class AccountRetirementStatusView(ViewSet):
so to get one day you would set both dates to that day.
"""
try:
start_date = datetime.datetime.strptime(request.GET['start_date'], '%Y-%m-%d')
end_date = datetime.datetime.strptime(request.GET['end_date'], '%Y-%m-%d')
now = datetime.datetime.now()
start_date = datetime.datetime.strptime(request.GET['start_date'], '%Y-%m-%d').replace(tzinfo=pytz.UTC)
end_date = datetime.datetime.strptime(request.GET['end_date'], '%Y-%m-%d').replace(tzinfo=pytz.UTC)
now = datetime.datetime.now(pytz.UTC)
if start_date > now or end_date > now or start_date > end_date:
raise RetirementStateError('Dates must be today or earlier, and start must be earlier than end.')