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
54a9cb8a
Commit
54a9cb8a
authored
Jan 08, 2018
by
Michael Frey
Committed by
Michael Frey
Jan 09, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only delete entitlements after we process all pages.
parent
7bb785bd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
3 deletions
+16
-3
course_discovery/apps/course_metadata/data_loaders/api.py
+16
-3
No files found.
course_discovery/apps/course_metadata/data_loaders/api.py
View file @
54a9cb8a
...
@@ -252,6 +252,13 @@ class CoursesApiDataLoader(AbstractDataLoader):
...
@@ -252,6 +252,13 @@ class CoursesApiDataLoader(AbstractDataLoader):
class
EcommerceApiDataLoader
(
AbstractDataLoader
):
class
EcommerceApiDataLoader
(
AbstractDataLoader
):
""" Loads course seats and entitlements from the E-Commerce API. """
""" Loads course seats and entitlements from the E-Commerce API. """
def
__init__
(
self
,
partner
,
api_url
,
access_token
=
None
,
token_type
=
None
,
max_workers
=
None
,
is_threadsafe
=
False
,
**
kwargs
):
super
(
EcommerceApiDataLoader
,
self
)
.
__init__
(
partner
,
api_url
,
access_token
,
token_type
,
max_workers
,
is_threadsafe
,
**
kwargs
)
self
.
entitlement_skus
=
[]
def
ingest
(
self
):
def
ingest
(
self
):
logger
.
info
(
'Refreshing course seats from
%
s...'
,
self
.
partner
.
ecommerce_api_url
)
logger
.
info
(
'Refreshing course seats from
%
s...'
,
self
.
partner
.
ecommerce_api_url
)
...
@@ -260,6 +267,7 @@ class EcommerceApiDataLoader(AbstractDataLoader):
...
@@ -260,6 +267,7 @@ class EcommerceApiDataLoader(AbstractDataLoader):
entitlements
=
self
.
_request_entitlments
(
initial_page
)
entitlements
=
self
.
_request_entitlments
(
initial_page
)
count
=
course_runs
[
'count'
]
+
entitlements
[
'count'
]
count
=
course_runs
[
'count'
]
+
entitlements
[
'count'
]
pages
=
math
.
ceil
(
count
/
self
.
PAGE_SIZE
)
pages
=
math
.
ceil
(
count
/
self
.
PAGE_SIZE
)
self
.
entitlement_skus
=
[]
self
.
_process_course_runs
(
course_runs
)
self
.
_process_course_runs
(
course_runs
)
self
.
_process_entitlements
(
entitlements
)
self
.
_process_entitlements
(
entitlements
)
...
@@ -281,6 +289,7 @@ class EcommerceApiDataLoader(AbstractDataLoader):
...
@@ -281,6 +289,7 @@ class EcommerceApiDataLoader(AbstractDataLoader):
entitlements
[
'count'
],
self
.
partner
.
ecommerce_api_url
)
entitlements
[
'count'
],
self
.
partner
.
ecommerce_api_url
)
self
.
delete_orphans
()
self
.
delete_orphans
()
self
.
_delete_entitlements
()
def
_load_data
(
self
,
page
):
# pragma: no cover
def
_load_data
(
self
,
page
):
# pragma: no cover
"""Make a request for the given page and process the response."""
"""Make a request for the given page and process the response."""
...
@@ -307,11 +316,15 @@ class EcommerceApiDataLoader(AbstractDataLoader):
...
@@ -307,11 +316,15 @@ class EcommerceApiDataLoader(AbstractDataLoader):
results
=
response
[
'results'
]
results
=
response
[
'results'
]
logger
.
info
(
'Retrieved
%
d course entitlements...'
,
len
(
results
))
logger
.
info
(
'Retrieved
%
d course entitlements...'
,
len
(
results
))
skus
=
[]
for
body
in
results
:
for
body
in
results
:
body
=
self
.
clean_strings
(
body
)
body
=
self
.
clean_strings
(
body
)
skus
.
append
(
self
.
update_entitlement
(
body
))
self
.
entitlement_skus
.
append
(
self
.
update_entitlement
(
body
))
entitlements_to_delete
=
CourseEntitlement
.
objects
.
filter
(
partner
=
self
.
partner
)
.
exclude
(
sku__in
=
skus
)
def
_delete_entitlements
(
self
):
entitlements_to_delete
=
CourseEntitlement
.
objects
.
filter
(
partner
=
self
.
partner
)
.
exclude
(
sku__in
=
self
.
entitlement_skus
)
for
entitlement
in
entitlements_to_delete
:
for
entitlement
in
entitlements_to_delete
:
msg
=
'Deleting entitlement with sku {sku} for partner {partner}'
.
format
(
msg
=
'Deleting entitlement with sku {sku} for partner {partner}'
.
format
(
sku
=
entitlement
.
sku
,
partner
=
entitlement
.
partner
sku
=
entitlement
.
sku
,
partner
=
entitlement
.
partner
...
...
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