Updated basket analytics signal - wasn't working previously

- Also refactored the calculate scores management command

oscar/apps/analytics/management/commands/calculate_scores.py

@@ -1,42 +1,20 @@
 import logging
-import sys
-from optparse import make_option
 
-from django.core.management.base import BaseCommand, CommandError
-from django.db import connection, transaction
+from django.core.management.base import BaseCommand
 
-from oscar.apps.analytics.models import ProductRecord
-from oscar.apps.catalogue.models import Item
+from oscar.core.loading import import_module
+import_module('analytics.utils', ['ScoreCalculator'], locals())
 
 
 class Command(BaseCommand):
     
-    help = 'For creating product catalogues based on a CSV file'
+    help = 'Calculate product scores based on analytics data'
     
     def handle(self, *args, **options):
         
-        logger = self._get_logger()
-        cursor = connection.cursor()
-        
-        logger.info("Calculating product scores")
-        sql = '''UPDATE `%s` 
-                 SET score = (num_views + 3*num_basket_additions + 5*num_purchases) / 9''' % ProductRecord._meta.db_table
-        cursor.execute(sql)
-        
-        logger.info("Updating product table")
-        sql = '''UPDATE `%s` product, `%s` analytics
-                 SET product.score = analytics.score
-                 WHERE product.id = analytics.product_id''' % (Product._meta.db_table, ProductRecord._meta.db_table)
-        cursor.execute(sql)
-        
-        transaction.commit_unless_managed()
-        
-    def _get_logger(self):
-        logger = logging.getLogger('oscar.apps.score_calculation')
-        stream = logging.StreamHandler(self.stdout)
-        logger.addHandler(stream)
-        logger.setLevel(logging.DEBUG)
-        return logger
+        logger = logging.getLogger(__name__)
+        calculator = ScoreCalculator(logger)
+        calculator.run()
 
         
         

oscar/apps/analytics/utils.py

@@ -0,0 +1,44 @@
+from django.db import connection, transaction
+
+from oscar.core.loading import import_module
+import_module('analytics.models', ['ProductRecord'], locals())
+import_module('catalogue.models', ['Product'], locals())
+
+
+class ScoreCalculator(object):
+    
+    # Map of field name to weight
+    weights = {'num_views': 1,
+               'num_basket_additions': 3,
+               'num_purchases': 5}
+    
+    def __init__(self, logger):
+        self.logger = logger
+        self.cursor = connection.cursor()
+    
+    def run(self):
+        self.calculate_scores()
+        self.update_product_models()
+        
+    def calculate_scores(self):
+        self.logger.info("Calculating product scores")
+        
+        # Build the "SET ..." part of the SQL statement
+        weighted_sum = " + ".join(["%s*`%s`" % (weight, field) for field, weight in self.weights.items()])
+        
+        ctx = {'table': ProductRecord._meta.db_table,
+               'weighted_total': weighted_sum,
+               'total_weight': sum(self.weights.values())}
+        sql = '''UPDATE `%(table)s` 
+                 SET score = (%(weighted_total)s) / %(total_weight)s''' % ctx
+        self.logger.debug(sql)         
+        self.cursor.execute(sql)
+        transaction.commit_unless_managed()
+        
+    def update_product_models(self):
+        self.logger.info("Updating product records")
+        sql = '''UPDATE `%s` product, `%s` analytics
+                 SET product.score = analytics.score
+                 WHERE product.id = analytics.product_id''' % (Product._meta.db_table, ProductRecord._meta.db_table)
+        self.cursor.execute(sql)
+        transaction.commit_unless_managed()

oscar/apps/basket/views.py

@@ -9,6 +9,7 @@ from django.utils.translation import ugettext_lazy as _
 from extra_views import ModelFormSetView
 from oscar.apps.basket.forms import BasketLineForm, AddToBasketForm, \
     BasketVoucherForm, SavedLineForm
+from oscar.apps.basket.signals import basket_addition
 
 
 class BasketView(ModelFormSetView):
@@ -70,6 +71,7 @@ class BasketAddView(FormView):
     """
     form_class = AddToBasketForm
     product_model = get_model('catalogue', 'product')
+    add_signal = basket_addition
     
     def get(self, request, *args, **kwargs):
         return HttpResponseRedirect(reverse('basket:summary'))
@@ -96,6 +98,10 @@ class BasketAddView(FormView):
         messages.info(self.request, _("'%(title)s' (quantity %(quantity)d) has been added to your basket" %
                 {'title': form.instance.get_title(), 
                  'quantity': form.cleaned_data['quantity']}))
+        
+        # Send signal for basket addition
+        self.add_signal.send(sender=self, product=form.instance, user=self.request.user)
+        
         return super(BasketAddView, self).form_valid(form)
     
     def form_invalid(self, form):

oscar/apps/catalogue/views.py

@@ -21,8 +21,8 @@ class ProductDetailView(DetailView):
         return self._product
     
     def get(self, request, **kwargs):
-        u"""
-        Ensures that the correct URL is used
+        """
+        Ensure that the correct URL is used
         """
         product = self.get_object()
         correct_path = product.get_absolute_url() 
@@ -36,7 +36,7 @@ class ProductDetailView(DetailView):
 
     def get_template_names(self):
         """
-        Returns a list of possible templates.
+        Return a list of possible templates.
         
         We try 2 options before defaulting to catalogue/detail.html:
         1). detail-for-upc-<upc>.html