Merge lp:~michael.nelson/rnr-server/dont-depend-on-appname into lp:rnr-server

[Michael Nelson]

[r=achuni][bug=737649] Data migration from SoftwareItem.app_name -> Review.app_name including removing/creating relevant software items (forwards/backwards respectively).

Overview
========

This branch adds a schema migration (add Review.app_name column) and a data migration (copy app_name from software items, then remove now-redundant software items).

Unfortunately, testing the migrations sux. The best I could come up with is:
http://pastebin.ubuntu.com/582130/

which ensures that for a small subset of data at least, the migration works both forwards and backwards without losing info.

The next branch:
https://code.edge.launchpad.net/~michael.nelson/rnr-server/dont-depend-on-appname-2/+merge/54042
removes the actual SoftwareItem.app_name.

[Anthony Lenton (elachuni)]

review: Approve

=== modified file 'src/reviewsapp/api/handlers.py'
--- src/reviewsapp/api/handlers.py	2011-03-17 14:29:54 +0000
+++ src/reviewsapp/api/handlers.py	2011-03-18 17:09:28 +0000
@@ -191,7 +191,7 @@
         kwargs = dict(item for item in kwargs.items() if item[1] != 'any')
         return Review.objects.filter(
             softwareitem__package_name=package_name,
-            softwareitem__app_name=appname,
+            app_name=appname,
             hide=False,
             **kwargs).order_by(
                 '-usefulness_percentage')[batch_start:batch_end]

=== modified file 'src/reviewsapp/management/commands/populate.py'
--- src/reviewsapp/management/commands/populate.py	2011-03-15 14:08:02 +0000
+++ src/reviewsapp/management/commands/populate.py	2011-03-18 17:09:28 +0000
@@ -182,7 +182,7 @@
         Currently (id, softwareitem_id, version, architecture_id,
             repository_id, reviewer_id, date_created, rating, summary,
             review_text, language, hide, usefulness_total,
-            usefulness_favorable, usefulness_percentage)
+            usefulness_favorable, usefulness_percentage, app_name)
         """
         softwareitem_id = randint(*self.ranges['reviewsapp_softwareitem'])
         version = '%.1f' % random()
@@ -195,5 +195,5 @@
         review_text = self.random_comment(wordcount=20)
         false = self.booleans[0]
         return [id, softwareitem_id, version, arch_id, repo_id, reviewer_id,
-            date_created, rating, summary, review_text, 'en', false, 0, 0, 0]
+            date_created, rating, summary, review_text, 'en', false, 0, 0, 0, '']
 

=== added file 'src/reviewsapp/migrations/0006_add_review_app_name.py'
--- src/reviewsapp/migrations/0006_add_review_app_name.py	1970-01-01 00:00:00 +0000
+++ src/reviewsapp/migrations/0006_add_review_app_name.py	2011-03-18 17:09:28 +0000
@@ -0,0 +1,160 @@
+
+from south.db import db
+from django.db import models
+from reviewsapp.models import *
+
+class Migration:
+
+    def forwards(self, orm):
+
+        # Adding field 'Review.app_name'
+        db.add_column('reviewsapp_review', 'app_name', orm['reviewsapp.review:app_name'])
+
+    def backwards(self, orm):
+
+        # Deleting field 'Review.app_name'
+        db.delete_column('reviewsapp_review', 'app_name')
+
+
+    models = {
+        'auth.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': {'unique_together': "(('content_type', 'codename'),)"},
+            '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': {
+            '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', 'blank': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            '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': {'unique_together': "(('app_label', 'model'),)", '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'})
+        },
+        'reviewsapp.architecture': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tag': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '16'})
+        },
+        'reviewsapp.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': "'OzuURCXRwhChWIMXbLbcgooiStFeze'", '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']"})
+        },
+        'reviewsapp.nonce': {
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.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['reviewsapp.Token']"})
+        },
+        'reviewsapp.repository': {
+            'distroseries': ('django.db.models.fields.SlugField', [], {'max_length': '25', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'origin': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'db_index': 'True'})
+        },
+        'reviewsapp.review': {
+            'app_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
+            'architecture': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Architecture']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 11, 25, 823060)'}),
+            'hide': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.SlugField', [], {'max_length': '10', 'db_index': 'True'}),
+            'rating': ('django.db.models.fields.IntegerField', [], {}),
+            'repository': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Repository']"}),
+            'review_text': ('django.db.models.fields.CharField', [], {'max_length': '5000'}),
+            'reviewer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'softwareitem': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.SoftwareItem']"}),
+            'summary': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
+            'usefulness_favorable': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'usefulness_percentage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'usefulness_total': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'reviewsapp.reviewmoderation': {
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 11, 25, 770486)'}),
+            'date_moderated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'moderation_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'moderator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'review': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Review']"}),
+            'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'})
+        },
+        'reviewsapp.reviewmoderationflag': {
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 11, 25, 569414)'}),
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'review_moderation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.ReviewModeration']"}),
+            'summary': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
+        },
+        'reviewsapp.rnrsettings': {
+            'blacklist_words': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'moderation_mode': ('django.db.models.fields.CharField', [], {'default': "'passive'", 'max_length': '8'})
+        },
+        'reviewsapp.softwareitem': {
+            'app_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'date_ratings_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 11, 24, 339806)'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_name': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'db_index': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '3', 'decimal_places': '2'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'reviewsapp.softwareiteminorigin': {
+            'Meta': {'unique_together': "(('softwareitem', 'origin'),)"},
+            'date_ratings_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 11, 24, 339806)'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'origin': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'db_index': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '3', 'decimal_places': '2'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'softwareitem': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.SoftwareItem']"})
+        },
+        'reviewsapp.softwareiteminrepository': {
+            'Meta': {'unique_together': "(('softwareitem', 'repository'),)"},
+            'date_ratings_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 11, 24, 339806)'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '3', 'decimal_places': '2'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'repository': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Repository']"}),
+            'softwareitem': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.SoftwareItem']"})
+        },
+        'reviewsapp.token': {
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.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': "'LXGJOoldWHCXXULnsTXhHOGmAaKCYUrXJRRgrfUjMaJfObdlEU'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'MnRkFdkPZXmIqCKNExfyzqdWifIWiWaoZGQKNdtoounoziJVsU'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'reviewsapp.usefulness': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'review': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Review']"}),
+            'useful': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['reviewsapp']

=== added file 'src/reviewsapp/migrations/0007_populate_review_app_name_and_remove_redundant_software_items.py'
--- src/reviewsapp/migrations/0007_populate_review_app_name_and_remove_redundant_software_items.py	1970-01-01 00:00:00 +0000
+++ src/reviewsapp/migrations/0007_populate_review_app_name_and_remove_redundant_software_items.py	2011-03-18 17:09:28 +0000
@@ -0,0 +1,234 @@
+
+from south.db import db
+from django.db import models
+from reviewsapp.models import *
+
+class Migration:
+
+    def forwards(self, orm):
+        """Copy the app name from the software item and update the link."""
+        # For each software_item, we want to update all the related
+        # reviews.
+        for software_item in orm['reviewsapp.softwareitem'].objects.all():
+            software_item.review_set.update(
+                app_name=software_item.app_name)
+
+        # Next, we ensure that all the reviews for a given packagename
+        # refer to a single software_item, and delete the redundant
+        # softawre_items.
+        package_names = orm['reviewsapp.softwareitem'].objects.values_list(
+            'package_name', flat=True)
+        package_names = package_names.order_by('package_name').distinct()
+        for package_name in package_names:
+            # Grab all the reviews for a given package name and update
+            # them to all point to the one software item.
+            reviews = orm['reviewsapp.review'].objects.filter(
+                softwareitem__package_name=package_name)
+            first_review = reviews[0]
+            remaining_software_item = reviews[0].softwareitem
+            reviews.update(softwareitem=remaining_software_item)
+
+            # Now delete all the other software items with the same
+            # package name (and software item in origins /
+            # repositories).
+            orm['reviewsapp.softwareitem'].objects.filter(
+                package_name=package_name).exclude(
+                    id=remaining_software_item.id).delete()
+
+            # Finally, we need to ensure that each review corresponds
+            # to a valid SoftwareItemInRepository so that stats can be
+            # calculated.
+            self.ensure_softwareitem_in_repos(orm, remaining_software_item)
+
+    def backwards(self, orm):
+        """Create the software items with app names and update reviews."""
+        SoftwareItemClass = orm['reviewsapp.softwareitem']
+        for software_item in SoftwareItemClass.objects.all():
+            app_names = software_item.review_set.values_list(
+                'app_name', flat=True).distinct()
+            software_item.app_name = app_names[0]
+            software_item.save()
+            package_name = software_item.package_name
+            # We need to recreate the repository/origin stats for
+            # the existing softwareitem.
+            software_item.softwareiteminrepository_set.all().delete()
+            software_item.softwareiteminorigin_set.all().delete()
+
+            # For any other app names, we create a new software item and
+            # point the relevant reviews to it.
+            for app_name in app_names:
+                new_item, created = SoftwareItemClass.objects.get_or_create(
+                    package_name=package_name,
+                    app_name=app_name)
+
+                orm['reviewsapp.review'].objects.filter(
+                    softwareitem=software_item,
+                    app_name=app_name).update(
+                        softwareitem=new_item)
+
+        # Once all review.software_items have been updated, we can
+        # create the related items in repos etc.
+        for item in SoftwareItemClass.objects.all():
+            self.ensure_softwareitem_in_repos(orm, item)
+
+        # Finally, blank out the Review.app_name field.
+        orm['reviewsapp.review'].objects.all().update(app_name='')
+
+    def ensure_softwareitem_in_repos(self, orm, software_item):
+        # Find all reviews referencing the item and get a list of
+        # distint repositories.
+        reviews = orm['reviewsapp.review'].objects.filter(
+            softwareitem=software_item)
+        repository_ids = reviews.values_list('repository', flat=True).distinct()
+        SIIRepo = orm['reviewsapp.softwareiteminrepository']
+        SIIOrigin = orm['reviewsapp.softwareiteminorigin']
+        for repo_id in repository_ids:
+            repo = orm['reviewsapp.repository'].objects.get(id=repo_id)
+            item_in_repo, created = SIIRepo.objects.get_or_create(
+                softwareitem=software_item, repository=repo)
+            item_in_origin, created = SIIOrigin.objects.get_or_create(
+                softwareitem=software_item, origin=repo.origin)
+
+
+    models = {
+        'auth.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': {'unique_together': "(('content_type', 'codename'),)"},
+            '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': {
+            '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', 'blank': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            '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': {'unique_together': "(('app_label', 'model'),)", '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'})
+        },
+        'reviewsapp.architecture': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tag': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '16'})
+        },
+        'reviewsapp.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': "'qBxqBnulneXJvOyccXpAJdJmhzatIw'", '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']"})
+        },
+        'reviewsapp.nonce': {
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.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['reviewsapp.Token']"})
+        },
+        'reviewsapp.repository': {
+            'distroseries': ('django.db.models.fields.SlugField', [], {'max_length': '25', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'origin': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'db_index': 'True'})
+        },
+        'reviewsapp.review': {
+            'app_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
+            'architecture': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Architecture']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 13, 11, 823749)'}),
+            'hide': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.SlugField', [], {'max_length': '10', 'db_index': 'True'}),
+            'rating': ('django.db.models.fields.IntegerField', [], {}),
+            'repository': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Repository']"}),
+            'review_text': ('django.db.models.fields.CharField', [], {'max_length': '5000'}),
+            'reviewer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'softwareitem': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.SoftwareItem']"}),
+            'summary': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
+            'usefulness_favorable': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'usefulness_percentage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'usefulness_total': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'reviewsapp.reviewmoderation': {
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 13, 11, 959691)'}),
+            'date_moderated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'moderation_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'moderator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'review': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Review']"}),
+            'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'})
+        },
+        'reviewsapp.reviewmoderationflag': {
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 13, 12, 530560)'}),
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'review_moderation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.ReviewModeration']"}),
+            'summary': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
+        },
+        'reviewsapp.rnrsettings': {
+            'blacklist_words': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'moderation_mode': ('django.db.models.fields.CharField', [], {'default': "'passive'", 'max_length': '8'})
+        },
+        'reviewsapp.softwareitem': {
+                'app_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True', 'default': "''"}),
+            'date_ratings_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 13, 11, 529267)'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_name': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'db_index': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '3', 'decimal_places': '2'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'reviewsapp.softwareiteminorigin': {
+            'Meta': {'unique_together': "(('softwareitem', 'origin'),)"},
+            'date_ratings_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 13, 11, 529267)'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'origin': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'db_index': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '3', 'decimal_places': '2'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'softwareitem': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.SoftwareItem']"})
+        },
+        'reviewsapp.softwareiteminrepository': {
+            'Meta': {'unique_together': "(('softwareitem', 'repository'),)"},
+            'date_ratings_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 3, 18, 11, 13, 11, 529267)'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '3', 'decimal_places': '2'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'repository': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Repository']"}),
+            'softwareitem': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.SoftwareItem']"})
+        },
+        'reviewsapp.token': {
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.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': "'mwoIqDbtCeQyFKvSAnleoBTvXpZzbKjDdkxAmBxsqpuAftkRvt'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'wTeEOEKkKzbDsJPtEUszuDgiDToSnKlTZjnOIrDlWXYKNkDkSr'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'reviewsapp.usefulness': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'review': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Review']"}),
+            'useful': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['reviewsapp']

=== modified file 'src/reviewsapp/models/reviews.py'
--- src/reviewsapp/models/reviews.py	2011-03-18 07:29:55 +0000
+++ src/reviewsapp/models/reviews.py	2011-03-18 17:09:28 +0000
@@ -307,6 +307,11 @@
     usefulness_total = models.IntegerField(default=0)
     usefulness_favorable = models.IntegerField(default=0)
     usefulness_percentage = models.IntegerField(default=0)
+    # XXX 2011-03-18 michaeln Remove application_name eventually.
+    # After removing the app_name attribute of software item, we add it
+    # here on the review so that we're not losing any information being
+    # passed by the client.
+    app_name = models.CharField(max_length=100, default='', blank=True)
 
     def __unicode__(self):
         return u'lang: {0}, rating: {1}, summary: {2}\n{3}'.format(
@@ -322,9 +327,6 @@
     def package_name(self):
         return self.softwareitem.package_name
 
-    def app_name(self):
-        return self.softwareitem.app_name
-
     def origin(self):
         return self.repository.origin
 
@@ -332,7 +334,7 @@
         return self.repository.distroseries
 
     def package_app_name(self):
-        app_name = self.app_name()
+        app_name = self.app_name
         if app_name:
             return self.package_name() + "/" + app_name
         else:

=== modified file 'src/reviewsapp/tests/factory.py'
--- src/reviewsapp/tests/factory.py	2011-03-17 09:21:32 +0000
+++ src/reviewsapp/tests/factory.py	2011-03-18 17:09:28 +0000
@@ -160,7 +160,7 @@
     def makeReview(self, reviewer=None, software_item=None, repository=None,
                    version=None, rating="5", summary=None, review_text=None,
                    date_created=None, language=None, hide=False, num_flags=0,
-                   architecture='i386'):
+                   architecture='i386', app_name=''):
         if reviewer is None:
             reviewer = self.makeUser()
         if software_item is None:
@@ -185,7 +185,8 @@
             softwareitem=software_item, repository=repository,
             version=version, rating=rating, summary=summary,
             review_text=review_text, language=language, hide=hide,
-            date_created=date_created, architecture=architecture)
+            date_created=date_created, architecture=architecture,
+            app_name=app_name)
         review.softwareitem_in_repository.update_stats()
         for flag_count in range(num_flags):
             review.flag(

=== modified file 'src/reviewsapp/tests/test_handlers.py'
--- src/reviewsapp/tests/test_handlers.py	2011-03-17 11:52:10 +0000
+++ src/reviewsapp/tests/test_handlers.py	2011-03-18 17:09:28 +0000
@@ -69,7 +69,7 @@
 def _get_url_kwargs_dict_for_review(review):
     # this is the quoting we expect
     appname=quote_plus(quote_plus(
-        ";"+review.softwareitem.app_name.encode("utf-8")))
+        ";"+review.app_name.encode("utf-8")))
     pkgname=review.softwareitem.package_name
     return dict(language=review.language,
                 origin=review.repository.origin,
@@ -332,8 +332,8 @@
 
     def test_review_for_app(self):
         review = self.factory.makeReview(
-            software_item=self.factory.makeSoftwareItem('package_foo',
-                app_name='app_foo'))
+            software_item=self.factory.makeSoftwareItem('package_foo'),
+            app_name='app_foo')
         handler = ShowReviewsHandler()
 
         reviews = handler.read(None, 'any', 'any', 'any', 'any',
@@ -345,15 +345,15 @@
     def test_review_for_app_url(self):
         # test utf8 encoded app
         review = self.factory.makeReview(
-            software_item=self.factory.makeSoftwareItem('package_foo',
-                app_name=u'Déjà Dup'))
+            software_item=self.factory.makeSoftwareItem('package_foo'),
+            app_name=u'Déjà Dup')
         url = reverse(
             'rnr-api-reviews-for-package',
             kwargs=_get_url_kwargs_dict_for_review(review))
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         reviews = simplejson.loads(response.content)
-        self.assertEqual(reviews[0]["app_name"], review.app_name())
+        self.assertEqual(reviews[0]["app_name"], review.app_name)
         self.assertEqual(reviews[0]["package_name"], review.package_name())
 
         # now repeat with blender that contains a ()
@@ -366,7 +366,7 @@
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         reviews = simplejson.loads(response.content)
-        self.assertEqual(reviews[0]["app_name"], review.app_name())
+        self.assertEqual(reviews[0]["app_name"], review.app_name)
         self.assertEqual(reviews[0]["package_name"], review.package_name())
 
         # now repeat with a fake app that contains a ";"
@@ -379,7 +379,7 @@
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         reviews = simplejson.loads(response.content)
-        self.assertEqual(reviews[0]["app_name"], review.app_name())
+        self.assertEqual(reviews[0]["app_name"], review.app_name)
         self.assertEqual(reviews[0]["package_name"], review.package_name())
 
     def test_review_for_language(self):

=== modified file 'src/reviewsapp/tests/test_rnrclient.py'
--- src/reviewsapp/tests/test_rnrclient.py	2011-03-17 11:52:10 +0000
+++ src/reviewsapp/tests/test_rnrclient.py	2011-03-18 17:09:28 +0000
@@ -147,7 +147,7 @@
 
         self.assertEqual(1, len(reviews))
         self.assertEqual(review.package_name(), reviews[0].package_name)
-        self.assertEqual(review.app_name(), reviews[0].app_name)
+        self.assertEqual(review.app_name, reviews[0].app_name)
         self.assertEqual(review.summary, reviews[0].summary)
         self.assertEqual(review.version, reviews[0].version)
         self.assertEqual(review.reviewer_username(),
@@ -166,13 +166,13 @@
             origin=review.repository.origin,
             distroseries=review.repository.distroseries,
             packagename=review.package_name(),
-            appname=review.app_name(),
+            appname=str(review.app_name),
             version=review.version
         )
 
         self.assertEqual(1, len(reviews))
         self.assertEqual(review.package_name(), reviews[0].package_name)
-        self.assertEqual(review.app_name(), reviews[0].app_name)
+        self.assertEqual(review.app_name, reviews[0].app_name)
         self.assertEqual(review.summary, reviews[0].summary)
         self.assertEqual(review.version, reviews[0].version)