Merge lp:~canonical-ca-hackers/ubuntu-recommender/top-up-recommendations into lp:ubuntu-recommender

[Łukasz Czyżykowski]

Always return RECOMMENDATION_LIMIT number of recommendations from recommend me api call.

Overview
========
Added code to always return RECOMMENDATION_LIMIT number of recommendations from recommend me api call.

[Anthony Lenton (elachuni)]

Thanks lukazs!

[Anthony Lenton (elachuni)]

review: Approve

=== modified file 'src/recommender/api/handlers.py'
--- src/recommender/api/handlers.py	2012-03-28 19:36:23 +0000
+++ src/recommender/api/handlers.py	2012-04-19 14:43:18 +0000
@@ -107,8 +107,9 @@
             predictions = get_top_rated_apps(settings.RECOMMENDATION_LIMIT)
             return UserRecommendation(rid='', data=json.dumps(predictions))
         predictions = slopeone.predict_for_user(request.user.username)
-        if not predictions:
-            predictions = get_top_rated_apps(settings.RECOMMENDATION_LIMIT)
+        missing_no = settings.RECOMMENDATION_LIMIT - len(predictions)
+        if missing_no > 0:
+            predictions += get_top_rated_apps(missing_no)
         rec = UserRecommendation.objects.create(
             user=request.user,
             rid=get_random_id(),
 
=== modified file 'src/recommender/tests/test_api.py'
--- src/recommender/tests/test_api.py	2012-03-28 19:36:23 +0000
+++ src/recommender/tests/test_api.py	2012-04-19 14:43:18 +0000
@@ -49,6 +49,7 @@
     Package,
     RemovedApp,
     RatingsAndReviewsDataItem,
+    PersonIdentification,
     Token,
     UserProfile,
     UserRecommendation,
@@ -58,6 +59,7 @@
     header_from_token,
     patch_settings,
     )
+from recommender.predict import slopeone
 
 from django_factory import TestCase
 
@@ -275,6 +277,7 @@
     def setUp(self):
         super(RecommendMeTestCase, self).setUp()
         token, consumer = create_oauth_token_and_consumer(self.factory)
+        self.consumer = consumer
         self.url = reverse('api-recommend-me',
             kwargs={'uuid': '12345678123456781234567812345678'})
         self.header = header_from_token(self.url, token, consumer)
@@ -313,6 +316,19 @@
         data = json.loads(response.content)
         self.assertNotEqual(data['data'], [])
 
+    @patch('recommender.api.handlers.slopeone')
+    def test_user_will_always_gets_max_number_of_predictions(
+        self, mock_slopeone):
+        mock_slopeone.predict_for_user.return_value = [
+            {'package_name': 'a', 'rating': 5}
+        ]
+        self.factory.make(settings.RECOMMENDATION_LIMIT, Package)
+
+        response = self.client.get(self.url, **self.header)
+
+        data = json.loads(response.content)
+        self.assertEqual(len(data['data']), settings.RECOMMENDATION_LIMIT)
+
 
 class RecommendAppTestCase(TestCase):
     def setUp(self):