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
9005819d
Commit
9005819d
authored
Mar 07, 2018
by
Bessie Steinberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
digital book bundle api
parent
0430072c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
56 additions
and
9 deletions
+56
-9
course_discovery/apps/api/serializers.py
+13
-3
course_discovery/apps/course_metadata/admin.py
+2
-3
course_discovery/apps/course_metadata/migrations/0079_merge_20180307_1540.py
+16
-0
course_discovery/apps/course_metadata/migrations/0080_auto_20180307_2234.py
+24
-0
course_discovery/apps/course_metadata/models.py
+1
-3
No files found.
course_discovery/apps/api/serializers.py
View file @
9005819d
...
@@ -26,6 +26,9 @@ from course_discovery.apps.course_metadata.models import (
...
@@ -26,6 +26,9 @@ from course_discovery.apps.course_metadata.models import (
)
)
from
course_discovery.apps.course_metadata.search_indexes
import
CourseIndex
,
CourseRunIndex
,
ProgramIndex
from
course_discovery.apps.course_metadata.search_indexes
import
CourseIndex
,
CourseRunIndex
,
ProgramIndex
import
logging
logger
=
logging
.
getLogger
(
__name__
)
User
=
get_user_model
()
User
=
get_user_model
()
COMMON_IGNORED_FIELDS
=
(
'text'
,)
COMMON_IGNORED_FIELDS
=
(
'text'
,)
...
@@ -955,10 +958,14 @@ class ProgramTypeSerializer(serializers.ModelSerializer):
...
@@ -955,10 +958,14 @@ class ProgramTypeSerializer(serializers.ModelSerializer):
class
MinimalDigitalBookBundleSerializer
(
serializers
.
ModelSerializer
):
class
MinimalDigitalBookBundleSerializer
(
serializers
.
ModelSerializer
):
courses
=
MinimalCourseSerializer
(
many
=
True
,
read_only
=
True
)
@classmethod
@classmethod
def
prefetch_queryset
(
cls
):
def
prefetch_queryset
(
cls
):
return
DigitalBookBundle
.
objects
.
all
()
#TODO: optimize this
return
DigitalBookBundle
.
objects
.
prefetch_related
(
Prefetch
(
'courses'
,
queryset
=
MinimalCourseSerializer
.
prefetch_queryset
())
)
class
Meta
:
class
Meta
:
model
=
DigitalBookBundle
model
=
DigitalBookBundle
...
@@ -966,13 +973,16 @@ class MinimalDigitalBookBundleSerializer(serializers.ModelSerializer):
...
@@ -966,13 +973,16 @@ class MinimalDigitalBookBundleSerializer(serializers.ModelSerializer):
'uuid'
,
'uuid'
,
'title'
,
'title'
,
'book_key'
,
'book_key'
,
'course
'
#TODO: return actual course not course id
'course
s'
)
)
def
get_course
(
self
,
digital_book_bundle
):
def
get_course
(
self
,
digital_book_bundle
):
import
pdb
;
pdb
.
set_trace
()
import
pdb
;
pdb
.
set_trace
()
pass
course_runs
=
list
(
digital_book_bundle
.
course_runs
)
logger
.
info
(
">>> course_runs:
%
s"
,
course_runs
)
return
MinimalCourseSerializer
()
class
AffiliateWindowSerializer
(
serializers
.
ModelSerializer
):
class
AffiliateWindowSerializer
(
serializers
.
ModelSerializer
):
""" Serializer for Affiliate Window product feeds. """
""" Serializer for Affiliate Window product feeds. """
...
...
course_discovery/apps/course_metadata/admin.py
View file @
9005819d
...
@@ -115,10 +115,9 @@ class DigitalBookBundleAdmin(admin.ModelAdmin):
...
@@ -115,10 +115,9 @@ class DigitalBookBundleAdmin(admin.ModelAdmin):
'id'
,
'id'
,
'uuid'
,
'uuid'
,
'title'
,
'title'
,
'book_key'
,
'book_key'
'course'
)
)
raw_id_fields
=
(
'course'
,)
raw_id_fields
=
(
'course
s
'
,)
@admin.register
(
Program
)
@admin.register
(
Program
)
...
...
course_discovery/apps/course_metadata/migrations/0079_merge_20180307_1540.py
0 → 100644
View file @
9005819d
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2018-03-07 15:40
from
__future__
import
unicode_literals
from
django.db
import
migrations
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'course_metadata'
,
'0078_merge_20180209_1044'
),
(
'course_metadata'
,
'0078_digitalbookbundle'
),
]
operations
=
[
]
course_discovery/apps/course_metadata/migrations/0080_auto_20180307_2234.py
0 → 100644
View file @
9005819d
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2018-03-07 22:34
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'course_metadata'
,
'0079_merge_20180307_1540'
),
]
operations
=
[
migrations
.
RemoveField
(
model_name
=
'digitalbookbundle'
,
name
=
'course'
,
),
migrations
.
AddField
(
model_name
=
'digitalbookbundle'
,
name
=
'courses'
,
field
=
models
.
ManyToManyField
(
blank
=
True
,
to
=
'course_metadata.Course'
),
),
]
course_discovery/apps/course_metadata/models.py
View file @
9005819d
...
@@ -934,9 +934,7 @@ class DigitalBookBundle(TimeStampedModel):
...
@@ -934,9 +934,7 @@ class DigitalBookBundle(TimeStampedModel):
)
)
#TODO: replace with foreign key
#TODO: replace with foreign key
book_key
=
models
.
CharField
(
max_length
=
255
)
book_key
=
models
.
CharField
(
max_length
=
255
)
#TODO: we may one day want to make this a many to many relationship
courses
=
models
.
ManyToManyField
(
Course
,
blank
=
True
)
#TODO: should it be a course or a course run?
course
=
models
.
ForeignKey
(
Course
)
class
Program
(
TimeStampedModel
):
class
Program
(
TimeStampedModel
):
...
...
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