Updated repository and added tests

oscar/apps/checkout/views.py

@@ -285,9 +285,8 @@ class ShippingMethodView(CheckoutSessionMixin, TemplateView):
         # Shipping methods can depend on the user, the contents of the basket
         # and the shipping address.  I haven't come across a scenario that doesn't
         # fit this system.
-        repo = Repository()
-        return repo.get_shipping_methods(self.request.user, self.request.basket, 
-                                         self.get_shipping_address())
+        return Repository().get_shipping_methods(self.request.user, self.request.basket, 
+                                                 self.get_shipping_address())
     
     def post(self, request, *args, **kwargs):
         # Need to check that this code is valid for this user

oscar/apps/shipping/base.py

@@ -6,8 +6,9 @@ class ShippingMethod(object):
     name = 'Default shipping'
     description = ''
     
-    def __init__(self):
+    def __init__(self, *args, **kwargs):
         self.exempt_from_tax = False
+        super(ShippingMethod, self).__init__(*args, **kwargs)
     
     def set_basket(self, basket):
         self.basket = basket

oscar/apps/shipping/models.py

@@ -5,11 +5,8 @@ from django.utils.translation import ugettext_lazy as _
 from django.template.defaultfilters import slugify
 from django.conf import settings
 
-from oscar.apps.shipping.abstract_models import AbstractOrderAndItemLevelChargeMethod
-from oscar.apps.shipping.base import ShippingMethod
 
-
-class OrderAndItemLevelChargeMethod(models.Model, ShippingMethod):
+class OrderAndItemLevelChargeMethod(models.Model):
     """
     Standard shipping method
     
@@ -37,9 +34,6 @@ class OrderAndItemLevelChargeMethod(models.Model, ShippingMethod):
         if not self.code:
             self.code = slugify(self.name)
         super(AbstractOrderAndItemLevelChargeMethod, self).save(*args, **kwargs)
-    
-    class Meta:
-        abstract = True
         
     def __unicode__(self):
         return self.name

oscar/apps/shipping/repository.py

@@ -1,6 +1,4 @@
-from oscar.apps.shipping.methods import FreeShipping
-from oscar.core.loading import import_module
-shipping_models = import_module('shipping.models', ['OrderAndItemLevelChargeMethod'])
+from oscar.apps.shipping.methods import FreeShipping, OrderAndItemLevelChargeMethod
 
 
 class Repository(object):
@@ -9,7 +7,7 @@ class Repository(object):
     objects for a given user, basket etc
     """
     
-    def get_shipping_methods(self, user, basket, shipping_addr, **kwargs):
+    def get_shipping_methods(self, user, basket, shipping_addr=None, **kwargs):
         """
         Return a list of all applicable shipping method objects
         for a given basket.
@@ -18,10 +16,7 @@ class Repository(object):
         this behaviour can easily be overridden by subclassing this class
         and overriding this method.
         """ 
-        methods = shipping_models.OrderAndItemLevelChargeMethod._default_manager.all()
-        if not methods.count():
-            return [FreeShipping()]
-        
+        methods = [FreeShipping()]
         for method in methods:
             method.set_basket(basket)
         return methods
@@ -32,4 +27,4 @@ class Repository(object):
         """
         if code == FreeShipping.code:
             return FreeShipping()
-        return shipping_models.OrderAndItemLevelChargeMethod._default_manager.get(code=code)          
+        return None

oscar/apps/shipping/tests.py

@@ -2,9 +2,11 @@ from decimal import Decimal as D
 
 from django.utils import unittest
 from django.test.client import Client
+from django.contrib.auth.models import User
 
 from oscar.apps.shipping.methods import FreeShipping, FixedPriceShipping, WeightBasedChargesMethod
 from oscar.apps.shipping.models import OrderAndItemLevelChargeMethod, WeightBand
+from oscar.apps.shipping.repository import Repository
 from oscar.apps.shipping import Scales
 from oscar.apps.basket.models import Basket
 from oscar.test.helpers import create_product
@@ -247,3 +249,16 @@ class WeightBandTests(unittest.TestCase):
         WeightBand.objects.create(method_code='express', upper_limit=2, charge=D('8.00'))
         WeightBand.objects.create(method_code='standard', upper_limit=3, charge=D('12.00'))
         self.assertEqual(D('12.00'), WeightBand.get_band_for_weight('standard', 2.5).charge)
+
+
+class RepositoryTests(unittest.TestCase):
+
+    def setUp(self):
+        self.repo = Repository()
+
+    def test_default_method_is_free(self):
+        user, basket = User(), Basket()
+        methods = self.repo.get_shipping_methods(user, basket)
+        self.assertEqual(1, len(methods))
+        self.assertTrue(isinstance(methods[0], FreeShipping))
+