diff --git a/backend/server/adventures/models.py b/backend/server/adventures/models.py index 165e7d1..8315e52 100644 --- a/backend/server/adventures/models.py +++ b/backend/server/adventures/models.py @@ -32,7 +32,8 @@ User = get_user_model() class Adventure(models.Model): - id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True) + id = models.AutoField(primary_key=True) + temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True) user_id = models.ForeignKey( User, on_delete=models.CASCADE, default=default_user_id) type = models.CharField(max_length=100, choices=ADVENTURE_TYPES) @@ -63,7 +64,8 @@ class Adventure(models.Model): return self.name class Collection(models.Model): - id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True) + id = models.AutoField(primary_key=True) + temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True) user_id = models.ForeignKey( User, on_delete=models.CASCADE, default=default_user_id) name = models.CharField(max_length=200) @@ -87,7 +89,8 @@ class Collection(models.Model): return self.name class Transportation(models.Model): - id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True) + id = models.AutoField(primary_key=True) + temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True) user_id = models.ForeignKey( User, on_delete=models.CASCADE, default=default_user_id) type = models.CharField(max_length=100, choices=TRANSPORTATION_TYPES) @@ -115,7 +118,8 @@ class Transportation(models.Model): return self.name class Note(models.Model): - id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True) + id = models.AutoField(primary_key=True) + temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True) user_id = models.ForeignKey( User, on_delete=models.CASCADE, default=default_user_id) name = models.CharField(max_length=200) @@ -138,7 +142,8 @@ class Note(models.Model): return self.name class Checklist(models.Model): - id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True) + id = models.AutoField(primary_key=True) + temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True) user_id = models.ForeignKey( User, on_delete=models.CASCADE, default=default_user_id) name = models.CharField(max_length=200) @@ -159,7 +164,8 @@ class Checklist(models.Model): return self.name class ChecklistItem(models.Model): - id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True) + id = models.AutoField(primary_key=True) + temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True) user_id = models.ForeignKey( User, on_delete=models.CASCADE, default=default_user_id) name = models.CharField(max_length=200) diff --git a/backend/server/users/models.py b/backend/server/users/models.py index 32e9e3e..83985d0 100644 --- a/backend/server/users/models.py +++ b/backend/server/users/models.py @@ -5,7 +5,7 @@ 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=False, unique=True, primary_key=True) + uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True, null=True, blank=True) def __str__(self): return self.username \ No newline at end of file