Merge lp:~rockstar/launchpad/no-recipe-dupes into lp:launchpad

[Paul Hummer]

This branch makes it so that the UI can't create a recipe owned by the same person with the same name. There's a database patch to go along with this.

[Curtis Hovey (sinzui)]

Thanks for reworking the implementation and providing the extra test.

review: Approve

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-05-18 20:29:30 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-05-27 20:23:27 +0000
@@ -321,6 +321,13 @@
                 'recipe_text',
                 'The recipe text is not a valid bzr-builder recipe.')
 
+        if getUtility(ISourcePackageRecipeSource).exists(
+                                                    self.user, data['name']):
+            self.setFieldError(
+                'name',
+                'There is already a recipe owned by %s with this name.' %
+                    self.user.displayname)
+
 
 class SourcePackageRecipeAddView(RecipeTextValidatorMixin, LaunchpadFormView):
     """View for creating Source Package Recipes."""

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-26 12:11:31 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-27 20:23:27 +0000
@@ -127,6 +127,31 @@
             extract_text(find_tags_by_class(browser.contents, 'message')[1]),
             'The recipe text is not a valid bzr-builder recipe.')
 
+    def test_create_dupe_recipe(self):
+        # You shouldn't be able to create a duplicate recipe owned by the same
+        # person with the same name.
+        recipe = self.factory.makeSourcePackageRecipe(owner=self.chef)
+
+        product = self.factory.makeProduct(
+            name='ratatouille', displayname='Ratatouille')
+        branch = self.factory.makeBranch(
+            owner=self.chef, product=product, name='veggies')
+        self.factory.makeSourcePackage(sourcepackagename='ratatouille')
+
+        # A new recipe can be created from the branch page.
+        browser = self.getUserBrowser(canonical_url(branch), user=self.chef)
+        browser.getLink('Create packaging recipe').click()
+
+        browser.getControl(name='field.name').value = recipe.name
+        browser.getControl('Description').value = 'Make some food!'
+        browser.getControl('Source Package Name').value = 'ratatouille'
+        browser.getControl('Secret Squirrel').click()
+        browser.getControl('Create Recipe').click()
+
+        self.assertEqual(
+            extract_text(find_tags_by_class(browser.contents, 'message')[1]),
+            'There is already a recipe owned by Master Chef with this name.')
+
 
 class TestSourcePackageRecipeEditView(TestCaseForRecipe):
     """Test the editing behaviour of a source package recipe."""

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2010-05-18 20:29:30 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2010-05-27 20:23:27 +0000
@@ -186,3 +186,6 @@
     def new(registrant, owner, distroseries, sourcepackagename, name,
             builder_recipe, description):
         """Create an `ISourcePackageRecipe`."""
+
+    def exists(owner, name):
+        """Check to see if a recipe by the same name and owner exists."""

=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
--- lib/lp/code/model/sourcepackagerecipe.py	2010-05-26 19:23:20 +0000
+++ lib/lp/code/model/sourcepackagerecipe.py	2010-05-27 20:23:27 +0000
@@ -134,6 +134,19 @@
         store.add(sprecipe)
         return sprecipe
 
+    @staticmethod
+    def exists(owner, name):
+        """See `ISourcePackageRecipeSource.new`."""
+        store = IMasterStore(SourcePackageRecipe)
+        recipe = store.find(
+            SourcePackageRecipe,
+            SourcePackageRecipe.owner == owner,
+            SourcePackageRecipe.name == name).one()
+        if recipe:
+            return True
+        else:
+            return False
+
     def destroySelf(self):
         store = Store.of(self)
         self.distroseries.clear()

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipe.py	2010-05-18 19:14:16 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipe.py	2010-05-27 20:23:27 +0000
@@ -85,6 +85,18 @@
             (recipe.registrant, recipe.owner, set(recipe.distroseries),
              recipe.sourcepackagename, recipe.name))
 
+    def test_exists(self):
+        # Test ISourcePackageRecipeSource.exists
+        recipe = self.factory.makeSourcePackageRecipe()
+
+        self.assertTrue(
+            getUtility(ISourcePackageRecipeSource).exists(
+                recipe.owner, recipe.name))
+
+        self.assertFalse(
+            getUtility(ISourcePackageRecipeSource).exists(
+                recipe.owner, u'daily'))
+
     def test_source_implements_interface(self):
         # The SourcePackageRecipe class implements ISourcePackageRecipeSource.
         self.assertProvides(