Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ecommerce
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
ecommerce
Commits
391acc8c
Commit
391acc8c
authored
Apr 13, 2015
by
jsa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add endpoint to retrieve order by basket id.
XCOM-218
parent
f89ac74a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
7 deletions
+33
-7
ecommerce/extensions/api/tests/test_views.py
+17
-6
ecommerce/extensions/api/urls.py
+7
-1
ecommerce/extensions/api/views.py
+9
-0
No files found.
ecommerce/extensions/api/tests/test_views.py
View file @
391acc8c
...
@@ -50,15 +50,18 @@ class RetrieveOrderViewTests(ThrottlingMixin, UserMixin, TestCase):
...
@@ -50,15 +50,18 @@ class RetrieveOrderViewTests(ThrottlingMixin, UserMixin, TestCase):
def
setUp
(
self
):
def
setUp
(
self
):
super
(
RetrieveOrderViewTests
,
self
)
.
setUp
()
super
(
RetrieveOrderViewTests
,
self
)
.
setUp
()
user
=
self
.
create_user
()
user
=
self
.
create_user
()
basket
=
factories
.
create_basket
()
self
.
basket
=
factories
.
create_basket
()
order_number
=
OrderNumberGenerator
.
order_number
(
basket
)
order_number
=
OrderNumberGenerator
.
order_number
(
self
.
basket
)
self
.
order
=
factories
.
create_order
(
number
=
order_number
)
self
.
order
=
factories
.
create_order
(
number
=
order_number
,
basket
=
self
.
basket
)
self
.
order
.
status
=
ORDER
.
PAID
self
.
order
.
status
=
ORDER
.
PAID
self
.
order
.
user
=
user
self
.
order
.
user
=
user
self
.
order
.
save
()
self
.
order
.
save
()
self
.
token
=
self
.
generate_jwt_token_header
(
user
)
self
.
token
=
self
.
generate_jwt_token_header
(
user
)
self
.
url
=
reverse
(
'orders:retrieve'
,
kwargs
=
{
'number'
:
self
.
order
.
number
})
@property
def
url
(
self
):
return
reverse
(
'orders:retrieve'
,
kwargs
=
{
'number'
:
self
.
order
.
number
})
@ddt.data
(
ORDER
.
PAID
,
ORDER
.
COMPLETE
,
ORDER
.
REFUNDED
,
ORDER
.
FULFILLMENT_ERROR
)
@ddt.data
(
ORDER
.
PAID
,
ORDER
.
COMPLETE
,
ORDER
.
REFUNDED
,
ORDER
.
FULFILLMENT_ERROR
)
def
test_get_order
(
self
,
order_status
):
def
test_get_order
(
self
,
order_status
):
...
@@ -67,8 +70,7 @@ class RetrieveOrderViewTests(ThrottlingMixin, UserMixin, TestCase):
...
@@ -67,8 +70,7 @@ class RetrieveOrderViewTests(ThrottlingMixin, UserMixin, TestCase):
self
.
order
.
save
()
self
.
order
.
save
()
response
=
self
.
client
.
get
(
self
.
url
,
HTTP_AUTHORIZATION
=
self
.
token
)
response
=
self
.
client
.
get
(
self
.
url
,
HTTP_AUTHORIZATION
=
self
.
token
)
self
.
assertEqual
(
response
.
status_code
,
status
.
HTTP_200_OK
)
self
.
assertEqual
(
response
.
status_code
,
status
.
HTTP_200_OK
)
result_order
=
json
.
loads
(
response
.
content
)
self
.
assertEqual
(
response
.
data
,
OrderSerializer
(
self
.
order
)
.
data
)
self
.
assertEqual
(
OrderSerializer
(
self
.
order
)
.
data
,
result_order
)
@ddt.data
(
ORDER
.
OPEN
,
ORDER
.
BEING_PROCESSED
,
ORDER
.
ORDER_CANCELLED
,
ORDER
.
PAYMENT_CANCELLED
)
@ddt.data
(
ORDER
.
OPEN
,
ORDER
.
BEING_PROCESSED
,
ORDER
.
ORDER_CANCELLED
,
ORDER
.
PAYMENT_CANCELLED
)
def
test_order_not_found
(
self
,
order_status
):
def
test_order_not_found
(
self
,
order_status
):
...
@@ -86,6 +88,15 @@ class RetrieveOrderViewTests(ThrottlingMixin, UserMixin, TestCase):
...
@@ -86,6 +88,15 @@ class RetrieveOrderViewTests(ThrottlingMixin, UserMixin, TestCase):
self
.
assertEqual
(
response
.
status_code
,
status
.
HTTP_404_NOT_FOUND
)
self
.
assertEqual
(
response
.
status_code
,
status
.
HTTP_404_NOT_FOUND
)
@ddt.ddt
class
RetrieveOrderByBasketViewTests
(
RetrieveOrderViewTests
):
"""Test cases for getting orders using the basket id. """
@property
def
url
(
self
):
return
reverse
(
'order_by_basket'
,
kwargs
=
{
'basket_id'
:
self
.
basket
.
id
})
class
CreateOrderViewTests
(
TestCase
):
class
CreateOrderViewTests
(
TestCase
):
USER_DATA
=
{
USER_DATA
=
{
'username'
:
'sgoodman'
,
'username'
:
'sgoodman'
,
...
...
ecommerce/extensions/api/urls.py
View file @
391acc8c
...
@@ -4,6 +4,7 @@ from ecommerce.extensions.api import views
...
@@ -4,6 +4,7 @@ from ecommerce.extensions.api import views
ORDER_NUMBER_PATTERN
=
r"(?P<number>[-\w]+)"
ORDER_NUMBER_PATTERN
=
r"(?P<number>[-\w]+)"
BASKET_ID_PATTERN
=
r"(?P<basket_id>[\w]+)"
ORDER_URLS
=
patterns
(
ORDER_URLS
=
patterns
(
''
,
''
,
...
@@ -23,5 +24,10 @@ ORDER_URLS = patterns(
...
@@ -23,5 +24,10 @@ ORDER_URLS = patterns(
urlpatterns
=
patterns
(
urlpatterns
=
patterns
(
''
,
''
,
url
(
r'^processors/$'
,
views
.
PaymentProcessorsView
.
as_view
(),
name
=
'payment_processors'
),
url
(
r'^processors/$'
,
views
.
PaymentProcessorsView
.
as_view
(),
name
=
'payment_processors'
),
url
(
r'^orders/'
,
include
(
ORDER_URLS
,
namespace
=
'orders'
))
url
(
r'^orders/'
,
include
(
ORDER_URLS
,
namespace
=
'orders'
)),
url
(
r'^baskets/{basket_id}/order/$'
.
format
(
basket_id
=
BASKET_ID_PATTERN
),
views
.
RetrieveOrderByBasketView
.
as_view
(),
name
=
'order_by_basket'
),
)
)
ecommerce/extensions/api/views.py
View file @
391acc8c
...
@@ -91,6 +91,15 @@ class RetrieveOrderView(RetrieveAPIView):
...
@@ -91,6 +91,15 @@ class RetrieveOrderView(RetrieveAPIView):
raise
Http404
raise
Http404
class
RetrieveOrderByBasketView
(
RetrieveOrderView
):
""" Allow the viewing of Orders by Basket.
Works exactly the same as RetrieveOrderView, except that orders are looked
up via the id of the related basket.
"""
lookup_field
=
'basket_id'
class
OrderListCreateAPIView
(
FulfillmentMixin
,
ListCreateAPIView
):
class
OrderListCreateAPIView
(
FulfillmentMixin
,
ListCreateAPIView
):
"""
"""
Endpoint for listing or creating orders.
Endpoint for listing or creating orders.
...
...
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