alex/voyage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #182 from seanmorley15/development

Browse Source 
temp id
This commit is contained in:
Sean Morley
2024-08-11 08:39:06 -04:00
committed by GitHub
parent 303eeab113 cc0e50076f
commit 6220e5905d
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/server/adventures/models.py
View File

@@ -32,7 +32,8 @@ User = get_user_model()
class Adventure(models.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_id = models.ForeignKey(
User, on_delete=models.CASCADE, default=default_user_id) User, on_delete=models.CASCADE, default=default_user_id)
type = models.CharField(max_length=100, choices=ADVENTURE_TYPES) type = models.CharField(max_length=100, choices=ADVENTURE_TYPES)
@@ -63,7 +64,8 @@ class Adventure(models.Model):
return self.name return self.name
class Collection(models.Model): 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_id = models.ForeignKey(
User, on_delete=models.CASCADE, default=default_user_id) User, on_delete=models.CASCADE, default=default_user_id)
name = models.CharField(max_length=200) name = models.CharField(max_length=200)
@@ -87,7 +89,8 @@ class Collection(models.Model):
return self.name return self.name
class Transportation(models.Model): 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_id = models.ForeignKey(
User, on_delete=models.CASCADE, default=default_user_id) User, on_delete=models.CASCADE, default=default_user_id)
type = models.CharField(max_length=100, choices=TRANSPORTATION_TYPES) type = models.CharField(max_length=100, choices=TRANSPORTATION_TYPES)
@@ -115,7 +118,8 @@ class Transportation(models.Model):
return self.name return self.name
class Note(models.Model): 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_id = models.ForeignKey(
User, on_delete=models.CASCADE, default=default_user_id) User, on_delete=models.CASCADE, default=default_user_id)
name = models.CharField(max_length=200) name = models.CharField(max_length=200)
@@ -138,7 +142,8 @@ class Note(models.Model):
return self.name return self.name
class Checklist(models.Model): 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_id = models.ForeignKey(
User, on_delete=models.CASCADE, default=default_user_id) User, on_delete=models.CASCADE, default=default_user_id)
name = models.CharField(max_length=200) name = models.CharField(max_length=200)
@@ -159,7 +164,8 @@ class Checklist(models.Model):
return self.name return self.name
class ChecklistItem(models.Model): 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_id = models.ForeignKey(
User, on_delete=models.CASCADE, default=default_user_id) User, on_delete=models.CASCADE, default=default_user_id)
name = models.CharField(max_length=200) 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): class CustomUser(AbstractUser):
profile_pic = ResizedImageField(force_format="WEBP", quality=75, null=True, blank=True, upload_to='profile-pics/') 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): def __str__(self):
return self.username return self.username