Merge lp:~canonical-ca-hackers/ubuntu-webcatalog/1006442-double-distroseries into lp:ubuntu-webcatalog

[Łukasz Czyżykowski]

Cope with doubled applications in the database.

Overview
========
This branch fixes bug 1006442. It does that by coping with a rather strange condition in the database, because I wasn't able to find the root cause of why the current state was reached.

[Michael Nelson (michael.nelson)]

14:11 < noodles> lukasz: could lines 31 and 41 do the client.get consistently, or are they doing different things?
14:12 < noodles> lukasz: actually, if they're doing the same thing, why do we need the first test? The one test (the second one) ensures that the status is 200 already?
14:12 < lukasz> noodles, yup, one is for app detail within distroseries, second is for general app detail
14:12 < noodles> lukasz: as, got it. +1

review: Approve

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-05-08 06:42:38 +0000
+++ src/webcatalog/models/applications.py	2012-06-06 13:15:41 +0000
@@ -140,8 +140,9 @@
 
     def available_distroseries(self):
         """Return the set of distroseries for which this app is available"""
-        return DistroSeries.objects.filter(
-            application__package_name=self.package_name).order_by('-code_name')
+        return (DistroSeries.objects
+                .filter(application__package_name=self.package_name)
+                .distinct().order_by('-code_name'))
 
     def update_departments(self):
         """Update the list of departments for this app"""

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-05-31 20:00:27 +0000
+++ src/webcatalog/tests/test_views.py	2012-06-06 13:15:41 +0000
@@ -377,6 +377,31 @@
         self.assertContains(response,
             '<iframe src="http://example.com/video_iframe.html"')
 
+    def test_double_entry_in_the_db_is_displayed_sainely(self):
+        """Make sure that bug:1006442 is fixed"""
+        app = self.factory.make_application()
+        self.factory.make_application(
+            package_name=app.package_name,
+            distroseries=app.distroseries
+        )
+        response = self.client.get(self.get_app_details_url(app))
+
+        self.assertEquals(response.status_code, 200)
+
+    def test_make_sure_doubled_entry_displays_only_one_distroseries(self):
+        app = self.factory.make_application()
+        self.factory.make_application(
+            package_name=app.package_name,
+            distroseries=app.distroseries
+        )
+        response = self.client.get(
+            reverse('wc-package-detail', args=[app.package_name]))
+
+        ds = "Ubuntu {0} ({1})".format(
+            app.distroseries.version, app.distroseries.code_name)
+
+        self.assertContains(response, ds, 1)
+
 
 class ApplicationDetailNoSeriesTestCase(TestCaseWithFactory):
     def test_renders_latest(self):

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-05-31 19:45:40 +0000
+++ src/webcatalog/views.py	2012-06-06 13:15:41 +0000
@@ -194,8 +194,9 @@
     if distro is None:
         app = Application.objects.find_best_or_404(package_name=package_name)
     else:
-        app = get_object_or_404(Application, package_name=package_name,
-                                distroseries__code_name=distro)
+        app = Application.objects.find_best_or_404(
+            package_name=package_name,
+            distroseries__code_name=distro)
     if request.POST:
         form = EmailDownloadLinkForm(request.POST)
         if form.is_valid():