Merge lp:~michael.nelson/ubuntu-webcatalog/1015515-only-one-app into lp:ubuntu-webcatalog

[Michael Nelson]

package_name and distroseries are unique together on Application.

Overview
========

Continues on from the prereq for bug 1015515, adding a migration to ensure that duplicates are removed, before updating the unique constraint for Application.

`fab test:pg=true`

Note:
 1) I'm getting "psycopg2.OperationalError: FATAL: role "michael" does not exist" when trying to run tests here with psql (which looks like it's trying to use ident, but I've set local privs in pg_hba to be trust), so
 2) I'm not sure whether I should comment out the migration test as per usual. If it does pass locally with psql, I'm keen to see if it fails on the vps or passes. If it passes, yay.

[lp:~michael.nelson/ubuntu-webcatalog/1015515-only-one-app]

174. By Michael Nelson on 2012-06-28

Merged 1015515-dont-create-new-app into 1015515-only-one-app.

175. By Michael Nelson on 2012-06-28

REFACTOR: removed outdated comment and switched get_list_or_404 to get_object now that we have db restriction.

[Anthony Lenton (elachuni)]

Looks fine!

review: Approve

=== added file 'src/webcatalog/migrations/0025_only_one_app_per_series_pkg_name.py'
--- src/webcatalog/migrations/0025_only_one_app_per_series_pkg_name.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0025_only_one_app_per_series_pkg_name.py	2012-06-28 14:07:20 +0000
@@ -0,0 +1,186 @@
+# encoding: utf-8
+from south.v2 import DataMigration
+from django.db.models import Count
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        """Delete duplicate apps per distroseries.
+
+        Prefer first an sca_imported app, then the most recent.
+        """
+        Application = orm['webcatalog.Application']
+        dups = Application.objects.values(
+            'package_name', 'distroseries__code_name').order_by().annotate(
+            num_dups=Count('distroseries')).filter(num_dups__gt=1)
+        for dup in dups:
+            sca_version = Application.objects.filter(
+                package_name=dup['package_name'],
+                distroseries__code_name=dup['distroseries__code_name'],
+                imported_from_sca=True)
+            if sca_version:
+                sca_version = sca_version[0]
+                dups_to_delete = Application.objects.filter(
+                    package_name=dup['package_name'],
+                    distroseries__code_name=dup['distroseries__code_name'])
+                dups_to_delete = dups_to_delete.exclude(id=sca_version.id)
+                dups_to_delete.delete()
+            else:
+                dup_apps = Application.objects.filter(
+                    package_name=dup['package_name'],
+                    distroseries__code_name=dup['distroseries__code_name']
+                    ).order_by('-id')
+                most_recent = dup_apps[0]
+                dup_apps.exclude(id=most_recent.id).delete()
+
+    def backwards(self, orm):
+        pass
+
+
+    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': "'HQTqmfphaOwnrnRfWIzLsPUUqqthuh'", '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': "'sZsoIBDSOGiMtIjLpqHhOsnLNFoJrpvXhCUaZHktQQKzdYMMPU'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'bpTvhxNJwAHXkVNvtBgcEhuhXeTvySnFZtIQxjgENGFnrrHjMM'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== added file 'src/webcatalog/migrations/0026_unique_pkg_name_distroseries.py'
--- src/webcatalog/migrations/0026_unique_pkg_name_distroseries.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0026_unique_pkg_name_distroseries.py	2012-06-28 14:07:20 +0000
@@ -0,0 +1,171 @@
+# encoding: utf-8
+from south.db import db
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Removing unique constraint on 'Application', fields ['archive_id', 'distroseries']
+        db.delete_unique('webcatalog_application', ['archive_id', 'distroseries_id'])
+
+        # Adding unique constraint on 'Application', fields ['distroseries', 'package_name']
+        db.create_unique('webcatalog_application', ['distroseries_id', 'package_name'])
+
+
+    def backwards(self, orm):
+
+        # Removing unique constraint on 'Application', fields ['distroseries', 'package_name']
+        db.delete_unique('webcatalog_application', ['distroseries_id', 'package_name'])
+
+        # Adding unique constraint on 'Application', fields ['archive_id', 'distroseries']
+        db.create_unique('webcatalog_application', ['archive_id', 'distroseries_id'])
+
+    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', 'package_name'),)", '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': "'CkaJaMaVaYjiDEVByNnJWMmblaoFop'", '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': "'XTzTOPjxjOzhqRWOpdmAPcbaAZqIKoiJKPnfuAVUpuYhCwgxhm'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'uZmUdXqaSKXXaCeeLbiwQjLzDPixijEGysvlXSiSpVatcifOxX'", '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-28 14:07:20 +0000
+++ src/webcatalog/models/applications.py	2012-06-28 14:07:20 +0000
@@ -191,7 +191,7 @@
 
     class Meta:
         app_label = 'webcatalog'
-        unique_together = ('distroseries', 'archive_id')
+        unique_together = ('distroseries', 'package_name')
         ordering = ('-wilson_score', 'name')
 
 

=== modified file 'src/webcatalog/tests/__init__.py'
--- src/webcatalog/tests/__init__.py	2012-05-30 21:57:52 +0000
+++ src/webcatalog/tests/__init__.py	2012-06-28 14:07:20 +0000
@@ -24,6 +24,7 @@
 from .test_handlers import *
 from .test_models import *
 from .test_managers import *
+from .test_migrations import *
 from .test_pep8 import *
 from .test_preflight import *
 from .test_templatetags import *

=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2012-06-28 14:07:20 +0000
+++ src/webcatalog/tests/factory.py	2012-06-28 14:07:20 +0000
@@ -29,7 +29,10 @@
 from itertools import count
 from django.contrib.auth.models import User
 from django.contrib.sessions.models import Session
-from django.test import TestCase
+from django.test import (
+    TestCase,
+    TransactionTestCase,
+)
 from django_openid_auth.models import UserOpenID
 
 from webcatalog.models import (
@@ -104,7 +107,7 @@
                          ratings_histogram='', screenshot_url='',
                          archive_id=None, version='', is_latest=False,
                          wilson_score=0.0, debtags=[], departments=None,
-                         license='', price=None):
+                         license='', price=None, imported_from_sca=False):
         if name is None:
             name = self.get_unique_string(prefix='Readable Name')
         if package_name is None:
@@ -124,7 +127,7 @@
             ratings_histogram=ratings_histogram,
             archive_id=archive_id, version=version, is_latest=is_latest,
             wilson_score=wilson_score, debtags=debtags,
-            license=license, price=price)
+            license=license, price=price, imported_from_sca=imported_from_sca)
 
         if departments is not None:
             for d in departments:
@@ -237,3 +240,10 @@
     def setUp(self):
         super(TestCaseWithFactory, self).setUp()
         self.factory = WebCatalogObjectFactory()
+
+
+class TxTestCaseWithFactory(TransactionTestCase):
+
+    def setUp(self):
+        super(TxTestCaseWithFactory, self).setUp()
+        self.factory = WebCatalogObjectFactory()

=== modified file 'src/webcatalog/tests/helpers.py'
--- src/webcatalog/tests/helpers.py	2012-06-06 18:00:26 +0000
+++ src/webcatalog/tests/helpers.py	2012-06-28 14:07:20 +0000
@@ -30,6 +30,10 @@
 
 from contextlib import contextmanager
 from django.conf import settings
+from django.core.management import call_command
+from south.migration import Migrations
+
+from webcatalog.tests.factory import TxTestCaseWithFactory
 
 
 # Original snippet from http://djangosnippets.org/snippets/2156/
@@ -60,3 +64,36 @@
     finally:
         switch_settings(**old_settings)
 # end snippet
+
+
+class MigrationTestCase(TxTestCaseWithFactory):
+    """A Test case for testing migrations."""
+
+    # These must be defined by subclasses.
+    start_migration = None
+    dest_migration = None
+    django_application = None
+
+    def setUp(self):
+        super(MigrationTestCase, self).setUp()
+        migrations = Migrations(self.django_application)
+        self.start_orm = migrations[self.start_migration].orm()
+        self.dest_orm = migrations[self.dest_migration].orm()
+
+        # Ensure the migration history is up-to-date with a fake migration.
+        # The other option would be to use the south setting for these tests
+        # so that the migrations are used to setup the test db.
+        call_command('migrate', self.django_application, fake=True,
+                     verbosity=0)
+        # Then migrate back to the start migration.
+        call_command('migrate', self.django_application, self.start_migration,
+                     verbosity=0)
+
+    def tearDown(self):
+        # Leave the db in the final state so that the test runner doesn't
+        # error when truncating the database.
+        call_command('migrate', self.django_application, verbosity=0)
+
+    def migrate_to_dest(self):
+        call_command('migrate', self.django_application, self.dest_migration,
+                     verbosity=0)

=== added file 'src/webcatalog/tests/test_migrations.py'
--- src/webcatalog/tests/test_migrations.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_migrations.py	2012-06-28 14:07:20 +0000
@@ -0,0 +1,57 @@
+#   -*- 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/>.
+
+"""Temporary test cases for developing and reviewing migrations."""
+
+from webcatalog.tests.helpers import MigrationTestCase
+from webcatalog.models import Application
+
+
+class OnlyOneAppPerSeriesPkgNameTestCase(MigrationTestCase):
+    start_migration = '0024_remove_application_id_and_rename_for_purchase'
+    dest_migration = '0025_only_one_app_per_series_pkg_name'
+    django_application = 'webcatalog'
+
+    def test_latest_app_remains_when_neither_sca_imported(self):
+        oneiric = self.factory.make_distroseries(code_name='oneiric')
+        precise = self.factory.make_distroseries(code_name='precise')
+        self.factory.make_application(
+            package_name='foo', distroseries=oneiric)
+        foo_oneiric_2 = self.factory.make_application(
+            package_name='foo', distroseries=oneiric)
+        foo_precise = self.factory.make_application(
+            package_name='foo', distroseries=precise)
+
+        self.migrate_to_dest()
+
+        all_foo_apps = Application.objects.filter(package_name='foo')
+        self.assertEqual([foo_oneiric_2, foo_precise], list(all_foo_apps))
+
+    def test_sca_imported_app_wins(self):
+        oneiric = self.factory.make_distroseries(code_name='oneiric')
+        precise = self.factory.make_distroseries(code_name='precise')
+        foo_oneiric_1 = self.factory.make_application(
+            package_name='foo', distroseries=oneiric, imported_from_sca=True)
+        self.factory.make_application(
+            package_name='foo', distroseries=oneiric)
+        foo_precise = self.factory.make_application(
+            package_name='foo', distroseries=precise)
+
+        self.migrate_to_dest()
+
+        all_foo_apps = Application.objects.filter(package_name='foo')
+        self.assertEqual([foo_oneiric_1, foo_precise], list(all_foo_apps))

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-06-28 14:07:20 +0000
+++ src/webcatalog/tests/test_views.py	2012-06-28 14:07:20 +0000
@@ -419,29 +419,6 @@
             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}".format(app.distroseries.version)
-        self.assertContains(response, ds, 1)
-
 
 class ApplicationDetailNoSeriesTestCase(TestCaseWithFactory):
     def test_renders_latest(self):
@@ -1162,16 +1139,6 @@
 
         self.assertEqual(200, response.status_code)
 
-    def test_handles_multiple_apps_for_same_distroseries(self):
-        ds = self.factory.make_distroseries()
-        self.factory.make_application(package_name='skype', distroseries=ds)
-        self.factory.make_application(package_name='skype', distroseries=ds)
-
-        response = self.client.get(reverse('wc-package-reviews',
-                                           args=[ds.code_name, 'skype']))
-
-        self.assertEqual(200, response.status_code)
-
     def test_handles_api_error(self):
         app = self.factory.make_application()
         self.mock_get_reviews.side_effect = APIError('500', 'error')

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-06-21 09:21:42 +0000
+++ src/webcatalog/views.py	2012-06-28 14:07:20 +0000
@@ -231,14 +231,8 @@
 
 
 def application_reviews(request, package_name, distro, ajax=False, page=1):
-    # XXX 2012-05-25 bug=1002262 michaeln Multiple apps for distroseries.
-    # It seems that we have a few applications which are present in
-    # multiple archives for the same distroseries (skype,
-    # unity-lens-utilities, probably via a myapps PPA as well as extras?).
-    # Don't break when this happens.
-    apps = get_list_or_404(Application, package_name=package_name,
+    app = get_object_or_404(Application, package_name=package_name,
                            distroseries__code_name=distro)
-    app = apps[0]
 
     # XXX michaeln 2011-09-15 bug=851662 Better review language options.
     reviews = WebServices().get_reviews_for_package(