Merge lp:~jcsackett/launchpad/dsp-vocab-is-a-pain into lp:launchpad

[j.c.sackett]

[r=sinzui][bug=820005][incr] Updates dsp vocab to use the dsp in db in the search query.

Summary
=======
We want the dsp vocab to actually use DSPs. This means updating the vocab to use DistributionSourcePackageInDatabase as part of the search query.

Proposed Fix
============
Update the query to use DistributionSourcePackageInDatabase.

Preimplementation
=================
Spoke with Curtis Hovey.

Implementation
==============
lib/lp/registry/adapters.py
---------------------------
Drive by fix of a typo.

lib/lp/registry/vocabularies.py
lib/lp/registry/model/distributionsourcepackage.py
--------------------------------------------------
DistributionSourcePackageInDatabase is now used in the vocab's query; it also provides the link to Distribution, so DistroSeries is removed from the query. toTerm is updated to deal with producing a dsp term from the dsp-in-db; handling of proper dsps and spns is left alone.

LaunchpadTargetWidget may need to be updated; however as this vocab is behind a disabled feature flag (because it still has bugs barring it from being turned on) the update will be done in a separate branch to keep the work clear. Initial investigation shows that the the target widget can handle dsps -- since toTerm still returns dsps (as opposed to dsp in db), it should be fine.

Tests
=====
bin/test -vvct dsp_vocab

QA
==
With feature flag enabled, confirm that the package picker on retargeting answers works. Do not check on bug retargeting -- the dsp vocab is broken for that use in devel, and this branch has not fixed it. Make sure to disable the flag after QA.

Lint
====

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/registry/adapters.py
  lib/lp/registry/vocabularies.py
  lib/lp/registry/model/distributionsourcepackage.py

[Curtis Hovey (sinzui)]

Thank you. I am happy to see this land.

review: Approve (code)

=== modified file 'lib/lp/registry/adapters.py'
--- lib/lp/registry/adapters.py	2011-07-25 19:21:49 +0000
+++ lib/lp/registry/adapters.py	2011-08-22 14:35:39 +0000
@@ -1,7 +1,7 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Adapters for regisrty objects."""
+"""Adapters for registry objects."""
 
 __metaclass__ = type
 

=== modified file 'lib/lp/registry/model/distributionsourcepackage.py'
--- lib/lp/registry/model/distributionsourcepackage.py	2011-06-22 06:28:38 +0000
+++ lib/lp/registry/model/distributionsourcepackage.py	2011-08-22 14:35:39 +0000
@@ -9,6 +9,7 @@
 
 __all__ = [
     'DistributionSourcePackage',
+    'DistributionSourcePackageInDatabase',
     ]
 
 import itertools

=== modified file 'lib/lp/registry/vocabularies.py'
--- lib/lp/registry/vocabularies.py	2011-08-22 14:35:38 +0000
+++ lib/lp/registry/vocabularies.py	2011-08-22 14:35:39 +0000
@@ -131,6 +131,7 @@
     SQLObjectVocabularyBase,
     VocabularyFilter,
     )
+from canonical.lazr.utils import safe_hasattr
 from lp.app.browser.tales import DateTimeFormatterAPI
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.blueprints.interfaces.specification import ISpecification
@@ -173,7 +174,11 @@
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.projectgroup import IProjectGroup
 from lp.registry.interfaces.sourcepackage import ISourcePackage
+from lp.registry.interfaces.sourcepackagename import ISourcePackageName
 from lp.registry.model.distribution import Distribution
+from lp.registry.model.distributionsourcepackage import (
+    DistributionSourcePackageInDatabase,
+    )
 from lp.registry.model.distroseries import DistroSeries
 from lp.registry.model.distroseriesdifference import DistroSeriesDifference
 from lp.registry.model.distroseriesparent import DistroSeriesParent
@@ -2186,6 +2191,14 @@
         if IDistributionSourcePackage.providedBy(spn_or_dsp):
             dsp = spn_or_dsp
             distribution = spn_or_dsp.distribution
+        elif (not ISourcePackageName.providedBy(spn_or_dsp) and
+            safe_hasattr(spn_or_dsp, 'distribution')
+            and safe_hasattr(spn_or_dsp, 'sourcepackagename')):
+            # We use the hasattr checks rather than adaption because the
+            # DistributionSourcePackageInDatabase object is a little bit
+            # broken, and does not provide any interface.
+            distribution = spn_or_dsp.distribution
+            dsp = distribution.getSourcePackage(spn_or_dsp.sourcepackagename)
         else:
             distribution = distribution or self.distribution
             if distribution is not None and spn_or_dsp is not None:
@@ -2224,7 +2237,7 @@
             return EmptyResultSet()
         search_term = unicode(query)
         store = IStore(SourcePackagePublishingHistory)
-        spns = store.using(
+        dsps = store.using(
             SourcePackagePublishingHistory,
             LeftJoin(
                 SourcePackageRelease,
@@ -2235,9 +2248,9 @@
                 SourcePackageRelease.sourcepackagenameID ==
                     SourcePackageName.id),
             LeftJoin(
-                DistroSeries,
-                SourcePackagePublishingHistory.distroseriesID ==
-                    DistroSeries.id),
+                DistributionSourcePackageInDatabase,
+                SourcePackageName.id ==
+                    DistributionSourcePackageInDatabase.sourcepackagename_id),
             LeftJoin(
                 BinaryPackageBuild,
                 BinaryPackageBuild.source_package_release_id ==
@@ -2250,8 +2263,9 @@
                 BinaryPackageRelease.binarypackagenameID ==
                     BinaryPackageName.id
             )).find(
-                SourcePackageName,
-                DistroSeries.distributionID == distribution.id,
+                DistributionSourcePackageInDatabase,
+                DistributionSourcePackageInDatabase.distribution_id ==
+                    distribution.id,
                 SourcePackagePublishingHistory.status.is_in((
                     PackagePublishingStatus.PENDING,
                     PackagePublishingStatus.PUBLISHED)),
@@ -2262,4 +2276,4 @@
                     BinaryPackageName.name.contains_string(
                         search_term))).config(distinct=True)
         # XXX sinzui 2011-07-26: This query ignored SPN branches.
-        return CountableIterator(spns.count(), spns, self.toTerm)
+        return CountableIterator(dsps.count(), dsps, self.toTerm)