Merge lp:~bac/launchpad/voucherdot into lp:launchpad

[Brad Crittenden]

Allow ProductSet.forReview() to find product's with special characters in the name.

= Summary =

When trying to assign a voucher to a product with a (legal) dot in it's
name there was an InvalidValue error because the vocabulary invoked
during widget validation returned no product. The vocabulary uses
ProductSet.forReview() to look up the product, which only uses an fti
search.

== Proposed fix ==

Comparing with the PillarSet.search() shows that the latter has an extra
clause to match on the pillar name. Such a clause has been added to the
forReview search.

== Pre-implementation notes ==

None

== Implementation details ==

As above.

== Tests ==

bin/text -vvm lp.registry -t commercialsubscription.txt

== Demo and Q/A ==

Attempt to assign a voucher to the accountz.com outstanding project.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/doc/commercialsubscription.txt
  lib/lp/registry/model/product.py

== Pylint notices ==

lib/lp/registry/model/product.py
    22: [F0401] Unable to import 'zope.interface'
    23: [F0401] Unable to import 'zope.component'
    24: [F0401] Unable to import 'zope.security.proxy'
    27: [F0401] Unable to import 'lazr.delegates'

[Curtis Hovey (sinzui)]

Oh. I think I discovered this last year while searching. Thanks for the fix.

review: Approve (code)

[Brad Crittenden (bac)]

QA:
Perform the following search and get one result:

https://edge.launchpad.net/projects/+review-licenses?field.search_text=accountz.com&field.active=True&field.active-empty-marker=1&field.license_reviewed=&field.license_reviewed-empty-marker=1&field.license_approved=&field.license_approved-empty-marker=1&field.license_info_is_empty=&field.license_info_is_empty-empty-marker=1&field.licenses-empty-marker=1&field.has_zero_licenses=&field.has_zero_licenses-empty-marker=1&field.created_after=&field.subscription_expires_after=&field.subscription_modified_after=&field.created_before=&field.subscription_expires_before=&field.subscription_modified_before=&search=Search

=== modified file 'lib/lp/registry/doc/commercialsubscription.txt'
--- lib/lp/registry/doc/commercialsubscription.txt	2010-02-17 11:19:42 +0000
+++ lib/lp/registry/doc/commercialsubscription.txt	2010-04-03 21:16:25 +0000
@@ -518,6 +518,14 @@
     ...
     AssertionError...
 
+The full text search will not match strings with dots in their name
+but a clause is included to search specifically for the name.
+
+    >>> new_product = factory.makeProduct(name="abc.com")
+    >>> for product in product_set.forReview(search_text="abc.com"):
+    ...     print product.name
+    abc.com
+
 The use of 'forReview' is limited to users with launchpad.Commercial permission.
 
 Anonymous users cannot access 'forReview'.

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2010-03-19 11:13:00 +0000
+++ lib/lp/registry/model/product.py	2010-04-03 21:16:25 +0000
@@ -1141,8 +1141,10 @@
             conditions.append(Product.active == active)
 
         if search_text is not None and search_text.strip() != '':
-            conditions.append(SQL(
-                'Product.fti @@ ftq(%s)' % sqlvalues(search_text)))
+            conditions.append(SQL('''
+                Product.fti @@ ftq(%(text)s) OR
+                Product.name = lower(%(text)s)
+                ''' % sqlvalues(text=search_text)))
 
         def dateToDatetime(date):
             """Convert a datetime.date to a datetime.datetime