Merge lp:~canonical-ca-hackers/ubuntu-webcatalog/1006362-remove-maverick-add-quantal into lp:ubuntu-webcatalog

[Łukasz Czyżykowski]

Only create distroseries which are set in settings.

Overview
========
This branch makes sure that import for purchase apps only creates distroseries from ubuntu_series_for_versions dict.

Additionally there are two new import commands, import_all_ratings_stats and import_all_app_install_data which takes distroseries setting and iterate over it calling appropriate import_* command.

[Anthony Lenton (elachuni)]

Hi Łukasz,

Looks good! Another minor improvement: import_ratings_stats, import_exhibits, import_for_purchase_apps and import_app_install_data all create DistroSeries objects if they don't find one in the DB, but they do so with the information they find available at the time, which I think is always only the code_name, not the version. Could you use the UBUNTU_SERIES_FOR_VERSIONS setting to create DistroSeries always with the right value for both fields? (If you think this is something for a separate branch, I'm happy to land this as is!)

achuni.

review: Approve

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

Yes I think it will be better done separately.

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2012-06-04 10:54:02 +0000
+++ django_project/config/main.cfg	2012-06-08 15:05:22 +0000
@@ -117,7 +117,6 @@
 
 [series_for_versions]
 10.04 = lucid
-10.10 = maverick
 11.04 = natty
 11.10 = oneiric
 12.04 = precise

=== added file 'src/webcatalog/management/commands/import_all_app_install_data.py'
--- src/webcatalog/management/commands/import_all_app_install_data.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/management/commands/import_all_app_install_data.py	2012-06-08 15:05:22 +0000
@@ -0,0 +1,47 @@
+#   -*- coding: utf-8 -*-
+#   This file is part of the Apps Directory
+#   Copyright (C) 2011 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Management command to import app install data for all distroseries."""
+
+from __future__ import (
+    absolute_import,
+    with_statement,
+)
+
+__metaclass__ = type
+__all__ = []
+
+from django.conf import settings
+from django.core.management import call_command
+from django.core.management.base import NoArgsCommand
+
+
+class Command(NoArgsCommand):
+
+    def handle_noargs(self, **options):
+        self.verbosity = int(options['verbosity'])
+        for distroseries in settings.UBUNTU_SERIES_FOR_VERSIONS.values():
+            self.output("Importing app-install-data for {0}".format(
+                distroseries), 1)
+            call_command('import_app_install_data', distroseries)
+
+    def output(self, message, level=None, flush=False):
+        if hasattr(self, 'stdout'):
+            if level is None or self.verbosity >= level:
+                self.stdout.write(message)
+            if flush:
+                self.stdout.flush()

=== added file 'src/webcatalog/management/commands/import_all_ratings_stats.py'
--- src/webcatalog/management/commands/import_all_ratings_stats.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/management/commands/import_all_ratings_stats.py	2012-06-08 15:05:22 +0000
@@ -0,0 +1,47 @@
+#   -*- coding: utf-8 -*-
+#   This file is part of the Apps Directory
+#   Copyright (C) 2011 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Management command to import review statistics for all distroseries."""
+
+from __future__ import (
+    absolute_import,
+    with_statement,
+)
+
+__metaclass__ = type
+__all__ = []
+
+from django.conf import settings
+from django.core.management import call_command
+from django.core.management.base import NoArgsCommand
+
+
+class Command(NoArgsCommand):
+
+    def handle_noargs(self, **options):
+        self.verbosity = int(options['verbosity'])
+        for distroseries in settings.UBUNTU_SERIES_FOR_VERSIONS.values():
+            self.output("Importing ratings stats for {0}".format(
+                distroseries), 1)
+            call_command('import_ratings_stats', distroseries)
+
+    def output(self, message, level=None, flush=False):
+        if hasattr(self, 'stdout'):
+            if level is None or self.verbosity >= level:
+                self.stdout.write(message)
+            if flush:
+                self.stdout.flush()

=== modified file 'src/webcatalog/management/commands/import_for_purchase_apps.py'
--- src/webcatalog/management/commands/import_for_purchase_apps.py	2012-06-06 16:38:11 +0000
+++ src/webcatalog/management/commands/import_for_purchase_apps.py	2012-06-08 15:05:22 +0000
@@ -55,12 +55,18 @@
         if response.code != 200:
             raise Exception("Couldn't connect to server at %s" % url)
         app_list = json.loads(response.read())
+        reverse_versions = dict((v, k) for (k, v) in
+                                settings.UBUNTU_SERIES_FOR_VERSIONS.items())
         for app_data in app_list:
             # get icon data once per app (not per app per distroseries!)
             icon_data = self.get_icon_data(app_data)
             for series_name in app_data['series']:
+                if series_name not in reverse_versions:
+                    continue
                 distroseries, created = DistroSeries.objects.get_or_create(
-                    code_name=series_name)
+                    code_name=series_name,
+                    defaults=dict(version=reverse_versions[series_name])
+                )
                 if created:
                     self.output(
                         "Created a DistroSeries record called '{0}'.\n".format(

=== 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-08 15:05:22 +0000
@@ -61,6 +61,7 @@
     TestCaseWithFactory,
     WebCatalogObjectFactory,
 )
+from webcatalog.tests.helpers import patch_settings
 
 __metaclass__ = type
 __all__ = [
@@ -71,8 +72,16 @@
     'ImportExhibitsTestCase',
     'ImportForPurchaseAppsTestCase',
     'ImportRatingsTestCase',
+    'ImportAllAppInstallDataTestCase',
+    'ImportAllRatingsStatsTestCase',
 ]
 
+TEST_VERSIONS = {
+    '11.04': 'natty',
+    '10.10': 'maverick',
+    '12.04': 'precise',
+}
+
 
 class ImportAppInstallTestCase(TestCaseWithFactory):
 
@@ -551,12 +560,22 @@
         self.assertTrue(app_for_purchase.description.find('hello') > -1)
 
     def test_app_gets_distroseries(self):
-        call_command('import_for_purchase_apps')
+        with patch_settings(UBUNTU_SERIES_FOR_VERSIONS=TEST_VERSIONS):
+            call_command('import_for_purchase_apps')
 
         app = Application.objects.get(name='MyApp',
                                       distroseries=self.natty)
         self.assertEqual(2, len(app.available_distroseries()))
 
+    def test_app_gets_only_distroseries_from_the_list_from_settings(self):
+        with patch_settings(UBUNTU_SERIES_FOR_VERSIONS={'11.04': 'natty'}):
+            call_command('import_for_purchase_apps')
+
+            app = Application.objects.get(
+                name='MyApp', distroseries=self.natty)
+
+            self.assertEqual(1, len(app.available_distroseries()))
+
     def test_app_gets_price(self):
         call_command('import_for_purchase_apps')
 
@@ -575,7 +594,8 @@
             distroseries__in=(self.natty, self.maverick)).count()
         self.assertEqual(2, apps)
 
-        call_command('import_for_purchase_apps')
+        with patch_settings(UBUNTU_SERIES_FOR_VERSIONS=TEST_VERSIONS):
+            call_command('import_for_purchase_apps')
 
         actual_apps = Application.objects.filter(
             distroseries__in=(self.natty, self.maverick))
@@ -958,3 +978,27 @@
 
         self.assertEqual(4, Session.objects.count())
         self.check_expected_output()
+
+
+class ImportAllAppInstallDataTestCase(TestCaseWithFactory):
+
+    def test_handle(self):
+        patch_attr = ('webcatalog.management.commands.'
+                      'import_all_app_install_data.call_command')
+        with patch_settings(UBUNTU_SERIES_FOR_VERSIONS=TEST_VERSIONS):
+            with patch(patch_attr) as mock_call_command:
+                call_command('import_all_app_install_data')
+
+            self.assertEqual(mock_call_command.call_count, 3)
+
+
+class ImportAllRatingsStatsTestCase(TestCaseWithFactory):
+
+    def test_handle(self):
+        patch_attr = ('webcatalog.management.commands.'
+                      'import_all_ratings_stats.call_command')
+        with patch_settings(UBUNTU_SERIES_FOR_VERSIONS=TEST_VERSIONS):
+            with patch(patch_attr) as mock_call_command:
+                call_command('import_all_ratings_stats')
+
+            self.assertEqual(mock_call_command.call_count, 3)