Skip to content

Commit 8ea0724

Browse files
seanmorley15seanmorley15
authored
Merge pull request #186 from seanmorley15/development
change name
2 parents 3da1526 + cd55437 commit 8ea0724

File tree

3 files changed

+127
-6
lines changed

3 files changed

+127
-6
lines changed

‎backend/server/adventures/migrations/0001_initial.py‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
# Generated by Django 5.0.8 on 2024-08-11 13:37
2+
3+
import django.contrib.postgres.fields
4+
import django.db.models.deletion
5+
import django_resized.forms
6+
import uuid
7+
from django.conf import settings
8+
from django.db import migrations, models
9+
10+
11+
class Migration(migrations.Migration):
12+
13+
initial = True
14+
15+
dependencies = [
16+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
17+
]
18+
19+
operations = [
20+
migrations.CreateModel(
21+
name='Checklist',
22+
fields=[
23+
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
24+
('name', models.CharField(max_length=200)),
25+
('date', models.DateField(blank=True, null=True)),
26+
('is_public', models.BooleanField(default=False)),
27+
('created_at', models.DateTimeField(auto_now_add=True)),
28+
('updated_at', models.DateTimeField(auto_now=True)),
29+
('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
30+
],
31+
),
32+
migrations.CreateModel(
33+
name='ChecklistItem',
34+
fields=[
35+
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
36+
('name', models.CharField(max_length=200)),
37+
('is_checked', models.BooleanField(default=False)),
38+
('created_at', models.DateTimeField(auto_now_add=True)),
39+
('updated_at', models.DateTimeField(auto_now=True)),
40+
('checklist', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='adventures.checklist')),
41+
('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
42+
],
43+
),
44+
migrations.CreateModel(
45+
name='Collection',
46+
fields=[
47+
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
48+
('name', models.CharField(max_length=200)),
49+
('description', models.TextField(blank=True, null=True)),
50+
('is_public', models.BooleanField(default=False)),
51+
('created_at', models.DateTimeField(auto_now_add=True)),
52+
('start_date', models.DateField(blank=True, null=True)),
53+
('end_date', models.DateField(blank=True, null=True)),
54+
('updated_at', models.DateTimeField(auto_now=True)),
55+
('is_archived', models.BooleanField(default=False)),
56+
('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
57+
],
58+
),
59+
migrations.AddField(
60+
model_name='checklist',
61+
name='collection',
62+
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection'),
63+
),
64+
migrations.CreateModel(
65+
name='Adventure',
66+
fields=[
67+
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
68+
('type', models.CharField(choices=[('visited', 'Visited'), ('planned', 'Planned'), ('lodging', 'Lodging'), ('dining', 'Dining')], max_length=100)),
69+
('name', models.CharField(max_length=200)),
70+
('location', models.CharField(blank=True, max_length=200, null=True)),
71+
('activity_types', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), blank=True, null=True, size=None)),
72+
('description', models.TextField(blank=True, null=True)),
73+
('rating', models.FloatField(blank=True, null=True)),
74+
('link', models.URLField(blank=True, null=True)),
75+
('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/')),
76+
('date', models.DateField(blank=True, null=True)),
77+
('is_public', models.BooleanField(default=False)),
78+
('longitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
79+
('latitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
80+
('created_at', models.DateTimeField(auto_now_add=True)),
81+
('updated_at', models.DateTimeField(auto_now=True)),
82+
('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
83+
('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection')),
84+
],
85+
),
86+
migrations.CreateModel(
87+
name='Note',
88+
fields=[
89+
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
90+
('name', models.CharField(max_length=200)),
91+
('content', models.TextField(blank=True, null=True)),
92+
('links', django.contrib.postgres.fields.ArrayField(base_field=models.URLField(), blank=True, null=True, size=None)),
93+
('date', models.DateField(blank=True, null=True)),
94+
('is_public', models.BooleanField(default=False)),
95+
('created_at', models.DateTimeField(auto_now_add=True)),
96+
('updated_at', models.DateTimeField(auto_now=True)),
97+
('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection')),
98+
('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
99+
],
100+
),
101+
migrations.CreateModel(
102+
name='Transportation',
103+
fields=[
104+
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
105+
('type', models.CharField(choices=[('car', 'Car'), ('plane', 'Plane'), ('train', 'Train'), ('bus', 'Bus'), ('boat', 'Boat'), ('bike', 'Bike'), ('walking', 'Walking'), ('other', 'Other')], max_length=100)),
106+
('name', models.CharField(max_length=200)),
107+
('description', models.TextField(blank=True, null=True)),
108+
('rating', models.FloatField(blank=True, null=True)),
109+
('link', models.URLField(blank=True, null=True)),
110+
('date', models.DateTimeField(blank=True, null=True)),
111+
('flight_number', models.CharField(blank=True, max_length=100, null=True)),
112+
('from_location', models.CharField(blank=True, max_length=200, null=True)),
113+
('to_location', models.CharField(blank=True, max_length=200, null=True)),
114+
('is_public', models.BooleanField(default=False)),
115+
('created_at', models.DateTimeField(auto_now_add=True)),
116+
('updated_at', models.DateTimeField(auto_now=True)),
117+
('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection')),
118+
('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
119+
],
120+
),
121+
]

‎backend/server/adventures/migrations/__init__.py‎

Whitespace-only changes.

‎backend/server/adventures/models.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
class Adventure(models.Model):
3535
#id = models.AutoField(primary_key=True)
36-
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
36+
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
3737
user_id = models.ForeignKey(
3838
User, on_delete=models.CASCADE, default=default_user_id)
3939
type = models.CharField(max_length=100, choices=ADVENTURE_TYPES)
@@ -65,7 +65,7 @@ def __str__(self):
6565

6666
class Collection(models.Model):
6767
#id = models.AutoField(primary_key=True)
68-
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
68+
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
6969
user_id = models.ForeignKey(
7070
User, on_delete=models.CASCADE, default=default_user_id)
7171
name = models.CharField(max_length=200)
@@ -90,7 +90,7 @@ def __str__(self):
9090

9191
class Transportation(models.Model):
9292
#id = models.AutoField(primary_key=True)
93-
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
93+
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
9494
user_id = models.ForeignKey(
9595
User, on_delete=models.CASCADE, default=default_user_id)
9696
type = models.CharField(max_length=100, choices=TRANSPORTATION_TYPES)
@@ -119,7 +119,7 @@ def __str__(self):
119119

120120
class Note(models.Model):
121121
#id = models.AutoField(primary_key=True)
122-
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
122+
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
123123
user_id = models.ForeignKey(
124124
User, on_delete=models.CASCADE, default=default_user_id)
125125
name = models.CharField(max_length=200)
@@ -143,7 +143,7 @@ def __str__(self):
143143

144144
class Checklist(models.Model):
145145
# id = models.AutoField(primary_key=True)
146-
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
146+
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
147147
user_id = models.ForeignKey(
148148
User, on_delete=models.CASCADE, default=default_user_id)
149149
name = models.CharField(max_length=200)
@@ -165,7 +165,7 @@ def __str__(self):
165165

166166
class ChecklistItem(models.Model):
167167
#id = models.AutoField(primary_key=True)
168-
temp_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
168+
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
169169
user_id = models.ForeignKey(
170170
User, on_delete=models.CASCADE, default=default_user_id)
171171
name = models.CharField(max_length=200)

0 commit comments

Comments
 (0)