From d12a396626d136ef3cea13802ca968370d104efe Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Sun, 11 Aug 2024 09:06:53 -0400 Subject: [PATCH] Refactor database field names for adventures and users --- .../adventures/migrations/0001_initial.py | 121 ------------------ ...02_rename_id_adventure_temp_id_and_more.py | 43 ------- .../server/adventures/migrations/__init__.py | 0 .../server/users/migrations/0001_initial.py | 45 ------- .../0002_alter_customuser_profile_pic.py | 19 --- ...03_remove_customuser_id_customuser_uuid.py | 23 ---- ...004_customuser_id_alter_customuser_uuid.py | 25 ---- backend/server/users/migrations/__init__.py | 0 backend/server/users/models.py | 3 +- 9 files changed, 1 insertion(+), 278 deletions(-) delete mode 100644 backend/server/adventures/migrations/0001_initial.py delete mode 100644 backend/server/adventures/migrations/0002_rename_id_adventure_temp_id_and_more.py delete mode 100644 backend/server/adventures/migrations/__init__.py delete mode 100644 backend/server/users/migrations/0001_initial.py delete mode 100644 backend/server/users/migrations/0002_alter_customuser_profile_pic.py delete mode 100644 backend/server/users/migrations/0003_remove_customuser_id_customuser_uuid.py delete mode 100644 backend/server/users/migrations/0004_customuser_id_alter_customuser_uuid.py delete mode 100644 backend/server/users/migrations/__init__.py diff --git a/backend/server/adventures/migrations/0001_initial.py b/backend/server/adventures/migrations/0001_initial.py deleted file mode 100644 index 0cde55c..0000000 --- a/backend/server/adventures/migrations/0001_initial.py +++ /dev/null @@ -1,121 +0,0 @@ -# Generated by Django 5.0.8 on 2024-08-11 02:25 - -import django.contrib.postgres.fields -import django.db.models.deletion -import django_resized.forms -import uuid -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Checklist', - fields=[ - ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), - ('name', models.CharField(max_length=200)), - ('date', models.DateField(blank=True, null=True)), - ('is_public', models.BooleanField(default=False)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('updated_at', models.DateTimeField(auto_now=True)), - ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='ChecklistItem', - fields=[ - ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), - ('name', models.CharField(max_length=200)), - ('is_checked', models.BooleanField(default=False)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('updated_at', models.DateTimeField(auto_now=True)), - ('checklist', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='adventures.checklist')), - ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Collection', - fields=[ - ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), - ('name', models.CharField(max_length=200)), - ('description', models.TextField(blank=True, null=True)), - ('is_public', models.BooleanField(default=False)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('updated_at', models.DateTimeField(auto_now=True)), - ('is_archived', models.BooleanField(default=False)), - ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.AddField( - model_name='checklist', - name='collection', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection'), - ), - migrations.CreateModel( - name='Adventure', - fields=[ - ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), - ('type', models.CharField(choices=[('visited', 'Visited'), ('planned', 'Planned'), ('lodging', 'Lodging'), ('dining', 'Dining')], max_length=100)), - ('name', models.CharField(max_length=200)), - ('location', models.CharField(blank=True, max_length=200, null=True)), - ('activity_types', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), blank=True, null=True, size=None)), - ('description', models.TextField(blank=True, null=True)), - ('rating', models.FloatField(blank=True, null=True)), - ('link', models.URLField(blank=True, null=True)), - ('image', django_resized.forms.ResizedImageField(blank=True, crop=None, force_format='WEBP', keep_meta=True, null=True, quality=75, scale=None, size=[1920, 1080], upload_to='images/')), - ('date', models.DateField(blank=True, null=True)), - ('is_public', models.BooleanField(default=False)), - ('longitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)), - ('latitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('updated_at', models.DateTimeField(auto_now=True)), - ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection')), - ], - ), - migrations.CreateModel( - name='Note', - fields=[ - ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), - ('name', models.CharField(max_length=200)), - ('content', models.TextField(blank=True, null=True)), - ('links', django.contrib.postgres.fields.ArrayField(base_field=models.URLField(), blank=True, null=True, size=None)), - ('date', models.DateField(blank=True, null=True)), - ('is_public', models.BooleanField(default=False)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('updated_at', models.DateTimeField(auto_now=True)), - ('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection')), - ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Transportation', - fields=[ - ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), - ('type', models.CharField(choices=[('car', 'Car'), ('plane', 'Plane'), ('train', 'Train'), ('bus', 'Bus'), ('boat', 'Boat'), ('bike', 'Bike'), ('walking', 'Walking'), ('other', 'Other')], max_length=100)), - ('name', models.CharField(max_length=200)), - ('description', models.TextField(blank=True, null=True)), - ('rating', models.FloatField(blank=True, null=True)), - ('link', models.URLField(blank=True, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('flight_number', models.CharField(blank=True, max_length=100, null=True)), - ('from_location', models.CharField(blank=True, max_length=200, null=True)), - ('to_location', models.CharField(blank=True, max_length=200, null=True)), - ('is_public', models.BooleanField(default=False)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('updated_at', models.DateTimeField(auto_now=True)), - ('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection')), - ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/backend/server/adventures/migrations/0002_rename_id_adventure_temp_id_and_more.py b/backend/server/adventures/migrations/0002_rename_id_adventure_temp_id_and_more.py deleted file mode 100644 index 5be0392..0000000 --- a/backend/server/adventures/migrations/0002_rename_id_adventure_temp_id_and_more.py +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by Django 5.0.8 on 2024-08-11 12:59 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('adventures', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='adventure', - old_name='id', - new_name='temp_id', - ), - migrations.RenameField( - model_name='checklist', - old_name='id', - new_name='temp_id', - ), - migrations.RenameField( - model_name='checklistitem', - old_name='id', - new_name='temp_id', - ), - migrations.RenameField( - model_name='collection', - old_name='id', - new_name='temp_id', - ), - migrations.RenameField( - model_name='note', - old_name='id', - new_name='temp_id', - ), - migrations.RenameField( - model_name='transportation', - old_name='id', - new_name='temp_id', - ), - ] diff --git a/backend/server/adventures/migrations/__init__.py b/backend/server/adventures/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/backend/server/users/migrations/0001_initial.py b/backend/server/users/migrations/0001_initial.py deleted file mode 100644 index daf6a0b..0000000 --- a/backend/server/users/migrations/0001_initial.py +++ /dev/null @@ -1,45 +0,0 @@ -# Generated by Django 5.0.6 on 2024-06-28 01:01 - -import django.contrib.auth.models -import django.contrib.auth.validators -import django.utils.timezone -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('auth', '0012_alter_user_first_name_max_length'), - ] - - operations = [ - migrations.CreateModel( - name='CustomUser', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('password', models.CharField(max_length=128, verbose_name='password')), - ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), - ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), - ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), - ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')), - ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), - ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), - ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), - ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), - ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), - ('profile_pic', models.ImageField(blank=True, null=True, upload_to='profile-pics/')), - ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')), - ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')), - ], - options={ - 'verbose_name': 'user', - 'verbose_name_plural': 'users', - 'abstract': False, - }, - managers=[ - ('objects', django.contrib.auth.models.UserManager()), - ], - ), - ] diff --git a/backend/server/users/migrations/0002_alter_customuser_profile_pic.py b/backend/server/users/migrations/0002_alter_customuser_profile_pic.py deleted file mode 100644 index 7d525c7..0000000 --- a/backend/server/users/migrations/0002_alter_customuser_profile_pic.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-18 15:06 - -import django_resized.forms -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='customuser', - name='profile_pic', - field=django_resized.forms.ResizedImageField(blank=True, crop=None, force_format='WEBP', keep_meta=True, null=True, quality=75, scale=None, size=[1920, 1080], upload_to='profile-pics/'), - ), - ] diff --git a/backend/server/users/migrations/0003_remove_customuser_id_customuser_uuid.py b/backend/server/users/migrations/0003_remove_customuser_id_customuser_uuid.py deleted file mode 100644 index d583ef1..0000000 --- a/backend/server/users/migrations/0003_remove_customuser_id_customuser_uuid.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 5.0.8 on 2024-08-11 12:26 - -import uuid -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0002_alter_customuser_profile_pic'), - ] - - operations = [ - migrations.RemoveField( - model_name='customuser', - name='id', - ), - migrations.AddField( - model_name='customuser', - name='uuid', - field=models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True), - ), - ] diff --git a/backend/server/users/migrations/0004_customuser_id_alter_customuser_uuid.py b/backend/server/users/migrations/0004_customuser_id_alter_customuser_uuid.py deleted file mode 100644 index 92982eb..0000000 --- a/backend/server/users/migrations/0004_customuser_id_alter_customuser_uuid.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 5.0.8 on 2024-08-11 12:59 - -import uuid -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0003_remove_customuser_id_customuser_uuid'), - ] - - operations = [ - migrations.AddField( - model_name='customuser', - name='id', - field=models.BigAutoField(auto_created=True, default=None, primary_key=True, serialize=False, verbose_name='ID'), - preserve_default=False, - ), - migrations.AlterField( - model_name='customuser', - name='uuid', - field=models.UUIDField(blank=True, default=uuid.uuid4, null=True, unique=True), - ), - ] diff --git a/backend/server/users/migrations/__init__.py b/backend/server/users/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/backend/server/users/models.py b/backend/server/users/models.py index 6f22cfb..d425210 100644 --- a/backend/server/users/models.py +++ b/backend/server/users/models.py @@ -5,7 +5,6 @@ from django_resized import ResizedImageField class CustomUser(AbstractUser): profile_pic = ResizedImageField(force_format="WEBP", quality=75, null=True, blank=True, upload_to='profile-pics/') - uuid = models.UUIDField(default=uuid.uuid4, editable=True, unique=True, null=True, blank=True) - + def __str__(self): return self.username \ No newline at end of file