Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-24 23:39:37 +02:00
Code Issues Releases Activity

Merge pull request #183 from seanmorley15/development

Browse source 
temp id
This commit is contained in:
Sean Morley 2024-08-11 08:44:13 -04:00 • committed by GitHub
commit a6041ec654
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/server/adventures/models.py
View file

@ -33,7 +33,7 @@ User = get_user_model()
class Adventure(models.Model):
id = models.AutoField(primary_key=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=True, 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)
@ -65,7 +65,7 @@ class Adventure(models.Model):
class Collection(models.Model):
id = models.AutoField(primary_key=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=True, 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)
@ -90,7 +90,7 @@ class Collection(models.Model):
class Transportation(models.Model):
id = models.AutoField(primary_key=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=True, 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)
@ -119,7 +119,7 @@ class Transportation(models.Model):
class Note(models.Model):
id = models.AutoField(primary_key=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=True, 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)
@ -143,7 +143,7 @@ class Note(models.Model):
class Checklist(models.Model):
id = models.AutoField(primary_key=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=True, 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)
@ -165,7 +165,7 @@ class Checklist(models.Model):
class ChecklistItem(models.Model):
id = models.AutoField(primary_key=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, null=True, blank=True)
temp_id = models.UUIDField(default=uuid.uuid4, editable=True, 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)

2
backend/server/users/models.py
View file

@ -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, null=True, blank=True)
uuid = models.UUIDField(default=uuid.uuid4, editable=True, unique=True, null=True, blank=True)
def __str__(self):
return self.username