Tided up address, analytics, basket apps

oscar/apps/address/models.py

@@ -1,5 +1,3 @@
-from django.db import models
-
 from oscar.apps.address.abstract_models import AbstractUserAddress, AbstractCountry
 
 

oscar/apps/address/tests.py

@@ -2,7 +2,6 @@ from django.contrib.auth.models import User
 from django.test import TestCase
 
 from oscar.apps.address.models import Country, UserAddress
-from oscar.apps.basket.models import Basket
 from oscar.apps.order.models import ShippingAddress
 
 

oscar/apps/analytics/abstract_models.py

@@ -1,6 +1,5 @@
 from decimal import Decimal
 
-from django.contrib.auth.models import User
 from django.db import models
 from django.utils.translation import ugettext as _
 
@@ -74,7 +73,7 @@ class AbstractUserSearch(models.Model):
      
      class Meta:
          abstract = True
-         verbose_name_plural = "User search queries"
+         verbose_name_plural = _("User search queries")
          
      def __unicode__(self):
          return u"%s searched for '%s'" % (self.user, self.query)

oscar/apps/analytics/models.py

@@ -1,13 +1,11 @@
-from django.dispatch import receiver
-
 from oscar.apps.analytics.abstract_models import (AbstractProductRecord, AbstractUserRecord,
-                                             AbstractUserProductView, AbstractUserSearch)
+                                                  AbstractUserProductView, AbstractUserSearch)
 from oscar.core.loading import import_module
-
 product_signals = import_module('product.signals', ['product_viewed', 'product_search'])
 basket_signals = import_module('basket.signals', ['basket_addition'])
 order_signals = import_module('order.signals', ['order_placed'])
 
+
 class ProductRecord(AbstractProductRecord):
     pass
 
@@ -20,71 +18,5 @@ class UserProductView(AbstractUserProductView):
 class UserSearch(AbstractUserSearch):
     pass
 
-# Helpers
-
-def _record_product_view(product):
-    record,_ = ProductRecord.objects.get_or_create(product=product)
-    record.num_views += 1
-    record.save()
-    
-def _record_user_product_view(user, product):
-    if user.is_authenticated():
-        # Update user record
-        record,_ = UserRecord.objects.get_or_create(user=user)
-        record.num_product_views += 1
-        record.save()
-        
-        # Add user product view record
-        UserProductView.objects.create(product=product, user=user)
-        
-def _record_basket_addition(product):
-    record,_ = ProductRecord.objects.get_or_create(product=product)
-    record.num_basket_additions += 1
-    record.save()
-    
-def _record_user_basket_addition(user, product):
-    if user.is_authenticated():
-        record,_ = UserRecord.objects.get_or_create(user=user)
-        record.num_basket_additions += 1
-        record.save()
-
-def _record_products_in_order(order):
-    for line in order.lines.all():
-        record,_ = ProductRecord.objects.get_or_create(product=line.product)
-        record.num_purchases += line.quantity
-        record.save()
-
-def _record_user_order(user, order):
-    if user.is_authenticated():
-        record,_ = UserRecord.objects.get_or_create(user=user)
-        record.num_orders += 1
-        record.num_order_lines += order.num_lines
-        record.num_order_items += order.num_items
-        record.total_spent += order.total_incl_tax
-        record.date_last_order = order.date_placed
-        record.save()
-
-def _record_user_product_search(user, query):
-    if user.is_authenticated():
-        UserSearch._default_manager.create(user=user, query=query)
-
-# Receivers
-
-@receiver(product_signals.product_viewed)
-def receive_product_view(sender, product, user, **kwargs):
-    _record_product_view(product)
-    _record_user_product_view(user, product)
-    
-@receiver(product_signals.product_search)
-def receive_product_search(sender, query, user, **kwargs):
-    _record_user_product_search(user, query)
-    
-@receiver(basket_signals.basket_addition)
-def receive_basket_addition(sender, product, user, **kwargs):
-    _record_basket_addition(product)
-    _record_user_basket_addition(user, product)
-    
-@receiver(order_signals.order_placed)
-def receive_order_placed(sender, order, user, **kwargs):
-    _record_products_in_order(order)
-    _record_user_order(user, order)
+# Import receiver functions
+from oscar.apps.analytics.receivers import *

oscar/apps/analytics/receivers.py

@@ -0,0 +1,76 @@
+from django.dispatch import receiver
+
+from oscar.core.loading import import_module
+analytics_models = import_module('analytics.models', ['UserRecord', 'ProductRecord', 'UserProductView'])
+product_signals = import_module('product.signals', ['product_viewed', 'product_search'])
+basket_signals = import_module('basket.signals', ['basket_addition'])
+order_signals = import_module('order.signals', ['order_placed'])
+
+# Helpers
+
+def _record_product_view(product):
+    record,_ = analytics_models.ProductRecord.objects.get_or_create(product=product)
+    record.num_views += 1
+    record.save()
+    
+def _record_user_product_view(user, product):
+    if user.is_authenticated():
+        # Update user record
+        record,_ = analytics_models.UserRecord.objects.get_or_create(user=user)
+        record.num_product_views += 1
+        record.save()
+        
+        # Add user product view record
+        analytics_models.UserProductView.objects.create(product=product, user=user)
+        
+def _record_basket_addition(product):
+    record,_ = analytics_models.ProductRecord.objects.get_or_create(product=product)
+    record.num_basket_additions += 1
+    record.save()
+    
+def _record_user_basket_addition(user, product):
+    if user.is_authenticated():
+        record,_ = analytics_models.UserRecord.objects.get_or_create(user=user)
+        record.num_basket_additions += 1
+        record.save()
+
+def _record_products_in_order(order):
+    for line in order.lines.all():
+        record,_ = analytics_models.ProductRecord.objects.get_or_create(product=line.product)
+        record.num_purchases += line.quantity
+        record.save()
+
+def _record_user_order(user, order):
+    if user.is_authenticated():
+        record,_ = analytics_models.UserRecord.objects.get_or_create(user=user)
+        record.num_orders += 1
+        record.num_order_lines += order.num_lines
+        record.num_order_items += order.num_items
+        record.total_spent += order.total_incl_tax
+        record.date_last_order = order.date_placed
+        record.save()
+
+def _record_user_product_search(user, query):
+    if user.is_authenticated():
+        analytics_models.UserSearch._default_manager.create(user=user, query=query)
+
+# Receivers
+
+@receiver(product_signals.product_viewed)
+def receive_product_view(sender, product, user, **kwargs):
+    _record_product_view(product)
+    _record_user_product_view(user, product)
+    
+@receiver(product_signals.product_search)
+def receive_product_search(sender, query, user, **kwargs):
+    _record_user_product_search(user, query)
+    
+@receiver(basket_signals.basket_addition)
+def receive_basket_addition(sender, product, user, **kwargs):
+    _record_basket_addition(product)
+    _record_user_basket_addition(user, product)
+    
+@receiver(order_signals.order_placed)
+def receive_order_placed(sender, order, user, **kwargs):
+    _record_products_in_order(order)
+    _record_user_order(user, order)

oscar/apps/basket/abstract_models.py

@@ -2,7 +2,6 @@ from decimal import Decimal
 import zlib
 import datetime
 
-from django.contrib.auth.models import User
 from django.db import models
 from django.utils.translation import ugettext as _
 from django.core.exceptions import ObjectDoesNotExist

oscar/apps/basket/admin.py

@@ -7,6 +7,7 @@ models = import_module('basket.models', ['Basket', 'Line', 'LineAttribute'])
 class BasketAdmin(admin.ModelAdmin):
     read_only_fields = ('date_merged', 'date_submitted')
 
+
 admin.site.register(models.Basket, BasketAdmin)
 admin.site.register(models.Line)
 admin.site.register(models.LineAttribute)

oscar/apps/basket/factory.py

@@ -27,13 +27,13 @@ class BasketFactory(object):
         return self._get_or_create_cookie_basket(request, response, 
                                                  COOKIE_KEY_SAVED_BASKET, basket_models.Basket.saved)
     
-    def get_open_basket(self, request):
+    def get_open_basket(self, request, response):
         u"""Returns the basket for the current user"""
-        return self._get_basket(request, COOKIE_KEY_OPEN_BASKET, basket_models.Basket.open)
+        return self._get_basket(request, response, COOKIE_KEY_OPEN_BASKET, basket_models.Basket.open)
     
-    def get_saved_basket(self, request):
+    def get_saved_basket(self, request, response):
         u"""Returns the saved basket for the current user"""
-        return self._get_basket(request, COOKIE_KEY_SAVED_BASKET, basket_models.Basket.saved)
+        return self._get_basket(request, response, COOKIE_KEY_SAVED_BASKET, basket_models.Basket.saved)
     
     # Utility methods
     
@@ -42,7 +42,7 @@ class BasketFactory(object):
         Loads or creates a basket for the current user.  Any offers are also
         applied to the basket before it is returned.
         """
-        anon_basket = self._get_cookie_basket(request, cookie_key, manager)
+        anon_basket = self._get_cookie_basket(request, response, cookie_key, manager)
         if request.user.is_authenticated():
             basket, created = manager.get_or_create(owner=request.user)
             if anon_basket:
@@ -65,21 +65,21 @@ class BasketFactory(object):
     def _apply_offers_to_basket(self, request, basket):
         offer_utils.Applicator().apply(request, basket)
     
-    def _get_basket(self, request, cookie_key, manager):
+    def _get_basket(self, request, response, cookie_key, manager):
         u"""Returns a basket object given a cookie key and manager."""
         b = None
         if request.user.is_authenticated():
             try:
                 b = manager.get(owner=request.user)
-            except basket_models.Basket.DoesNotExist, e:
+            except basket_models.Basket.DoesNotExist:
                 pass
         else:
-            b = self._get_cookie_basket(request, cookie_key, manager)
+            b = self._get_cookie_basket(request, response, cookie_key, manager)
         if b:
             self._apply_offers_to_basket(request, b)
         return b    
         
-    def _get_cookie_basket(self, request, cookie_key, manager):
+    def _get_cookie_basket(self, request, response, cookie_key, manager):
         u"""Returns a basket based on the cookie key given."""
         b = None
         # If user is anonymous, their basket ID (if they have one) will be
@@ -90,7 +90,7 @@ class BasketFactory(object):
             if basket_hash == self._get_basket_hash(basket_id):
                 try:
                     b = manager.get(pk=basket_id, owner=None)
-                except basket_models.Basket.DoesNotExist, e:
+                except basket_models.Basket.DoesNotExist:
                     b = None
             else:
                 response.delete_cookie(cookie_key)

oscar/apps/basket/models.py

@@ -1,10 +1,7 @@
 from exceptions import Exception
 
-from django.core.signals import request_finished
-from django.dispatch import receiver
-
 from oscar.apps.basket.abstract_models import (AbstractBasket, AbstractLine, AbstractLineAttribute,
-                                          OPEN, MERGED, SAVED, SUBMITTED)
+                                               OPEN, MERGED, SAVED, SUBMITTED)
 
 
 class InvalidBasketLineError(Exception):

oscar/apps/basket/tests.py

@@ -2,18 +2,15 @@ from django.utils import unittest
 from django.test.client import Client
 from django.core.urlresolvers import reverse
 
-from oscar.apps.basket.models import * 
-from oscar.apps.product.models import Item, ItemClass
+from oscar.apps.basket.models import Basket, Line 
+from oscar.test.helpers import create_product
 
 
 class BasketModelTest(unittest.TestCase):
     
     def setUp(self):
         self.basket = Basket.objects.create()
-        
-        # Create a dummy product
-        ic,_ = ItemClass.objects.get_or_create(name='Dummy class')
-        self.dummy_product = Item.objects.create(title='Dummy product', item_class=ic)
+        self.dummy_product = create_product()
     
     def test_empty_baskets_have_zero_lines(self):
         self.assertTrue(Basket().num_lines == 0)
@@ -22,7 +19,7 @@ class BasketModelTest(unittest.TestCase):
         self.assertTrue(Basket().is_empty)
         
     def test_basket_have_with_one_line(self):
-        line = Line.objects.create(basket=self.basket, product=self.dummy_product)
+        Line.objects.create(basket=self.basket, product=self.dummy_product)
         self.assertTrue(self.basket.num_lines == 1)
         
     def test_add_product_creates_line(self):
@@ -46,8 +43,7 @@ class BasketViewsTest(unittest.TestCase):
         self.assertEquals(0, response.context['basket'].num_lines)
         
     def test_anonymous_add_to_basket_creates_cookie(self):
-        ic,_ = ItemClass.objects.get_or_create(name='Dummy class')
-        dummy_product = Item.objects.create(title='Dummy product', item_class=ic)
+        dummy_product = create_product()
         url = reverse('oscar-basket')
         post_params = {'product_id': dummy_product.id,
                        'action': 'add',

oscar/apps/basket/urls.py

@@ -1,15 +1,16 @@
 from django.conf.urls.defaults import *
 
-from oscar.apps.basket.views import BasketView, LineView, SavedLineView
+from oscar.core.loading import import_module
+basket_views = import_module('basket.views', ['BasketView', 'LineView', 'SavedLineView'])
 
 def line_view(request, *args, **kwargs):
-    return LineView()(request, *args, **kwargs)
+    return basket_views.LineView()(request, *args, **kwargs)
 
 def saved_line_view(request, *args, **kwargs):
-    return SavedLineView()(request, *args, **kwargs)
+    return basket_views.SavedLineView()(request, *args, **kwargs)
 
 def basket_view(request, *args, **kwargs):
-    return BasketView()(request, *args, **kwargs)
+    return basket_views.BasketView()(request, *args, **kwargs)
 
 urlpatterns = patterns('oscar.basket.views',
     url(r'^line/(?P<line_reference>[\w-]+)/$', line_view, name='oscar-basket-line'),

oscar/apps/basket/views.py

@@ -1,6 +1,5 @@
-from django.http import HttpResponse, Http404, HttpResponseRedirect, HttpResponseBadRequest
-from django.template import RequestContext
-from django.shortcuts import render_to_response, get_object_or_404, render
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404, render
 from django.core.urlresolvers import reverse
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
@@ -30,7 +29,7 @@ class BasketView(ModelView):
     
     def handle_GET(self, basket):
         u"""Handle GET requests against the basket"""
-        saved_basket = self.factory.get_saved_basket(self.request)
+        saved_basket = self.factory.get_saved_basket(self.request, self.response)
         self.response = render(self.request, self.template_file, locals())
         
     def handle_POST(self, basket):
@@ -116,7 +115,7 @@ class LineView(ModelView):
     
     def get_model(self):
         u"""Get basket lines"""
-        basket = self.factory.get_open_basket(self.request)
+        basket = self.factory.get_open_basket(self.request, self.response)
         return basket.lines.get(line_reference=self.kwargs['line_reference'])
         
     def handle_POST(self, line):
@@ -181,7 +180,7 @@ class SavedLineView(ModelView):
         self.factory = basket_factory.BasketFactory()
     
     def get_model(self):
-        basket = self.factory.get_saved_basket(self.request)
+        basket = self.factory.get_saved_basket(self.request, self.response)
         return basket.lines.get(line_reference=self.kwargs['line_reference'])
         
     def handle_POST(self, line):
@@ -189,7 +188,7 @@ class SavedLineView(ModelView):
         try:
             super(SavedLineView, self).handle_POST(line)
         except basket_models.InvalidBasketLineError, e:
-            messages.error(request, str(e))   
+            messages.error(self.request, str(e))   
             
     def do_move_to_basket(self, line):
         u"""Merge line items in to current basket"""