Remove old todo list models

Signed-off-by: Dan McGee <dan@archlinux.org>

3 files changed, 134 insertions, 70 deletions

diff --git a/main/admin.py b/main/admin.py
index 741f6665..ef134187 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from main.models import Arch, Donor, Package, Repo, Todolist
+from main.models import Arch, Donor, Package, Repo
 
 class DonorAdmin(admin.ModelAdmin):
     list_display = ('name', 'visible', 'created')
@@ -25,10 +25,6 @@ class PackageAdmin(admin.ModelAdmin):
     search_fields = ('pkgname', 'pkgbase', 'pkgdesc')
     date_hierarchy = 'build_date'
 
-class TodolistAdmin(admin.ModelAdmin):
-    list_display = ('name', 'date_added', 'creator', 'description')
-    search_fields = ('name', 'description')
-
 
 admin.site.register(Donor, DonorAdmin)
 
@@ -36,6 +32,4 @@ admin.site.register(Package, PackageAdmin)
 admin.site.register(Arch, ArchAdmin)
 admin.site.register(Repo, RepoAdmin)
 
-admin.site.register(Todolist, TodolistAdmin)
-
 # vim: set ts=4 sw=4 et:
diff --git a/main/migrations/0062_remove_old_todolist_models.py b/main/migrations/0062_remove_old_todolist_models.py
new file mode 100644
index 00000000..46b2a4fc
--- /dev/null
+++ b/main/migrations/0062_remove_old_todolist_models.py
@@ -0,0 +1,133 @@
+# -*- coding: utf-8 -*-
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    depends_on = (
+        ('todolists', '0003_migrate_todolist_data'),
+    )
+
+    def forwards(self, orm):
+        db.delete_unique('todolist_pkgs', ['list_id', 'pkg_id'])
+        db.delete_table('todolists')
+        db.delete_table('todolist_pkgs')
+
+
+    def backwards(self, orm):
+        db.create_table('todolists', (
+            ('description', self.gf('django.db.models.fields.TextField')()),
+            ('creator', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], on_delete=models.PROTECT)),
+            ('date_added', self.gf('django.db.models.fields.DateTimeField')(db_index=True)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal('main', ['Todolist'])
+
+        db.create_table('todolist_pkgs', (
+            ('list', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['main.Todolist'])),
+            ('complete', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('pkg', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['main.Package'])),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        ))
+        db.send_create_signal('main', ['TodolistPkg'])
+
+        db.create_unique('todolist_pkgs', ['list_id', 'pkg_id'])
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'main.arch': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Arch', 'db_table': "'arches'"},
+            'agnostic': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
+        },
+        'main.donor': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Donor', 'db_table': "'donors'"},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'main.package': {
+            'Meta': {'ordering': "('pkgname',)", 'unique_together': "(('pkgname', 'repo', 'arch'),)", 'object_name': 'Package', 'db_table': "'packages'"},
+            'arch': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'packages'", 'on_delete': 'models.PROTECT', 'to': "orm['main.Arch']"}),
+            'build_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'compressed_size': ('main.fields.PositiveBigIntegerField', [], {}),
+            'epoch': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'files_last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'flag_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'installed_size': ('main.fields.PositiveBigIntegerField', [], {}),
+            'last_update': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'packager': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
+            'packager_str': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'pgp_signature': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'pkgbase': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'pkgdesc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
+            'pkgname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'pkgrel': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'pkgver': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'repo': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'packages'", 'on_delete': 'models.PROTECT', 'to': "orm['main.Repo']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
+        },
+        'main.packagefile': {
+            'Meta': {'object_name': 'PackageFile', 'db_table': "'package_files'"},
+            'directory': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_directory': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'pkg': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['main.Package']"})
+        },
+        'main.repo': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Repo', 'db_table': "'repos'"},
+            'bugs_category': ('django.db.models.fields.SmallIntegerField', [], {'default': '2'}),
+            'bugs_project': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'staging': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'svn_root': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'testing': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        }
+    }
+
+    complete_apps = ['main']
diff --git a/main/models.py b/main/models.py
index 8e705c54..b3cc97e1 100644
--- a/main/models.py
+++ b/main/models.py
@@ -14,11 +14,6 @@ from .utils import cache_function, set_created_field
 from packages.alpm import AlpmAPI
 
 
-class TodolistManager(models.Manager):
-    def incomplete(self):
-        return self.filter(todolistpkg__complete=False).order_by().distinct()
-
-
 class PackageManager(models.Manager):
     def flagged(self):
         """Used by dev dashboard."""
@@ -423,70 +418,12 @@ class PackageFile(models.Model):
         db_table = 'package_files'
 
 
-class Todolist(models.Model):
-    creator = models.ForeignKey(User, on_delete=models.PROTECT)
-    name = models.CharField(max_length=255)
-    description = models.TextField()
-    date_added = models.DateTimeField(db_index=True)
-    objects = TodolistManager()
-
-    def __unicode__(self):
-        return self.name
-
-    _packages = None
-
-    @property
-    def packages(self):
-        if not self._packages:
-            # select_related() does not use LEFT OUTER JOIN for nullable
-            # ForeignKey fields. That is why we need to explicitly list the
-            # ones we want.
-            self._packages = TodolistPkg.objects.select_related(
-                'pkg__repo', 'pkg__arch').filter(list=self).order_by('pkg')
-        return self._packages
-
-    @property
-    def package_names(self):
-        # depends on packages property returning a queryset
-        return self.packages.values_list(
-                'pkg__pkgname', flat=True).order_by().distinct()
-
-    class Meta:
-        db_table = 'todolists'
-
-    def get_absolute_url(self):
-        return '/todo/%i/' % self.id
-
-    def get_full_url(self, proto='https'):
-        '''get a URL suitable for things like email including the domain'''
-        domain = Site.objects.get_current().domain
-        return '%s://%s%s' % (proto, domain, self.get_absolute_url())
-
-
-class TodolistPkg(models.Model):
-    list = models.ForeignKey(Todolist)
-    pkg = models.ForeignKey(Package)
-    complete = models.BooleanField(default=False)
-
-    class Meta:
-        db_table = 'todolist_pkgs'
-        unique_together = (('list','pkg'),)
-
-
-def set_todolist_fields(sender, **kwargs):
-    todolist = kwargs['instance']
-    if not todolist.date_added:
-        todolist.date_added = now()
-
-
 # connect signals needed to keep cache in line with reality
 from main.utils import refresh_latest
 from django.db.models.signals import pre_save, post_save
 
 post_save.connect(refresh_latest, sender=Package,
         dispatch_uid="main.models")
-pre_save.connect(set_todolist_fields, sender=Todolist,
-        dispatch_uid="main.models")
 pre_save.connect(set_created_field, sender=Donor,
         dispatch_uid="main.models")