Merge lp:~michael.nelson/ubuntu-webcatalog/1015515-dont-create-new-app into lp:ubuntu-webcatalog

[Michael Nelson]

Don't create new apps for the same distroseries and package_name.

Overview
========

Updates the form used to process sca app data so that we don't create new applications for the same distroseries just because they have different archive_ids.

Instead, if there's already an app in the same distroseries with the same package name, we update it.

I also fixed test_check_latest which was a false positive (it was passing if you ran all tests, but failing if I just ran the test case, because it was dependent on the alpha-ordering of the implicit versions being created by the test).

`fab test`

Notes: I'm currently left a little confused as to why we added application_id. We (I) added it with r116 as a way for us to distinguish apps imported from sca, given that we now had sca apps with archive_id=None. But this doesn't help distinguishing existing apps in the archive.

I don't know why we didn't go with package_name, or is package_name an issue because we may well *want* to have different versions of an app available in myapps. In which case, application_id still doesn't help, but checking for package_name+version+distroseries may.

Should we add some unique constraints for this? (unique_together=('distroseries', 'package_name', 'version') or similar.

RESOLVED after chatting with achuni:
 * Both application_id and for_purchase allow us to distinguish between sca_imported apps and archive imported (so we can remove one of them - I've deleted application_id and renamed for_purchase->imported_from_sca, as we only ever use the bool value - check with achuni).
 * We only ever want one package_name per distroseries, always preferring the sca imported data. Therefore we should add a unique_together on distroseries/packagename and a migration to ensure we have the DB in this state initially. I'll do this is the next branch (as well as ensuring that archive updates don't overwrite apps imported_from_sca).

[lp:~michael.nelson/ubuntu-webcatalog/1015515-dont-create-new-app]

168. By Michael Nelson on 2012-06-28

Remove unnecessary exclude from admin form.

[Anthony Lenton (elachuni)]

Looks good! :)

+1 to remove application_id, and rename for_purchase -> imported_from_sca too.

review: Approve

=== modified file 'src/webcatalog/admin.py'
--- src/webcatalog/admin.py	2012-06-06 17:42:04 +0000
+++ src/webcatalog/admin.py	2012-06-28 13:32:29 +0000
@@ -42,8 +42,8 @@
     list_display = ('package_name', 'name', 'comment', 'distroseries',
                     'wilson_score')
     search_fields = ('package_name', 'name', 'comment')
-    list_filter = ('distroseries', 'for_purchase', 'is_latest', 'departments')
-    exclude = ('for_purchase', 'archive_id')
+    list_filter = ('distroseries', 'imported_from_sca', 'is_latest',
+                   'departments')
 
 
 class MachineAdmin(admin.ModelAdmin):

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2012-06-20 07:48:28 +0000
+++ src/webcatalog/forms.py	2012-06-28 13:32:29 +0000
@@ -62,7 +62,7 @@
 
     class Meta:
         model = Application
-        exclude = ('for_purchase', 'archive_id', 'price', 'version')
+        exclude = ('imported_from_sca', 'archive_id', 'price', 'version')
 
     @classmethod
     def get_form_from_desktop_data(cls, str_data, distroseries):
@@ -142,7 +142,7 @@
     def from_api_data(cls, app_data, distroseries):
         app_data = app_data.copy()
         app_data['distroseries'] = distroseries.id
-        app_data['for_purchase'] = True
+        app_data['imported_from_sca'] = True
         if 'description' in app_data:
             tagline, _, description = app_data['description'].partition('\n')
             app_data['comment'] = tagline
@@ -150,21 +150,11 @@
         if 'debtags' in app_data and app_data['debtags']:
             app_data['debtags'] = json.dumps([get_hw_short_description(x)
                                               for x in app_data['debtags']])
-        app_data['application_id'] = app_data.get('id')
 
         try:
-            # XXX 2012-05-03 michaeln bug=993813 We can update to use
-            # application_id only below once an import runs on production
-            # setting the application_ids.
-            archive_id = app_data.get('archive_id')
-            if archive_id:
-                instance = Application.objects.get(
-                    archive_id=archive_id,
-                    distroseries=distroseries)
-            else:
-                instance = Application.objects.get(
-                    application_id=app_data['application_id'],
-                    distroseries=distroseries)
+            instance = Application.objects.get(
+                package_name=app_data['package_name'],
+                distroseries=distroseries)
         except Application.DoesNotExist:
             instance = None
 

=== added file 'src/webcatalog/migrations/0024_remove_application_id_and_rename_for_purchase.py'
--- src/webcatalog/migrations/0024_remove_application_id_and_rename_for_purchase.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0024_remove_application_id_and_rename_for_purchase.py	2012-06-28 13:32:29 +0000
@@ -0,0 +1,169 @@
+# encoding: utf-8
+from south.db import db
+from south.v2 import SchemaMigration
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'Application.application_id'
+        db.delete_column('webcatalog_application', 'application_id')
+
+        # Renaming field 'Application.for_purchase'
+        db.rename_column('webcatalog_application', 'for_purchase', 'imported_from_sca')
+
+    def backwards(self, orm):
+        # Adding field 'Application.application_id'
+        db.add_column('webcatalog_application', 'application_id',
+                      self.gf('django.db.models.fields.IntegerField')(
+                          null=True, blank=True), keep_default=False)
+
+        # Renaming field 'Application.for_purchase'
+        db.rename_column('webcatalog_application', 'imported_from_sca', 'for_purchase')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'webcatalog.application': {
+            'Meta': {'ordering': "('-wilson_score', 'name')", 'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'debtags': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imported_from_sca': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_latest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'license': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'wilson_score': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'webcatalog.applicationmedia': {
+            'Meta': {'ordering': "('url',)", 'unique_together': "(('application', 'url'),)", 'object_name': 'ApplicationMedia'},
+            'application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Application']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'media_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'webcatalog.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'hyPFlJHgDizTUdnTNWGRLtVITxkCXv'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prerelease': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.exhibit': {
+            'Meta': {'object_name': 'Exhibit'},
+            'banner_url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.DistroSeries']", 'symmetrical': 'False'}),
+            'html': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_names': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sca_id': ('django.db.models.fields.IntegerField', [], {}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Token']"})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'webcatalog.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'jfRUKQyKMbFDEhdHVnneCWnhZtSCSALtPMdkMsVgDZgpYnjpme'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'lwXqDRKNlctQNbzZSQkHyKccayMHZlFtpbPngazmvxMKywrNKS'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-06-26 09:08:44 +0000
+++ src/webcatalog/models/applications.py	2012-06-28 13:32:29 +0000
@@ -87,13 +87,12 @@
     icon_name = models.CharField(max_length=255, blank=True)
     icon = models.ImageField(
         upload_to='icons/%Y/%m', max_length=200, null=True, blank=True)
-    for_purchase = models.BooleanField(default=False)
+    imported_from_sca = models.BooleanField(default=False)
     archive_id = models.CharField(
         max_length=64, null=True, db_index=True, blank=True)
     price = models.DecimalField(
         max_digits=7, decimal_places=2, null=True,
         blank=True, help_text="For-purchase applications (in US Dollars).")
-    application_id = models.IntegerField(null=True, blank=True)
 
     ratings_total = models.IntegerField(null=True, blank=True)
     ratings_average = models.DecimalField(

=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2012-06-26 09:18:42 +0000
+++ src/webcatalog/tests/factory.py	2012-06-28 13:32:29 +0000
@@ -103,8 +103,8 @@
                          ratings_average=None, ratings_total=None,
                          ratings_histogram='', screenshot_url='',
                          archive_id=None, version='', is_latest=False,
-                         wilson_score=0.0, debtags=[], application_id=None,
-                         departments=None, license='', price=None):
+                         wilson_score=0.0, debtags=[], departments=None,
+                         license='', price=None):
         if name is None:
             name = self.get_unique_string(prefix='Readable Name')
         if package_name is None:
@@ -124,7 +124,7 @@
             ratings_histogram=ratings_histogram,
             archive_id=archive_id, version=version, is_latest=is_latest,
             wilson_score=wilson_score, debtags=debtags,
-            application_id=application_id, license=license, price=price)
+            license=license, price=price)
 
         if departments is not None:
             for d in departments:

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-06-26 09:00:21 +0000
+++ src/webcatalog/tests/test_commands.py	2012-06-28 13:32:29 +0000
@@ -577,17 +577,18 @@
         self.mock_urlopen.side_effect = mock_urlopen_fn
         self.addCleanup(self.patch_urlopen.stop)
 
-    def test_app_for_purchase_is_found(self):
-        apps_for_purchase = Application.objects.filter(for_purchase=True)
-        self.assertEqual(0, len(apps_for_purchase))
+    def test_app_imported_from_sca_is_found(self):
+        apps_imported_from_sca = Application.objects.filter(
+            imported_from_sca=True)
+        self.assertEqual(0, len(apps_imported_from_sca))
 
         call_command('import_for_purchase_apps')
 
-        app_for_purchase = Application.objects.get(name='MyApp',
-                                                   distroseries=self.natty)
-        self.assertEqual(True, app_for_purchase.for_purchase)
-        self.assertTrue(app_for_purchase.description.find('hello') > -1)
-        self.assertEqual("Proprietary", app_for_purchase.license)
+        app = Application.objects.get(name='MyApp',
+                                      distroseries=self.natty)
+        self.assertEqual(True, app.imported_from_sca)
+        self.assertTrue(app.description.find('hello') > -1)
+        self.assertEqual("Proprietary", app.license)
 
     def test_app_gets_distroseries(self):
         with patch_settings(UBUNTU_SERIES_FOR_VERSIONS=TEST_VERSIONS):
@@ -613,13 +614,11 @@
                                       distroseries=self.natty)
         self.assertEqual(Decimal('2.50'), app.price)
 
-    def test_existing_app_gets_updated_by_archive_id(self):
-        self.factory.make_application(
-            archive_id='launchpad_zematynnad2/myppa',
-            package_name='somethingelse', distroseries=self.maverick)
-        self.factory.make_application(
-            archive_id='launchpad_zematynnad2/myppa',
-            package_name='somethingelse', distroseries=self.natty)
+    def test_existing_app_gets_updated_by_package_name(self):
+        self.factory.make_application(
+            package_name='hello', distroseries=self.maverick)
+        self.factory.make_application(
+            package_name='hello', distroseries=self.natty)
         apps = Application.objects.filter(
             distroseries__in=(self.natty, self.maverick)).count()
         self.assertEqual(2, apps)
@@ -631,8 +630,7 @@
             distroseries__in=(self.natty, self.maverick))
         self.assertEqual(2, actual_apps.count())
         for app in actual_apps:
-            self.assertEqual('launchpad_zematynnad2/myppa', app.archive_id)
-            self.assertEqual('hello', app.package_name)
+            self.assertTrue(app.imported_from_sca)
 
     def test_app_gets_icon(self):
         call_command('import_for_purchase_apps')

=== modified file 'src/webcatalog/tests/test_forms.py'
--- src/webcatalog/tests/test_forms.py	2012-06-13 08:53:46 +0000
+++ src/webcatalog/tests/test_forms.py	2012-06-28 13:32:29 +0000
@@ -176,7 +176,7 @@
 
     def test_from_api_data_shortens_debtag(self):
         app = self.factory.make_application()
-        data = {'debtags': ['hardware::storage:cd-writer']}
+        data = self.make_valid_data(debtags=['hardware::storage:cd-writer'])
 
         form = ForPurchaseApplicationForm.from_api_data(data, app.distroseries)
 
@@ -252,28 +252,6 @@
         data.update(**kwargs)
         return data
 
-    def test_archive_id_none_uses_application_id(self):
-        precise = self.factory.make_distroseries(code_name='precise')
-        existing_app = self.factory.make_application(
-            archive_id=None, application_id=21, distroseries=precise)
-
-        data = self.make_valid_data(archive_id=None, id=21)
-        form = ForPurchaseApplicationForm.from_api_data(data, precise)
-
-        self.assertEqual(existing_app, form.instance)
-
-    def test_updates_application_id(self):
-        precise = self.factory.make_distroseries(code_name='precise')
-        existing_app = self.factory.make_application(
-            archive_id='foo/bar', application_id=None, distroseries=precise)
-
-        data = self.make_valid_data(archive_id='foo/bar', id=21)
-        form = ForPurchaseApplicationForm.from_api_data(data, precise)
-        form.save()
-
-        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')

=== modified file 'src/webcatalog/tests/test_managers.py'
--- src/webcatalog/tests/test_managers.py	2012-06-06 18:00:26 +0000
+++ src/webcatalog/tests/test_managers.py	2012-06-28 13:32:29 +0000
@@ -50,14 +50,14 @@
         self.assertEqual(expected.id, retrieved.id)
 
     def test_check_latest(self):
-        for code_name in ['lucid', 'maverick', 'natty', 'oneiric']:
-            dseries = self.factory.make_distroseries(code_name=code_name)
+        for version in ['10.04', '10.10', '11.04', '11.10']:
+            dseries = self.factory.make_distroseries(version=version)
             self.factory.make_application(
                 package_name='foobar', distroseries=dseries)
 
         Application.objects.check_latest('foobar')
 
         retrieved = Application.objects.filter(package_name='foobar').order_by(
-            '-distroseries__code_name')
+            '-distroseries__version')
         self.assertEqual([True, False, False, False],
                          [app.is_latest for app in retrieved])

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-06-26 09:40:37 +0000
+++ src/webcatalog/tests/test_views.py	2012-06-28 13:32:29 +0000
@@ -91,7 +91,7 @@
     def get_app_and_response(self, code_name='natty', version='11.04',
                              arch='x86_64', name=None, comment=None,
                              description=None, detail_distro=None,
-                             detail_package=None, for_purchase=False,
+                             detail_package=None, imported_from_sca=False,
                              screenshot_url='', useragent=UBUNTU_USERAGENT):
         series, created = DistroSeries.objects.get_or_create(
             code_name=code_name, version=version)
@@ -100,8 +100,8 @@
                                             name=name, comment=comment,
                                             description=description,
                                             screenshot_url=screenshot_url)
-        if for_purchase:
-            app.for_purchase = True
+        if imported_from_sca:
+            app.imported_from_sca = True
             app.save()
         if not detail_distro:
             detail_distro = app.distroseries.code_name
@@ -168,7 +168,7 @@
 
     def test_button_for_non_puchase_app(self):
         self.factory.make_application(package_name='pkgfoo',
-                                            price=None)
+                                      price=None)
 
         response = self.get_package_details_response('pkgfoo')
 
@@ -178,7 +178,7 @@
 
     def test_button_for_for_puchase_app(self):
         self.factory.make_application(package_name='pkgfoo',
-                                            price=Decimal('12.99'))
+                                      price=Decimal('12.99'))
 
         response = self.get_package_details_response('pkgfoo')