euscanwww: Moving from XXXAssociation to UserProfile

Signed-off-by: volpino <fox91@anche.no>

euscanwww/djeuscan/admin.py

@@ -1,7 +1,6 @@
 from djeuscan.models import Package, Version, VersionLog, EuscanResult, \
     Log, WorldLog, CategoryLog, HerdLog, MaintainerLog, Herd, Maintainer, \
-    RefreshPackageQuery, HerdAssociation, CategoryAssociation, \
+    RefreshPackageQuery, Category, Overlay, ProblemReport
-    MaintainerAssociation, PackageAssociation, ProblemReport
 from django.contrib import admin
 
 
@@ -54,9 +53,7 @@ admin.site.register(HerdLog)
 admin.site.register(MaintainerLog)
 
 admin.site.register(RefreshPackageQuery)
-admin.site.register(HerdAssociation)
+admin.site.register(Category)
-admin.site.register(CategoryAssociation)
+admin.site.register(Overlay)
-admin.site.register(MaintainerAssociation)
-admin.site.register(PackageAssociation)
 
 admin.site.register(ProblemReport, ProblemReportAdmin)

euscanwww/djeuscan/helpers.py

@@ -76,33 +76,32 @@ class catch_and_return(object):
         return wrapper
 
 
-def get_account_categories(user):
+def get_profile(user):
-    from djeuscan.models import Package, CategoryAssociation
+    from djeuscan.models import UserProfile
+    try:
+        return user.get_profile()
+    except UserProfile.DoesNotExist:
+        UserProfile.objects.create(user=user)
+        return user.get_profile()
 
+
+def get_account_categories(user):
+    from djeuscan.models import Package
     # TODO: This is quite ugly
-    category_names = [obj.category for obj in
+    category_names = [obj.name for obj in get_profile(user).categories.all()]
-                      CategoryAssociation.objects.filter(user=user)]
     return [c for c in Package.objects.categories()
             if c["category"] in category_names]
 
 
 def get_account_herds(user):
-    from djeuscan.models import Package, HerdAssociation
+    from djeuscan.models import Package
 
-    ids = [obj.herd.pk for obj in
+    ids = [herd.pk for herd in get_profile(user).herds.all()]
-           HerdAssociation.objects.filter(user=user)]
     return Package.objects.herds(ids=ids)
 
 
 def get_account_maintainers(user):
-    from djeuscan.models import Package, MaintainerAssociation
+    from djeuscan.models import Package
 
-    ids = [obj.maintainer.pk for obj in
+    ids = [obj.pk for obj in get_profile(user).maintainers.all()]
-           MaintainerAssociation.objects.filter(user=user)]
     return Package.objects.maintainers(ids=ids)
-
-
-def get_account_packages(user):
-    from djeuscan.models import PackageAssociation
-    return [obj.package for obj in
-            PackageAssociation.objects.filter(user=user)]

euscanwww/djeuscan/migrations/0016_auto__del_maintainerassociation__del_unique_maintainerassociation_user.py

@@ -0,0 +1,355 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Removing unique constraint on 'CategoryAssociation', fields ['user', 'category']
+        db.delete_unique('djeuscan_categoryassociation', ['user_id', 'category'])
+
+        # Removing unique constraint on 'OverlayAssociation', fields ['user', 'overlay']
+        db.delete_unique('djeuscan_overlayassociation', ['user_id', 'overlay'])
+
+        # Removing unique constraint on 'HerdAssociation', fields ['user', 'herd']
+        db.delete_unique('djeuscan_herdassociation', ['user_id', 'herd_id'])
+
+        # Removing unique constraint on 'PackageAssociation', fields ['user', 'package']
+        db.delete_unique('djeuscan_packageassociation', ['user_id', 'package_id'])
+
+        # Removing unique constraint on 'MaintainerAssociation', fields ['user', 'maintainer']
+        db.delete_unique('djeuscan_maintainerassociation', ['user_id', 'maintainer_id'])
+
+        # Deleting model 'MaintainerAssociation'
+        db.delete_table('djeuscan_maintainerassociation')
+
+        # Deleting model 'PackageAssociation'
+        db.delete_table('djeuscan_packageassociation')
+
+        # Deleting model 'HerdAssociation'
+        db.delete_table('djeuscan_herdassociation')
+
+        # Deleting model 'OverlayAssociation'
+        db.delete_table('djeuscan_overlayassociation')
+
+        # Deleting model 'CategoryAssociation'
+        db.delete_table('djeuscan_categoryassociation')
+
+        # Adding model 'UserProfile'
+        db.create_table('djeuscan_userprofile', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
+        ))
+        db.send_create_signal('djeuscan', ['UserProfile'])
+
+        # Adding M2M table for field herds on 'UserProfile'
+        db.create_table('djeuscan_userprofile_herds', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('userprofile', models.ForeignKey(orm['djeuscan.userprofile'], null=False)),
+            ('herd', models.ForeignKey(orm['djeuscan.herd'], null=False))
+        ))
+        db.create_unique('djeuscan_userprofile_herds', ['userprofile_id', 'herd_id'])
+
+        # Adding M2M table for field maintainers on 'UserProfile'
+        db.create_table('djeuscan_userprofile_maintainers', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('userprofile', models.ForeignKey(orm['djeuscan.userprofile'], null=False)),
+            ('maintainer', models.ForeignKey(orm['djeuscan.maintainer'], null=False))
+        ))
+        db.create_unique('djeuscan_userprofile_maintainers', ['userprofile_id', 'maintainer_id'])
+
+        # Adding M2M table for field packages on 'UserProfile'
+        db.create_table('djeuscan_userprofile_packages', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('userprofile', models.ForeignKey(orm['djeuscan.userprofile'], null=False)),
+            ('package', models.ForeignKey(orm['djeuscan.package'], null=False))
+        ))
+        db.create_unique('djeuscan_userprofile_packages', ['userprofile_id', 'package_id'])
+
+        # Adding M2M table for field categories on 'UserProfile'
+        db.create_table('djeuscan_userprofile_categories', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('userprofile', models.ForeignKey(orm['djeuscan.userprofile'], null=False)),
+            ('category', models.ForeignKey(orm['djeuscan.category'], null=False))
+        ))
+        db.create_unique('djeuscan_userprofile_categories', ['userprofile_id', 'category_id'])
+
+        # Adding M2M table for field overlays on 'UserProfile'
+        db.create_table('djeuscan_userprofile_overlays', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('userprofile', models.ForeignKey(orm['djeuscan.userprofile'], null=False)),
+            ('overlay', models.ForeignKey(orm['djeuscan.overlay'], null=False))
+        ))
+        db.create_unique('djeuscan_userprofile_overlays', ['userprofile_id', 'overlay_id'])
+
+        # Adding model 'Category'
+        db.create_table('djeuscan_category', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
+        ))
+        db.send_create_signal('djeuscan', ['Category'])
+
+        # Adding model 'Overlay'
+        db.create_table('djeuscan_overlay', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
+        ))
+        db.send_create_signal('djeuscan', ['Overlay'])
+
+    def backwards(self, orm):
+        # Adding model 'MaintainerAssociation'
+        db.create_table('djeuscan_maintainerassociation', (
+            ('maintainer', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['djeuscan.Maintainer'])),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+        ))
+        db.send_create_signal('djeuscan', ['MaintainerAssociation'])
+
+        # Adding unique constraint on 'MaintainerAssociation', fields ['user', 'maintainer']
+        db.create_unique('djeuscan_maintainerassociation', ['user_id', 'maintainer_id'])
+
+        # Adding model 'PackageAssociation'
+        db.create_table('djeuscan_packageassociation', (
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('package', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['djeuscan.Package'])),
+        ))
+        db.send_create_signal('djeuscan', ['PackageAssociation'])
+
+        # Adding unique constraint on 'PackageAssociation', fields ['user', 'package']
+        db.create_unique('djeuscan_packageassociation', ['user_id', 'package_id'])
+
+        # Adding model 'HerdAssociation'
+        db.create_table('djeuscan_herdassociation', (
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('herd', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['djeuscan.Herd'])),
+        ))
+        db.send_create_signal('djeuscan', ['HerdAssociation'])
+
+        # Adding unique constraint on 'HerdAssociation', fields ['user', 'herd']
+        db.create_unique('djeuscan_herdassociation', ['user_id', 'herd_id'])
+
+        # Adding model 'OverlayAssociation'
+        db.create_table('djeuscan_overlayassociation', (
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('overlay', self.gf('django.db.models.fields.CharField')(max_length=128)),
+        ))
+        db.send_create_signal('djeuscan', ['OverlayAssociation'])
+
+        # Adding unique constraint on 'OverlayAssociation', fields ['user', 'overlay']
+        db.create_unique('djeuscan_overlayassociation', ['user_id', 'overlay'])
+
+        # Adding model 'CategoryAssociation'
+        db.create_table('djeuscan_categoryassociation', (
+            ('category', self.gf('django.db.models.fields.CharField')(max_length=128)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+        ))
+        db.send_create_signal('djeuscan', ['CategoryAssociation'])
+
+        # Adding unique constraint on 'CategoryAssociation', fields ['user', 'category']
+        db.create_unique('djeuscan_categoryassociation', ['user_id', 'category'])
+
+        # Deleting model 'UserProfile'
+        db.delete_table('djeuscan_userprofile')
+
+        # Removing M2M table for field herds on 'UserProfile'
+        db.delete_table('djeuscan_userprofile_herds')
+
+        # Removing M2M table for field maintainers on 'UserProfile'
+        db.delete_table('djeuscan_userprofile_maintainers')
+
+        # Removing M2M table for field packages on 'UserProfile'
+        db.delete_table('djeuscan_userprofile_packages')
+
+        # Removing M2M table for field categories on 'UserProfile'
+        db.delete_table('djeuscan_userprofile_categories')
+
+        # Removing M2M table for field overlays on 'UserProfile'
+        db.delete_table('djeuscan_userprofile_overlays')
+
+        # Deleting model 'Category'
+        db.delete_table('djeuscan_category')
+
+        # Deleting model 'Overlay'
+        db.delete_table('djeuscan_overlay')
+
+    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'})
+        },
+        'djeuscan.category': {
+            'Meta': {'object_name': 'Category'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'djeuscan.categorylog': {
+            'Meta': {'object_name': 'CategoryLog', '_ormbases': ['djeuscan.Log']},
+            'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'djeuscan.euscanresult': {
+            'Meta': {'object_name': 'EuscanResult'},
+            'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+            'ebuild': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+            'result': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'scan_time': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'djeuscan.herd': {
+            'Meta': {'object_name': 'Herd'},
+            'email': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'herd': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False'})
+        },
+        'djeuscan.herdlog': {
+            'Meta': {'object_name': 'HerdLog', '_ormbases': ['djeuscan.Log']},
+            'herd': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Herd']"}),
+            'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'djeuscan.log': {
+            'Meta': {'object_name': 'Log'},
+            'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'n_packages_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_packages_outdated': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_packages_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_versions_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_versions_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_versions_upstream': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'djeuscan.maintainer': {
+            'Meta': {'object_name': 'Maintainer'},
+            'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'djeuscan.maintainerlog': {
+            'Meta': {'object_name': 'MaintainerLog', '_ormbases': ['djeuscan.Log']},
+            'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'}),
+            'maintainer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Maintainer']"})
+        },
+        'djeuscan.overlay': {
+            'Meta': {'object_name': 'Overlay'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'djeuscan.package': {
+            'Meta': {'unique_together': "(['category', 'name'],)", 'object_name': 'Package'},
+            'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'herds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Herd']", 'symmetrical': 'False', 'blank': 'True'}),
+            'homepage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_version_gentoo': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_gentoo'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+            'last_version_overlay': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_overlay'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+            'last_version_upstream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_upstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+            'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False', 'blank': 'True'}),
+            'n_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_packaged': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_versions': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'djeuscan.problemreport': {
+            'Meta': {'object_name': 'ProblemReport'},
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.TextField', [], {}),
+            'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'version': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Version']", 'null': 'True', 'blank': 'True'})
+        },
+        'djeuscan.refreshpackagequery': {
+            'Meta': {'object_name': 'RefreshPackageQuery'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False'})
+        },
+        'djeuscan.userprofile': {
+            'Meta': {'object_name': 'UserProfile'},
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Category']", 'symmetrical': 'False'}),
+            'herds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Herd']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False'}),
+            'overlays': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Overlay']", 'symmetrical': 'False'}),
+            'packages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Package']", 'symmetrical': 'False'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'djeuscan.version': {
+            'Meta': {'unique_together': "(['package', 'slot', 'revision', 'version', 'overlay'],)", 'object_name': 'Version'},
+            'alive': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+            'confidence': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'ebuild_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+            'handler': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'metadata_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+            'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'db_index': 'True', 'blank': 'True'}),
+            'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+            'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+            'urls': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+        },
+        'djeuscan.versionlog': {
+            'Meta': {'object_name': 'VersionLog'},
+            'action': ('django.db.models.fields.IntegerField', [], {}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'blank': 'True'}),
+            'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+            'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+        },
+        'djeuscan.worldlog': {
+            'Meta': {'object_name': 'WorldLog', '_ormbases': ['djeuscan.Log']},
+            'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['djeuscan']

euscanwww/djeuscan/migrations/0017_auto__add_unique_overlay_name__add_unique_category_name.py

@@ -0,0 +1,197 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding unique constraint on 'Overlay', fields ['name']
+        db.create_unique('djeuscan_overlay', ['name'])
+
+        # Adding unique constraint on 'Category', fields ['name']
+        db.create_unique('djeuscan_category', ['name'])
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'Category', fields ['name']
+        db.delete_unique('djeuscan_category', ['name'])
+
+        # Removing unique constraint on 'Overlay', fields ['name']
+        db.delete_unique('djeuscan_overlay', ['name'])
+
+    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'})
+        },
+        'djeuscan.category': {
+            'Meta': {'object_name': 'Category'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
+        },
+        'djeuscan.categorylog': {
+            'Meta': {'object_name': 'CategoryLog', '_ormbases': ['djeuscan.Log']},
+            'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'djeuscan.euscanresult': {
+            'Meta': {'object_name': 'EuscanResult'},
+            'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+            'ebuild': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+            'result': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'scan_time': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'djeuscan.herd': {
+            'Meta': {'object_name': 'Herd'},
+            'email': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'herd': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False'})
+        },
+        'djeuscan.herdlog': {
+            'Meta': {'object_name': 'HerdLog', '_ormbases': ['djeuscan.Log']},
+            'herd': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Herd']"}),
+            'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'djeuscan.log': {
+            'Meta': {'object_name': 'Log'},
+            'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'n_packages_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_packages_outdated': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_packages_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_versions_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_versions_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_versions_upstream': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'djeuscan.maintainer': {
+            'Meta': {'object_name': 'Maintainer'},
+            'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'djeuscan.maintainerlog': {
+            'Meta': {'object_name': 'MaintainerLog', '_ormbases': ['djeuscan.Log']},
+            'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'}),
+            'maintainer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Maintainer']"})
+        },
+        'djeuscan.overlay': {
+            'Meta': {'object_name': 'Overlay'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
+        },
+        'djeuscan.package': {
+            'Meta': {'unique_together': "(['category', 'name'],)", 'object_name': 'Package'},
+            'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'herds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Herd']", 'symmetrical': 'False', 'blank': 'True'}),
+            'homepage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_version_gentoo': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_gentoo'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+            'last_version_overlay': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_overlay'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+            'last_version_upstream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_upstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+            'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False', 'blank': 'True'}),
+            'n_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_packaged': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'n_versions': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'djeuscan.problemreport': {
+            'Meta': {'object_name': 'ProblemReport'},
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.TextField', [], {}),
+            'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'version': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Version']", 'null': 'True', 'blank': 'True'})
+        },
+        'djeuscan.refreshpackagequery': {
+            'Meta': {'object_name': 'RefreshPackageQuery'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False'})
+        },
+        'djeuscan.userprofile': {
+            'Meta': {'object_name': 'UserProfile'},
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Category']", 'symmetrical': 'False'}),
+            'herds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Herd']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False'}),
+            'overlays': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Overlay']", 'symmetrical': 'False'}),
+            'packages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Package']", 'symmetrical': 'False'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'djeuscan.version': {
+            'Meta': {'unique_together': "(['package', 'slot', 'revision', 'version', 'overlay'],)", 'object_name': 'Version'},
+            'alive': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+            'confidence': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'ebuild_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+            'handler': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'metadata_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+            'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'db_index': 'True', 'blank': 'True'}),
+            'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+            'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+            'urls': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+        },
+        'djeuscan.versionlog': {
+            'Meta': {'object_name': 'VersionLog'},
+            'action': ('django.db.models.fields.IntegerField', [], {}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'blank': 'True'}),
+            'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+            'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+        },
+        'djeuscan.worldlog': {
+            'Meta': {'object_name': 'WorldLog', '_ormbases': ['djeuscan.Log']},
+            'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['djeuscan']

euscanwww/djeuscan/models.py

@@ -231,6 +231,31 @@ class EuscanResult(models.Model):
         )
 
 
+class Category(models.Model):
+    name = models.CharField(max_length=128, validators=[validate_category],
+                            unique=True)
+
+    def __unicode__(self):
+        return self.name
+
+
+class Overlay(models.Model):
+    name = models.CharField(max_length=128, validators=[validate_name],
+                            unique=True)
+
+    def __unicode__(self):
+        return self.name
+
+
+class UserProfile(models.Model):
+    user = models.OneToOneField(User)
+    herds = models.ManyToManyField(Herd)
+    maintainers = models.ManyToManyField(Maintainer)
+    packages = models.ManyToManyField(Package)
+    categories = models.ManyToManyField(Category)
+    overlays = models.ManyToManyField(Overlay)
+
+
 class Log(models.Model):
     """
     Model used for keeping data for charts
@@ -303,61 +328,6 @@ class RefreshPackageQuery(models.Model):
         return u'[%d] %s' % (self.priority, self.package)
 
 
-class HerdAssociation(models.Model):
-    user = models.ForeignKey(User)
-    herd = models.ForeignKey(Herd)
-
-    class Meta:
-        unique_together = ['user', 'herd']
-
-    def __unicode__(self):
-        return u'[%s] %s' % (self.user, self.herd)
-
-
-class MaintainerAssociation(models.Model):
-    user = models.ForeignKey(User)
-    maintainer = models.ForeignKey(Maintainer)
-
-    class Meta:
-        unique_together = ['user', 'maintainer']
-
-    def __unicode__(self):
-        return u'[%s] %s' % (self.user, self.maintainer)
-
-
-class PackageAssociation(models.Model):
-    user = models.ForeignKey(User)
-    package = models.ForeignKey(Package)
-
-    class Meta:
-        unique_together = ['user', 'package']
-
-    def __unicode__(self):
-        return u'[%s] %s' % (self.user, self.package)
-
-
-class CategoryAssociation(models.Model):
-    user = models.ForeignKey(User)
-    category = models.CharField(max_length=128, validators=[validate_category])
-
-    class Meta:
-        unique_together = ['user', 'category']
-
-    def __unicode__(self):
-        return u'[%s] %s' % (self.user, self.category)
-
-
-class OverlayAssociation(models.Model):
-    user = models.ForeignKey(User)
-    overlay = models.CharField(max_length=128, validators=[validate_name])
-
-    class Meta:
-        unique_together = ['user', 'overlay']
-
-    def __unicode__(self):
-        return u'[%s] %s' % (self.user, self.category)
-
-
 class ProblemReport(models.Model):
     package = models.ForeignKey(Package)
     version = models.ForeignKey(Version, null=True, blank=True)

euscanwww/djeuscan/processing/misc/update_counters.py

@@ -1,8 +1,8 @@
 from django.db.transaction import commit_on_success
 from django.utils import timezone
 
-from djeuscan.models import Package, Herd, Maintainer, Version
+from djeuscan.models import Package, Herd, Maintainer, Version, HerdLog, \
-from djeuscan.models import HerdLog, MaintainerLog, CategoryLog, WorldLog
+    MaintainerLog, CategoryLog, WorldLog, Category, Overlay
 from djeuscan import charts
 from djeuscan.processing import FakeLogger
 
@@ -48,6 +48,19 @@ def update_counters(fast=False, nolog=False, logger=None):
 
     wlog = None
 
+    # Populate Category and Overlay
+    for cat in Package.objects.values('category').distinct():
+        obj, created = Category.objects.get_or_create(name=cat["category"])
+        if created:
+            logger.info("+ [c] %s", cat["category"])
+
+    for overlay in Version.objects.values('overlay').distinct():
+        if not overlay["overlay"]:
+            continue
+        obj, created = Overlay.objects.get_or_create(name=overlay["overlay"])
+        if created:
+            logger.info("+ [o] %s", overlay["overlay"])
+
     if not nolog:
         wlog = WorldLog()
         wlog.datetime = now
@@ -157,17 +170,17 @@ def update_counters(fast=False, nolog=False, logger=None):
         return
 
     for clog in categories.values():
-        logger.info('+ [cl] %s' % clog)
+        logger.info('+ [cl] %s', clog)
         charts.rrd_update('category-%s' % clog.category, now, clog)
         clog.save()
 
     for hlog in herds.values():
-        logger.info('+ [hl] %s' % hlog)
+        logger.info('+ [hl] %s', hlog)
         charts.rrd_update('herd-%d' % hlog.herd.id, now, hlog)
         hlog.save()
 
     for mlog in maintainers.values():
-        logger.info('+ [ml] %s' % mlog)
+        logger.info('+ [ml] %s', mlog)
         charts.rrd_update('maintainer-%d' % mlog.maintainer.id, now, mlog)
         mlog.save()
 

euscanwww/djeuscan/tests/euscan_factory.py

@@ -4,10 +4,12 @@ from datetime import datetime
 from collections import defaultdict
 
 from django.contrib.auth.models import User
+from django.db import IntegrityError
 
 import factory
 
-from djeuscan.models import Herd, Maintainer, Package, Version, EuscanResult
+from djeuscan.models import Herd, Maintainer, Package, Version, EuscanResult, \
+    Category, Overlay
 
 
 class UserFactory(factory.Factory):
@@ -36,6 +38,18 @@ class MaintainerFactory(factory.Factory):
     email = factory.LazyAttribute(lambda a: "%s@example.com" % a.name)
 
 
+class CategoryFactory(factory.Factory):
+    FACTORY_FOR = Category
+
+    name = factory.LazyAttribute(lambda a: random_string())
+
+
+class OverlayFactory(factory.Factory):
+    FACTORY_FOR = Overlay
+
+    name = factory.LazyAttribute(lambda a: random_string())
+
+
 class PackageFactory(factory.Factory):
     FACTORY_FOR = Package
 
@@ -46,6 +60,16 @@ class PackageFactory(factory.Factory):
     description = "This is a test package"
     homepage = "http://testpackage.com"
 
+    @classmethod
+    def _prepare(cls, create, **kwargs):
+        package = super(PackageFactory, cls)._prepare(create, **kwargs)
+        category = kwargs.pop('category', None)
+        if create:
+            CategoryFactory.create(name=category)
+        else:
+            CategoryFactory.build(name=category)
+        return package
+
 
 class VersionFactory(factory.Factory):
     FACTORY_FOR = Version
@@ -59,6 +83,19 @@ class VersionFactory(factory.Factory):
     urls = "http://packageurl.com"
     alive = True
 
+    @classmethod
+    def _prepare(cls, create, **kwargs):
+        version = super(VersionFactory, cls)._prepare(create, **kwargs)
+        overlay = kwargs.pop('overlay', None)
+        try:
+            if create:
+                OverlayFactory.create(name=overlay)
+            else:
+                OverlayFactory.build(name=overlay)
+        except IntegrityError:
+            pass
+        return version
+
 
 class EuscanResultFactory(factory.Factory):
     FACTORY_FOR = EuscanResult

euscanwww/djeuscan/tests/test_views.py

@@ -5,13 +5,12 @@ try:
 except ImportError:
     from bs4 import BeautifulSoup
 
+from djeuscan.helpers import get_profile
+
 from djeuscan.tests import SystemTestCase
 from djeuscan.tests.euscan_factory import PackageFactory, setup_maintainers, \
     setup_herds, setup_categories, setup_overlays
 
-from djeuscan.models import PackageAssociation, CategoryAssociation, \
-    HerdAssociation, MaintainerAssociation
-
 
 class PagesTest(SystemTestCase):
     """
@@ -50,11 +49,10 @@ class PackageTests(SystemTestCase):
         self.assertEqual(response.status_code, 200)
 
     def test_favourite(self):
-        self.assertEqual(PackageAssociation.objects.count(), 0)
-
         response = self.get("package", category=self.package.category,
                             package=self.package.name)
         self.assertEqual(response.status_code, 200)
+
         self.assertNotIn("Watch", response.content)
 
         with self.login():
@@ -62,11 +60,14 @@ class PackageTests(SystemTestCase):
                                 package=self.package.name)
             self.assertEqual(response.status_code, 200)
 
+            user = response.context["user"]
+            self.assertEquals(get_profile(user).categories.count(), 0)
+
             self.assertIn("Watch", response.content)
             self.post("favourite_package", category=self.package.category,
                       package=self.package.name)
 
-            self.assertEqual(PackageAssociation.objects.count(), 1)
+            self.assertEquals(get_profile(user).packages.count(), 1)
 
             response = self.get("accounts_packages")
             self.assertEqual(response.status_code, 200)
@@ -75,7 +76,7 @@ class PackageTests(SystemTestCase):
 
             self.post("unfavourite_package", category=self.package.category,
                       package=self.package.name)
-            self.assertEqual(PackageAssociation.objects.count(), 0)
+            self.assertEquals(get_profile(user).packages.count(), 0)
 
 
 class SectionTests(SystemTestCase):
@@ -118,9 +119,9 @@ class CategoriesTests(SectionTests):
 
     def test_favourite(self):
         category = self.categories[0]
-        self.assertEqual(CategoryAssociation.objects.count(), 0)
 
         response = self.get("category", category=category)
+
         self.assertEqual(response.status_code, 200)
         self.assertNotIn("Watch", response.content)
 
@@ -128,10 +129,13 @@ class CategoriesTests(SectionTests):
             response = self.get("category", category=category)
             self.assertEqual(response.status_code, 200)
 
+            user = response.context["user"]
+            self.assertEquals(get_profile(user).categories.count(), 0)
+
             self.assertIn("Watch", response.content)
             self.post("favourite_category", category=category)
 
-            self.assertEqual(CategoryAssociation.objects.count(), 1)
+            self.assertEquals(get_profile(user).categories.count(), 1)
 
             response = self.get("accounts_categories")
             self.assertEqual(response.status_code, 200)
@@ -139,7 +143,8 @@ class CategoriesTests(SectionTests):
             self._check_table(response, [category])
 
             self.post("unfavourite_category", category=category)
-            self.assertEqual(CategoryAssociation.objects.count(), 0)
+
+            self.assertEquals(get_profile(user).categories.count(), 0)
 
 
 class HerdsTests(SectionTests):
@@ -167,7 +172,6 @@ class HerdsTests(SectionTests):
 
     def test_favourite(self):
         herd = self.herds[0]
-        self.assertEqual(HerdAssociation.objects.count(), 0)
 
         response = self.get("herd", herd=herd.herd)
         self.assertEqual(response.status_code, 200)
@@ -177,10 +181,13 @@ class HerdsTests(SectionTests):
             response = self.get("herd", herd=herd.herd)
             self.assertEqual(response.status_code, 200)
 
+            user = response.context["user"]
+            self.assertEquals(get_profile(user).herds.count(), 0)
+
             self.assertIn("Watch", response.content)
             self.post("favourite_herd", herd=herd.herd)
 
-            self.assertEqual(HerdAssociation.objects.count(), 1)
+            self.assertEquals(get_profile(user).herds.count(), 1)
 
             response = self.get("accounts_herds")
             self.assertEqual(response.status_code, 200)
@@ -188,7 +195,7 @@ class HerdsTests(SectionTests):
             self._check_table(response, [herd], attr="herd")
 
             self.post("unfavourite_herd", herd=herd.herd)
-            self.assertEqual(HerdAssociation.objects.count(), 0)
+            self.assertEquals(get_profile(user).herds.count(), 0)
 
 
 class MaintainersTests(SectionTests):
@@ -216,7 +223,6 @@ class MaintainersTests(SectionTests):
 
     def test_favourite(self):
         maintainer = self.maintainers[0]
-        self.assertEqual(MaintainerAssociation.objects.count(), 0)
 
         response = self.get("maintainer", maintainer_id=maintainer.pk)
         self.assertEqual(response.status_code, 200)
@@ -226,10 +232,13 @@ class MaintainersTests(SectionTests):
             response = self.get("maintainer", maintainer_id=maintainer.pk)
             self.assertEqual(response.status_code, 200)
 
+            user = response.context["user"]
+            self.assertEquals(get_profile(user).maintainers.count(), 0)
+
             self.assertIn("Watch", response.content)
             self.post("favourite_maintainer", maintainer_id=maintainer.pk)
 
-            self.assertEqual(MaintainerAssociation.objects.count(), 1)
+            self.assertEquals(get_profile(user).maintainers.count(), 1)
 
             response = self.get("accounts_maintainers")
             self.assertEqual(response.status_code, 200)
@@ -237,7 +246,8 @@ class MaintainersTests(SectionTests):
             self._check_table(response, [maintainer], attr="name")
 
             self.post("unfavourite_maintainer", maintainer_id=maintainer.pk)
-            self.assertEqual(MaintainerAssociation.objects.count(), 0)
+
+            self.assertEquals(get_profile(user).maintainers.count(), 0)
 
 
 class OverlayTests(SectionTests):

euscanwww/djeuscan/views.py

@@ -8,12 +8,10 @@ from django.shortcuts import get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.views.decorators.http import require_POST
 
-from djeuscan.helpers import version_key, packages_from_names, \
+from djeuscan.helpers import version_key, packages_from_names, get_profile, \
-    get_account_categories, get_account_herds, get_account_maintainers, \
+    get_account_categories, get_account_herds, get_account_maintainers
-    get_account_packages
 from djeuscan.models import Version, Package, Herd, Maintainer, EuscanResult, \
-    VersionLog, RefreshPackageQuery, HerdAssociation, MaintainerAssociation, \
+    VersionLog, RefreshPackageQuery, ProblemReport, Category, Overlay
-    CategoryAssociation, PackageAssociation, OverlayAssociation, ProblemReport
 from djeuscan.forms import WorldForm, PackagesForm, ProblemReportForm
 from djeuscan.tasks import admin_tasks
 from djeuscan import charts
@@ -68,12 +66,8 @@ def category(request, category):
 
     favourited = False
     if request.user.is_authenticated():
-        try:
+        if Category.objects.get(name=category) in \
-            CategoryAssociation.objects.get(user=request.user,
+           get_profile(request.user).categories.all():
-                                            category=category)
-        except CategoryAssociation.DoesNotExist:
-            pass
-        else:
             favourited = True
 
     return {'category': category, 'packages': packages, 'last_scan': last_scan,
@@ -104,11 +98,7 @@ def herd(request, herd):
 
     favourited = False
     if request.user.is_authenticated():
-        try:
+        if herd in get_profile(request.user).herds.all():
-            HerdAssociation.objects.get(user=request.user, herd=herd)
-        except HerdAssociation.DoesNotExist:
-            pass
-        else:
             favourited = True
 
     return {'herd': herd, 'packages': packages, "last_scan": last_scan,
@@ -140,12 +130,7 @@ def maintainer(request, maintainer_id):
 
     favourited = False
     if request.user.is_authenticated():
-        try:
+        if maintainer in get_profile(request.user).maintainers.all():
-            MaintainerAssociation.objects.get(user=request.user,
-                                              maintainer=maintainer)
-        except MaintainerAssociation.DoesNotExist:
-            pass
-        else:
             favourited = True
 
     return {'maintainer': maintainer, 'packages': packages,
@@ -177,11 +162,8 @@ def overlay(request, overlay):
 
     favourited = False
     if request.user.is_authenticated():
-        try:
+        if Overlay.objects.get(name=overlay) in \
-            OverlayAssociation.objects.get(user=request.user, overlay=overlay)
+           get_profile(request.user).overlays.all():
-        except OverlayAssociation.DoesNotExist:
-            pass
-        else:
             favourited = True
 
     return {'overlay': overlay, 'packages': packages, 'last_scan': last_scan,
@@ -209,11 +191,7 @@ def package(request, category, package):
 
     favourited = False
     if request.user.is_authenticated():
-        try:
+        if package in get_profile(request.user).packages.all():
-            PackageAssociation.objects.get(user=request.user, package=package)
-        except PackageAssociation.DoesNotExist:
-            pass
-        else:
             favourited = True
 
     try:
@@ -226,8 +204,8 @@ def package(request, category, package):
         'package': package,
         'packaged': packaged,
         'upstream': upstream,
-        'log': log.messages(),
         'vlog': vlog,
+        'log': log,
         'msg': log.messages() if log else "",
         'last_scan': last_scan,
         'favourited': favourited,
@@ -397,9 +375,10 @@ def refresh_package(request, category, package):
 @login_required
 @render_to('euscan/accounts/index.html')
 def accounts_index(request):
+    user = request.user
     upstream_k = lambda c: c["n_versions"] - c["n_packaged"]
 
-    categories = sorted(get_account_categories(request.user),
+    categories = sorted(get_account_categories(user),
                         key=upstream_k, reverse=True)
     c_upstream = sum([c["n_versions"] - c["n_packaged"] for c in categories])
     herds = sorted(get_account_herds(request.user),
@@ -408,7 +387,7 @@ def accounts_index(request):
     maintainers = sorted(get_account_maintainers(request.user),
                          key=upstream_k, reverse=True)
     m_upstream = sum([c["n_versions"] - c["n_packaged"] for c in maintainers])
-    packages = sorted(get_account_packages(request.user),
+    packages = sorted(get_profile(user).packages.all(),
                       key=lambda p: p.n_versions - p.n_packaged, reverse=True)
     p_upstream = sum([c.n_versions - c.n_packaged for c in packages])
     return {
@@ -440,14 +419,13 @@ def accounts_maintainers(request):
 @login_required
 @render_to('euscan/accounts/packages.html')
 def accounts_packages(request):
-    return {"packages": get_account_packages(request.user)}
+    return {"packages": get_profile(request.user).packages.all()}
 
 
 @login_required
 @render_to('euscan/accounts/overlays.html')
 def accounts_overlays(request):
-    overlays = [obj.overlay for obj in
+    overlays = [obj.name for obj in get_profile(request.user).overlays.all()]
-                OverlayAssociation.objects.filter(user=request.user)]
     return {"overlays": overlays}
 
 
@@ -456,10 +434,8 @@ def accounts_overlays(request):
 @ajax_request
 def favourite_package(request, category, package):
     obj = get_object_or_404(Package, category=category, name=package)
-    _, created = PackageAssociation.objects.get_or_create(
+    get_profile(request.user).packages.add(obj)
-        user=request.user, package=obj
+    return {"success": True}
-    )
-    return {"success": created}
 
 
 @login_required
@@ -467,10 +443,7 @@ def favourite_package(request, category, package):
 @ajax_request
 def unfavourite_package(request, category, package):
     package = get_object_or_404(Package, category=category, name=package)
-    obj = get_object_or_404(
+    get_profile(request.user).packages.remove(package)
-        PackageAssociation, package=package, user=request.user
-    )
-    obj.delete()
     return {"success": True}
 
 
@@ -479,10 +452,8 @@ def unfavourite_package(request, category, package):
 @ajax_request
 def favourite_herd(request, herd):
     obj = get_object_or_404(Herd, herd=herd)
-    _, created = HerdAssociation.objects.get_or_create(
+    get_profile(request.user).herds.add(obj)
-        user=request.user, herd=obj
+    return {"success": True}
-    )
-    return {"success": created}
 
 
 @login_required
@@ -490,10 +461,7 @@ def favourite_herd(request, herd):
 @ajax_request
 def unfavourite_herd(request, herd):
     herd = get_object_or_404(Herd, herd=herd)
-    obj = get_object_or_404(
+    get_profile(request.user).herds.remove(herd)
-        HerdAssociation, herd=herd, user=request.user
-    )
-    obj.delete()
     return {"success": True}
 
 
@@ -502,10 +470,8 @@ def unfavourite_herd(request, herd):
 @ajax_request
 def favourite_maintainer(request, maintainer_id):
     obj = get_object_or_404(Maintainer, pk=maintainer_id)
-    _, created = MaintainerAssociation.objects.get_or_create(
+    get_profile(request.user).maintainers.add(obj)
-        user=request.user, maintainer=obj
+    return {"success": True}
-    )
-    return {"success": created}
 
 
 @login_required
@@ -513,10 +479,7 @@ def favourite_maintainer(request, maintainer_id):
 @ajax_request
 def unfavourite_maintainer(request, maintainer_id):
     maintainer = get_object_or_404(Maintainer, pk=maintainer_id)
-    obj = get_object_or_404(
+    get_profile(request.user).maintainers.remove(maintainer)
-        MaintainerAssociation, maintainer=maintainer, user=request.user
-    )
-    obj.delete()
     return {"success": True}
 
 
@@ -524,25 +487,17 @@ def unfavourite_maintainer(request, maintainer_id):
 @require_POST
 @ajax_request
 def favourite_category(request, category):
-    packages = Package.objects.for_category(category, last_versions=True)
+    obj = Category.objects.get(name=category)
-
+    get_profile(request.user).categories.add(obj)
-    if not packages:
+    return {"success": True}
-        raise Http404
-
-    _, created = CategoryAssociation.objects.get_or_create(
-        user=request.user, category=category
-    )
-    return {"success": created}
 
 
 @login_required
 @require_POST
 @ajax_request
 def unfavourite_category(request, category):
-    obj = get_object_or_404(
+    obj = Category.objects.get(name=category)
-        CategoryAssociation, user=request.user, category=category
+    get_profile(request.user).categories.remove(obj)
-    )
-    obj.delete()
     return {"success": True}
 
 
@@ -550,22 +505,15 @@ def unfavourite_category(request, category):
 @require_POST
 @ajax_request
 def favourite_overlay(request, overlay):
-    packages = Package.objects.for_overlay(overlay)
+    obj = Category.objects.get(name=overlay)
-    if not packages:
+    get_profile(request.user).overlays.add(obj)
-        raise Http404
+    return {"success": True}
-
-    _, created = OverlayAssociation.objects.get_or_create(
-        user=request.user, overlay=overlay
-    )
-    return {"success": created}
 
 
 @login_required
 @require_POST
 @ajax_request
 def unfavourite_overlay(request, overlay):
-    obj = get_object_or_404(
+    obj = Category.objects.get(name=overlay)
-        OverlayAssociation, user=request.user, overlay=overlay
+    get_profile(request.user).overlays.remove(obj)
-    )
-    obj.delete()
     return {"success": True}

euscanwww/euscanwww/settings.py

@@ -261,3 +261,5 @@ except ImportError, ex:
 os.environ['ROOT'] = PORTAGE_ROOT
 os.environ['PORTAGE_CONFIGROOT'] = PORTAGE_CONFIGROOT
 os.environ['EIX_CACHEFILE'] = EIX_CACHEFILE
+
+AUTH_PROFILE_MODULE = 'djeuscan.UserProfile'

euscanwww/runtests.py

@@ -29,6 +29,7 @@ settings.configure(
     USE_TZ=True,
     TASKS_CONCURRENTLY=8,
     TASKS_SUBTASK_PACKAGES=32,
+    AUTH_PROFILE_MODULE="djeuscan.UserProfile"
 )