Merge lp:~rockstar/launchpad/ihasrecipes-person into lp:launchpad

[Paul Hummer]

This branch adds IHasRecipes to IPerson and IProduct. It also, initially,
added it to IDistroSeries, but I can't think of a sane reason why you'd ever
want to see all the recipes for a DistroSeries, and the circular imports were
more trouble than it was worth.

To test:
  bin/test -vvt lp.code.model.tests.test_hasrecipes

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'lib/lp/code/model/tests/test_hasrecipes.py'
--- lib/lp/code/model/tests/test_hasrecipes.py	2010-04-06 21:17:28 +0000
+++ lib/lp/code/model/tests/test_hasrecipes.py	2010-04-08 19:54:40 +0000
@@ -33,6 +33,37 @@
         recipe_ignored = self.factory.makeSourcePackageRecipe()
         self.assertEqual(2, base_branch.getRecipes().count())
 
+    def test_person_implements_hasrecipes(self):
+        # Person should implement IHasRecipes.
+        person = self.factory.makeBranch()
+        self.assertProvides(person, IHasRecipes)
+
+    def test_person_getRecipes(self):
+        # IPerson.getRecipes should provide all the SourcePackageRecipes
+        # owned by that person.
+        person = self.factory.makePerson()
+        recipe1 = self.factory.makeSourcePackageRecipe(owner=person)
+        recipe2 = self.factory.makeSourcePackageRecipe(owner=person)
+        recipe_ignored = self.factory.makeSourcePackageRecipe()
+        self.assertEqual(2, person.getRecipes().count())
+
+    def test_product_implements_hasrecipes(self):
+        # Product should implement IHasRecipes.
+        product = self.factory.makeProduct()
+        self.assertProvides(product, IHasRecipes)
+
+    def test_product_getRecipes(self):
+        # IProduct.recipes should provide all the SourcePackageRecipes attached
+        # to that product's branches.
+        product = self.factory.makeProduct()
+        branch = self.factory.makeBranch(product=product)
+        recipe1 = self.factory.makeSourcePackageRecipe(
+            None, None, None, None, None, None, branch)
+        recipe2 = self.factory.makeSourcePackageRecipe(
+            None, None, None, None, None, None, branch)
+        recipe_ignored = self.factory.makeSourcePackageRecipe()
+        self.assertEqual(2, product.getRecipes().count())
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py	2010-04-06 20:17:04 +0000
+++ lib/lp/registry/interfaces/person.py	2010-04-08 19:54:40 +0000
@@ -82,6 +82,7 @@
 from lp.bugs.interfaces.bugtarget import IHasBugs
 from lp.code.interfaces.hasbranches import (
     IHasBranches, IHasMergeProposals, IHasRequestedReviews)
+from lp.code.interfaces.hasrecipes import IHasRecipes
 from lp.registry.interfaces.gpg import IGPGKey
 from lp.registry.interfaces.irc import IIrcID
 from lp.registry.interfaces.jabber import IJabberID
@@ -457,7 +458,7 @@
 class IPersonPublic(IHasBranches, IHasSpecifications, IHasMentoringOffers,
                     IHasMergeProposals, IHasLogo, IHasMugshot, IHasIcon,
                     IHasLocation, IHasRequestedReviews, IObjectWithLocation,
-                    IPrivacy, IHasBugs):
+                    IPrivacy, IHasBugs, IHasRecipes):
     """Public attributes for a Person."""
 
     id = Int(title=_('ID'), required=True, readonly=True)

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2010-03-24 14:29:12 +0000
+++ lib/lp/registry/interfaces/product.py	2010-04-08 19:54:40 +0000
@@ -44,6 +44,7 @@
 from lp.code.interfaces.branchvisibilitypolicy import (
     IHasBranchVisibilityPolicy)
 from lp.code.interfaces.hasbranches import IHasBranches, IHasMergeProposals
+from lp.code.interfaces.hasrecipes import IHasRecipes
 from lp.bugs.interfaces.bugtarget import (
     IBugTarget, IOfficialBugTagTargetPublic, IOfficialBugTagTargetRestricted)
 from lp.registry.interfaces.karma import IKarmaContext
@@ -338,7 +339,7 @@
     IHasLogo, IHasMentoringOffers, IHasMergeProposals, IHasMilestones,
     IHasMugshot, IHasOwner, IHasSecurityContact, IHasSprints,
     ITranslationPolicy, IKarmaContext, ILaunchpadUsage, IMakesAnnouncements,
-    IOfficialBugTagTargetPublic, IPillar, ISpecificationTarget):
+    IOfficialBugTagTargetPublic, IPillar, ISpecificationTarget, IHasRecipes):
     """Public IProduct properties."""
 
     # XXX Mark Shuttleworth 2004-10-12: Let's get rid of ID's in interfaces

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2010-04-06 20:17:04 +0000
+++ lib/lp/registry/model/person.py	2010-04-08 19:54:40 +0000
@@ -2366,6 +2366,14 @@
         from lp.hardwaredb.model.hwdb import HWSubmissionSet
         return HWSubmissionSet().search(owner=self)
 
+    def getRecipes(self):
+        """See `IHasRecipes`."""
+        from lp.code.model.sourcepackagerecipe import SourcePackageRecipe
+        store = Store.of(self)
+        return store.find(
+            SourcePackageRecipe,
+            SourcePackageRecipe.owner == self)
+
 
 class PersonSet:
     """The set of persons."""

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2010-04-03 17:07:26 +0000
+++ lib/lp/registry/model/product.py	2010-04-08 19:54:40 +0000
@@ -34,6 +34,8 @@
 from lp.code.model.branchvisibilitypolicy import (
     BranchVisibilityPolicyMixin)
 from lp.code.model.hasbranches import HasBranchesMixin, HasMergeProposalsMixin
+from lp.code.model.sourcepackagerecipe import SourcePackageRecipe
+from lp.code.model.sourcepackagerecipedata import SourcePackageRecipeData
 from lp.bugs.interfaces.bugtarget import IHasBugHeat
 from lp.bugs.model.bug import (
     BugSet, get_bug_tags, get_bug_tags_open_count)
@@ -1018,6 +1020,17 @@
             if include_inactive or series.active or
                series == self.development_focus]
 
+    def getRecipes(self):
+        """See `IHasRecipes`."""
+        from lp.code.model.branch import Branch
+        store = Store.of(self)
+        return store.find(
+            SourcePackageRecipe,
+            SourcePackageRecipe.id ==
+                SourcePackageRecipeData.sourcepackage_recipe_id,
+            SourcePackageRecipeData.base_branch == Branch.id,
+            Branch.product == self)
+
 
 class ProductSet:
     implements(IProductSet)