Merge lp:~canonical-ca-hackers/ubuntu-webcatalog/1010655-several-issues-with-qreator into lp:ubuntu-webcatalog

[Łukasz Czyżykowski]

Fix problem with importing apps with archive_id = ''.

Overview
========
This branch fixes problem for apps which are pulled from MyApps in the case when they are missing archive_id. Until this branch, there could be only one app per distroseries with archive_id = '', which caused all following import tries to fail due to unique_together constrain. Making sure this field is always None in those cases makes it possible to successfully import them.

[Anthony Lenton (elachuni)]

Looks good

review: Approve

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2012-06-06 17:42:04 +0000
+++ src/webcatalog/forms.py	2012-06-14 08:38:18 +0000
@@ -128,6 +128,12 @@
     screenshot_urls = MultiURLField(required=False)
     video_embedded_html_urls = MultiURLField(required=False)
 
+    def clean_archive_id(self):
+        archive_id = self.cleaned_data.get('archive_id')
+        if not archive_id:
+            return None
+        return archive_id
+
     class Meta:
         model = Application
         exclude = ('section', 'popcon')
 
=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-06-06 18:00:26 +0000
+++ src/webcatalog/tests/test_commands.py	2012-06-14 08:38:18 +0000
@@ -623,8 +623,8 @@
 
         arb_apps = Application.objects.filter(package_name='eg_arb_app')
         self.assertEqual(2, arb_apps.count())
-        self.assertEqual('', arb_apps[0].archive_id)
-        self.assertEqual('', arb_apps[1].archive_id)
+        self.assertEqual(None, arb_apps[0].archive_id)
+        self.assertEqual(None, arb_apps[1].archive_id)
 
     def test_import_arb_app_handle_existing_none_archive_id(self):
         precise = self.factory.make_distroseries(code_name='precise')
 
=== modified file 'src/webcatalog/tests/test_forms.py'
--- src/webcatalog/tests/test_forms.py	2012-06-06 18:00:26 +0000
+++ src/webcatalog/tests/test_forms.py	2012-06-14 08:38:18 +0000
@@ -274,6 +274,17 @@
         app_reloaded = Application.objects.get(id=existing_app.id)
         self.assertEqual(21, app_reloaded.application_id)
 
+    def test_archive_id_is_set_to_none_when_supplied_as_empty_str(self):
+        """Check that bug 1010655 is not happening again."""
+        precise = self.factory.make_distroseries(code_name='precise')
+        self.factory.make_application(archive_id='', distroseries=precise)
+
+        data = self.make_valid_data(archive_id='')
+
+        form = ForPurchaseApplicationForm.from_api_data(data, precise)
+
+        self.assertTrue(form.is_valid())
+
 
 class MultiURLFieldTestCase(TestCase):