From 8a4e00c6b91df92d7c307976b698add9c75eb54e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 2 Nov 2020 16:17:48 -0800 Subject: [PATCH 1/4] migrations are fucked --- .../migrations/0006_auto_20200221_1702.py | 18 - ..._1702_squashed_0064_merge_20201101_1913.py | 1072 +++++++++++++++++ .../migrations/0007_auto_20200223_0902.py | 17 - ...ite_user.py => 0007_auto_20201103_0014.py} | 9 +- .../migrations/0008_auto_20200224_1504.py | 19 - .../migrations/0009_status_published_date.py | 19 - .../migrations/0010_auto_20200307_0655.py | 190 --- bookwyrm/migrations/0011_notification.py | 32 - .../migrations/0012_auto_20200308_1625.py | 19 - .../0013_user_manually_approves_followers.py | 18 - bookwyrm/migrations/0014_status_remote_id.py | 18 - .../migrations/0015_auto_20200311_1212.py | 115 -- .../migrations/0016_auto_20200313_1337.py | 22 - .../migrations/0017_auto_20200314_2152.py | 26 - .../migrations/0018_favorite_remote_id.py | 18 - bookwyrm/migrations/0019_comment.py | 26 - .../migrations/0020_auto_20200327_2335.py | 58 - .../migrations/0021_auto_20200328_0428.py | 44 - .../migrations/0022_auto_20200328_2001.py | 27 - .../migrations/0023_auto_20200328_2203.py | 114 -- ...024_federatedserver_application_version.py | 18 - .../migrations/0025_auto_20200330_0037.py | 24 - .../migrations/0026_auto_20200330_1456.py | 42 - .../migrations/0027_auto_20200330_2232.py | 82 -- .../migrations/0028_auto_20200401_1824.py | 23 - .../migrations/0029_auto_20200403_1835.py | 18 - bookwyrm/migrations/0030_quotation.py | 26 - bookwyrm/migrations/0031_readthrough.py | 31 - .../migrations/0032_auto_20200421_1347.py | 60 - .../migrations/0033_auto_20200422_1249.py | 43 - .../0034_importjob_import_status.py | 19 - .../migrations/0035_auto_20200429_1708.py | 33 - .../migrations/0036_auto_20200503_2007.py | 39 - .../migrations/0037_auto_20200504_0154.py | 41 - bookwyrm/migrations/0038_author_remote_id.py | 18 - .../migrations/0039_auto_20200510_2342.py | 21 - .../migrations/0040_auto_20200513_0153.py | 77 -- bookwyrm/migrations/0041_user_remote_id.py | 18 - .../migrations/0042_auto_20200524_0346.py | 21 - bookwyrm/migrations/0042_sitesettings.py | 23 - bookwyrm/migrations/0043_siteinvite.py | 24 - .../migrations/0045_merge_20200810_2010.py | 14 - .../migrations/0046_auto_20200921_1509.py | 28 - .../migrations/0047_auto_20200928_2312.py | 18 - bookwyrm/migrations/0048_generatednote.py | 24 - bookwyrm/migrations/0049_passwordreset.py | 25 - .../migrations/0050_auto_20201002_2156.py | 18 - .../migrations/0051_auto_20201005_2142.py | 18 - .../migrations/0052_auto_20201005_2145.py | 18 - .../migrations/0053_auto_20201006_2020.py | 24 - .../migrations/0053_auto_20201014_1700.py | 15 - .../migrations/0054_auto_20201016_1707.py | 25 - .../migrations/0054_auto_20201016_2359.py | 18 - .../migrations/0055_merge_20201017_0011.py | 14 - .../migrations/0056_auto_20201021_0150.py | 18 - .../migrations/0057_auto_20201026_2131.py | 18 - .../0058_remove_importjob_import_status.py | 17 - .../migrations/0059_auto_20201030_1755.py | 23 - .../migrations/0060_auto_20201030_2010.py | 19 - .../migrations/0061_auto_20201030_2157.py | 17 - .../migrations/0062_auto_20201031_1936.py | 38 - .../migrations/0063_auto_20201101_1758.py | 26 - .../migrations/0063_user_last_active_date.py | 18 - .../migrations/0064_merge_20201101_1913.py | 14 - 64 files changed, 1076 insertions(+), 1973 deletions(-) delete mode 100644 bookwyrm/migrations/0006_auto_20200221_1702.py create mode 100644 bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py delete mode 100644 bookwyrm/migrations/0007_auto_20200223_0902.py rename bookwyrm/migrations/{0044_siteinvite_user.py => 0007_auto_20201103_0014.py} (50%) delete mode 100644 bookwyrm/migrations/0008_auto_20200224_1504.py delete mode 100644 bookwyrm/migrations/0009_status_published_date.py delete mode 100644 bookwyrm/migrations/0010_auto_20200307_0655.py delete mode 100644 bookwyrm/migrations/0011_notification.py delete mode 100644 bookwyrm/migrations/0012_auto_20200308_1625.py delete mode 100644 bookwyrm/migrations/0013_user_manually_approves_followers.py delete mode 100644 bookwyrm/migrations/0014_status_remote_id.py delete mode 100644 bookwyrm/migrations/0015_auto_20200311_1212.py delete mode 100644 bookwyrm/migrations/0016_auto_20200313_1337.py delete mode 100644 bookwyrm/migrations/0017_auto_20200314_2152.py delete mode 100644 bookwyrm/migrations/0018_favorite_remote_id.py delete mode 100644 bookwyrm/migrations/0019_comment.py delete mode 100644 bookwyrm/migrations/0020_auto_20200327_2335.py delete mode 100644 bookwyrm/migrations/0021_auto_20200328_0428.py delete mode 100644 bookwyrm/migrations/0022_auto_20200328_2001.py delete mode 100644 bookwyrm/migrations/0023_auto_20200328_2203.py delete mode 100644 bookwyrm/migrations/0024_federatedserver_application_version.py delete mode 100644 bookwyrm/migrations/0025_auto_20200330_0037.py delete mode 100644 bookwyrm/migrations/0026_auto_20200330_1456.py delete mode 100644 bookwyrm/migrations/0027_auto_20200330_2232.py delete mode 100644 bookwyrm/migrations/0028_auto_20200401_1824.py delete mode 100644 bookwyrm/migrations/0029_auto_20200403_1835.py delete mode 100644 bookwyrm/migrations/0030_quotation.py delete mode 100644 bookwyrm/migrations/0031_readthrough.py delete mode 100644 bookwyrm/migrations/0032_auto_20200421_1347.py delete mode 100644 bookwyrm/migrations/0033_auto_20200422_1249.py delete mode 100644 bookwyrm/migrations/0034_importjob_import_status.py delete mode 100644 bookwyrm/migrations/0035_auto_20200429_1708.py delete mode 100644 bookwyrm/migrations/0036_auto_20200503_2007.py delete mode 100644 bookwyrm/migrations/0037_auto_20200504_0154.py delete mode 100644 bookwyrm/migrations/0038_author_remote_id.py delete mode 100644 bookwyrm/migrations/0039_auto_20200510_2342.py delete mode 100644 bookwyrm/migrations/0040_auto_20200513_0153.py delete mode 100644 bookwyrm/migrations/0041_user_remote_id.py delete mode 100644 bookwyrm/migrations/0042_auto_20200524_0346.py delete mode 100644 bookwyrm/migrations/0042_sitesettings.py delete mode 100644 bookwyrm/migrations/0043_siteinvite.py delete mode 100644 bookwyrm/migrations/0045_merge_20200810_2010.py delete mode 100644 bookwyrm/migrations/0046_auto_20200921_1509.py delete mode 100644 bookwyrm/migrations/0047_auto_20200928_2312.py delete mode 100644 bookwyrm/migrations/0048_generatednote.py delete mode 100644 bookwyrm/migrations/0049_passwordreset.py delete mode 100644 bookwyrm/migrations/0050_auto_20201002_2156.py delete mode 100644 bookwyrm/migrations/0051_auto_20201005_2142.py delete mode 100644 bookwyrm/migrations/0052_auto_20201005_2145.py delete mode 100644 bookwyrm/migrations/0053_auto_20201006_2020.py delete mode 100644 bookwyrm/migrations/0053_auto_20201014_1700.py delete mode 100644 bookwyrm/migrations/0054_auto_20201016_1707.py delete mode 100644 bookwyrm/migrations/0054_auto_20201016_2359.py delete mode 100644 bookwyrm/migrations/0055_merge_20201017_0011.py delete mode 100644 bookwyrm/migrations/0056_auto_20201021_0150.py delete mode 100644 bookwyrm/migrations/0057_auto_20201026_2131.py delete mode 100644 bookwyrm/migrations/0058_remove_importjob_import_status.py delete mode 100644 bookwyrm/migrations/0059_auto_20201030_1755.py delete mode 100644 bookwyrm/migrations/0060_auto_20201030_2010.py delete mode 100644 bookwyrm/migrations/0061_auto_20201030_2157.py delete mode 100644 bookwyrm/migrations/0062_auto_20201031_1936.py delete mode 100644 bookwyrm/migrations/0063_auto_20201101_1758.py delete mode 100644 bookwyrm/migrations/0063_user_last_active_date.py delete mode 100644 bookwyrm/migrations/0064_merge_20201101_1913.py diff --git a/bookwyrm/migrations/0006_auto_20200221_1702.py b/bookwyrm/migrations/0006_auto_20200221_1702.py deleted file mode 100644 index 560facc6..00000000 --- a/bookwyrm/migrations/0006_auto_20200221_1702.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2020-02-21 17:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0005_auto_20200221_1645'), - ] - - operations = [ - migrations.AlterField( - model_name='tag', - name='identifier', - field=models.CharField(max_length=100), - ), - ] diff --git a/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py b/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py new file mode 100644 index 00000000..980b6614 --- /dev/null +++ b/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py @@ -0,0 +1,1072 @@ +# Generated by Django 3.0.7 on 2020-11-03 00:05 + +import bookwyrm.models.connector +import bookwyrm.models.site +import bookwyrm.utils.fields +import datetime +from django.conf import settings +import django.contrib.postgres.operations +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion +import django.db.models.expressions +import django.utils.timezone +import uuid + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0005_auto_20200221_1645'), + ] + + operations = [ + migrations.AlterField( + model_name='tag', + name='identifier', + field=models.CharField(max_length=100), + ), + migrations.AddConstraint( + model_name='userrelationship', + constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='followers_unique'), + ), + migrations.RemoveField( + model_name='user', + name='followers', + ), + migrations.AddField( + model_name='status', + name='published_date', + field=models.DateTimeField(default=datetime.datetime.now), + ), + migrations.CreateModel( + name='Edition', + fields=[ + ('book_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Book')), + ('isbn', models.CharField(max_length=255, null=True, unique=True)), + ('oclc_number', models.CharField(max_length=255, null=True, unique=True)), + ('pages', models.IntegerField(null=True)), + ], + options={ + 'abstract': False, + }, + bases=('bookwyrm.book',), + ), + migrations.CreateModel( + name='Work', + fields=[ + ('book_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Book')), + ('lccn', models.CharField(max_length=255, null=True, unique=True)), + ], + options={ + 'abstract': False, + }, + bases=('bookwyrm.book',), + ), + migrations.RemoveField( + model_name='author', + name='data', + ), + migrations.RemoveField( + model_name='book', + name='added_by', + ), + migrations.RemoveField( + model_name='book', + name='data', + ), + migrations.AddField( + model_name='author', + name='bio', + field=models.TextField(blank=True, null=True), + ), + migrations.AddField( + model_name='author', + name='born', + field=models.DateTimeField(null=True), + ), + migrations.AddField( + model_name='author', + name='died', + field=models.DateTimeField(null=True), + ), + migrations.AddField( + model_name='author', + name='first_name', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='author', + name='last_name', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='author', + name='name', + field=models.CharField(default='Unknown', max_length=255), + preserve_default=False, + ), + migrations.AddField( + model_name='author', + name='wikipedia_link', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='book', + name='description', + field=models.TextField(blank=True, null=True), + ), + migrations.AddField( + model_name='book', + name='first_published_date', + field=models.DateTimeField(null=True), + ), + migrations.AddField( + model_name='book', + name='language', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='book', + name='last_sync_date', + field=models.DateTimeField(default=datetime.datetime.now), + ), + migrations.AddField( + model_name='book', + name='librarything_key', + field=models.CharField(max_length=255, null=True, unique=True), + ), + migrations.AddField( + model_name='book', + name='local_edits', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='book', + name='local_key', + field=models.CharField(default=uuid.uuid4, max_length=255, unique=True), + ), + migrations.AddField( + model_name='book', + name='misc_identifiers', + field=bookwyrm.utils.fields.JSONField(null=True), + ), + migrations.AddField( + model_name='book', + name='origin', + field=models.CharField(max_length=255, null=True, unique=True), + ), + migrations.AddField( + model_name='book', + name='published_date', + field=models.DateTimeField(null=True), + ), + migrations.AddField( + model_name='book', + name='series', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='book', + name='series_number', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='book', + name='sort_title', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='book', + name='subtitle', + field=models.TextField(blank=True, null=True), + ), + migrations.AddField( + model_name='book', + name='sync', + field=models.BooleanField(default=True), + ), + migrations.AddField( + model_name='book', + name='title', + field=models.CharField(default='Unknown', max_length=255), + preserve_default=False, + ), + migrations.AlterField( + model_name='author', + name='openlibrary_key', + field=models.CharField(max_length=255, null=True, unique=True), + ), + migrations.AlterField( + model_name='book', + name='openlibrary_key', + field=models.CharField(max_length=255, null=True, unique=True), + ), + migrations.AddField( + model_name='book', + name='parent_work', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Work'), + ), + migrations.CreateModel( + name='Notification', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_date', models.DateTimeField(auto_now_add=True)), + ('updated_date', models.DateTimeField(auto_now=True)), + ('read', models.BooleanField(default=False)), + ('notification_type', models.CharField(max_length=255)), + ('related_book', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')), + ('related_status', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status')), + ('related_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='related_user', to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'abstract': False, + }, + ), + migrations.AddField( + model_name='author', + name='aliases', + field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), + ), + migrations.AddField( + model_name='user', + name='manually_approves_followers', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='status', + name='remote_id', + field=models.CharField(max_length=255, null=True, unique=True), + ), + migrations.CreateModel( + name='UserBlocks', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_date', models.DateTimeField(auto_now_add=True)), + ('updated_date', models.DateTimeField(auto_now=True)), + ('relationship_id', models.CharField(max_length=100)), + ('user_object', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userblocks_user_object', to=settings.AUTH_USER_MODEL)), + ('user_subject', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userblocks_user_subject', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='UserFollowRequest', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_date', models.DateTimeField(auto_now_add=True)), + ('updated_date', models.DateTimeField(auto_now=True)), + ('relationship_id', models.CharField(max_length=100)), + ('user_object', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollowrequest_user_object', to=settings.AUTH_USER_MODEL)), + ('user_subject', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollowrequest_user_subject', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='UserFollows', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_date', models.DateTimeField(auto_now_add=True)), + ('updated_date', models.DateTimeField(auto_now=True)), + ('relationship_id', models.CharField(max_length=100)), + ('user_object', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollows_user_object', to=settings.AUTH_USER_MODEL)), + ('user_subject', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollows_user_subject', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'abstract': False, + }, + ), + migrations.DeleteModel( + name='UserRelationship', + ), + migrations.AddField( + model_name='user', + name='blocks', + field=models.ManyToManyField(related_name='blocked_by', through='bookwyrm.UserBlocks', to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='user', + name='follow_requests', + field=models.ManyToManyField(related_name='follower_requests', through='bookwyrm.UserFollowRequest', to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='user', + name='following', + field=models.ManyToManyField(related_name='followers', through='bookwyrm.UserFollows', to=settings.AUTH_USER_MODEL), + ), + migrations.AddConstraint( + model_name='userfollows', + constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='userfollows_unique'), + ), + migrations.AddConstraint( + model_name='userfollowrequest', + constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='userfollowrequest_unique'), + ), + migrations.AddConstraint( + model_name='userblocks', + constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='userblocks_unique'), + ), + migrations.AlterField( + model_name='notification', + name='notification_type', + field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request')], max_length=255), + ), + migrations.AddConstraint( + model_name='notification', + constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST']), name='notification_type_valid'), + ), + migrations.AddConstraint( + model_name='userblocks', + constraint=models.CheckConstraint(check=models.Q(_negated=True, user_subject=django.db.models.expressions.F('user_object')), name='userblocks_no_self'), + ), + migrations.AddConstraint( + model_name='userfollowrequest', + constraint=models.CheckConstraint(check=models.Q(_negated=True, user_subject=django.db.models.expressions.F('user_object')), name='userfollowrequest_no_self'), + ), + migrations.AddConstraint( + model_name='userfollows', + constraint=models.CheckConstraint(check=models.Q(_negated=True, user_subject=django.db.models.expressions.F('user_object')), name='userfollows_no_self'), + ), + migrations.AddField( + model_name='favorite', + name='remote_id', + field=models.CharField(max_length=255, null=True, unique=True), + ), + migrations.CreateModel( + name='Comment', + fields=[ + ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')), + ('name', models.CharField(max_length=255)), + ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')), + ], + options={ + 'abstract': False, + }, + bases=('bookwyrm.status',), + ), + migrations.CreateModel( + name='Connector', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_date', models.DateTimeField(auto_now_add=True)), + ('updated_date', models.DateTimeField(auto_now=True)), + ('identifier', models.CharField(max_length=255, unique=True)), + ('connector_file', models.CharField(choices=[('openlibrary', 'Openlibrary'), ('bookwyrm', 'BookWyrm')], default='openlibrary', max_length=255)), + ('is_self', models.BooleanField(default=False)), + ('api_key', models.CharField(max_length=255, null=True)), + ('base_url', models.CharField(max_length=255)), + ('covers_url', models.CharField(max_length=255)), + ('search_url', models.CharField(max_length=255, null=True)), + ('key_name', models.CharField(max_length=255)), + ('politeness_delay', models.IntegerField(null=True)), + ('max_query_count', models.IntegerField(null=True)), + ('query_count', models.IntegerField(default=0)), + ('query_count_expiry', models.DateTimeField(auto_now_add=True)), + ], + ), + migrations.RenameField( + model_name='book', + old_name='local_key', + new_name='fedireads_key', + ), + migrations.RenameField( + model_name='book', + old_name='origin', + new_name='source_url', + ), + migrations.RemoveField( + model_name='book', + name='local_edits', + ), + migrations.AddConstraint( + model_name='connector', + constraint=models.CheckConstraint(check=models.Q(connector_file__in=bookwyrm.models.connector.ConnectorFiles), name='connector_file_valid'), + ), + migrations.AddField( + model_name='book', + name='connector', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Connector'), + ), + migrations.AddField( + model_name='book', + name='subject_places', + field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), + ), + migrations.AddField( + model_name='book', + name='subjects', + field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), + ), + migrations.AddField( + model_name='edition', + name='publishers', + field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), + ), + migrations.AlterField( + model_name='connector', + name='connector_file', + field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('fedireads_connector', 'Fedireads Connector')], default='openlibrary', max_length=255), + ), + migrations.RemoveField( + model_name='connector', + name='is_self', + ), + migrations.AlterField( + model_name='connector', + name='connector_file', + field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('fedireads_connector', 'Fedireads Connector')], default='openlibrary', max_length=255), + ), + migrations.AddField( + model_name='book', + name='sync_cover', + field=models.BooleanField(default=True), + ), + migrations.AlterField( + model_name='author', + name='born', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AlterField( + model_name='author', + name='died', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AddField( + model_name='author', + name='fedireads_key', + field=models.CharField(default=uuid.uuid4, max_length=255, unique=True), + ), + migrations.AlterField( + model_name='author', + name='first_name', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='author', + name='last_name', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='author', + name='openlibrary_key', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='book', + name='first_published_date', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AddField( + model_name='book', + name='goodreads_key', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='book', + name='language', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='book', + name='librarything_key', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='book', + name='openlibrary_key', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='book', + name='published_date', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AlterField( + model_name='book', + name='sort_title', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='book', + name='subtitle', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='edition', + name='isbn', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='edition', + name='oclc_number', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='edition', + name='pages', + field=models.IntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='edition', + name='physical_format', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='work', + name='lccn', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='federatedserver', + name='application_version', + field=models.CharField(max_length=255, null=True), + ), + migrations.AlterField( + model_name='book', + name='last_sync_date', + field=models.DateTimeField(default=django.utils.timezone.now), + ), + migrations.AlterField( + model_name='status', + name='published_date', + field=models.DateTimeField(default=django.utils.timezone.now), + ), + migrations.CreateModel( + name='Boost', + fields=[ + ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')), + ], + options={ + 'abstract': False, + }, + bases=('bookwyrm.status',), + ), + migrations.RemoveConstraint( + model_name='notification', + name='notification_type_valid', + ), + migrations.AlterField( + model_name='notification', + name='notification_type', + field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost')], max_length=255), + ), + migrations.AddConstraint( + model_name='notification', + constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST']), name='notification_type_valid'), + ), + migrations.AddField( + model_name='boost', + name='boosted_status', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='boosters', to='bookwyrm.Status'), + ), + migrations.RemoveField( + model_name='book', + name='language', + ), + migrations.RemoveField( + model_name='book', + name='parent_work', + ), + migrations.RemoveField( + model_name='book', + name='shelves', + ), + migrations.AddField( + model_name='book', + name='languages', + field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), + ), + migrations.AddField( + model_name='edition', + name='default', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='edition', + name='parent_work', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Work'), + ), + migrations.AddField( + model_name='edition', + name='shelves', + field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Shelf'), + ), + migrations.AlterField( + model_name='comment', + name='book', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'), + ), + migrations.AlterField( + model_name='notification', + name='related_book', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'), + ), + migrations.AlterField( + model_name='review', + name='book', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'), + ), + migrations.AlterField( + model_name='shelf', + name='books', + field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Edition'), + ), + migrations.AlterField( + model_name='shelfbook', + name='book', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'), + ), + migrations.AlterField( + model_name='status', + name='mention_books', + field=models.ManyToManyField(related_name='mention_book', to='bookwyrm.Edition'), + ), + migrations.AlterField( + model_name='tag', + name='book', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'), + ), + migrations.RemoveField( + model_name='comment', + name='name', + ), + migrations.AlterField( + model_name='review', + name='rating', + field=models.IntegerField(blank=True, default=None, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]), + ), + migrations.AlterField( + model_name='review', + name='name', + field=models.CharField(max_length=255, null=True), + ), + migrations.CreateModel( + name='Quotation', + fields=[ + ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')), + ('quote', models.TextField()), + ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition')), + ], + options={ + 'abstract': False, + }, + bases=('bookwyrm.status',), + ), + migrations.CreateModel( + name='ReadThrough', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_date', models.DateTimeField(auto_now_add=True)), + ('updated_date', models.DateTimeField(auto_now=True)), + ('pages_read', models.IntegerField(blank=True, null=True)), + ('start_date', models.DateTimeField(blank=True, null=True)), + ('finish_date', models.DateTimeField(blank=True, null=True)), + ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='ImportItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('data', bookwyrm.utils.fields.JSONField()), + ], + ), + migrations.CreateModel( + name='ImportJob', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_date', models.DateTimeField(default=django.utils.timezone.now)), + ('task_id', models.CharField(max_length=100, null=True)), + ], + ), + migrations.RemoveConstraint( + model_name='notification', + name='notification_type_valid', + ), + migrations.AlterField( + model_name='notification', + name='notification_type', + field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT_RESULT', 'Import Result')], max_length=255), + ), + migrations.AddConstraint( + model_name='notification', + constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT_RESULT']), name='notification_type_valid'), + ), + migrations.AddField( + model_name='importjob', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='importitem', + name='book', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='bookwyrm.Book'), + ), + migrations.AddField( + model_name='importitem', + name='job', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='bookwyrm.ImportJob'), + ), + migrations.RemoveConstraint( + model_name='notification', + name='notification_type_valid', + ), + migrations.AddField( + model_name='importitem', + name='fail_reason', + field=models.TextField(null=True), + ), + migrations.AddField( + model_name='importitem', + name='index', + field=models.IntegerField(default=1), + preserve_default=False, + ), + migrations.AddField( + model_name='notification', + name='related_import', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.ImportJob'), + ), + migrations.AlterField( + model_name='notification', + name='notification_type', + field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import')], max_length=255), + ), + migrations.AddConstraint( + model_name='notification', + constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT']), name='notification_type_valid'), + ), + migrations.RenameField( + model_name='edition', + old_name='isbn', + new_name='isbn_13', + ), + migrations.AddField( + model_name='book', + name='author_text', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='edition', + name='asin', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='edition', + name='isbn_10', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='connector', + name='books_url', + field=models.CharField(default='https://openlibrary.org', max_length=255), + preserve_default=False, + ), + migrations.AddField( + model_name='connector', + name='local', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='connector', + name='name', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='connector', + name='priority', + field=models.IntegerField(default=2), + ), + migrations.AlterField( + model_name='connector', + name='connector_file', + field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('fedireads_connector', 'Fedireads Connector')], max_length=255), + ), + migrations.RemoveField( + model_name='author', + name='fedireads_key', + ), + migrations.RemoveField( + model_name='book', + name='fedireads_key', + ), + migrations.RemoveField( + model_name='book', + name='source_url', + ), + migrations.AddField( + model_name='author', + name='last_sync_date', + field=models.DateTimeField(default=django.utils.timezone.now), + ), + migrations.AddField( + model_name='author', + name='sync', + field=models.BooleanField(default=True), + ), + migrations.AddField( + model_name='book', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='author', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.RemoveField( + model_name='book', + name='misc_identifiers', + ), + migrations.RemoveField( + model_name='connector', + name='key_name', + ), + migrations.RemoveField( + model_name='user', + name='actor', + ), + migrations.AddField( + model_name='connector', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='federatedserver', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='notification', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='readthrough', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='shelf', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='shelfbook', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='tag', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='userblocks', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='userfollowrequest', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='userfollows', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AlterField( + model_name='favorite', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AlterField( + model_name='status', + name='remote_id', + field=models.CharField(max_length=255, null=True), + ), + migrations.AddField( + model_name='user', + name='remote_id', + field=models.CharField(max_length=255, null=True, unique=True), + ), + migrations.CreateModel( + name='SiteInvite', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(default=bookwyrm.models.site.new_access_code, max_length=32)), + ('expiry', models.DateTimeField(blank=True, null=True)), + ('use_limit', models.IntegerField(blank=True, null=True)), + ('times_used', models.IntegerField(default=0)), + ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.RemoveField( + model_name='status', + name='activity_type', + ), + migrations.RemoveField( + model_name='status', + name='status_type', + ), + migrations.RenameField( + model_name='user', + old_name='fedireads_user', + new_name='bookwyrm_user', + ), + migrations.AlterField( + model_name='connector', + name='connector_file', + field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'BookWyrm Connector')], max_length=255), + ), + migrations.AlterField( + model_name='connector', + name='connector_file', + field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'Bookwyrm Connector')], max_length=255), + ), + migrations.CreateModel( + name='GeneratedStatus', + fields=[ + ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')), + ], + options={ + 'abstract': False, + }, + bases=('bookwyrm.status',), + ), + migrations.CreateModel( + name='PasswordReset', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(default=bookwyrm.models.site.new_access_code, max_length=32)), + ('expiry', models.DateTimeField(default=bookwyrm.models.site.get_passowrd_reset_expiry)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.AlterField( + model_name='user', + name='email', + field=models.EmailField(max_length=254, unique=True), + ), + migrations.CreateModel( + name='SiteSettings', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(default='BookWyrm', max_length=100)), + ('instance_description', models.TextField(default='This instance has no description.')), + ('code_of_conduct', models.TextField(default='Add a code of conduct here.')), + ('allow_registration', models.BooleanField(default=True)), + ], + ), + migrations.AlterField( + model_name='user', + name='email', + field=models.EmailField(blank=True, max_length=254, verbose_name='email address'), + ), + migrations.AddField( + model_name='status', + name='deleted', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='status', + name='deleted_date', + field=models.DateTimeField(), + ), + django.contrib.postgres.operations.TrigramExtension( + ), + migrations.RemoveField( + model_name='userblocks', + name='relationship_id', + ), + migrations.RemoveField( + model_name='userfollowrequest', + name='relationship_id', + ), + migrations.RemoveField( + model_name='userfollows', + name='relationship_id', + ), + migrations.AlterField( + model_name='status', + name='deleted_date', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AlterField( + model_name='status', + name='privacy', + field=models.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255), + ), + migrations.AddField( + model_name='importjob', + name='include_reviews', + field=models.BooleanField(default=True), + ), + migrations.AddField( + model_name='importjob', + name='privacy', + field=models.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255), + ), + migrations.AlterField( + model_name='user', + name='federated_server', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.FederatedServer'), + ), + migrations.RenameModel( + old_name='GeneratedStatus', + new_name='GeneratedNote', + ), + migrations.AlterField( + model_name='connector', + name='api_key', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='connector', + name='max_query_count', + field=models.IntegerField(blank=True, null=True), + ), + migrations.AlterField( + model_name='connector', + name='name', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='connector', + name='politeness_delay', + field=models.IntegerField(blank=True, null=True), + ), + migrations.AlterField( + model_name='connector', + name='search_url', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='user', + name='last_active_date', + field=models.DateTimeField(auto_now=True), + ), + migrations.RemoveConstraint( + model_name='notification', + name='notification_type_valid', + ), + migrations.AlterField( + model_name='notification', + name='notification_type', + field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('MENTION', 'Mention'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import')], max_length=255), + ), + migrations.AddConstraint( + model_name='notification', + constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'MENTION', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT']), name='notification_type_valid'), + ), + ] diff --git a/bookwyrm/migrations/0007_auto_20200223_0902.py b/bookwyrm/migrations/0007_auto_20200223_0902.py deleted file mode 100644 index 3b9011e7..00000000 --- a/bookwyrm/migrations/0007_auto_20200223_0902.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.0.3 on 2020-02-23 09:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0006_auto_20200221_1702'), - ] - - operations = [ - migrations.AddConstraint( - model_name='userrelationship', - constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='followers_unique'), - ), - ] diff --git a/bookwyrm/migrations/0044_siteinvite_user.py b/bookwyrm/migrations/0007_auto_20201103_0014.py similarity index 50% rename from bookwyrm/migrations/0044_siteinvite_user.py rename to bookwyrm/migrations/0007_auto_20201103_0014.py index fdf99866..bf0a12eb 100644 --- a/bookwyrm/migrations/0044_siteinvite_user.py +++ b/bookwyrm/migrations/0007_auto_20201103_0014.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.3 on 2020-06-02 15:46 +# Generated by Django 3.0.7 on 2020-11-03 00:14 from django.conf import settings from django.db import migrations, models @@ -8,14 +8,13 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0043_siteinvite'), + ('bookwyrm', '0006_auto_20200221_1702_squashed_0064_merge_20201101_1913'), ] operations = [ - migrations.AddField( + migrations.AlterField( model_name='siteinvite', name='user', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - preserve_default=False, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), ), ] diff --git a/bookwyrm/migrations/0008_auto_20200224_1504.py b/bookwyrm/migrations/0008_auto_20200224_1504.py deleted file mode 100644 index 0dbaefec..00000000 --- a/bookwyrm/migrations/0008_auto_20200224_1504.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.0.3 on 2020-02-24 15:04 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0007_auto_20200223_0902'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='followers', - field=models.ManyToManyField(related_name='following', through='bookwyrm.UserRelationship', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/bookwyrm/migrations/0009_status_published_date.py b/bookwyrm/migrations/0009_status_published_date.py deleted file mode 100644 index 9e7e726d..00000000 --- a/bookwyrm/migrations/0009_status_published_date.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-07 00:28 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0008_auto_20200224_1504'), - ] - - operations = [ - migrations.AddField( - model_name='status', - name='published_date', - field=models.DateTimeField(default=datetime.datetime.now), - ), - ] diff --git a/bookwyrm/migrations/0010_auto_20200307_0655.py b/bookwyrm/migrations/0010_auto_20200307_0655.py deleted file mode 100644 index f9279258..00000000 --- a/bookwyrm/migrations/0010_auto_20200307_0655.py +++ /dev/null @@ -1,190 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-07 06:55 - -import datetime -from django.db import migrations, models -import django.db.models.deletion -import bookwyrm.utils.fields -import uuid - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0009_status_published_date'), - ] - - operations = [ - migrations.CreateModel( - name='Edition', - fields=[ - ('book_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Book')), - ('isbn', models.CharField(max_length=255, null=True, unique=True)), - ('oclc_number', models.CharField(max_length=255, null=True, unique=True)), - ('pages', models.IntegerField(null=True)), - ], - options={ - 'abstract': False, - }, - bases=('bookwyrm.book',), - ), - migrations.CreateModel( - name='Work', - fields=[ - ('book_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Book')), - ('lccn', models.CharField(max_length=255, null=True, unique=True)), - ], - options={ - 'abstract': False, - }, - bases=('bookwyrm.book',), - ), - migrations.RemoveField( - model_name='author', - name='data', - ), - migrations.RemoveField( - model_name='book', - name='added_by', - ), - migrations.RemoveField( - model_name='book', - name='data', - ), - migrations.AddField( - model_name='author', - name='aliases', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, size=None), - ), - migrations.AddField( - model_name='author', - name='bio', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='author', - name='born', - field=models.DateTimeField(null=True), - ), - migrations.AddField( - model_name='author', - name='died', - field=models.DateTimeField(null=True), - ), - migrations.AddField( - model_name='author', - name='first_name', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='author', - name='last_name', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='author', - name='name', - field=models.CharField(default='Unknown', max_length=255), - preserve_default=False, - ), - migrations.AddField( - model_name='author', - name='wikipedia_link', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='book', - name='description', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='book', - name='first_published_date', - field=models.DateTimeField(null=True), - ), - migrations.AddField( - model_name='book', - name='language', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='book', - name='last_sync_date', - field=models.DateTimeField(default=datetime.datetime.now), - ), - migrations.AddField( - model_name='book', - name='librarything_key', - field=models.CharField(max_length=255, null=True, unique=True), - ), - migrations.AddField( - model_name='book', - name='local_edits', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='book', - name='local_key', - field=models.CharField(default=uuid.uuid4, max_length=255, unique=True), - ), - migrations.AddField( - model_name='book', - name='misc_identifiers', - field=bookwyrm.utils.fields.JSONField(null=True), - ), - migrations.AddField( - model_name='book', - name='origin', - field=models.CharField(max_length=255, null=True, unique=True), - ), - migrations.AddField( - model_name='book', - name='published_date', - field=models.DateTimeField(null=True), - ), - migrations.AddField( - model_name='book', - name='series', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='book', - name='series_number', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='book', - name='sort_title', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='book', - name='subtitle', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='book', - name='sync', - field=models.BooleanField(default=True), - ), - migrations.AddField( - model_name='book', - name='title', - field=models.CharField(default='Unknown', max_length=255), - preserve_default=False, - ), - migrations.AlterField( - model_name='author', - name='openlibrary_key', - field=models.CharField(max_length=255, null=True, unique=True), - ), - migrations.AlterField( - model_name='book', - name='openlibrary_key', - field=models.CharField(max_length=255, null=True, unique=True), - ), - migrations.AddField( - model_name='book', - name='parent_work', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Work'), - ), - ] diff --git a/bookwyrm/migrations/0011_notification.py b/bookwyrm/migrations/0011_notification.py deleted file mode 100644 index 0d8f333e..00000000 --- a/bookwyrm/migrations/0011_notification.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-07 22:23 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0010_auto_20200307_0655'), - ] - - operations = [ - migrations.CreateModel( - name='Notification', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_date', models.DateTimeField(auto_now_add=True)), - ('updated_date', models.DateTimeField(auto_now=True)), - ('read', models.BooleanField(default=False)), - ('notification_type', models.CharField(max_length=255)), - ('related_book', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')), - ('related_status', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status')), - ('related_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='related_user', to=settings.AUTH_USER_MODEL)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'abstract': False, - }, - ), - ] diff --git a/bookwyrm/migrations/0012_auto_20200308_1625.py b/bookwyrm/migrations/0012_auto_20200308_1625.py deleted file mode 100644 index 65c12da7..00000000 --- a/bookwyrm/migrations/0012_auto_20200308_1625.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-08 16:25 - -from django.db import migrations, models -import bookwyrm.utils.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0011_notification'), - ] - - operations = [ - migrations.AlterField( - model_name='author', - name='aliases', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), - ), - ] diff --git a/bookwyrm/migrations/0013_user_manually_approves_followers.py b/bookwyrm/migrations/0013_user_manually_approves_followers.py deleted file mode 100644 index 3fd83d91..00000000 --- a/bookwyrm/migrations/0013_user_manually_approves_followers.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-09 20:09 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0012_auto_20200308_1625'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='manually_approves_followers', - field=models.BooleanField(default=False), - ), - ] diff --git a/bookwyrm/migrations/0014_status_remote_id.py b/bookwyrm/migrations/0014_status_remote_id.py deleted file mode 100644 index fecc6ffc..00000000 --- a/bookwyrm/migrations/0014_status_remote_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-10 19:04 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0013_user_manually_approves_followers'), - ] - - operations = [ - migrations.AddField( - model_name='status', - name='remote_id', - field=models.CharField(max_length=255, null=True, unique=True), - ), - ] diff --git a/bookwyrm/migrations/0015_auto_20200311_1212.py b/bookwyrm/migrations/0015_auto_20200311_1212.py deleted file mode 100644 index bc7a80d6..00000000 --- a/bookwyrm/migrations/0015_auto_20200311_1212.py +++ /dev/null @@ -1,115 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-11 12:12 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0014_status_remote_id'), - ] - - operations = [ - migrations.CreateModel( - name='UserBlocks', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_date', models.DateTimeField(auto_now_add=True)), - ('updated_date', models.DateTimeField(auto_now=True)), - ('relationship_id', models.CharField(max_length=100)), - ], - options={ - 'abstract': False, - }, - ), - migrations.CreateModel( - name='UserFollowRequest', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_date', models.DateTimeField(auto_now_add=True)), - ('updated_date', models.DateTimeField(auto_now=True)), - ('relationship_id', models.CharField(max_length=100)), - ], - options={ - 'abstract': False, - }, - ), - migrations.CreateModel( - name='UserFollows', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_date', models.DateTimeField(auto_now_add=True)), - ('updated_date', models.DateTimeField(auto_now=True)), - ('relationship_id', models.CharField(max_length=100)), - ], - options={ - 'abstract': False, - }, - ), - migrations.RemoveField( - model_name='user', - name='followers', - ), - migrations.DeleteModel( - name='UserRelationship', - ), - migrations.AddField( - model_name='userfollows', - name='user_object', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollows_user_object', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='userfollows', - name='user_subject', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollows_user_subject', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='userfollowrequest', - name='user_object', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollowrequest_user_object', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='userfollowrequest', - name='user_subject', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollowrequest_user_subject', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='userblocks', - name='user_object', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userblocks_user_object', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='userblocks', - name='user_subject', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userblocks_user_subject', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='user', - name='blocks', - field=models.ManyToManyField(related_name='blocked_by', through='bookwyrm.UserBlocks', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='user', - name='follow_requests', - field=models.ManyToManyField(related_name='follower_requests', through='bookwyrm.UserFollowRequest', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='user', - name='following', - field=models.ManyToManyField(related_name='followers', through='bookwyrm.UserFollows', to=settings.AUTH_USER_MODEL), - ), - migrations.AddConstraint( - model_name='userfollows', - constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='userfollows_unique'), - ), - migrations.AddConstraint( - model_name='userfollowrequest', - constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='userfollowrequest_unique'), - ), - migrations.AddConstraint( - model_name='userblocks', - constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='userblocks_unique'), - ), - ] diff --git a/bookwyrm/migrations/0016_auto_20200313_1337.py b/bookwyrm/migrations/0016_auto_20200313_1337.py deleted file mode 100644 index c9b7015d..00000000 --- a/bookwyrm/migrations/0016_auto_20200313_1337.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-13 13:37 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0015_auto_20200311_1212'), - ] - - operations = [ - migrations.AlterField( - model_name='notification', - name='notification_type', - field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request')], max_length=255), - ), - migrations.AddConstraint( - model_name='notification', - constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST']), name='notification_type_valid'), - ), - ] diff --git a/bookwyrm/migrations/0017_auto_20200314_2152.py b/bookwyrm/migrations/0017_auto_20200314_2152.py deleted file mode 100644 index 39fd6407..00000000 --- a/bookwyrm/migrations/0017_auto_20200314_2152.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-14 21:52 - -from django.db import migrations, models -import django.db.models.expressions - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0016_auto_20200313_1337'), - ] - - operations = [ - migrations.AddConstraint( - model_name='userblocks', - constraint=models.CheckConstraint(check=models.Q(_negated=True, user_subject=django.db.models.expressions.F('user_object')), name='userblocks_no_self'), - ), - migrations.AddConstraint( - model_name='userfollowrequest', - constraint=models.CheckConstraint(check=models.Q(_negated=True, user_subject=django.db.models.expressions.F('user_object')), name='userfollowrequest_no_self'), - ), - migrations.AddConstraint( - model_name='userfollows', - constraint=models.CheckConstraint(check=models.Q(_negated=True, user_subject=django.db.models.expressions.F('user_object')), name='userfollows_no_self'), - ), - ] diff --git a/bookwyrm/migrations/0018_favorite_remote_id.py b/bookwyrm/migrations/0018_favorite_remote_id.py deleted file mode 100644 index 7ddb7e37..00000000 --- a/bookwyrm/migrations/0018_favorite_remote_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-21 21:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0017_auto_20200314_2152'), - ] - - operations = [ - migrations.AddField( - model_name='favorite', - name='remote_id', - field=models.CharField(max_length=255, null=True, unique=True), - ), - ] diff --git a/bookwyrm/migrations/0019_comment.py b/bookwyrm/migrations/0019_comment.py deleted file mode 100644 index a639ca99..00000000 --- a/bookwyrm/migrations/0019_comment.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-21 22:43 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0018_favorite_remote_id'), - ] - - operations = [ - migrations.CreateModel( - name='Comment', - fields=[ - ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')), - ('name', models.CharField(max_length=255)), - ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')), - ], - options={ - 'abstract': False, - }, - bases=('bookwyrm.status',), - ), - ] diff --git a/bookwyrm/migrations/0020_auto_20200327_2335.py b/bookwyrm/migrations/0020_auto_20200327_2335.py deleted file mode 100644 index ef818537..00000000 --- a/bookwyrm/migrations/0020_auto_20200327_2335.py +++ /dev/null @@ -1,58 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-27 23:35 - -from django.db import migrations, models -import django.db.models.deletion -import bookwyrm.models.book - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0019_comment'), - ] - - operations = [ - migrations.CreateModel( - name='Connector', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_date', models.DateTimeField(auto_now_add=True)), - ('updated_date', models.DateTimeField(auto_now=True)), - ('identifier', models.CharField(max_length=255, unique=True)), - ('connector_file', models.CharField(choices=[('openlibrary', 'Openlibrary'), ('bookwyrm', 'BookWyrm')], default='openlibrary', max_length=255)), - ('is_self', models.BooleanField(default=False)), - ('api_key', models.CharField(max_length=255, null=True)), - ('base_url', models.CharField(max_length=255)), - ('covers_url', models.CharField(max_length=255)), - ('search_url', models.CharField(max_length=255, null=True)), - ('key_name', models.CharField(max_length=255)), - ('politeness_delay', models.IntegerField(null=True)), - ('max_query_count', models.IntegerField(null=True)), - ('query_count', models.IntegerField(default=0)), - ('query_count_expiry', models.DateTimeField(auto_now_add=True)), - ], - ), - migrations.RenameField( - model_name='book', - old_name='local_key', - new_name='fedireads_key', - ), - migrations.RenameField( - model_name='book', - old_name='origin', - new_name='source_url', - ), - migrations.RemoveField( - model_name='book', - name='local_edits', - ), - migrations.AddConstraint( - model_name='connector', - constraint=models.CheckConstraint(check=models.Q(connector_file__in=bookwyrm.models.connector.ConnectorFiles), name='connector_file_valid'), - ), - migrations.AddField( - model_name='book', - name='connector', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Connector'), - ), - ] diff --git a/bookwyrm/migrations/0021_auto_20200328_0428.py b/bookwyrm/migrations/0021_auto_20200328_0428.py deleted file mode 100644 index 8587c508..00000000 --- a/bookwyrm/migrations/0021_auto_20200328_0428.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-28 04:28 - -from django.db import migrations, models -import bookwyrm.utils.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0020_auto_20200327_2335'), - ] - - operations = [ - migrations.AddField( - model_name='book', - name='goodreads_key', - field=models.CharField(max_length=255, null=True, unique=True), - ), - migrations.AddField( - model_name='book', - name='subject_places', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), - ), - migrations.AddField( - model_name='book', - name='subjects', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), - ), - migrations.AddField( - model_name='edition', - name='physical_format', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='edition', - name='publishers', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), - ), - migrations.AlterField( - model_name='connector', - name='connector_file', - field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('fedireads_connector', 'Fedireads Connector')], default='openlibrary', max_length=255), - ), - ] diff --git a/bookwyrm/migrations/0022_auto_20200328_2001.py b/bookwyrm/migrations/0022_auto_20200328_2001.py deleted file mode 100644 index 188078c8..00000000 --- a/bookwyrm/migrations/0022_auto_20200328_2001.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-28 20:01 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0021_auto_20200328_0428'), - ] - - operations = [ - migrations.RemoveField( - model_name='connector', - name='is_self', - ), - migrations.AddField( - model_name='author', - name='fedireads_key', - field=models.CharField(max_length=255, null=True, unique=True), - ), - migrations.AlterField( - model_name='connector', - name='connector_file', - field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('fedireads_connector', 'Fedireads Connector')], default='openlibrary', max_length=255), - ), - ] diff --git a/bookwyrm/migrations/0023_auto_20200328_2203.py b/bookwyrm/migrations/0023_auto_20200328_2203.py deleted file mode 100644 index 85416e72..00000000 --- a/bookwyrm/migrations/0023_auto_20200328_2203.py +++ /dev/null @@ -1,114 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-28 22:03 - -from django.db import migrations, models -import uuid - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0022_auto_20200328_2001'), - ] - - operations = [ - migrations.AddField( - model_name='book', - name='sync_cover', - field=models.BooleanField(default=True), - ), - migrations.AlterField( - model_name='author', - name='born', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AlterField( - model_name='author', - name='died', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AlterField( - model_name='author', - name='fedireads_key', - field=models.CharField(default=uuid.uuid4, max_length=255, unique=True), - ), - migrations.AlterField( - model_name='author', - name='first_name', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='author', - name='last_name', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='author', - name='openlibrary_key', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='book', - name='first_published_date', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AlterField( - model_name='book', - name='goodreads_key', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='book', - name='language', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='book', - name='librarything_key', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='book', - name='openlibrary_key', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='book', - name='published_date', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AlterField( - model_name='book', - name='sort_title', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='book', - name='subtitle', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='edition', - name='isbn', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='edition', - name='oclc_number', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='edition', - name='pages', - field=models.IntegerField(blank=True, null=True), - ), - migrations.AlterField( - model_name='edition', - name='physical_format', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='work', - name='lccn', - field=models.CharField(blank=True, max_length=255, null=True), - ), - ] diff --git a/bookwyrm/migrations/0024_federatedserver_application_version.py b/bookwyrm/migrations/0024_federatedserver_application_version.py deleted file mode 100644 index 10e78c23..00000000 --- a/bookwyrm/migrations/0024_federatedserver_application_version.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-29 22:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0023_auto_20200328_2203'), - ] - - operations = [ - migrations.AddField( - model_name='federatedserver', - name='application_version', - field=models.CharField(max_length=255, null=True), - ), - ] diff --git a/bookwyrm/migrations/0025_auto_20200330_0037.py b/bookwyrm/migrations/0025_auto_20200330_0037.py deleted file mode 100644 index 5477e377..00000000 --- a/bookwyrm/migrations/0025_auto_20200330_0037.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-30 00:37 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0024_federatedserver_application_version'), - ] - - operations = [ - migrations.AlterField( - model_name='book', - name='last_sync_date', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - migrations.AlterField( - model_name='status', - name='published_date', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - ] diff --git a/bookwyrm/migrations/0026_auto_20200330_1456.py b/bookwyrm/migrations/0026_auto_20200330_1456.py deleted file mode 100644 index 7ca7cb34..00000000 --- a/bookwyrm/migrations/0026_auto_20200330_1456.py +++ /dev/null @@ -1,42 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-30 14:56 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0025_auto_20200330_0037'), - ] - - operations = [ - migrations.CreateModel( - name='Boost', - fields=[ - ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')), - ], - options={ - 'abstract': False, - }, - bases=('bookwyrm.status',), - ), - migrations.RemoveConstraint( - model_name='notification', - name='notification_type_valid', - ), - migrations.AlterField( - model_name='notification', - name='notification_type', - field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost')], max_length=255), - ), - migrations.AddConstraint( - model_name='notification', - constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST']), name='notification_type_valid'), - ), - migrations.AddField( - model_name='boost', - name='boosted_status', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='boosters', to='bookwyrm.Status'), - ), - ] diff --git a/bookwyrm/migrations/0027_auto_20200330_2232.py b/bookwyrm/migrations/0027_auto_20200330_2232.py deleted file mode 100644 index 2dc1af24..00000000 --- a/bookwyrm/migrations/0027_auto_20200330_2232.py +++ /dev/null @@ -1,82 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-30 22:32 - -from django.db import migrations, models -import django.db.models.deletion -import bookwyrm.utils.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0026_auto_20200330_1456'), - ] - - operations = [ - migrations.RemoveField( - model_name='book', - name='language', - ), - migrations.RemoveField( - model_name='book', - name='parent_work', - ), - migrations.RemoveField( - model_name='book', - name='shelves', - ), - migrations.AddField( - model_name='book', - name='languages', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), - ), - migrations.AddField( - model_name='edition', - name='default', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='edition', - name='parent_work', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Work'), - ), - migrations.AddField( - model_name='edition', - name='shelves', - field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Shelf'), - ), - migrations.AlterField( - model_name='comment', - name='book', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'), - ), - migrations.AlterField( - model_name='notification', - name='related_book', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'), - ), - migrations.AlterField( - model_name='review', - name='book', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'), - ), - migrations.AlterField( - model_name='shelf', - name='books', - field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Edition'), - ), - migrations.AlterField( - model_name='shelfbook', - name='book', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'), - ), - migrations.AlterField( - model_name='status', - name='mention_books', - field=models.ManyToManyField(related_name='mention_book', to='bookwyrm.Edition'), - ), - migrations.AlterField( - model_name='tag', - name='book', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'), - ), - ] diff --git a/bookwyrm/migrations/0028_auto_20200401_1824.py b/bookwyrm/migrations/0028_auto_20200401_1824.py deleted file mode 100644 index 3421f353..00000000 --- a/bookwyrm/migrations/0028_auto_20200401_1824.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.0.3 on 2020-04-01 18:24 - -import django.core.validators -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0027_auto_20200330_2232'), - ] - - operations = [ - migrations.RemoveField( - model_name='comment', - name='name', - ), - migrations.AlterField( - model_name='review', - name='rating', - field=models.IntegerField(blank=True, default=None, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]), - ), - ] diff --git a/bookwyrm/migrations/0029_auto_20200403_1835.py b/bookwyrm/migrations/0029_auto_20200403_1835.py deleted file mode 100644 index c3f2a659..00000000 --- a/bookwyrm/migrations/0029_auto_20200403_1835.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2020-04-03 18:35 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0028_auto_20200401_1824'), - ] - - operations = [ - migrations.AlterField( - model_name='review', - name='name', - field=models.CharField(max_length=255, null=True), - ), - ] diff --git a/bookwyrm/migrations/0030_quotation.py b/bookwyrm/migrations/0030_quotation.py deleted file mode 100644 index 3a0c38d2..00000000 --- a/bookwyrm/migrations/0030_quotation.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 3.0.3 on 2020-04-07 00:51 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0029_auto_20200403_1835'), - ] - - operations = [ - migrations.CreateModel( - name='Quotation', - fields=[ - ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')), - ('quote', models.TextField()), - ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition')), - ], - options={ - 'abstract': False, - }, - bases=('bookwyrm.status',), - ), - ] diff --git a/bookwyrm/migrations/0031_readthrough.py b/bookwyrm/migrations/0031_readthrough.py deleted file mode 100644 index 9b9a6ffc..00000000 --- a/bookwyrm/migrations/0031_readthrough.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 3.0.3 on 2020-04-15 12:24 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0030_quotation'), - ] - - operations = [ - migrations.CreateModel( - name='ReadThrough', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_date', models.DateTimeField(auto_now_add=True)), - ('updated_date', models.DateTimeField(auto_now=True)), - ('pages_read', models.IntegerField(blank=True, null=True)), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('finish_date', models.DateTimeField(blank=True, null=True)), - ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'abstract': False, - }, - ), - ] diff --git a/bookwyrm/migrations/0032_auto_20200421_1347.py b/bookwyrm/migrations/0032_auto_20200421_1347.py deleted file mode 100644 index 08e74c18..00000000 --- a/bookwyrm/migrations/0032_auto_20200421_1347.py +++ /dev/null @@ -1,60 +0,0 @@ -# Generated by Django 3.0.3 on 2020-04-21 13:47 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import bookwyrm.utils.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0031_readthrough'), - ] - - operations = [ - migrations.CreateModel( - name='ImportItem', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('data', bookwyrm.utils.fields.JSONField()), - ], - ), - migrations.CreateModel( - name='ImportJob', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_date', models.DateTimeField(default=django.utils.timezone.now)), - ('task_id', models.CharField(max_length=100, null=True)), - ], - ), - migrations.RemoveConstraint( - model_name='notification', - name='notification_type_valid', - ), - migrations.AlterField( - model_name='notification', - name='notification_type', - field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT_RESULT', 'Import Result')], max_length=255), - ), - migrations.AddConstraint( - model_name='notification', - constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT_RESULT']), name='notification_type_valid'), - ), - migrations.AddField( - model_name='importjob', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='importitem', - name='book', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='bookwyrm.Book'), - ), - migrations.AddField( - model_name='importitem', - name='job', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='bookwyrm.ImportJob'), - ), - ] diff --git a/bookwyrm/migrations/0033_auto_20200422_1249.py b/bookwyrm/migrations/0033_auto_20200422_1249.py deleted file mode 100644 index 6d1eea83..00000000 --- a/bookwyrm/migrations/0033_auto_20200422_1249.py +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by Django 3.0.3 on 2020-04-22 12:49 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0032_auto_20200421_1347'), - ] - - operations = [ - migrations.RemoveConstraint( - model_name='notification', - name='notification_type_valid', - ), - migrations.AddField( - model_name='importitem', - name='fail_reason', - field=models.TextField(null=True), - ), - migrations.AddField( - model_name='importitem', - name='index', - field=models.IntegerField(default=1), - preserve_default=False, - ), - migrations.AddField( - model_name='notification', - name='related_import', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.ImportJob'), - ), - migrations.AlterField( - model_name='notification', - name='notification_type', - field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import')], max_length=255), - ), - migrations.AddConstraint( - model_name='notification', - constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT']), name='notification_type_valid'), - ), - ] diff --git a/bookwyrm/migrations/0034_importjob_import_status.py b/bookwyrm/migrations/0034_importjob_import_status.py deleted file mode 100644 index 678c4f9c..00000000 --- a/bookwyrm/migrations/0034_importjob_import_status.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.0.3 on 2020-04-22 13:12 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0033_auto_20200422_1249'), - ] - - operations = [ - migrations.AddField( - model_name='importjob', - name='import_status', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status'), - ), - ] diff --git a/bookwyrm/migrations/0035_auto_20200429_1708.py b/bookwyrm/migrations/0035_auto_20200429_1708.py deleted file mode 100644 index 3c9e78d4..00000000 --- a/bookwyrm/migrations/0035_auto_20200429_1708.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 3.0.3 on 2020-04-29 17:08 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0034_importjob_import_status'), - ] - - operations = [ - migrations.RenameField( - model_name='edition', - old_name='isbn', - new_name='isbn_13', - ), - migrations.AddField( - model_name='book', - name='author_text', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='edition', - name='asin', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='edition', - name='isbn_10', - field=models.CharField(blank=True, max_length=255, null=True), - ), - ] diff --git a/bookwyrm/migrations/0036_auto_20200503_2007.py b/bookwyrm/migrations/0036_auto_20200503_2007.py deleted file mode 100644 index 6fb2fe62..00000000 --- a/bookwyrm/migrations/0036_auto_20200503_2007.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.3 on 2020-05-03 20:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0035_auto_20200429_1708'), - ] - - operations = [ - migrations.AddField( - model_name='connector', - name='books_url', - field=models.CharField(default='https://openlibrary.org', max_length=255), - preserve_default=False, - ), - migrations.AddField( - model_name='connector', - name='local', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='connector', - name='name', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='connector', - name='priority', - field=models.IntegerField(default=2), - ), - migrations.AlterField( - model_name='connector', - name='connector_file', - field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('fedireads_connector', 'Fedireads Connector')], max_length=255), - ), - ] diff --git a/bookwyrm/migrations/0037_auto_20200504_0154.py b/bookwyrm/migrations/0037_auto_20200504_0154.py deleted file mode 100644 index dfcf41ad..00000000 --- a/bookwyrm/migrations/0037_auto_20200504_0154.py +++ /dev/null @@ -1,41 +0,0 @@ -# Generated by Django 3.0.3 on 2020-05-04 01:54 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0036_auto_20200503_2007'), - ] - - operations = [ - migrations.RemoveField( - model_name='author', - name='fedireads_key', - ), - migrations.RemoveField( - model_name='book', - name='fedireads_key', - ), - migrations.RemoveField( - model_name='book', - name='source_url', - ), - migrations.AddField( - model_name='author', - name='last_sync_date', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - migrations.AddField( - model_name='author', - name='sync', - field=models.BooleanField(default=True), - ), - migrations.AddField( - model_name='book', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - ] diff --git a/bookwyrm/migrations/0038_author_remote_id.py b/bookwyrm/migrations/0038_author_remote_id.py deleted file mode 100644 index 24f20d5e..00000000 --- a/bookwyrm/migrations/0038_author_remote_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2020-05-09 19:27 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0037_auto_20200504_0154'), - ] - - operations = [ - migrations.AddField( - model_name='author', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - ] diff --git a/bookwyrm/migrations/0039_auto_20200510_2342.py b/bookwyrm/migrations/0039_auto_20200510_2342.py deleted file mode 100644 index 3e604881..00000000 --- a/bookwyrm/migrations/0039_auto_20200510_2342.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 3.0.3 on 2020-05-10 23:42 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0038_author_remote_id'), - ] - - operations = [ - migrations.RemoveField( - model_name='book', - name='misc_identifiers', - ), - migrations.RemoveField( - model_name='connector', - name='key_name', - ), - ] diff --git a/bookwyrm/migrations/0040_auto_20200513_0153.py b/bookwyrm/migrations/0040_auto_20200513_0153.py deleted file mode 100644 index 04953c42..00000000 --- a/bookwyrm/migrations/0040_auto_20200513_0153.py +++ /dev/null @@ -1,77 +0,0 @@ -# Generated by Django 3.0.3 on 2020-05-13 01:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0039_auto_20200510_2342'), - ] - - operations = [ - migrations.RemoveField( - model_name='user', - name='actor', - ), - migrations.AddField( - model_name='connector', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='federatedserver', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='notification', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='readthrough', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='shelf', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='shelfbook', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='tag', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='userblocks', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='userfollowrequest', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name='userfollows', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AlterField( - model_name='favorite', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - migrations.AlterField( - model_name='status', - name='remote_id', - field=models.CharField(max_length=255, null=True), - ), - ] diff --git a/bookwyrm/migrations/0041_user_remote_id.py b/bookwyrm/migrations/0041_user_remote_id.py deleted file mode 100644 index 4bc4021f..00000000 --- a/bookwyrm/migrations/0041_user_remote_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2020-05-13 02:23 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0040_auto_20200513_0153'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='remote_id', - field=models.CharField(max_length=255, null=True, unique=True), - ), - ] diff --git a/bookwyrm/migrations/0042_auto_20200524_0346.py b/bookwyrm/migrations/0042_auto_20200524_0346.py deleted file mode 100644 index 8453a5e6..00000000 --- a/bookwyrm/migrations/0042_auto_20200524_0346.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 3.0.3 on 2020-05-24 03:46 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0041_user_remote_id'), - ] - - operations = [ - migrations.RemoveField( - model_name='status', - name='activity_type', - ), - migrations.RemoveField( - model_name='status', - name='status_type', - ), - ] diff --git a/bookwyrm/migrations/0042_sitesettings.py b/bookwyrm/migrations/0042_sitesettings.py deleted file mode 100644 index 4a0db282..00000000 --- a/bookwyrm/migrations/0042_sitesettings.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.0.3 on 2020-06-01 18:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0041_user_remote_id'), - ] - - operations = [ - migrations.CreateModel( - name='SiteSettings', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='wyrms.cthulahoops.org', max_length=100)), - ('instance_description', models.TextField(default='This instance has no description.')), - ('code_of_conduct', models.TextField(default='Add a code of conduct here.')), - ('allow_registration', models.BooleanField(default=True)), - ], - ), - ] diff --git a/bookwyrm/migrations/0043_siteinvite.py b/bookwyrm/migrations/0043_siteinvite.py deleted file mode 100644 index d5865063..00000000 --- a/bookwyrm/migrations/0043_siteinvite.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.0.3 on 2020-06-01 21:31 - -from django.db import migrations, models -import bookwyrm.models.site - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0042_sitesettings'), - ] - - operations = [ - migrations.CreateModel( - name='SiteInvite', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(default=bookwyrm.models.site.new_access_code, max_length=32)), - ('expiry', models.DateTimeField(blank=True, null=True)), - ('use_limit', models.IntegerField(blank=True, null=True)), - ('times_used', models.IntegerField(default=0)), - ], - ), - ] diff --git a/bookwyrm/migrations/0045_merge_20200810_2010.py b/bookwyrm/migrations/0045_merge_20200810_2010.py deleted file mode 100644 index d93921c6..00000000 --- a/bookwyrm/migrations/0045_merge_20200810_2010.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.0.7 on 2020-08-10 20:10 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0044_siteinvite_user'), - ('bookwyrm', '0042_auto_20200524_0346'), - ] - - operations = [ - ] diff --git a/bookwyrm/migrations/0046_auto_20200921_1509.py b/bookwyrm/migrations/0046_auto_20200921_1509.py deleted file mode 100644 index beec5981..00000000 --- a/bookwyrm/migrations/0046_auto_20200921_1509.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.0.7 on 2020-09-21 15:09 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0045_merge_20200810_2010'), - ] - - operations = [ - migrations.RenameField( - model_name='user', - old_name='fedireads_user', - new_name='bookwyrm_user', - ), - migrations.AlterField( - model_name='connector', - name='connector_file', - field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'BookWyrm Connector')], max_length=255), - ), - migrations.AlterField( - model_name='sitesettings', - name='name', - field=models.CharField(default='1d8390fd.ngrok.io', max_length=100), - ), - ] diff --git a/bookwyrm/migrations/0047_auto_20200928_2312.py b/bookwyrm/migrations/0047_auto_20200928_2312.py deleted file mode 100644 index 73ce3937..00000000 --- a/bookwyrm/migrations/0047_auto_20200928_2312.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.7 on 2020-09-28 23:12 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0046_auto_20200921_1509'), - ] - - operations = [ - migrations.AlterField( - model_name='connector', - name='connector_file', - field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'Bookwyrm Connector')], max_length=255), - ), - ] diff --git a/bookwyrm/migrations/0048_generatednote.py b/bookwyrm/migrations/0048_generatednote.py deleted file mode 100644 index 09fcef9f..00000000 --- a/bookwyrm/migrations/0048_generatednote.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.0.7 on 2020-09-29 00:22 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0047_auto_20200928_2312'), - ] - - operations = [ - migrations.CreateModel( - name='GeneratedStatus', - fields=[ - ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')), - ], - options={ - 'abstract': False, - }, - bases=('bookwyrm.status',), - ), - ] diff --git a/bookwyrm/migrations/0049_passwordreset.py b/bookwyrm/migrations/0049_passwordreset.py deleted file mode 100644 index a9e784ad..00000000 --- a/bookwyrm/migrations/0049_passwordreset.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-02 19:43 - -import bookwyrm.models.site -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0048_generatednote'), - ] - - operations = [ - migrations.CreateModel( - name='PasswordReset', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(default=bookwyrm.models.site.new_access_code, max_length=32)), - ('expiry', models.DateTimeField(default=bookwyrm.models.site.get_passowrd_reset_expiry)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/bookwyrm/migrations/0050_auto_20201002_2156.py b/bookwyrm/migrations/0050_auto_20201002_2156.py deleted file mode 100644 index 96cf7ff6..00000000 --- a/bookwyrm/migrations/0050_auto_20201002_2156.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-02 21:56 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0049_passwordreset'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(max_length=254, unique=True), - ), - ] diff --git a/bookwyrm/migrations/0051_auto_20201005_2142.py b/bookwyrm/migrations/0051_auto_20201005_2142.py deleted file mode 100644 index f25f77d7..00000000 --- a/bookwyrm/migrations/0051_auto_20201005_2142.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-05 21:42 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0050_auto_20201002_2156'), - ] - - operations = [ - migrations.AlterField( - model_name='sitesettings', - name='name', - field=models.CharField(default='BookWyrm', max_length=100), - ), - ] diff --git a/bookwyrm/migrations/0052_auto_20201005_2145.py b/bookwyrm/migrations/0052_auto_20201005_2145.py deleted file mode 100644 index 430c8358..00000000 --- a/bookwyrm/migrations/0052_auto_20201005_2145.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-05 21:45 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0051_auto_20201005_2142'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(blank=True, max_length=254, verbose_name='email address'), - ), - ] diff --git a/bookwyrm/migrations/0053_auto_20201006_2020.py b/bookwyrm/migrations/0053_auto_20201006_2020.py deleted file mode 100644 index 515fc446..00000000 --- a/bookwyrm/migrations/0053_auto_20201006_2020.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-06 20:20 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0052_auto_20201005_2145'), - ] - - operations = [ - migrations.AddField( - model_name='status', - name='deleted', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='status', - name='deleted_date', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - ] diff --git a/bookwyrm/migrations/0053_auto_20201014_1700.py b/bookwyrm/migrations/0053_auto_20201014_1700.py deleted file mode 100644 index d1306dfe..00000000 --- a/bookwyrm/migrations/0053_auto_20201014_1700.py +++ /dev/null @@ -1,15 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-14 17:00 - -from django.contrib.postgres.operations import TrigramExtension -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0052_auto_20201005_2145'), - ] - - operations = [ - TrigramExtension() - ] diff --git a/bookwyrm/migrations/0054_auto_20201016_1707.py b/bookwyrm/migrations/0054_auto_20201016_1707.py deleted file mode 100644 index 043ff12d..00000000 --- a/bookwyrm/migrations/0054_auto_20201016_1707.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-16 17:07 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0053_auto_20201014_1700'), - ] - - operations = [ - migrations.RemoveField( - model_name='userblocks', - name='relationship_id', - ), - migrations.RemoveField( - model_name='userfollowrequest', - name='relationship_id', - ), - migrations.RemoveField( - model_name='userfollows', - name='relationship_id', - ), - ] diff --git a/bookwyrm/migrations/0054_auto_20201016_2359.py b/bookwyrm/migrations/0054_auto_20201016_2359.py deleted file mode 100644 index c8ab3480..00000000 --- a/bookwyrm/migrations/0054_auto_20201016_2359.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-16 23:59 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0053_auto_20201006_2020'), - ] - - operations = [ - migrations.AlterField( - model_name='status', - name='deleted_date', - field=models.DateTimeField(), - ), - ] diff --git a/bookwyrm/migrations/0055_merge_20201017_0011.py b/bookwyrm/migrations/0055_merge_20201017_0011.py deleted file mode 100644 index fd995eaa..00000000 --- a/bookwyrm/migrations/0055_merge_20201017_0011.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-17 00:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0054_auto_20201016_1707'), - ('bookwyrm', '0054_auto_20201016_2359'), - ] - - operations = [ - ] diff --git a/bookwyrm/migrations/0056_auto_20201021_0150.py b/bookwyrm/migrations/0056_auto_20201021_0150.py deleted file mode 100644 index 1408efb9..00000000 --- a/bookwyrm/migrations/0056_auto_20201021_0150.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-21 01:50 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0055_merge_20201017_0011'), - ] - - operations = [ - migrations.AlterField( - model_name='status', - name='deleted_date', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/bookwyrm/migrations/0057_auto_20201026_2131.py b/bookwyrm/migrations/0057_auto_20201026_2131.py deleted file mode 100644 index cc414e98..00000000 --- a/bookwyrm/migrations/0057_auto_20201026_2131.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-26 21:31 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0056_auto_20201021_0150'), - ] - - operations = [ - migrations.AlterField( - model_name='status', - name='privacy', - field=models.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255), - ), - ] diff --git a/bookwyrm/migrations/0058_remove_importjob_import_status.py b/bookwyrm/migrations/0058_remove_importjob_import_status.py deleted file mode 100644 index 61f41546..00000000 --- a/bookwyrm/migrations/0058_remove_importjob_import_status.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-29 23:48 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0057_auto_20201026_2131'), - ] - - operations = [ - migrations.RemoveField( - model_name='importjob', - name='import_status', - ), - ] diff --git a/bookwyrm/migrations/0059_auto_20201030_1755.py b/bookwyrm/migrations/0059_auto_20201030_1755.py deleted file mode 100644 index 9004ed2f..00000000 --- a/bookwyrm/migrations/0059_auto_20201030_1755.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-30 17:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0058_remove_importjob_import_status'), - ] - - operations = [ - migrations.AddField( - model_name='importjob', - name='include_reviews', - field=models.BooleanField(default=True), - ), - migrations.AddField( - model_name='importjob', - name='privacy', - field=models.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255), - ), - ] diff --git a/bookwyrm/migrations/0060_auto_20201030_2010.py b/bookwyrm/migrations/0060_auto_20201030_2010.py deleted file mode 100644 index bcc28c5c..00000000 --- a/bookwyrm/migrations/0060_auto_20201030_2010.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-30 20:10 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0059_auto_20201030_1755'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='federated_server', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.FederatedServer'), - ), - ] diff --git a/bookwyrm/migrations/0061_auto_20201030_2157.py b/bookwyrm/migrations/0061_auto_20201030_2157.py deleted file mode 100644 index 750b3763..00000000 --- a/bookwyrm/migrations/0061_auto_20201030_2157.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-30 21:57 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0060_auto_20201030_2010'), - ] - - operations = [ - migrations.RenameModel( - old_name='GeneratedStatus', - new_name='GeneratedNote', - ), - ] diff --git a/bookwyrm/migrations/0062_auto_20201031_1936.py b/bookwyrm/migrations/0062_auto_20201031_1936.py deleted file mode 100644 index 2fbfe6c0..00000000 --- a/bookwyrm/migrations/0062_auto_20201031_1936.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 3.0.7 on 2020-10-31 19:36 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0061_auto_20201030_2157'), - ] - - operations = [ - migrations.AlterField( - model_name='connector', - name='api_key', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='connector', - name='max_query_count', - field=models.IntegerField(blank=True, null=True), - ), - migrations.AlterField( - model_name='connector', - name='name', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AlterField( - model_name='connector', - name='politeness_delay', - field=models.IntegerField(blank=True, null=True), - ), - migrations.AlterField( - model_name='connector', - name='search_url', - field=models.CharField(blank=True, max_length=255, null=True), - ), - ] diff --git a/bookwyrm/migrations/0063_auto_20201101_1758.py b/bookwyrm/migrations/0063_auto_20201101_1758.py deleted file mode 100644 index 758548f7..00000000 --- a/bookwyrm/migrations/0063_auto_20201101_1758.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 3.0.7 on 2020-11-01 17:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0062_auto_20201031_1936'), - ] - - operations = [ - migrations.RemoveConstraint( - model_name='notification', - name='notification_type_valid', - ), - migrations.AlterField( - model_name='notification', - name='notification_type', - field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('MENTION', 'Mention'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import')], max_length=255), - ), - migrations.AddConstraint( - model_name='notification', - constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'MENTION', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT']), name='notification_type_valid'), - ), - ] diff --git a/bookwyrm/migrations/0063_user_last_active_date.py b/bookwyrm/migrations/0063_user_last_active_date.py deleted file mode 100644 index 0cecc37d..00000000 --- a/bookwyrm/migrations/0063_user_last_active_date.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.7 on 2020-11-01 17:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0062_auto_20201031_1936'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='last_active_date', - field=models.DateTimeField(auto_now=True), - ), - ] diff --git a/bookwyrm/migrations/0064_merge_20201101_1913.py b/bookwyrm/migrations/0064_merge_20201101_1913.py deleted file mode 100644 index d6d97367..00000000 --- a/bookwyrm/migrations/0064_merge_20201101_1913.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.0.7 on 2020-11-01 19:13 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0063_user_last_active_date'), - ('bookwyrm', '0063_auto_20201101_1758'), - ] - - operations = [ - ] From 0c73a1f42e0849aa4849993c7c153246764a1143 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 2 Nov 2020 16:23:18 -0800 Subject: [PATCH 2/4] updates test data and serialization --- bookwyrm/models/base_model.py | 1 - ...onnector.py => test_bookwyrm_connector.py} | 2 +- bookwyrm/tests/data/fr_edition.json | 68 +++++++++---------- bookwyrm/tests/data/fr_work.json | 64 ++++++++--------- bookwyrm/tests/models/test_user_model.py | 2 +- bookwyrm/tests/test_signing.py | 2 +- 6 files changed, 64 insertions(+), 75 deletions(-) rename bookwyrm/tests/connectors/{test_fedireads_connector.py => test_bookwyrm_connector.py} (97%) diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py index 2215a28a..b48ceea9 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -68,7 +68,6 @@ class ActivitypubMixin: if not hasattr(self, mapping.model_key) or not mapping.activity_key: continue value = getattr(self, mapping.model_key) - print(value) if hasattr(value, 'local_id'): value = value.local_id elif hasattr(value, 'remote_id'): diff --git a/bookwyrm/tests/connectors/test_fedireads_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py similarity index 97% rename from bookwyrm/tests/connectors/test_fedireads_connector.py rename to bookwyrm/tests/connectors/test_bookwyrm_connector.py index 5f475fdb..c41b454c 100644 --- a/bookwyrm/tests/connectors/test_fedireads_connector.py +++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py @@ -50,5 +50,5 @@ class BookWyrmConnector(TestCase): def test_get_date(self): date = get_date(self.edition_data['published_date']) - expected = parser.parse("2017-05-10T00:00:00+00:00") + expected = parser.parse("2020-09-15T00:00:00+00:00") self.assertEqual(date, expected) diff --git a/bookwyrm/tests/data/fr_edition.json b/bookwyrm/tests/data/fr_edition.json index bdb7c150..0cc17d29 100644 --- a/bookwyrm/tests/data/fr_edition.json +++ b/bookwyrm/tests/data/fr_edition.json @@ -1,42 +1,40 @@ { - "@context": "https://www.w3.org/ns/activitystreams", - "type": "Document", - "book_type": "Edition", - "name": "Jonathan Strange and Mr Norrell", - "url": "https://example.com/book/122", + "id": "https://bookwyrm.social/book/5989", + "type": "Edition", "authors": [ - "https://example.com/author/25" + "https://bookwyrm.social/author/417" ], - "published_date": "2017-05-10T00:00:00+00:00", - "work": { - "@context": "https://www.w3.org/ns/activitystreams", - "type": "Document", - "book_type": "Work", - "name": "Jonathan Strange and Mr Norrell", - "url": "https://example.com/book/121", - "authors": [ - "https://example.com/author/25" - ], - "title": "Jonathan Strange and Mr Norrell", - "attachment": [ - { - "type": "Document", - "mediaType": "image/jpg", - "url": "https://example.com/images/covers/8775540-M.jpg", - "name": "Cover of \"Jonathan Strange and Mr Norrell\"" - } - ] - }, - "title": "Jonathan Strange and Mr Norrell", - "subtitle": "Bloomsbury Modern Classics", - "isbn_13": "9781408891469", - "physical_format": "paperback", + "first_published_date": null, + "published_date": "2020-09-15T00:00:00+00:00", + "title": "Piranesi", + "sort_title": null, + "subtitle": null, + "description": "Piranesi's house is no ordinary building; its rooms are infinite, its corridors endless, its walls are lined with thousands upon thousands of statues, each one different from all the others. Within the labyrinth of halls an ocean is imprisoned; waves thunder up staircases, rooms are flooded in an instant. But Piranesi is not afraid; he understands the tides as he understands the pattern of the labyrinth itself. He lives to explore the house.\r\n\r\nThere is one other person in the house--a man called The Other, who visits Piranesi twice a week and asks for help with research into A Great and Secret Knowledge. But as Piranesi explores, evidence emerges of another person, and a terrible truth begins to unravel, revealing a world beyond the one Piranesi has always known.\r\n\r\nFor readers of Neil Gaiman's The Ocean at the End of the Lane and fans of Madeline Miller's Circe, Piranesi introduces an astonishing new world, an infinite labyrinth full of startling images of surreal beauty, haunted by the tides and the clouds.", + "languages": [ + "English" + ], + "series": null, + "series_number": null, + "subjects": [], + "subject_places": [], + "openlibrary_key": "OL29486417M", + "librarything_key": null, + "goodreads_key": null, "attachment": [ { - "type": "Document", - "mediaType": "image/jpg", - "url": "https://example.com/images/covers/9155821-M.jpg", - "name": "Cover of \"Jonathan Strange and Mr Norrell\"" + "url": "https://bookwyrm.social/images/covers/50202953._SX318_.jpg", + "type": "Image" } - ] + ], + "isbn_10": "1526622424", + "isbn_13": "9781526622426", + "oclc_number": null, + "asin": null, + "pages": 272, + "physical_format": null, + "publishers": [ + "Bloomsbury Publishing Plc" + ], + "work": "https://bookwyrm.social/book/5988", + "@context": "https://www.w3.org/ns/activitystreams" } diff --git a/bookwyrm/tests/data/fr_work.json b/bookwyrm/tests/data/fr_work.json index e93f6706..4e759a19 100644 --- a/bookwyrm/tests/data/fr_work.json +++ b/bookwyrm/tests/data/fr_work.json @@ -1,44 +1,36 @@ { - "@context": "https://www.w3.org/ns/activitystreams", - "type": "Document", - "book_type": "Work", - "name": "Jonathan Strange and Mr Norrell", - "url": "https://example.com/book/121", + "id": "https://bookwyrm.social/book/5988", + "type": "Work", "authors": [ - "https://example.com/author/25" + "https://bookwyrm.social/author/417" ], - "editions": [ - { - "@context": "https://www.w3.org/ns/activitystreams", - "type": "Document", - "book_type": "Edition", - "name": "Jonathan Strange and Mr Norrell", - "url": "https://example.com/book/122", - "authors": [ - "https://example.com/author/25" - ], - "published_date": "2017-05-10T00:00:00+00:00", - "title": "Jonathan Strange and Mr Norrell", - "subtitle": "Bloomsbury Modern Classics", - "isbn_13": "9781408891469", - "physical_format": "paperback", - "attachment": [ - { - "type": "Document", - "mediaType": "image/jpg", - "url": "https://example.com/images/covers/9155821-M.jpg", - "name": "Cover of \"Jonathan Strange and Mr Norrell\"" - } - ] - } + "first_published_date": null, + "published_date": null, + "title": "Piranesi", + "sort_title": null, + "subtitle": null, + "description": "**From the *New York Times* bestselling author of *Jonathan Strange & Mr. Norrell*, an intoxicating, hypnotic new novel set in a dreamlike alternative reality.**\r\n\r\nPiranesi's house is no ordinary building; its rooms are infinite, its corridors endless, its walls are lined with thousands upon thousands of statues, each one different from all the others. Within the labyrinth of halls an ocean is imprisoned; waves thunder up staircases, rooms are flooded in an instant. But Piranesi is not afraid; he understands the tides as he understands the pattern of the labyrinth itself. He lives to explore the house.\r\n\r\nThere is one other person in the house--a man called The Other, who visits Piranesi twice a week and asks for help with research into A Great and Secret Knowledge. But as Piranesi explores, evidence emerges of another person, and a terrible truth begins to unravel, revealing a world beyond the one Piranesi has always known.\r\n\r\nFor readers of Neil Gaiman's *The Ocean at the End of the Lane* and fans of Madeline Miller's *Circe*, *Piranesi* introduces an astonishing new world, an infinite labyrinth full of startling images of surreal beauty, haunted by the tides and the clouds.\r\n\r\nThis description comes from the publisher.", + "languages": [], + "series": null, + "series_number": null, + "subjects": [ + "English literature" ], - "title": "Jonathan Strange and Mr Norrell", + "subject_places": [], + "openlibrary_key": "OL20893680W", + "librarything_key": null, + "goodreads_key": null, "attachment": [ { - "type": "Document", - "mediaType": "image/jpg", - "url": "https://example.com/images/covers/8775540-M.jpg", - "name": "Cover of \"Jonathan Strange and Mr Norrell\"" + "url": "https://bookwyrm.social/images/covers/10226290-M.jpg", + "type": "Image" } - ] + ], + "lccn": null, + "editions": [ + "https://bookwyrm.social/book/5989", + "OL28439584M", + "OL28300471M" + ], + "@context": "https://www.w3.org/ns/activitystreams" } diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index 0b43cc00..203c558d 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -50,7 +50,7 @@ class User(TestCase): self.assertEqual(activity['inbox'], self.user.inbox) self.assertEqual(activity['outbox'], self.user.outbox) self.assertEqual(activity['followers'], self.user.ap_followers) - self.assertEqual(activity['bookwyrmUser'], False) + self.assertEqual(activity['bookwyrmUser'], True) self.assertEqual(activity['discoverable'], True) self.assertEqual(activity['type'], 'Person') diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index 62870336..ed5600ac 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -61,7 +61,7 @@ class Signature(TestCase): digest=None, date=None): now = date or http_date() - data = json.dumps(get_follow_data(sender, self.rat)).encode('utf-8') + data = json.dumps(get_follow_data(sender, self.rat)) digest = digest or make_digest(data) signature = make_signature( signer or sender, self.rat.inbox, now, digest) From 842291d7295c5c04e62ba9bdadace2797bbb991c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 2 Nov 2020 16:28:02 -0800 Subject: [PATCH 3/4] Fixes shelving tests --- bookwyrm/tests/outgoing/test_shelving.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bookwyrm/tests/outgoing/test_shelving.py b/bookwyrm/tests/outgoing/test_shelving.py index acf816e1..cc2b6b17 100644 --- a/bookwyrm/tests/outgoing/test_shelving.py +++ b/bookwyrm/tests/outgoing/test_shelving.py @@ -10,9 +10,13 @@ class Shelving(TestCase): local=True, remote_id='http://local.com/users/mouse', ) + work = models.Work.objects.create( + title='Example work', + ) self.book = models.Edition.objects.create( title='Example Edition', remote_id='https://example.com/book/1', + parent_work=work, ) self.shelf = models.Shelf.objects.create( name='Test Shelf', @@ -35,7 +39,7 @@ class Shelving(TestCase): self.assertEqual(shelf.books.get(), self.book) # it should have posted a status about this - status = models.GeneratedStatus.objects.get() + status = models.GeneratedNote.objects.get() self.assertEqual(status.content, 'wants to read') self.assertEqual(status.user, self.user) self.assertEqual(status.mention_books.count(), 1) @@ -53,7 +57,7 @@ class Shelving(TestCase): self.assertEqual(shelf.books.get(), self.book) # it should have posted a status about this - status = models.GeneratedStatus.objects.order_by('-published_date').first() + status = models.GeneratedNote.objects.order_by('-published_date').first() self.assertEqual(status.content, 'started reading') self.assertEqual(status.user, self.user) self.assertEqual(status.mention_books.count(), 1) @@ -75,7 +79,7 @@ class Shelving(TestCase): self.assertEqual(shelf.books.get(), self.book) # it should have posted a status about this - status = models.GeneratedStatus.objects.order_by('-published_date').first() + status = models.GeneratedNote.objects.order_by('-published_date').first() self.assertEqual(status.content, 'finished reading') self.assertEqual(status.user, self.user) self.assertEqual(status.mention_books.count(), 1) From c6b8357c77ba0c501593bcdb72d803cf3eb38e47 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 2 Nov 2020 16:32:56 -0800 Subject: [PATCH 4/4] Make tags optional in activitypub Notes --- bookwyrm/activitypub/note.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py index 357e164f..ebc0cf3c 100644 --- a/bookwyrm/activitypub/note.py +++ b/bookwyrm/activitypub/note.py @@ -20,11 +20,11 @@ class Note(ActivityObject): inReplyTo: str published: str attributedTo: str - tag: List[Link] to: List[str] cc: List[str] content: str replies: Dict + tag: List[Link] = field(default=lambda: []) attachment: List[Image] = field(default=lambda: []) sensitive: bool = False type: str = 'Note'