restrict reviewer receipts to the reviewer tools (bug 827352)

Andy McKay · Andy McKay · commit 141a685eb97d · 2013-01-22T10:34:45.000-08:00
diff --git a/mkt/account/tests/test_utils_.py b/mkt/account/tests/test_utils_.py
@@ -18,13 +18,20 @@ def setUp(self):
         self.app = Webapp.objects.get(pk=337141)
         self.req = RequestFactory().get('/')
 
-    def test_user(self):
-        Installed.objects.create(user=self.user, addon=self.app)
-        eq_(list(purchase_list(self.req, self.user, None)[0].object_list),
-            [self.app])
-
-    def test_other(self):
-        for t in [apps.INSTALL_TYPE_DEVELOPER, apps.INSTALL_TYPE_REVIEWER]:
-            Installed.objects.create(user=self.user, addon=self.app,
-                                     install_type=t)
+    def _test(self, type, exists):
+        Installed.objects.create(user=self.user, addon=self.app,
+                                 install_type=type)
+        if exists:
+            eq_(list(purchase_list(self.req, self.user, None)[0].object_list),
+                [self.app])
+        else:
             assert not purchase_list(self.req, self.user, None)[0].object_list
+
+    def test_user(self):
+        self._test(apps.INSTALL_TYPE_USER, True)
+
+    def test_developer(self):
+        self._test(apps.INSTALL_TYPE_DEVELOPER, True)
+
+    def test_reviewer(self):
+        self._test(apps.INSTALL_TYPE_REVIEWER, False)
diff --git a/mkt/account/utils.py b/mkt/account/utils.py
@@ -51,7 +51,9 @@ def purchase_list(request, user, product_id):
     # Otherwise, we'll show all apps that have a contribution or are free.
     if not product_id:
         product_ids = list(user.installed_set
-                           .filter(install_type=apps.INSTALL_TYPE_USER)
+                           .filter(install_type__in=
+                               [apps.INSTALL_TYPE_USER,
+                                apps.INSTALL_TYPE_DEVELOPER])
                            .exclude(addon__in=ids)
                            .values_list('addon_id', flat=True))
 
diff --git a/mkt/receipts/tests/test_views.py b/mkt/receipts/tests/test_views.py
@@ -88,8 +88,10 @@ def test_pending_paid_for_reviewer(self):
         assert self.client.login(username='editor@mozilla.com',
                                  password='password')
         eq_(self.client.post(self.url).status_code, 200)
+        # Because they aren't using reviewer tools, they'll get a normal
+        # install record and receipt.
         eq_(self.addon.installed.all()[0].install_type,
-            apps.INSTALL_TYPE_REVIEWER)
+            apps.INSTALL_TYPE_USER)
 
     def test_pending_paid_for_developer(self):
         AddonUser.objects.create(addon=self.addon, user=self.user)
diff --git a/mkt/receipts/views.py b/mkt/receipts/views.py
@@ -74,10 +74,12 @@ def _record(request, addon):
             not is_reviewer and not is_dev):
             raise PermissionDenied
 
-        # Log the install.
-        install_type = (apps.INSTALL_TYPE_REVIEWER if is_reviewer
-                        else apps.INSTALL_TYPE_DEVELOPER if is_dev
+        # If you are reviewer, you get a user receipt. Use the reviewer tools
+        # to get a reviewer receipt. App developers still get their special
+        # receipt.
+        install_type = (apps.INSTALL_TYPE_DEVELOPER if is_dev
                         else apps.INSTALL_TYPE_USER)
+        # Log the install.
         installed, c = Installed.objects.safer_get_or_create(addon=addon,
             user=request.amo_user, install_type=install_type)
 
@@ -170,6 +172,7 @@ def verify(request, uuid):
     return http.HttpResponse(verify.invalid(),
                              verify.get_headers(verify.invalid()))
 
+
 @addon_all_view
 @json_view
 @post_required
