delete testdata.

django_lostplaces/lostplaces/migrations/0001_initial.py

@@ -1,11 +1,11 @@
-# Generated by Django 3.1.1 on 2020-09-17 18:05
+# Generated by Django 3.1.1 on 2020-09-28 17:54
 
 from django.conf import settings
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 import easy_thumbnails.fields
-import lostplaces.models
+import lostplaces.models.place
 import taggit.managers
 
 
@@ -14,11 +14,19 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('taggit', '0003_taggeditem_add_unique_index'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('taggit', '0003_taggeditem_add_unique_index'),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Expireable',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_when', models.DateTimeField(auto_now_add=True)),
+                ('expires_when', models.DateTimeField()),
+            ],
+        ),
         migrations.CreateModel(
             name='Explorer',
             fields=[
@@ -26,16 +34,6 @@ class Migration(migrations.Migration):
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='explorer', to=settings.AUTH_USER_MODEL)),
             ],
         ),
-        migrations.CreateModel(
-            name='ExternalLink',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('url', models.URLField()),
-                ('label', models.CharField(max_length=100)),
-                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)),
-                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='external_links', to='lostplaces.explorer')),
-            ],
-        ),
         migrations.CreateModel(
             name='Place',
             fields=[
@@ -46,7 +44,7 @@ class Migration(migrations.Migration):
                 ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)),
                 ('location', models.CharField(max_length=50)),
                 ('description', models.TextField()),
-                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='place', to='lostplaces.explorer')),
+                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='places', to='lostplaces.explorer')),
                 ('tags', taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
             ],
             options={
@@ -56,11 +54,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Voucher',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('expireable_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='lostplaces.expireable')),
                 ('code', models.CharField(max_length=30, unique=True)),
-                ('created_when', models.DateTimeField(auto_now_add=True)),
-                ('expires_when', models.DateTimeField()),
             ],
+            bases=('lostplaces.expireable',),
         ),
         migrations.CreateModel(
             name='PlaceImage',
@@ -68,9 +65,9 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)),
                 ('description', models.TextField(blank=True)),
-                ('filename', easy_thumbnails.fields.ThumbnailerImageField(upload_to=lostplaces.models.generate_image_upload_path)),
+                ('filename', easy_thumbnails.fields.ThumbnailerImageField(upload_to=lostplaces.models.place.generate_image_upload_path)),
                 ('place', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='placeimages', to='lostplaces.place')),
-                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimage', to='lostplaces.explorer')),
+                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimages', to='lostplaces.explorer')),
             ],
             options={
                 'abstract': False,
@@ -79,9 +76,15 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='PhotoAlbum',
             fields=[
-                ('externallink_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='lostplaces.externallink')),
-                ('place', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='photo_albums', to='lostplaces.place')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)),
+                ('url', models.URLField()),
+                ('label', models.CharField(max_length=100)),
+                ('place', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='photoalbums', to='lostplaces.place')),
+                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='photoalbums', to='lostplaces.explorer')),
             ],
-            bases=('lostplaces.externallink',),
+            options={
+                'abstract': False,
+            },
         ),
     ]

django_lostplaces/lostplaces/migrations/0002_temp_create.py

@@ -1,60 +0,0 @@
-# Generated by Django 3.1.1 on 2020-09-27 17:39
-from django.conf import settings
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import easy_thumbnails.fields
-import lostplaces.models
-import taggit.managers
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Expireable',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_when', models.DateTimeField(auto_now_add=True)),
-                ('expires_when', models.DateTimeField()),
-            ],
-        ),
-        migrations.AddField(
-            model_name='photoalbum',
-            name='id',
-            field=models.AutoField(auto_created=True, null=True, primary_key=True, serialize=False, verbose_name='ID'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='photoalbum',
-            name='label',
-            field=models.CharField(null=True, max_length=100),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='photoalbum',
-            name='submitted_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='photoalbums', to='lostplaces.explorer'),
-        ),
-        migrations.AddField(
-            model_name='photoalbum',
-            name='submitted_when',
-            field=models.DateTimeField(auto_now_add=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='photoalbum',
-            name='url',
-            field=models.URLField(null=True),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='voucher',
-            name='expireable_ptr',
-            field=models.OneToOneField(auto_created=True, null=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='lostplaces.expireable'),
-            preserve_default=False,
-        ),
-    ]

django_lostplaces/lostplaces/migrations/0003_migrate_data.py

@@ -1,27 +0,0 @@
-# Generated by Django 3.1.1 on 2020-09-27 17:40
-
-from django.conf import settings
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import easy_thumbnails.fields
-import lostplaces.models
-import taggit.managers
-from django.apps import apps as global_apps
-
-def migrate_data(apps, schema_editor):
-    OldModel = apps.get_model('lostplaces', 'ExternalLink')
-    NewModel = apps.get_model('lostplaces', 'PhotoAlbum')
-
-    print(OldModel, NewModel)
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces', '0002_temp_create'),
-    ]
-
-    operations = [
-#        migrations.RunPython(migrate_data),
-    ]
-

django_lostplaces/lostplaces/migrations/0004_alter_fields_back.py

@@ -1,78 +0,0 @@
-# Generated by Django 3.1.1 on 2020-09-27 17:40
-
-from django.conf import settings
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import easy_thumbnails.fields
-import lostplaces.models
-import taggit.managers
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces', '0003_migrate_data'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='voucher',
-            name='expireable_ptr',
-            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='lostplaces.expireable'),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='photoalbum',
-            name='url',
-            field=models.URLField(),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='photoalbum',
-            name='label',
-            field=models.CharField(max_length=100),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='photoalbum',
-            name='id',
-            field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
-            preserve_default=False,
-        ),
-        migrations.RemoveField(
-            model_name='photoalbum',
-            name='externallink_ptr',
-        ),
-        migrations.RemoveField(
-            model_name='voucher',
-            name='created_when',
-        ),
-        migrations.RemoveField(
-            model_name='voucher',
-            name='expires_when',
-        ),
-        migrations.RemoveField(
-            model_name='voucher',
-            name='id',
-        ),
-        migrations.AlterField(
-            model_name='photoalbum',
-            name='place',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='photoalbums', to='lostplaces.place'),
-        ),
-        migrations.AlterField(
-            model_name='place',
-            name='submitted_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='places', to='lostplaces.explorer'),
-        ),
-        migrations.AlterField(
-            model_name='placeimage',
-            name='submitted_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimages', to='lostplaces.explorer'),
-        ),
-        migrations.DeleteModel(
-            name='ExternalLink',
-        ),
-    ]