Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-analytics-data-api
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-analytics-data-api
Commits
a54fb1db
Commit
a54fb1db
authored
Jul 25, 2016
by
Tyler Hallada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address PR comments
parent
c7330688
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
18 deletions
+21
-18
analytics_data_api/v0/tests/views/test_courses.py
+11
-3
analytics_data_api/v0/views/courses.py
+10
-15
No files found.
analytics_data_api/v0/tests/views/test_courses.py
View file @
a54fb1db
...
...
@@ -142,10 +142,18 @@ class CourseViewTestCaseMixin(DemoCourseMixin):
self
.
assertEquals
(
response
.
status_code
,
404
)
# If data falls in date range, data should be returned
start
_date
=
start_date
.
strftime
(
settings
.
DATETIME_FORMAT
)
end
_date
=
end_date
.
strftime
(
settings
.
DATETIME_FORMAT
)
start
=
start_date
.
strftime
(
settings
.
DATETIME_FORMAT
)
end
=
end_date
.
strftime
(
settings
.
DATETIME_FORMAT
)
response
=
self
.
authenticated_get
(
'
%
scourses/
%
s
%
s?start_date=
%
s&end_date=
%
s'
%
(
self
.
api_root_path
,
self
.
course_id
,
self
.
path
,
start_date
,
end_date
))
self
.
api_root_path
,
self
.
course_id
,
self
.
path
,
start
,
end
))
self
.
assertEquals
(
response
.
status_code
,
200
)
self
.
assertListEqual
(
response
.
data
,
expected_response
)
# Passing dates in DATE_FORMAT still works
start
=
start_date
.
strftime
(
settings
.
DATE_FORMAT
)
end
=
end_date
.
strftime
(
settings
.
DATE_FORMAT
)
response
=
self
.
authenticated_get
(
'
%
scourses/
%
s
%
s?start_date=
%
s&end_date=
%
s'
%
(
self
.
api_root_path
,
self
.
course_id
,
self
.
path
,
start
,
end
))
self
.
assertEquals
(
response
.
status_code
,
200
)
self
.
assertListEqual
(
response
.
data
,
expected_response
)
...
...
analytics_data_api/v0/views/courses.py
View file @
a54fb1db
...
...
@@ -29,24 +29,19 @@ class BaseCourseView(generics.ListAPIView):
end_date
=
request
.
QUERY_PARAMS
.
get
(
'end_date'
)
timezone
=
utc
if
start_date
:
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
)
self
.
start_date
=
self
.
parse_date
(
start_date
,
timezone
)
self
.
end_date
=
self
.
parse_date
(
end_date
,
timezone
)
return
super
(
BaseCourseView
,
self
)
.
get
(
request
,
*
args
,
**
kwargs
)
if
end_date
:
def
parse_date
(
self
,
date
,
timezone
):
if
date
:
try
:
end_date
=
datetime
.
datetime
.
strptime
(
end_
date
,
settings
.
DATETIME_FORMAT
)
date
=
datetime
.
datetime
.
strptime
(
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
self
.
end_date
=
end_date
return
super
(
BaseCourseView
,
self
)
.
get
(
request
,
*
args
,
**
kwargs
)
date
=
datetime
.
datetime
.
strptime
(
date
,
settings
.
DATE_FORMAT
)
date
=
make_aware
(
date
,
timezone
)
return
date
def
apply_date_filtering
(
self
,
queryset
):
raise
NotImplementedError
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment