Rename strategy fetch method to fetch_for_product

More explicit innit.

oscar/apps/basket/abstract_models.py

@@ -178,7 +178,7 @@ class AbstractBasket(models.Model):
 
         # Ensure that all lines are the same currency
         price_currency = self.currency
-        stock_info = self.strategy.fetch(product)
+        stock_info = self.strategy.fetch_for_product(product)
         if price_currency and stock_info.price.currency != price_currency:
             raise ValueError((
                 "Basket lines must all have the same currency. Proposed "
@@ -728,7 +728,7 @@ class AbstractLine(models.Model):
         if not hasattr(self, '_info'):
             # Cache the stockinfo (note that a strategy instance is assigned to
             # each line by the basket in the all_lines method).
-            self._info = self.strategy.fetch(
+            self._info = self.strategy.fetch_for_product(
                 self.product, self.stockrecord)
         return self._info
 

oscar/apps/basket/forms.py

@@ -83,7 +83,7 @@ class SavedLineForm(forms.ModelForm):
         else:
             desired_qty = self.instance.quantity + line.quantity
 
-        result = self.strategy.fetch(self.instance.product)
+        result = self.strategy.fetch_for_product(self.instance.product)
         is_available, reason = result.availability.is_purchase_permitted(
             quantity=desired_qty)
         if not is_available:
@@ -173,7 +173,7 @@ class AddToBasketForm(forms.Form):
         # basket.
         current_qty = self.basket.product_quantity(product)
         desired_qty = current_qty + self.cleaned_data.get('quantity', 1)
-        result = self.request.strategy.fetch(product)
+        result = self.request.strategy.fetch_for_product(product)
         is_permitted, reason = result.availability.is_purchase_permitted(
             desired_qty)
         if not is_permitted:

oscar/apps/basket/middleware.py

@@ -166,6 +166,6 @@ class BasketMiddleware(object):
         line.delete()
 
         # Attempt to re-add to basket with the appropriate stockrecord
-        stock_info = basket.strategy.fetch(product)
+        stock_info = basket.strategy.fetch_for_product(product)
         if stock_info.stockrecord:
             basket.add(product, quantity, options=options)

oscar/apps/checkout/views.py

@@ -469,7 +469,7 @@ class PaymentDetailsView(OrderPlacementMixin, TemplateView):
         """
         strategy = self.request.strategy
         for line in basket.all_lines():
-            result = strategy.fetch(line.product)
+            result = strategy.fetch_for_product(line.product)
             is_permitted, reason = result.availability.is_purchase_permitted(
                 line.quantity)
             if not is_permitted:

oscar/apps/customer/alerts/utils.py

@@ -83,7 +83,7 @@ def send_product_alerts(product):
     for alert in alerts:
         # Check if the product is available to this user
         strategy = selector.strategy(user=alert.user)
-        data = strategy.fetch(product)
+        data = strategy.fetch_for_product(product)
         if not data.availability.is_available_to_buy:
             continue
 

oscar/apps/order/abstract_models.py

@@ -643,7 +643,7 @@ class AbstractLine(models.Model):
         else:
             desired_qty = basket_line.quantity + self.quantity
 
-        result = strategy.fetch(self.product)
+        result = strategy.fetch_for_product(self.product)
         is_available, reason = result.availability.is_purchase_permitted(
             quantity=desired_qty)
         if not is_available:

oscar/apps/partner/strategy.py

@@ -53,7 +53,7 @@ class Base(object):
         if request and request.user.is_authenticated():
             self.user = request.user
 
-    def fetch(self, product, stockrecord=None):
+    def fetch_for_product(self, product, stockrecord=None):
         """
         Given a product, return a ``StockInfo`` instance.
 
@@ -61,13 +61,13 @@ class Base(object):
 
         - ``price``: a pricing policy object.
         - ``availability``: an availability policy object.
-        - ``stockrecord``: the stockrecord that is being used to calculate prices and
+        - ``stockrecord``: the stockrecord that is being used
 
         If a stockrecord is passed, return the appropriate ``StockInfo``
         instance for that product and stockrecord is returned.
         """
         raise NotImplementedError(
-            "A strategy class must define a fetch method "
+            "A strategy class must define a fetch_for_product method "
             "for returning the availability and pricing "
             "information."
         )
@@ -77,7 +77,7 @@ class Base(object):
         Given a basket line instance, fetch a ``StockInfo`` instance.
         """
         # Default to ignoring any basket line options
-        return self.fetch(line.product)
+        return self.fetch_for_product(line.product)
 
 
 class Structured(Base):
@@ -90,7 +90,7 @@ class Structured(Base):
     #) An availability policy
     """
 
-    def fetch(self, product, stockrecord=None):
+    def fetch_for_product(self, product, stockrecord=None):
         """
         Return the appropriate stockinfo instance.
 

oscar/apps/search/search_indexes.py

@@ -54,14 +54,14 @@ class ProductIndex(indexes.SearchIndex, indexes.Indexable):
         # (although that is the most common scenario).
         if obj.has_stockrecords:
             # Fetch a "default" stockinfo
-            result = strategy.fetch(obj)
+            result = strategy.fetch_for_product(obj)
             if result.price.is_tax_known:
                 return result.price.incl_tax
             return result.price.excl_tax
 
     def prepare_num_in_stock(self, obj):
         if obj.has_stockrecords:
-            result = strategy.fetch(obj)
+            result = strategy.fetch_for_product(obj)
             return result.stockrecord.net_stock_level
 
     def get_updated_field(self):

tests/integration/partner/strategy_tests.py

@@ -14,13 +14,13 @@ class TestDefaultStrategy(TestCase):
 
     def test_no_stockrecords(self):
         product = factories.create_product()
-        info = self.strategy.fetch(product)
+        info = self.strategy.fetch_for_product(product)
         self.assertFalse(info.availability.is_available_to_buy)
         self.assertIsNone(info.price.incl_tax)
 
     def test_one_stockrecord(self):
         product = factories.create_product(price=D('1.99'), num_in_stock=4)
-        info = self.strategy.fetch(product)
+        info = self.strategy.fetch_for_product(product)
         self.assertTrue(info.availability.is_available_to_buy)
         self.assertEquals(D('1.99'), info.price.excl_tax)
         self.assertEquals(D('1.99'), info.price.incl_tax)
@@ -31,7 +31,7 @@ class TestDefaultStrategy(TestCase):
         product = factories.create_product(
             product_class=product_class,
             price=D('1.99'), num_in_stock=None)
-        info = self.strategy.fetch(product)
+        info = self.strategy.fetch_for_product(product)
         self.assertTrue(info.availability.is_available_to_buy)
 
     def test_line_method_is_same_as_product_one(self):