Merge lp:~michael.nelson/ubuntu-webcatalog/985446-remove-commercial-apps-too into lp:ubuntu-webcatalog

[Michael Nelson]

Overview
========

As per bug 985446, ensures any apps that were previously imported from sca, but are no longer imported are deleted.

`fab test`

[Łukasz Czyżykowski (lukasz-czyzykowski)]

review: Approve

=== modified file 'src/webcatalog/management/commands/import_sca_apps.py'
--- src/webcatalog/management/commands/import_sca_apps.py	2012-07-02 21:25:30 +0000
+++ src/webcatalog/management/commands/import_sca_apps.py	2012-08-20 09:31:44 +0000
@@ -24,6 +24,7 @@
 import json
 import os
 import urllib
+from collections import defaultdict
 from StringIO import StringIO
 from tempfile import mkstemp
 
@@ -52,6 +53,13 @@
         if response.code != 200:
             raise Exception("Couldn't connect to server at %s" % url)
         app_list = json.loads(response.read())
+        imported_apps = Application.objects.filter(
+            imported_from_sca=True).values_list(
+                'package_name',
+                'distroseries__code_name')
+        existing_apps = defaultdict(list)
+        for package_name, code_name in imported_apps:
+            existing_apps[package_name].append(code_name)
         reverse_versions = dict((v, k) for (k, v) in
                                 settings.UBUNTU_SERIES_FOR_VERSIONS.items())
         for app_data in app_list:
@@ -66,9 +74,24 @@
                     self.output(
                         "Created a DistroSeries record called '{0}'.\n".format(
                             series_name), 1)
-                self.import_app_from_data(app_data, icon_data, distroseries)
+                package_name = self.import_app_from_data(
+                    app_data, icon_data, distroseries)
+                if package_name:
+                    existing_series = existing_apps.get(package_name)
+                    if existing_series and series_name in existing_series:
+                        existing_series.remove(series_name)
+                        if not existing_series:
+                            del(existing_apps[package_name])
+
             Application.objects.check_latest(app_data['package_name'])
 
+        # Any sca-imported apps that existed before update, but were not
+        # imported from sca are removed.
+        for package_name, series in existing_apps.items():
+            Application.objects.filter(
+                package_name=package_name,
+                distroseries__code_name__in=series).delete()
+
     def import_app_from_data(self, app_data, icon_data, distroseries):
         form = SCAApplicationForm.from_api_data(
             app_data, distroseries)
@@ -77,6 +100,7 @@
             app.update_departments()
             self.add_icon_to_app(app, data=icon_data)
             self.output(u"{0} created.\n".format(app.name).encode('utf-8'), 1)
+        return app.package_name
 
     def get_icon_data(self, app_data):
         icon_data = app_data.get('icon_data', '')

=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	2012-07-02 13:51:23 +0000
+++ src/webcatalog/schema.py	2012-08-20 09:31:44 +0000
@@ -22,7 +22,7 @@
 from configglue import schema
 from django_configglue.schema import schemas
 
-DjangoSchema = schemas.get(django.get_version())
+DjangoSchema = schemas.get('1.3')
 
 
 class WebCatalogSchema(DjangoSchema):

=== modified file 'src/webcatalog/static/js/screenshots.js'
--- src/webcatalog/static/js/screenshots.js	2012-05-29 18:23:21 +0000
+++ src/webcatalog/static/js/screenshots.js	2012-08-20 09:31:44 +0000
@@ -65,7 +65,7 @@
             slides.on("click", function(e){
                     var slide = e.currentTarget;
                     var url = slide.getAttribute('src');
-                    heading = appName + ' - screeshot ';
+                    heading = appName + ' - screenshot ';
                     panel.setStdModContent(Y.WidgetStdMod.HEADER, heading);
                     panel.setStdModContent(Y.WidgetStdMod.BODY, '<img width="800" src="' + url +'"/>');
                     panel.render('#viewerPanel');

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-07-02 21:25:30 +0000
+++ src/webcatalog/tests/test_commands.py	2012-08-20 09:31:44 +0000
@@ -68,7 +68,7 @@
     'CleanupDataTestCase',
     'ImportAppInstallTestCase',
     'ImportExhibitsTestCase',
-    'ImportForPurchaseAppsTestCase',
+    'ImportFromSCAAppsTestCase',
     'ImportRatingsTestCase',
     'ImportAllAppInstallDataTestCase',
     'ImportAllRatingsStatsTestCase',
@@ -538,10 +538,10 @@
         self.assertFalse(app.icon)
 
 
-class ImportForPurchaseAppsTestCase(TestCaseWithFactory):
+class ImportFromSCAAppsTestCase(TestCaseWithFactory):
 
     def setUp(self):
-        super(ImportForPurchaseAppsTestCase, self).setUp()
+        super(ImportFromSCAAppsTestCase, self).setUp()
         self.natty = self.factory.make_distroseries(
             code_name='natty', version='11.04')
         self.maverick = self.factory.make_distroseries(
@@ -682,6 +682,25 @@
         arb_apps = Application.objects.filter(package_name='eg_arb_app')
         self.assertEqual(2, arb_apps.count())
 
+    def test_no_longer_existing_apps_are_removed(self):
+        precise = self.factory.make_distroseries(code_name='precise')
+        old_app = self.factory.make_application(
+            package_name='hello', distroseries=precise,
+            imported_from_sca=True)
+
+        with patch_settings(UBUNTU_SERIES_FOR_VERIONS={
+            '10.04': 'lucid',
+            '11.04': 'natty',
+        }):
+            call_command('import_sca_apps')
+
+        self.assertEqual(0, Application.objects.filter(pk=old_app.id).count())
+        remaining_hello_apps = Application.objects.filter(
+            imported_from_sca=True, package_name='hello')
+        self.assertEqual(1, remaining_hello_apps.count())
+        self.assertEqual('natty',
+                         remaining_hello_apps[0].distroseries.code_name)
+
 
 class ImportRatingsTestCase(TestCaseWithFactory):