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
b857f029
Commit
b857f029
authored
Jan 14, 2016
by
Dennis Jen
Committed by
Daniel Friedman
Apr 11, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Return null for empty learner fields.
parent
a068da24
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
7 deletions
+22
-7
analytics_data_api/v0/serializers.py
+8
-0
analytics_data_api/v0/tests/views/test_learners.py
+14
-7
No files found.
analytics_data_api/v0/serializers.py
View file @
b857f029
...
...
@@ -332,6 +332,14 @@ class LearnerSerializer(serializers.Serializer, DefaultIfNoneMixin):
enrollment_date
=
serializers
.
DateField
(
source
=
'enrollment_date'
,
format
=
settings
.
DATE_FORMAT
)
cohort
=
serializers
.
CharField
(
source
=
'cohort'
)
def
transform_segments
(
self
,
_obj
,
value
):
# returns null instead of empty strings
return
value
or
[]
def
transform_cohort
(
self
,
_obj
,
value
):
# returns null instead of empty strings
return
value
or
None
def
get_account_url
(
self
,
obj
):
if
settings
.
LMS_USER_ACCOUNT_BASE_URL
:
return
urljoin
(
settings
.
LMS_USER_ACCOUNT_BASE_URL
,
obj
.
username
)
...
...
analytics_data_api/v0/tests/views/test_learners.py
View file @
b857f029
...
...
@@ -118,25 +118,32 @@ class LearnerAPITestMixin(object):
enrollment_date
=
'2015-01-28'
,
):
"""Create a single learner roster entry in the elasticsearch index."""
self
.
_es
.
create
(
index
=
settings
.
ELASTICSEARCH_LEARNERS_INDEX
,
doc_type
=
'roster_entry'
,
body
=
{
body
=
{
'username'
:
username
,
'course_id'
:
course_id
,
'name'
:
name
if
name
is
not
None
else
username
,
'email'
:
email
if
email
is
not
None
else
'{}@example.com'
.
format
(
username
),
'enrollment_mode'
:
enrollment_mode
,
'segments'
:
segments
if
segments
is
not
None
else
list
(),
'cohort'
:
cohort
,
'discussion_contributions'
:
discussion_contributions
,
'problems_attempted'
:
problems_attempted
,
'problems_completed'
:
problems_completed
,
'problem_attempts_per_completed'
:
problem_attempts_per_completed
,
'attempt_ratio_order'
:
attempt_ratio_order
,
'videos_viewed'
:
videos_viewed
,
'enrollment_date'
:
enrollment_date
,
}
# leave null fields from being stored in the index. Otherwise, they will have
# an explicit null value and we want to test for the case when they're not returned
optional_fields
=
[(
'segments'
,
segments
),
(
'cohort'
,
cohort
),
(
'problem_attempts_per_completed'
,
problem_attempts_per_completed
)]
for
optional_field
in
optional_fields
:
if
optional_field
[
1
]:
body
[
optional_field
[
0
]]
=
optional_field
[
1
]
self
.
_es
.
create
(
index
=
settings
.
ELASTICSEARCH_LEARNERS_INDEX
,
doc_type
=
'roster_entry'
,
body
=
body
)
def
create_learners
(
self
,
learners
):
...
...
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