Merge lp:~adeuring/launchpad/filter-private-product-RosettaApplication into lp:launchpad

[Abel Deuring]

omit private products in TranslationsOverview.getMostTranslatedPillars()

This branch changes the method TranslationsOverview.getMostTranslatedPillars() so that it does not return any private products.

It does not make much sense to include proprietary or embargoed products that the curent user can see. The method is used to show translatable products on the page https://translations.launchpad.net/ . Showing private products here might even concern some users that their secret stuff might accidentally been shown publicly.

So I added just the expression

  (product.information_type = InformationType.PUBLIC OR product.information_type IS NULL)

to the SQL query in getMostTranslatedPillars()

test: ./bin/test -vvt lib/lp/translations/doc/translationsoverview.txt

no lint

[Deryck Hodge (deryck)]

Looks good, generally. As mentioned here in person, we need an XXX to note that we don't want this check for NULL once Product.information_type cannot be NULL. Once the XXX is in place, landing this sounds fine. Also, please add a card to the Kanban board reminding us to revisit this code.

review: Approve

=== modified file 'lib/lp/translations/doc/translationsoverview.txt'
--- lib/lp/translations/doc/translationsoverview.txt	2012-01-20 15:42:44 +0000
+++ lib/lp/translations/doc/translationsoverview.txt	2012-10-26 13:34:23 +0000
@@ -177,6 +177,16 @@
     Evolution: 20
     Ubuntu: 24
 
+Private projects are never included.
+
+    >>> from lp.app.enums import InformationType
+    >>> removeSecurityProxy(upstart).information_type = (
+    ...     InformationType.PROPRIETARY)
+    >>> display_pillars(overview.getMostTranslatedPillars())
+    alsa-utils: 22
+    Evolution: 20
+    Ubuntu: 24
+
 
 Zero karma
 ----------

=== modified file 'lib/lp/translations/model/translationsoverview.py'
--- lib/lp/translations/model/translationsoverview.py	2011-12-30 06:14:56 +0000
+++ lib/lp/translations/model/translationsoverview.py	2012-10-26 13:34:23 +0000
@@ -6,7 +6,10 @@
 
 from zope.interface import implements
 
-from lp.app.enums import ServiceUsage
+from lp.app.enums import (
+    InformationType,
+    ServiceUsage,
+    )
 from lp.registry.model.distribution import Distribution
 from lp.registry.model.product import Product
 from lp.services.database.sqlbase import (
@@ -49,6 +52,10 @@
     def getMostTranslatedPillars(self, limit=50):
         """See `ITranslationsOverview`."""
 
+        # XXX Abel Deuring 2012-10-26 bug=1071751
+         # The expression product.information_type IS NULL can be
+         # removed once we have the DB constraint
+         # "Product.information_type IS NULL".
         query = """
         SELECT LOWER(COALESCE(product_name, distro_name)) AS name,
                product_id,
@@ -68,16 +75,19 @@
                      distribution=distribution.id
               WHERE category=3 AND
                     (product IS NOT NULL OR distribution IS NOT NULL) AND
-                    (product.translations_usage = %s OR
-                        distribution.translations_usage = %s)
+                    (product.translations_usage = %s AND
+                     (product.information_type = %s OR
+                      product.information_type IS NULL) OR
+                    distribution.translations_usage = %s)
               GROUP BY product.displayname, product.id,
                        distribution.displayname, distribution.id
               HAVING SUM(karmavalue) > 0
               ORDER BY total_karma DESC
               LIMIT %s) AS something
           ORDER BY name""" % sqlvalues(ServiceUsage.LAUNCHPAD,
-                              ServiceUsage.LAUNCHPAD,
-                              limit)
+                                       InformationType.PUBLIC,
+                                       ServiceUsage.LAUNCHPAD,
+                                       limit)
         cur = cursor()
         cur.execute(query)