Parse start/end dates as datetime, else try date

edx · Jul 25, 2016 · ae19e48 · ae19e48
1 parent ec784aa
commit ae19e48
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/analytics_data_api/v0/views/courses.py b/analytics_data_api/v0/views/courses.py
@@ -30,11 +30,17 @@ def get(self, request, *args, **kwargs):
         timezone = utc
 
         if start_date:
-            start_date = datetime.datetime.strptime(start_date, settings.DATE_FORMAT)
+            try:
+                start_date = datetime.datetime.strptime(start_date, settings.DATETIME_FORMAT)
+            except ValueError:
+                start_date = datetime.datetime.strptime(start_date, settings.DATE_FORMAT)
             start_date = make_aware(start_date, timezone)
 
         if end_date:
-            end_date = datetime.datetime.strptime(end_date, settings.DATE_FORMAT)
+            try:
+                end_date = datetime.datetime.strptime(end_date, settings.DATETIME_FORMAT)
+            except ValueError:
+                end_date = datetime.datetime.strptime(end_date, settings.DATE_FORMAT)
             end_date = make_aware(end_date, timezone)
 
         self.start_date = start_date