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
2d0559fd
Commit
2d0559fd
authored
Aug 02, 2016
by
Ahsan Ulhaq
Committed by
Ahsan
Aug 05, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Course Catalog API Title Field Source Change
ECOM-4981
parent
82eaddb1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
course_discovery/apps/course_metadata/data_loaders.py
+2
-1
course_discovery/apps/course_metadata/management/commands/refresh_course_metadata.py
+1
-1
course_discovery/apps/course_metadata/management/commands/tests/test_refresh_course_metadata.py
+3
-2
No files found.
course_discovery/apps/course_metadata/data_loaders.py
View file @
2d0559fd
...
@@ -307,7 +307,7 @@ class DrupalApiDataLoader(AbstractDataLoader):
...
@@ -307,7 +307,7 @@ class DrupalApiDataLoader(AbstractDataLoader):
# Clean Organizations separately from other orphaned instances to avoid removing all orgnaziations
# Clean Organizations separately from other orphaned instances to avoid removing all orgnaziations
# after an initial data load on an empty table.
# after an initial data load on an empty table.
Organization
.
objects
.
filter
(
courseorganization__isnull
=
True
)
.
delete
()
Organization
.
objects
.
filter
(
courseorganization__isnull
=
True
,
program__isnull
=
True
)
.
delete
()
self
.
delete_orphans
()
self
.
delete_orphans
()
logger
.
info
(
'Retrieved
%
d course runs from
%
s.'
,
len
(
data
),
api_url
)
logger
.
info
(
'Retrieved
%
d course runs from
%
s.'
,
len
(
data
),
api_url
)
...
@@ -324,6 +324,7 @@ class DrupalApiDataLoader(AbstractDataLoader):
...
@@ -324,6 +324,7 @@ class DrupalApiDataLoader(AbstractDataLoader):
course
.
full_description
=
self
.
clean_html
(
body
[
'description'
])
course
.
full_description
=
self
.
clean_html
(
body
[
'description'
])
course
.
short_description
=
self
.
clean_html
(
body
[
'subtitle'
])
course
.
short_description
=
self
.
clean_html
(
body
[
'subtitle'
])
course
.
partner
=
self
.
partner
course
.
partner
=
self
.
partner
course
.
title
=
self
.
clean_html
(
body
[
'title'
])
level_type
,
__
=
LevelType
.
objects
.
get_or_create
(
name
=
body
[
'level'
][
'title'
])
level_type
,
__
=
LevelType
.
objects
.
get_or_create
(
name
=
body
[
'level'
][
'title'
])
course
.
level_type
=
level_type
course
.
level_type
=
level_type
...
...
course_discovery/apps/course_metadata/management/commands/refresh_course_metadata.py
View file @
2d0559fd
...
@@ -79,8 +79,8 @@ class Command(BaseCommand):
...
@@ -79,8 +79,8 @@ class Command(BaseCommand):
(
partner
.
organizations_api_url
,
OrganizationsApiDataLoader
,),
(
partner
.
organizations_api_url
,
OrganizationsApiDataLoader
,),
(
partner
.
courses_api_url
,
CoursesApiDataLoader
,),
(
partner
.
courses_api_url
,
CoursesApiDataLoader
,),
(
partner
.
ecommerce_api_url
,
EcommerceApiDataLoader
,),
(
partner
.
ecommerce_api_url
,
EcommerceApiDataLoader
,),
(
partner
.
marketing_site_api_url
,
DrupalApiDataLoader
,),
(
partner
.
programs_api_url
,
ProgramsApiDataLoader
,),
(
partner
.
programs_api_url
,
ProgramsApiDataLoader
,),
(
partner
.
marketing_site_api_url
,
DrupalApiDataLoader
,),
(
partner
.
marketing_site_url_root
,
MarketingSiteDataLoader
,),
(
partner
.
marketing_site_url_root
,
MarketingSiteDataLoader
,),
)
)
...
...
course_discovery/apps/course_metadata/management/commands/tests/test_refresh_course_metadata.py
View file @
2d0559fd
...
@@ -8,7 +8,8 @@ from django.test import TestCase
...
@@ -8,7 +8,8 @@ from django.test import TestCase
from
course_discovery.apps.core.tests.factories
import
PartnerFactory
from
course_discovery.apps.core.tests.factories
import
PartnerFactory
from
course_discovery.apps.core.tests.utils
import
mock_api_callback
from
course_discovery.apps.core.tests.utils
import
mock_api_callback
from
course_discovery.apps.course_metadata.data_loaders
import
(
from
course_discovery.apps.course_metadata.data_loaders
import
(
CoursesApiDataLoader
,
DrupalApiDataLoader
,
OrganizationsApiDataLoader
,
EcommerceApiDataLoader
,
ProgramsApiDataLoader
CoursesApiDataLoader
,
DrupalApiDataLoader
,
OrganizationsApiDataLoader
,
EcommerceApiDataLoader
,
ProgramsApiDataLoader
,
MarketingSiteDataLoader
)
)
from
course_discovery.apps.course_metadata.models
import
Course
,
CourseRun
,
Organization
,
Program
from
course_discovery.apps.course_metadata.models
import
Course
,
CourseRun
,
Organization
,
Program
from
course_discovery.apps.course_metadata.tests
import
mock_data
from
course_discovery.apps.course_metadata.tests
import
mock_data
...
@@ -162,6 +163,6 @@ class RefreshCourseMetadataCommandTests(TestCase):
...
@@ -162,6 +163,6 @@ class RefreshCourseMetadataCommandTests(TestCase):
call_command
(
'refresh_course_metadata'
)
call_command
(
'refresh_course_metadata'
)
loader_classes
=
(
OrganizationsApiDataLoader
,
CoursesApiDataLoader
,
EcommerceApiDataLoader
,
loader_classes
=
(
OrganizationsApiDataLoader
,
CoursesApiDataLoader
,
EcommerceApiDataLoader
,
DrupalApiDataLoader
,
ProgramsApi
DataLoader
)
ProgramsApiDataLoader
,
DrupalApiDataLoader
,
MarketingSite
DataLoader
)
expected_calls
=
[
mock
.
call
(
'
%
s failed!'
,
loader_class
.
__name__
)
for
loader_class
in
loader_classes
]
expected_calls
=
[
mock
.
call
(
'
%
s failed!'
,
loader_class
.
__name__
)
for
loader_class
in
loader_classes
]
mock_logger
.
exception
.
assert_has_calls
(
expected_calls
)
mock_logger
.
exception
.
assert_has_calls
(
expected_calls
)
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