Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
course-discovery
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
course-discovery
Commits
604f18bf
Commit
604f18bf
authored
Apr 06, 2016
by
Bill DeRusha
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #59 from edx/bderusha/ecom-loader
ECommerce Data Ingest
parents
9e7b4563
2809e293
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
403 additions
and
4 deletions
+403
-4
course_discovery/apps/course_metadata/data_loaders.py
+82
-1
course_discovery/apps/course_metadata/tests/test_data_loaders.py
+321
-3
No files found.
course_discovery/apps/course_metadata/data_loaders.py
View file @
604f18bf
""" Data loaders. """
""" Data loaders. """
import
abc
import
abc
import
logging
import
logging
from
decimal
import
Decimal
from
urllib.parse
import
urljoin
from
urllib.parse
import
urljoin
from
dateutil.parser
import
parse
from
dateutil.parser
import
parse
...
@@ -9,8 +10,9 @@ from edx_rest_api_client.client import EdxRestApiClient
...
@@ -9,8 +10,9 @@ from edx_rest_api_client.client import EdxRestApiClient
import
html2text
import
html2text
from
opaque_keys.edx.keys
import
CourseKey
from
opaque_keys.edx.keys
import
CourseKey
from
course_discovery.apps.core.models
import
Currency
from
course_discovery.apps.course_metadata.models
import
(
from
course_discovery.apps.course_metadata.models
import
(
Course
,
CourseOrganization
,
CourseRun
,
Image
,
LanguageTag
,
LevelType
,
Organization
,
Subject
,
Video
Course
,
CourseOrganization
,
CourseRun
,
Image
,
LanguageTag
,
LevelType
,
Organization
,
S
eat
,
S
ubject
,
Video
)
)
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
...
@@ -304,3 +306,82 @@ class DrupalApiDataLoader(AbstractDataLoader):
...
@@ -304,3 +306,82 @@ class DrupalApiDataLoader(AbstractDataLoader):
html_converter
.
wrap_links
=
False
html_converter
.
wrap_links
=
False
html_converter
.
body_width
=
None
html_converter
.
body_width
=
None
return
html_converter
.
handle
(
stripped
)
.
strip
()
return
html_converter
.
handle
(
stripped
)
.
strip
()
class
EcommerceApiDataLoader
(
AbstractDataLoader
):
""" Loads course seats from the E-Commerce API. """
def
ingest
(
self
):
client
=
EdxRestApiClient
(
self
.
api_url
,
oauth_access_token
=
self
.
access_token
)
count
=
None
page
=
1
logger
.
info
(
'Refreshing course seats from
%
s...'
,
self
.
api_url
)
while
page
:
response
=
client
.
courses
()
.
get
(
page
=
page
,
page_size
=
self
.
PAGE_SIZE
,
include_products
=
True
)
count
=
response
[
'count'
]
results
=
response
[
'results'
]
logger
.
info
(
'Retrieved
%
d course seats...'
,
len
(
results
))
if
response
[
'next'
]:
page
+=
1
else
:
page
=
None
for
body
in
results
:
body
=
self
.
clean_strings
(
body
)
self
.
update_seats
(
body
)
logger
.
info
(
'Retrieved
%
d course seats from
%
s.'
,
count
,
self
.
api_url
)
def
update_seats
(
self
,
body
):
course_run_key
=
body
[
'id'
]
try
:
course_run
=
CourseRun
.
objects
.
get
(
key
=
course_run_key
)
except
CourseRun
.
DoesNotExist
:
logger
.
warning
(
'Could not find course run [
%
s]'
,
course_run_key
)
return
None
for
product
in
body
[
'products'
]:
if
product
[
'structure'
]
!=
'child'
:
continue
product
=
self
.
clean_strings
(
product
)
self
.
update_seat
(
course_run
,
product
)
# Remove seats which no longer exist for that course run
certificate_types
=
[
self
.
get_certificate_type
(
product
)
for
product
in
body
[
'products'
]
if
product
[
'structure'
]
==
'child'
]
course_run
.
seats
.
exclude
(
type__in
=
certificate_types
)
.
delete
()
def
update_seat
(
self
,
course_run
,
product
):
currency_code
=
product
[
'stockrecords'
][
0
][
'price_currency'
]
try
:
currency
=
Currency
.
objects
.
get
(
code
=
currency_code
)
except
Currency
.
DoesNotExist
:
logger
.
warning
(
"Could not find currency [
%
s]"
,
currency_code
)
return
None
product_values
=
{
'type'
:
Seat
.
AUDIT
,
'currency'
:
currency
,
'upgrade_deadline'
:
product
.
get
(
'expires'
),
'price'
:
Decimal
(
product
.
get
(
'price'
,
0.0
)),
}
for
att
in
product
[
'attribute_values'
]:
if
att
[
'name'
]
==
'certificate_type'
:
product_values
[
'type'
]
=
att
[
'value'
]
elif
att
[
'name'
]
==
'credit_provider'
:
product_values
[
'credit_provider'
]
=
att
[
'value'
]
elif
att
[
'name'
]
==
'credit_hours'
:
product_values
[
'credit_hours'
]
=
att
[
'value'
]
course_run
.
seats
.
update_or_create
(
type
=
product
.
get
(
'type'
),
defaults
=
product_values
)
def
get_certificate_type
(
self
,
product
):
return
next
(
(
att
[
'value'
]
for
att
in
product
[
'attribute_values'
]
if
att
[
'name'
]
==
'certificate_type'
),
Seat
.
AUDIT
)
course_discovery/apps/course_metadata/tests/test_data_loaders.py
View file @
604f18bf
...
@@ -8,18 +8,21 @@ import responses
...
@@ -8,18 +8,21 @@ import responses
from
django.conf
import
settings
from
django.conf
import
settings
from
django.test
import
TestCase
,
override_settings
from
django.test
import
TestCase
,
override_settings
from
opaque_keys.edx.keys
import
CourseKey
from
opaque_keys.edx.keys
import
CourseKey
from
pytz
import
UTC
from
course_discovery.apps.course_metadata.data_loaders
import
(
from
course_discovery.apps.course_metadata.data_loaders
import
(
OrganizationsApiDataLoader
,
CoursesApiDataLoader
,
AbstractDataLoader
,
DrupalApi
DataLoader
OrganizationsApiDataLoader
,
CoursesApiDataLoader
,
DrupalApiDataLoader
,
EcommerceApiDataLoader
,
Abstract
DataLoader
)
)
from
course_discovery.apps.course_metadata.models
import
(
from
course_discovery.apps.course_metadata.models
import
(
Course
,
CourseRun
,
Image
,
LanguageTag
,
Organization
,
Subject
Course
,
CourseRun
,
Image
,
LanguageTag
,
Organization
,
S
eat
,
S
ubject
)
)
from
course_discovery.apps.course_metadata.tests.factories
import
CourseRunFactory
,
SeatFactory
ACCESS_TOKEN
=
'secret'
ACCESS_TOKEN
=
'secret'
COURSES_API_URL
=
'https://lms.example.com/api/courses/v1'
COURSES_API_URL
=
'https://lms.example.com/api/courses/v1'
ORGANIZATIONS_API_URL
=
'https://lms.example.com/api/organizations/v0'
ORGANIZATIONS_API_URL
=
'https://lms.example.com/api/organizations/v0'
MARKETING_API_URL
=
'https://example.com/api/catalog/v2/'
MARKETING_API_URL
=
'https://example.com/api/catalog/v2/'
ECOMMERCE_API_URL
=
'https://ecommerce.example.com/api/v2'
JSON
=
'application/json'
JSON
=
'application/json'
...
@@ -543,3 +546,318 @@ class DrupalApiDataLoaderTests(DataLoaderTestMixin, TestCase):
...
@@ -543,3 +546,318 @@ class DrupalApiDataLoaderTests(DataLoaderTestMixin, TestCase):
@ddt.unpack
@ddt.unpack
def
test_get_language_tag
(
self
,
body
,
expected
):
def
test_get_language_tag
(
self
,
body
,
expected
):
self
.
assertEqual
(
self
.
loader
.
get_language_tag
(
body
),
expected
)
self
.
assertEqual
(
self
.
loader
.
get_language_tag
(
body
),
expected
)
@ddt.ddt
@override_settings
(
ECOMMERCE_API_URL
=
ECOMMERCE_API_URL
)
class
EcommerceApiDataLoaderTests
(
DataLoaderTestMixin
,
TestCase
):
api_url
=
ECOMMERCE_API_URL
loader_class
=
EcommerceApiDataLoader
def
mock_api
(
self
):
course_run_audit
=
CourseRunFactory
(
title
=
'audit'
)
course_run_verified
=
CourseRunFactory
(
title
=
'verified'
)
course_run_credit
=
CourseRunFactory
(
title
=
'credit'
)
course_run_no_currency
=
CourseRunFactory
(
title
=
'no currency'
)
# create existing seats to be removed by ingest
SeatFactory
(
course_run
=
course_run_audit
,
type
=
Seat
.
PROFESSIONAL
)
SeatFactory
(
course_run
=
course_run_verified
,
type
=
Seat
.
PROFESSIONAL
)
SeatFactory
(
course_run
=
course_run_credit
,
type
=
Seat
.
PROFESSIONAL
)
SeatFactory
(
course_run
=
course_run_no_currency
,
type
=
Seat
.
PROFESSIONAL
)
bodies
=
[
{
"id"
:
course_run_audit
.
key
,
"products"
:
[
{
"structure"
:
"parent"
,
"price"
:
None
,
"expires"
:
None
,
"attribute_values"
:
[],
"is_available_to_buy"
:
False
,
"stockrecords"
:
[]
},
{
"structure"
:
"child"
,
"price"
:
"0.00"
,
"expires"
:
None
,
"attribute_values"
:
[],
"stockrecords"
:
[
{
"price_currency"
:
"USD"
,
}
]
}
]
},
{
"id"
:
course_run_verified
.
key
,
"products"
:
[
{
"structure"
:
"parent"
,
"price"
:
None
,
"expires"
:
None
,
"attribute_values"
:
[],
"is_available_to_buy"
:
False
,
"stockrecords"
:
[]
},
{
"structure"
:
"child"
,
"price"
:
"0.00"
,
"expires"
:
None
,
"attribute_values"
:
[
{
"name"
:
"certificate_type"
,
"value"
:
"honor"
}
],
"stockrecords"
:
[
{
"price_currency"
:
"EUR"
,
}
]
},
{
"structure"
:
"child"
,
"price"
:
"25.00"
,
"expires"
:
"2017-01-01T12:00:00Z"
,
"attribute_values"
:
[
{
"name"
:
"certificate_type"
,
"value"
:
"verified"
}
],
"stockrecords"
:
[
{
"price_currency"
:
"EUR"
,
}
]
}
]
},
{
"id"
:
course_run_credit
.
key
,
"products"
:
[
{
"structure"
:
"parent"
,
"price"
:
None
,
"expires"
:
None
,
"attribute_values"
:
[],
"is_available_to_buy"
:
False
,
"stockrecords"
:
[]
},
{
"structure"
:
"child"
,
"price"
:
"0.00"
,
"expires"
:
None
,
"attribute_values"
:
[],
"stockrecords"
:
[
{
"price_currency"
:
"USD"
,
}
]
},
{
"structure"
:
"child"
,
"price"
:
"25.00"
,
"expires"
:
"2017-01-01T12:00:00Z"
,
"attribute_values"
:
[
{
"name"
:
"certificate_type"
,
"value"
:
"verified"
}
],
"stockrecords"
:
[
{
"price_currency"
:
"USD"
,
}
]
},
{
"structure"
:
"child"
,
"price"
:
"250.00"
,
"expires"
:
"2017-06-01T12:00:00Z"
,
"attribute_values"
:
[
{
"name"
:
"certificate_type"
,
"value"
:
"credit"
},
{
"name"
:
"credit_hours"
,
"value"
:
2
},
{
"name"
:
"credit_provider"
,
"value"
:
"asu"
},
{
"name"
:
"verification_required"
,
"value"
:
False
},
],
"stockrecords"
:
[
{
"price_currency"
:
"USD"
,
}
]
}
]
},
{
# Course with a currency not found in the database
"id"
:
course_run_no_currency
.
key
,
"products"
:
[
{
"structure"
:
"parent"
,
"price"
:
None
,
"expires"
:
None
,
"attribute_values"
:
[],
"is_available_to_buy"
:
False
,
"stockrecords"
:
[]
},
{
"structure"
:
"child"
,
"price"
:
"0.00"
,
"expires"
:
None
,
"attribute_values"
:
[],
"stockrecords"
:
[
{
"price_currency"
:
"123"
,
}
]
}
]
},
{
# Course which does not exist in LMS
"id"
:
"fake-course-does-not-exist"
,
"products"
:
[
{
"structure"
:
"parent"
,
"price"
:
None
,
"expires"
:
None
,
"attribute_values"
:
[],
"is_available_to_buy"
:
False
,
"stockrecords"
:
[]
},
{
"structure"
:
"child"
,
"price"
:
"0.00"
,
"expires"
:
None
,
"attribute_values"
:
[],
"stockrecords"
:
[
{
"price_currency"
:
"USD"
,
}
]
}
]
}
]
def
courses_api_callback
(
url
,
data
):
def
request_callback
(
request
):
# pylint: disable=redefined-builtin
next
=
None
count
=
len
(
bodies
)
# Use the querystring to determine which page should be returned. Default to page 1.
# Note that the values of the dict returned by `parse_qs` are lists, hence the `[1]` default value.
qs
=
parse_qs
(
urlparse
(
request
.
path_url
)
.
query
)
page
=
int
(
qs
.
get
(
'page'
,
[
1
])[
0
])
if
page
<
count
:
next
=
'{}?page={}'
.
format
(
url
,
page
)
body
=
{
'count'
:
count
,
'next'
:
next
,
'previous'
:
None
,
'results'
:
[
data
[
page
-
1
]]
}
return
200
,
{},
json
.
dumps
(
body
)
return
request_callback
url
=
'{host}/courses/'
.
format
(
host
=
settings
.
ECOMMERCE_API_URL
)
responses
.
add_callback
(
responses
.
GET
,
url
,
callback
=
courses_api_callback
(
url
,
bodies
),
content_type
=
JSON
)
return
bodies
def
assert_seats_loaded
(
self
,
body
):
""" Assert a Seat corresponding to the specified data body was properly loaded into the database. """
course_run
=
CourseRun
.
objects
.
get
(
key
=
body
[
'id'
])
products
=
[
p
for
p
in
body
[
'products'
]
if
p
[
'structure'
]
==
'child'
]
# Verify that the old seat is removed
self
.
assertEqual
(
course_run
.
seats
.
count
(),
len
(
products
))
# Validate each seat
for
product
in
products
:
price_currency
=
product
[
'stockrecords'
][
0
][
'price_currency'
]
price
=
float
(
product
.
get
(
'price'
,
0.0
))
certificate_type
=
Seat
.
AUDIT
credit_provider
=
None
credit_hours
=
None
if
product
[
'expires'
]:
upgrade_deadline
=
datetime
.
datetime
.
strptime
(
product
[
'expires'
],
"
%
Y-
%
m-
%
dT
%
H:
%
M:
%
SZ"
)
.
replace
(
tzinfo
=
UTC
)
else
:
upgrade_deadline
=
None
for
att
in
product
[
'attribute_values'
]:
if
att
[
'name'
]
==
'certificate_type'
:
certificate_type
=
att
[
'value'
]
elif
att
[
'name'
]
==
'credit_provider'
:
credit_provider
=
att
[
'value'
]
elif
att
[
'name'
]
==
'credit_hours'
:
credit_hours
=
att
[
'value'
]
seat
=
course_run
.
seats
.
get
(
type
=
certificate_type
)
self
.
assertEqual
(
seat
.
course_run
,
course_run
)
self
.
assertEqual
(
seat
.
type
,
certificate_type
)
self
.
assertEqual
(
seat
.
price
,
price
)
self
.
assertEqual
(
seat
.
currency
.
code
,
price_currency
)
self
.
assertEqual
(
seat
.
credit_provider
,
credit_provider
)
self
.
assertEqual
(
seat
.
credit_hours
,
credit_hours
)
self
.
assertEqual
(
seat
.
upgrade_deadline
,
upgrade_deadline
)
@responses.activate
def
test_ingest
(
self
):
""" Verify the method ingests data from the Courses API. """
data
=
self
.
mock_api
()
loaded_course_run_data
=
data
[:
-
1
]
loaded_seat_data
=
data
[:
-
2
]
self
.
assertEqual
(
CourseRun
.
objects
.
count
(),
len
(
loaded_course_run_data
))
# Verify a seat exists on all courses already
for
course_run
in
CourseRun
.
objects
.
all
():
self
.
assertEqual
(
course_run
.
seats
.
count
(),
1
)
self
.
loader
.
ingest
()
# Verify the API was called with the correct authorization header
expected_num_course_runs
=
len
(
data
)
self
.
assert_api_called
(
expected_num_course_runs
)
for
datum
in
loaded_seat_data
:
self
.
assert_seats_loaded
(
datum
)
@ddt.unpack
@ddt.data
(
({
"attribute_values"
:
[]},
Seat
.
AUDIT
),
({
"attribute_values"
:
[{
'name'
:
'certificate_type'
,
'value'
:
'professional'
}]},
'professional'
),
(
{
"attribute_values"
:
[
{
'name'
:
'other_data'
,
'value'
:
'other'
},
{
'name'
:
'certificate_type'
,
'value'
:
'credit'
}
]},
'credit'
),
({
"attribute_values"
:
[{
'name'
:
'other_data'
,
'value'
:
'other'
}]},
Seat
.
AUDIT
),
)
def
test_get_certificate_type
(
self
,
product
,
expected_certificate_type
):
""" Verify the method returns the correct certificate type"""
self
.
assertEqual
(
self
.
loader
.
get_certificate_type
(
product
),
expected_certificate_type
)
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