Added some more tests for the OrderCreator

oscar/apps/checkout/views.py

@@ -396,16 +396,16 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             status = self.get_initial_order_status(basket)
         else:
             status = kwargs.pop('status')
-        order = OrderCreator().place_order(self.request.user, 
-                                         basket, 
-                                         shipping_address, 
-                                         shipping_method, 
-                                         billing_address,
-                                         total_incl_tax,
-                                         total_excl_tax,
-                                         order_number,
-                                         status,
-                                         **kwargs)
+        order = OrderCreator().place_order(basket=basket, 
+                                           total_incl_tax=total_incl_tax,
+                                           total_excl_tax=total_excl_tax,
+                                           user=self.request.user, 
+                                           shipping_method=shipping_method, 
+                                           shipping_address=shipping_address, 
+                                           billing_address=billing_address,
+                                           order_number=order_number,
+                                           status=status,
+                                           **kwargs)
         self.save_payment_details(order)
         return order
     

oscar/apps/order/tests.py

@@ -1,13 +1,16 @@
-from decimal import Decimal
+from decimal import Decimal as D
 import hashlib
 
 from django.test import TestCase
 from django.conf import settings
+from mock import Mock
 
 from oscar.apps.address.models import Country
 from oscar.apps.basket.models import Basket
 from oscar.apps.order.models import ShippingAddress, Order, Line, ShippingEvent, ShippingEventType, ShippingEventQuantity
-from oscar.test.helpers import create_order
+from oscar.test.helpers import create_order, create_product
+from oscar.apps.order.utils import OrderCreator
+from oscar.apps.shipping.methods import Free
 
 ORDER_PLACED = 'order_placed'
 
@@ -134,4 +137,54 @@ class ShippingEventQuantityTest(TestCase):
         event_quantity = ShippingEventQuantity.objects.create(event=event, line=self.line)
         self.assertEquals(self.line.quantity, event_quantity.quantity)
     
-   
+   
+class OrderCreatorTests(TestCase):
+
+    def setUp(self):
+        self.creator = OrderCreator()
+        self.basket = Basket.objects.create()
+
+    def tearDown(self):
+        Order.objects.all().delete()
+
+    def test_exception_raised_when_empty_basket_passed(self):
+        with self.assertRaises(ValueError):
+            self.creator.place_order(basket=self.basket)
+
+    def test_order_models_are_created(self):
+        self.basket.add_product(create_product(price=D('12.00')))
+        self.creator.place_order(basket=self.basket, order_number='1234')
+        order = Order.objects.get(number='1234')
+        lines = order.lines.all()
+        self.assertEqual(1, len(lines))
+
+    def test_status_is_saved_if_passed(self):
+        self.basket.add_product(create_product(price=D('12.00')))
+        self.creator.place_order(basket=self.basket, order_number='1234', status='Active')
+        order = Order.objects.get(number='1234')
+        self.assertEqual('Active', order.status)
+
+    def test_shipping_is_free_by_default(self):
+        self.basket.add_product(create_product(price=D('12.00')))
+        self.creator.place_order(basket=self.basket, order_number='1234')
+        order = Order.objects.get(number='1234')
+        self.assertEqual(order.total_incl_tax, self.basket.total_incl_tax)
+        self.assertEqual(order.total_excl_tax, self.basket.total_excl_tax)
+
+    def test_basket_totals_are_used_by_default(self):
+        self.basket.add_product(create_product(price=D('12.00')))
+        method = Mock()
+        method.basket_charge_incl_tax = Mock(return_value=D('2.00'))
+        method.basket_charge_excl_tax = Mock(return_value=D('2.00'))
+
+        self.creator.place_order(basket=self.basket, order_number='1234', shipping_method=method)
+        order = Order.objects.get(number='1234')
+        self.assertEqual(order.total_incl_tax, self.basket.total_incl_tax + D('2.00'))
+        self.assertEqual(order.total_excl_tax, self.basket.total_excl_tax + D('2.00'))
+        
+    def test_exception_raised_if_duplicate_number_passed(self):
+        self.basket.add_product(create_product(price=D('12.00')))
+        self.creator.place_order(basket=self.basket, order_number='1234')
+        with self.assertRaises(ValueError):
+            self.creator.place_order(basket=self.basket, order_number='1234')
+

oscar/apps/order/utils.py

@@ -1,5 +1,6 @@
 from django.contrib.sites.models import Site
 
+from oscar.apps.shipping.methods import Free
 from oscar.core.loading import import_module
 import_module('order.models', ['ShippingAddress', 'Order', 'Line', 
                                'LinePrice', 'LineAttribute', 'OrderDiscount'], locals())
@@ -26,16 +27,33 @@ class OrderCreator(object):
     Places the order by writing out the various models
     """
     
-    def place_order(self, user, basket, shipping_address, shipping_method, 
-                    billing_address, total_incl_tax, total_excl_tax, 
-                    order_number=None, status=None, **kwargs):
+    def place_order(self, basket, total_incl_tax=None, total_excl_tax=None,
+                    user=None, shipping_method=None, shipping_address=None,
+                    billing_address=None, order_number=None, status=None, **kwargs):
         """
         Placing an order involves creating all the relevant models based on the
         basket and session data.
         """
+        # Only a basket instance is required to place an order - everything else can be set
+        # to defaults
+        if basket.is_empty:
+            raise ValueError("Empty baskets cannot be submitted")
+        if not shipping_method:
+            shipping_method = Free()
+        if total_incl_tax is None or total_excl_tax is None:
+            total_incl_tax = basket.total_incl_tax + shipping_method.basket_charge_incl_tax()
+            total_excl_tax = basket.total_excl_tax + shipping_method.basket_charge_excl_tax()
         if not order_number:
             generator = OrderNumberGenerator()
             order_number = generator.order_number(basket)
+        try:
+            Order._default_manager.get(number=order_number)
+        except Order.DoesNotExist:
+            pass
+        else:
+            raise ValueError("There is already an order with number %s" % order_number)
+        
+        # Ok - everything seems to be in order, let's place the order
         order = self.create_order_model(user, basket, shipping_address, 
                                         shipping_method, billing_address, total_incl_tax, 
                                         total_excl_tax, order_number, status, **kwargs)