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
ff9cea07
Commit
ff9cea07
authored
Aug 31, 2016
by
Clinton Blackburn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated data loaders to set course run status
ECOM-5411
parent
381b146d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
1 deletions
+18
-1
course_discovery/apps/course_metadata/data_loaders/api.py
+1
-0
course_discovery/apps/course_metadata/data_loaders/marketing_site.py
+4
-0
course_discovery/apps/course_metadata/data_loaders/tests/test_api.py
+1
-0
course_discovery/apps/course_metadata/data_loaders/tests/test_marketing_site.py
+12
-1
No files found.
course_discovery/apps/course_metadata/data_loaders/api.py
View file @
ff9cea07
...
...
@@ -135,6 +135,7 @@ class CoursesApiDataLoader(AbstractDataLoader):
'title_override'
:
body
[
'name'
],
'short_description_override'
:
body
[
'short_description'
],
'video'
:
self
.
get_courserun_video
(
body
),
'status'
:
CourseRun
.
Status
.
Published
,
})
course_run
,
__
=
course
.
course_runs
.
update_or_create
(
key__iexact
=
key
,
defaults
=
defaults
)
...
...
course_discovery/apps/course_metadata/data_loaders/marketing_site.py
View file @
ff9cea07
...
...
@@ -370,6 +370,9 @@ class CourseMarketingSiteDataLoader(AbstractMarketingSiteDataLoader):
description
=
self
.
clean_html
(
description
)
return
description
def
get_course_run_status
(
self
,
data
):
return
CourseRun
.
Status
.
Published
if
bool
(
int
(
data
[
'status'
]))
else
CourseRun
.
Status
.
Unpublished
def
get_level_type
(
self
,
name
):
level_type
=
None
...
...
@@ -397,6 +400,7 @@ class CourseMarketingSiteDataLoader(AbstractMarketingSiteDataLoader):
'language'
:
language
,
'slug'
:
slug
,
'card_image_url'
:
self
.
_get_nested_url
(
data
.
get
(
'field_course_image_promoted'
)),
'status'
:
self
.
get_course_run_status
(
data
),
}
try
:
...
...
course_discovery/apps/course_metadata/data_loaders/tests/test_api.py
View file @
ff9cea07
...
...
@@ -158,6 +158,7 @@ class CoursesApiDataLoaderTests(ApiClientTestMixin, DataLoaderTestMixin, TestCas
'title_override'
:
body
[
'name'
],
'short_description_override'
:
self
.
loader
.
clean_string
(
body
[
'short_description'
]),
'video'
:
self
.
loader
.
get_courserun_video
(
body
),
'status'
:
CourseRun
.
Status
.
Published
,
})
for
field
,
value
in
expected_values
.
items
():
...
...
course_discovery/apps/course_metadata/data_loaders/tests/test_marketing_site.py
View file @
ff9cea07
...
...
@@ -14,7 +14,8 @@ from course_discovery.apps.course_metadata.data_loaders.marketing_site import (
)
from
course_discovery.apps.course_metadata.data_loaders.tests
import
JSON
,
mock_data
from
course_discovery.apps.course_metadata.data_loaders.tests.mixins
import
DataLoaderTestMixin
from
course_discovery.apps.course_metadata.models
import
Organization
,
Subject
,
Program
,
Video
,
Person
,
Course
from
course_discovery.apps.course_metadata.models
import
Organization
,
Subject
,
Program
,
Video
,
Person
,
Course
,
\
CourseRun
from
course_discovery.apps.course_metadata.tests
import
factories
from
course_discovery.apps.ietf_language_tags.models
import
LanguageTag
...
...
@@ -354,6 +355,15 @@ class CourseMarketingSiteDataLoaderTests(AbstractMarketingSiteDataLoaderTestMixi
name
=
'Advanced'
self
.
assertEqual
(
self
.
loader
.
get_level_type
(
name
)
.
name
,
name
)
@ddt.unpack
@ddt.data
(
(
'0'
,
CourseRun
.
Status
.
Unpublished
),
(
'1'
,
CourseRun
.
Status
.
Published
),
)
def
test_get_course_run_status
(
self
,
marketing_site_status
,
expected
):
data
=
{
'status'
:
marketing_site_status
}
self
.
assertEqual
(
self
.
loader
.
get_course_run_status
(
data
),
expected
)
@ddt.data
(
{
'field_course_body'
:
{
'value'
:
'Test'
}},
{
'field_course_description'
:
{
'value'
:
'Test'
}},
...
...
@@ -417,6 +427,7 @@ class CourseMarketingSiteDataLoaderTests(AbstractMarketingSiteDataLoaderTestMixi
'language'
:
language
,
'slug'
:
data
[
'url'
]
.
split
(
'/'
)[
-
1
],
'card_image_url'
:
(
data
.
get
(
'field_course_image_promoted'
)
or
{})
.
get
(
'url'
),
'status'
:
self
.
loader
.
get_course_run_status
(
data
),
}
for
field
,
value
in
expected_values
.
items
():
...
...
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