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
a2b00507
Commit
a2b00507
authored
Mar 13, 2018
by
Adam Stankiewicz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add enrollment code SKU in Seat model, modify ecommerce data loader to get enrollment codes
parent
1efd2cbd
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
49 additions
and
8 deletions
+49
-8
course_discovery/apps/api/serializers.py
+2
-1
course_discovery/apps/api/tests/test_serializers.py
+2
-1
course_discovery/apps/course_metadata/data_loaders/api.py
+0
-0
course_discovery/apps/course_metadata/data_loaders/tests/mock_data.py
+23
-6
course_discovery/apps/course_metadata/data_loaders/tests/test_api.py
+0
-0
course_discovery/apps/course_metadata/migrations/0080_seat_bulk_sku.py
+20
-0
course_discovery/apps/course_metadata/models.py
+1
-0
course_discovery/apps/course_metadata/tests/factories.py
+1
-0
No files found.
course_discovery/apps/api/serializers.py
View file @
a2b00507
...
@@ -387,6 +387,7 @@ class SeatSerializer(serializers.ModelSerializer):
...
@@ -387,6 +387,7 @@ class SeatSerializer(serializers.ModelSerializer):
credit_provider
=
serializers
.
CharField
()
credit_provider
=
serializers
.
CharField
()
credit_hours
=
serializers
.
IntegerField
()
credit_hours
=
serializers
.
IntegerField
()
sku
=
serializers
.
CharField
()
sku
=
serializers
.
CharField
()
bulk_sku
=
serializers
.
CharField
()
@classmethod
@classmethod
def
prefetch_queryset
(
cls
):
def
prefetch_queryset
(
cls
):
...
@@ -394,7 +395,7 @@ class SeatSerializer(serializers.ModelSerializer):
...
@@ -394,7 +395,7 @@ class SeatSerializer(serializers.ModelSerializer):
class
Meta
(
object
):
class
Meta
(
object
):
model
=
Seat
model
=
Seat
fields
=
(
'type'
,
'price'
,
'currency'
,
'upgrade_deadline'
,
'credit_provider'
,
'credit_hours'
,
'sku'
,)
fields
=
(
'type'
,
'price'
,
'currency'
,
'upgrade_deadline'
,
'credit_provider'
,
'credit_hours'
,
'sku'
,
'bulk_sku'
)
class
CourseEntitlementSerializer
(
serializers
.
ModelSerializer
):
class
CourseEntitlementSerializer
(
serializers
.
ModelSerializer
):
...
...
course_discovery/apps/api/tests/test_serializers.py
View file @
a2b00507
...
@@ -1117,7 +1117,8 @@ class SeatSerializerTests(TestCase):
...
@@ -1117,7 +1117,8 @@ class SeatSerializerTests(TestCase):
'upgrade_deadline'
:
json_date_format
(
seat
.
upgrade_deadline
),
'upgrade_deadline'
:
json_date_format
(
seat
.
upgrade_deadline
),
'credit_provider'
:
seat
.
credit_provider
,
# pylint: disable=no-member
'credit_provider'
:
seat
.
credit_provider
,
# pylint: disable=no-member
'credit_hours'
:
seat
.
credit_hours
,
# pylint: disable=no-member
'credit_hours'
:
seat
.
credit_hours
,
# pylint: disable=no-member
'sku'
:
seat
.
sku
'sku'
:
seat
.
sku
,
'bulk_sku'
:
seat
.
bulk_sku
}
}
self
.
assertDictEqual
(
serializer
.
data
,
expected
)
self
.
assertDictEqual
(
serializer
.
data
,
expected
)
...
...
course_discovery/apps/course_metadata/data_loaders/api.py
View file @
a2b00507
This diff is collapsed.
Click to expand it.
course_discovery/apps/course_metadata/data_loaders/tests/mock_data.py
View file @
a2b00507
...
@@ -231,6 +231,23 @@ ECOMMERCE_API_BODIES = [
...
@@ -231,6 +231,23 @@ ECOMMERCE_API_BODIES = [
"partner_sku"
:
"sku003"
,
"partner_sku"
:
"sku003"
,
}
}
]
]
},
{
"structure"
:
"standalone"
,
"expires"
:
"2017-01-01T12:00:00Z"
,
"attribute_values"
:
[
{
"code"
:
"seat_type"
,
"value"
:
"verified"
}
],
"stockrecords"
:
[
{
"price_currency"
:
"EUR"
,
"price_excl_tax"
:
"25.00"
,
"partner_sku"
:
"sku004"
}
]
}
}
]
]
},
},
...
@@ -255,7 +272,7 @@ ECOMMERCE_API_BODIES = [
...
@@ -255,7 +272,7 @@ ECOMMERCE_API_BODIES = [
{
{
"price_currency"
:
"USD"
,
"price_currency"
:
"USD"
,
"price_excl_tax"
:
"0.00"
,
"price_excl_tax"
:
"0.00"
,
"partner_sku"
:
"sku00
4
"
,
"partner_sku"
:
"sku00
5
"
,
}
}
]
]
},
},
...
@@ -272,7 +289,7 @@ ECOMMERCE_API_BODIES = [
...
@@ -272,7 +289,7 @@ ECOMMERCE_API_BODIES = [
{
{
"price_currency"
:
"USD"
,
"price_currency"
:
"USD"
,
"price_excl_tax"
:
"25.00"
,
"price_excl_tax"
:
"25.00"
,
"partner_sku"
:
"sku00
5
"
,
"partner_sku"
:
"sku00
6
"
,
}
}
]
]
},
},
...
@@ -301,7 +318,7 @@ ECOMMERCE_API_BODIES = [
...
@@ -301,7 +318,7 @@ ECOMMERCE_API_BODIES = [
{
{
"price_currency"
:
"USD"
,
"price_currency"
:
"USD"
,
"price_excl_tax"
:
"250.00"
,
"price_excl_tax"
:
"250.00"
,
"partner_sku"
:
"sku00
6
"
,
"partner_sku"
:
"sku00
7
"
,
}
}
]
]
},
},
...
@@ -330,7 +347,7 @@ ECOMMERCE_API_BODIES = [
...
@@ -330,7 +347,7 @@ ECOMMERCE_API_BODIES = [
{
{
"price_currency"
:
"USD"
,
"price_currency"
:
"USD"
,
"price_excl_tax"
:
"250.00"
,
"price_excl_tax"
:
"250.00"
,
"partner_sku"
:
"sku00
7
"
,
"partner_sku"
:
"sku00
8
"
,
}
}
]
]
}
}
...
@@ -355,7 +372,7 @@ ECOMMERCE_API_BODIES = [
...
@@ -355,7 +372,7 @@ ECOMMERCE_API_BODIES = [
{
{
"price_currency"
:
"123"
,
"price_currency"
:
"123"
,
"price_excl_tax"
:
"0.00"
,
"price_excl_tax"
:
"0.00"
,
"partner_sku"
:
"sku00
8
"
,
"partner_sku"
:
"sku00
9
"
,
}
}
]
]
}
}
...
@@ -380,7 +397,7 @@ ECOMMERCE_API_BODIES = [
...
@@ -380,7 +397,7 @@ ECOMMERCE_API_BODIES = [
{
{
"price_currency"
:
"USD"
,
"price_currency"
:
"USD"
,
"price_excl_tax"
:
"0.00"
,
"price_excl_tax"
:
"0.00"
,
"partner_sku"
:
"sku0
09
"
,
"partner_sku"
:
"sku0
10
"
,
}
}
]
]
}
}
...
...
course_discovery/apps/course_metadata/data_loaders/tests/test_api.py
View file @
a2b00507
This diff is collapsed.
Click to expand it.
course_discovery/apps/course_metadata/migrations/0080_seat_bulk_sku.py
0 → 100644
View file @
a2b00507
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2018-03-09 19:38
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'course_metadata'
,
'0079_enable_program_default_true'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'seat'
,
name
=
'bulk_sku'
,
field
=
models
.
CharField
(
blank
=
True
,
max_length
=
128
,
null
=
True
),
),
]
course_discovery/apps/course_metadata/models.py
View file @
a2b00507
...
@@ -832,6 +832,7 @@ class Seat(TimeStampedModel):
...
@@ -832,6 +832,7 @@ class Seat(TimeStampedModel):
credit_provider
=
models
.
CharField
(
max_length
=
255
,
null
=
True
,
blank
=
True
)
credit_provider
=
models
.
CharField
(
max_length
=
255
,
null
=
True
,
blank
=
True
)
credit_hours
=
models
.
IntegerField
(
null
=
True
,
blank
=
True
)
credit_hours
=
models
.
IntegerField
(
null
=
True
,
blank
=
True
)
sku
=
models
.
CharField
(
max_length
=
128
,
null
=
True
,
blank
=
True
)
sku
=
models
.
CharField
(
max_length
=
128
,
null
=
True
,
blank
=
True
)
bulk_sku
=
models
.
CharField
(
max_length
=
128
,
null
=
True
,
blank
=
True
)
class
Meta
(
object
):
class
Meta
(
object
):
unique_together
=
(
unique_together
=
(
...
...
course_discovery/apps/course_metadata/tests/factories.py
View file @
a2b00507
...
@@ -155,6 +155,7 @@ class SeatFactory(factory.DjangoModelFactory):
...
@@ -155,6 +155,7 @@ class SeatFactory(factory.DjangoModelFactory):
currency
=
factory
.
Iterator
(
Currency
.
objects
.
all
())
currency
=
factory
.
Iterator
(
Currency
.
objects
.
all
())
upgrade_deadline
=
FuzzyDateTime
(
datetime
.
datetime
(
2014
,
1
,
1
,
tzinfo
=
UTC
))
upgrade_deadline
=
FuzzyDateTime
(
datetime
.
datetime
(
2014
,
1
,
1
,
tzinfo
=
UTC
))
sku
=
FuzzyText
(
length
=
8
)
sku
=
FuzzyText
(
length
=
8
)
bulk_sku
=
FuzzyText
(
length
=
8
)
course_run
=
factory
.
SubFactory
(
CourseRunFactory
)
course_run
=
factory
.
SubFactory
(
CourseRunFactory
)
class
Meta
:
class
Meta
:
...
...
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