- AdventureLog
- -- The ultimate travel companion for the modern-day explorer. -
- -
- - The ultimate travel companion for the modern-day explorer. -
- -
- Displays the adventures you have visited and the ones you plan to embark on. You can also filter and sort the adventures.
-
- Shows specific details about an adventure, including the name, date, location, description, and rating.
-
- 
- View all of your adventures on a map, with the ability to filter by visit status and add new ones by click on the map
-
- Displays a summary of your adventures, including your world travel stats.
-
- Plan your adventures and travel itinerary with a list of activities and a map view. View your trip in a variety of ways, including an itinerary list, a map view, and a calendar view.
-
- Lists all the countries you have visited and plan to visit, with the ability to filter by visit status.
-
- Displays the regions for a specific country, includes a map view to visually select regions.
-
bool:
- try:
- socket.gethostbyname(hostname)
- return True
- except socket.error:
- return False
-
-def reverse_geocode(lat, lon, user):
- if getattr(settings, 'GOOGLE_MAPS_API_KEY', None):
- return reverse_geocode_google(lat, lon, user)
- return reverse_geocode_osm(lat, lon, user)
-
-def reverse_geocode_osm(lat, lon, user):
- url = f"https://nominatim.openstreetmap.org/reverse?format=jsonv2&lat={lat}&lon={lon}"
- headers = {'User-Agent': 'AdventureLog Server'}
- connect_timeout = 1
- read_timeout = 5
-
- if not is_host_resolvable("nominatim.openstreetmap.org"):
- return {"error": "DNS resolution failed"}
-
- try:
- response = requests.get(url, headers=headers, timeout=(connect_timeout, read_timeout))
- response.raise_for_status()
- data = response.json()
- return extractIsoCode(user, data)
- except Exception:
- return {"error": "An internal error occurred while processing the request"}
-
-def reverse_geocode_google(lat, lon, user):
- api_key = settings.GOOGLE_MAPS_API_KEY
-
- # Updated to use the new Geocoding API endpoint (this one is still supported)
- # The Geocoding API is separate from Places API and still uses the old format
- url = "https://maps.googleapis.com/maps/api/geocode/json"
- params = {"latlng": f"{lat},{lon}", "key": api_key}
-
- try:
- response = requests.get(url, params=params)
- response.raise_for_status()
- data = response.json()
-
- if data.get("status") != "OK":
- return {"error": "Geocoding failed"}
-
- # Convert Google schema to Nominatim-style for extractIsoCode
- first_result = data.get("results", [])[0]
- result_data = {
- "name": first_result.get("formatted_address"),
- "address": _parse_google_address_components(first_result.get("address_components", []))
- }
- return extractIsoCode(user, result_data)
- except Exception:
- return {"error": "An internal error occurred while processing the request"}
-
-def _parse_google_address_components(components):
- parsed = {}
- country_code = None
- state_code = None
-
- for comp in components:
- types = comp.get("types", [])
- long_name = comp.get("long_name")
- short_name = comp.get("short_name")
-
- if "country" in types:
- parsed["country"] = long_name
- country_code = short_name
- parsed["ISO3166-1"] = short_name
- if "administrative_area_level_1" in types:
- parsed["state"] = long_name
- state_code = short_name
- if "administrative_area_level_2" in types:
- parsed["county"] = long_name
- if "locality" in types:
- parsed["city"] = long_name
- if "sublocality" in types:
- parsed["town"] = long_name
-
- # Build composite ISO 3166-2 code like US-ME
- if country_code and state_code:
- parsed["ISO3166-2-lvl1"] = f"{country_code}-{state_code}"
-
- return parsed
\ No newline at end of file
diff --git a/backend/server/adventures/managers.py b/backend/server/adventures/managers.py
deleted file mode 100644
index 4a12194..0000000
--- a/backend/server/adventures/managers.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from django.db import models
-from django.db.models import Q
-
-class AdventureManager(models.Manager):
- def retrieve_adventures(self, user, include_owned=False, include_shared=False, include_public=False):
- query = Q()
-
- if include_owned:
- query |= Q(user_id=user)
-
- if include_shared:
- query |= Q(collections__shared_with=user)
-
- if include_public:
- query |= Q(is_public=True)
-
- return self.filter(query).distinct()
diff --git a/backend/server/adventures/middleware.py b/backend/server/adventures/middleware.py
index fae6b0b..af54b68 100644
--- a/backend/server/adventures/middleware.py
+++ b/backend/server/adventures/middleware.py
@@ -1,40 +1,13 @@
-from django.conf import settings
-from django.utils.deprecation import MiddlewareMixin
-import os
-
-class OverrideHostMiddleware:
+class AppVersionMiddleware:
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
- public_url = os.getenv('PUBLIC_URL', None)
- if public_url:
- # Extract host and scheme
- scheme, host = public_url.split("://")
- request.META['HTTP_HOST'] = host
- request.META['wsgi.url_scheme'] = scheme
-
- # Set X-Forwarded-Proto for Django
- request.META['HTTP_X_FORWARDED_PROTO'] = scheme
-
+ # Process request (if needed)
response = self.get_response(request)
+
+ # Add custom header to response
+ # Replace with your app version
+ response['X-AdventureLog-Version'] = '1.0.0'
+
return response
-
-class XSessionTokenMiddleware(MiddlewareMixin):
- def process_request(self, request):
- session_token = request.headers.get('X-Session-Token')
- if session_token:
- request.COOKIES[settings.SESSION_COOKIE_NAME] = session_token
-
-class DisableCSRFForSessionTokenMiddleware(MiddlewareMixin):
- def process_request(self, request):
- if 'X-Session-Token' in request.headers:
- setattr(request, '_dont_enforce_csrf_checks', True)
-
-class DisableCSRFForMobileLoginSignup(MiddlewareMixin):
- def process_request(self, request):
- is_mobile = request.headers.get('X-Is-Mobile', '').lower() == 'true'
- is_login_or_signup = request.path in ['/auth/browser/v1/auth/login', '/auth/browser/v1/auth/signup']
- if is_mobile and is_login_or_signup:
- setattr(request, '_dont_enforce_csrf_checks', True)
-
\ No newline at end of file
diff --git a/backend/server/adventures/migrations/0001_adventure_image.py b/backend/server/adventures/migrations/0001_adventure_image.py
deleted file mode 100644
index 6906db4..0000000
--- a/backend/server/adventures/migrations/0001_adventure_image.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 5.0.8 on 2024-08-15 23:20
-
-import django_resized.forms
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', 'migrate_images'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='adventure',
- name='image',
- 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='images/'),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0002_adventureimage.py b/backend/server/adventures/migrations/0002_adventureimage.py
deleted file mode 100644
index bf80832..0000000
--- a/backend/server/adventures/migrations/0002_adventureimage.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 5.0.8 on 2024-08-15 23:17
-
-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):
-
- dependencies = [
- ('adventures', '0001_initial'),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.CreateModel(
- name='AdventureImage',
- fields=[
- ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
- ('image', django_resized.forms.ResizedImageField(crop=None, force_format='WEBP', keep_meta=True, quality=75, scale=None, size=[1920, 1080], upload_to='images/')),
- ('adventure', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='adventures.adventure')),
- ('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_alter_adventureimage_adventure.py b/backend/server/adventures/migrations/0002_alter_adventureimage_adventure.py
deleted file mode 100644
index b03c3ad..0000000
--- a/backend/server/adventures/migrations/0002_alter_adventureimage_adventure.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 5.0.8 on 2024-08-15 23:31
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0001_adventure_image'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='adventureimage',
- name='adventure',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='adventures.adventure'),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0003_adventure_end_date.py b/backend/server/adventures/migrations/0003_adventure_end_date.py
deleted file mode 100644
index a04bbdb..0000000
--- a/backend/server/adventures/migrations/0003_adventure_end_date.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.8 on 2024-08-18 16:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0002_alter_adventureimage_adventure'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='adventure',
- name='end_date',
- field=models.DateField(blank=True, null=True),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0004_transportation_end_date.py b/backend/server/adventures/migrations/0004_transportation_end_date.py
deleted file mode 100644
index 04f3b57..0000000
--- a/backend/server/adventures/migrations/0004_transportation_end_date.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.8 on 2024-08-19 20:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0003_adventure_end_date'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='transportation',
- name='end_date',
- field=models.DateTimeField(blank=True, null=True),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0005_collection_shared_with.py b/backend/server/adventures/migrations/0005_collection_shared_with.py
deleted file mode 100644
index c3ee3ac..0000000
--- a/backend/server/adventures/migrations/0005_collection_shared_with.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 5.0.8 on 2024-09-02 13:21
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0004_transportation_end_date'),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.AddField(
- model_name='collection',
- name='shared_with',
- field=models.ManyToManyField(blank=True, related_name='shared_with', to=settings.AUTH_USER_MODEL),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0006_alter_adventure_link.py b/backend/server/adventures/migrations/0006_alter_adventure_link.py
deleted file mode 100644
index 1a78820..0000000
--- a/backend/server/adventures/migrations/0006_alter_adventure_link.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.8 on 2024-09-17 14:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0005_collection_shared_with'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='adventure',
- name='link',
- field=models.URLField(blank=True, max_length=2083, null=True),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0007_visit_model.py b/backend/server/adventures/migrations/0007_visit_model.py
deleted file mode 100644
index 8197c08..0000000
--- a/backend/server/adventures/migrations/0007_visit_model.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated by Django 5.0.8 on 2024-09-23 18:06
-
-import django.db.models.deletion
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0006_alter_adventure_link'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='adventure',
- name='type',
- field=models.CharField(choices=[('general', 'General 🌍'), ('Outdoor', 'Outdoor 🏞️'), ('lodging', 'Lodging 🛌'), ('dining', 'Dining 🍽️'), ('activity', 'Activity 🏄'), ('attraction', 'Attraction 🎢'), ('shopping', 'Shopping 🛍️'), ('nightlife', 'Nightlife 🌃'), ('event', 'Event 🎉'), ('transportation', 'Transportation 🚗'), ('culture', 'Culture 🎭'), ('water_sports', 'Water Sports 🚤'), ('hiking', 'Hiking 🥾'), ('wildlife', 'Wildlife 🦒'), ('historical_sites', 'Historical Sites 🏛️'), ('music_concerts', 'Music & Concerts 🎶'), ('fitness', 'Fitness 🏋️'), ('art_museums', 'Art & Museums 🎨'), ('festivals', 'Festivals 🎪'), ('spiritual_journeys', 'Spiritual Journeys 🧘\u200d♀️'), ('volunteer_work', 'Volunteer Work 🤝'), ('other', 'Other')], default='general', max_length=100),
- ),
- migrations.CreateModel(
- name='Visit',
- fields=[
- ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
- ('start_date', models.DateField(blank=True, null=True)),
- ('end_date', models.DateField(blank=True, null=True)),
- ('notes', models.TextField(blank=True, null=True)),
- ('created_at', models.DateTimeField(auto_now_add=True)),
- ('updated_at', models.DateTimeField(auto_now=True)),
- ('adventure', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='visits', to='adventures.adventure')),
- ],
- ),
- ]
diff --git a/backend/server/adventures/migrations/0008_remove_date_field.py b/backend/server/adventures/migrations/0008_remove_date_field.py
deleted file mode 100644
index 0260097..0000000
--- a/backend/server/adventures/migrations/0008_remove_date_field.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 5.0.8 on 2024-09-23 18:06
-
-import django.db.models.deletion
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', 'migrate_visits_categories'),
- ('adventures', 'migrate_images'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='adventure',
- name='date',
- ),
- migrations.RemoveField(
- model_name='adventure',
- name='end_date',
- ),
- migrations.RemoveField(
- model_name='adventure',
- name='image',
- ),
- ]
diff --git a/backend/server/adventures/migrations/0009_alter_adventure_type.py b/backend/server/adventures/migrations/0009_alter_adventure_type.py
deleted file mode 100644
index 72178f9..0000000
--- a/backend/server/adventures/migrations/0009_alter_adventure_type.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.8 on 2024-09-30 00:33
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0008_remove_date_field'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='adventure',
- name='type',
- field=models.CharField(choices=[('general', 'General 🌍'), ('outdoor', 'Outdoor 🏞️'), ('lodging', 'Lodging 🛌'), ('dining', 'Dining 🍽️'), ('activity', 'Activity 🏄'), ('attraction', 'Attraction 🎢'), ('shopping', 'Shopping 🛍️'), ('nightlife', 'Nightlife 🌃'), ('event', 'Event 🎉'), ('transportation', 'Transportation 🚗'), ('culture', 'Culture 🎭'), ('water_sports', 'Water Sports 🚤'), ('hiking', 'Hiking 🥾'), ('wildlife', 'Wildlife 🦒'), ('historical_sites', 'Historical Sites 🏛️'), ('music_concerts', 'Music & Concerts 🎶'), ('fitness', 'Fitness 🏋️'), ('art_museums', 'Art & Museums 🎨'), ('festivals', 'Festivals 🎪'), ('spiritual_journeys', 'Spiritual Journeys 🧘\u200d♀️'), ('volunteer_work', 'Volunteer Work 🤝'), ('other', 'Other')], default='general', max_length=100),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0010_collection_link.py b/backend/server/adventures/migrations/0010_collection_link.py
deleted file mode 100644
index 85a5341..0000000
--- a/backend/server/adventures/migrations/0010_collection_link.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.8 on 2024-10-08 03:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0009_alter_adventure_type'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='collection',
- name='link',
- field=models.URLField(blank=True, max_length=2083, null=True),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0011_category_adventure_category.py b/backend/server/adventures/migrations/0011_category_adventure_category.py
deleted file mode 100644
index 6413454..0000000
--- a/backend/server/adventures/migrations/0011_category_adventure_category.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by Django 5.0.8 on 2024-11-14 04:30
-
-from django.conf import settings
-import django.db.models.deletion
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0010_collection_link'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Category',
- fields=[
- ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
- ('name', models.CharField(max_length=200)),
- ('display_name', models.CharField(max_length=200)),
- ('icon', models.CharField(default='🌍', max_length=200)),
- ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
- ],
- options={
- 'verbose_name_plural': 'Categories',
- },
- ),
- migrations.AddField(
- model_name='adventure',
- name='category',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.category'),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0012_migrate_types_to_categories.py b/backend/server/adventures/migrations/0012_migrate_types_to_categories.py
deleted file mode 100644
index 8aea132..0000000
--- a/backend/server/adventures/migrations/0012_migrate_types_to_categories.py
+++ /dev/null
@@ -1,59 +0,0 @@
-from django.db import migrations
-
-def migrate_categories(apps, schema_editor):
- # Use the historical models
- Adventure = apps.get_model('adventures', 'Adventure')
- Category = apps.get_model('adventures', 'Category')
-
- ADVENTURE_TYPES = {
- 'general': ('General', '🌍'),
- 'outdoor': ('Outdoor', '🏞️'),
- 'lodging': ('Lodging', '🛌'),
- 'dining': ('Dining', '🍽️'),
- 'activity': ('Activity', '🏄'),
- 'attraction': ('Attraction', '🎢'),
- 'shopping': ('Shopping', '🛍️'),
- 'nightlife': ('Nightlife', '🌃'),
- 'event': ('Event', '🎉'),
- 'transportation': ('Transportation', '🚗'),
- 'culture': ('Culture', '🎭'),
- 'water_sports': ('Water Sports', '🚤'),
- 'hiking': ('Hiking', '🥾'),
- 'wildlife': ('Wildlife', '🦒'),
- 'historical_sites': ('Historical Sites', '🏛️'),
- 'music_concerts': ('Music & Concerts', '🎶'),
- 'fitness': ('Fitness', '🏋️'),
- 'art_museums': ('Art & Museums', '🎨'),
- 'festivals': ('Festivals', '🎪'),
- 'spiritual_journeys': ('Spiritual Journeys', '🧘♀️'),
- 'volunteer_work': ('Volunteer Work', '🤝'),
- 'other': ('Other', '❓'),
- }
-
- adventures = Adventure.objects.all()
- for adventure in adventures:
- # Access the old 'type' field using __dict__ because it's not in the model anymore
- old_type = adventure.__dict__.get('type')
- if old_type in ADVENTURE_TYPES:
- category, created = Category.objects.get_or_create(
- name=old_type,
- user_id=adventure.user_id,
- defaults={
- 'display_name': ADVENTURE_TYPES[old_type][0],
- 'icon': ADVENTURE_TYPES[old_type][1],
- }
- )
- adventure.category = category
- adventure.save()
- else:
- print(f"Unknown type: {old_type}")
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0011_category_adventure_category'),
- ]
-
- operations = [
- migrations.RunPython(migrate_categories),
- ]
\ No newline at end of file
diff --git a/backend/server/adventures/migrations/0013_remove_adventure_type_alter_adventure_category.py b/backend/server/adventures/migrations/0013_remove_adventure_type_alter_adventure_category.py
deleted file mode 100644
index d52f950..0000000
--- a/backend/server/adventures/migrations/0013_remove_adventure_type_alter_adventure_category.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 5.0.8 on 2024-11-14 04:51
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0012_migrate_types_to_categories'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='adventure',
- name='type',
- ),
- migrations.AlterField(
- model_name='adventure',
- name='category',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='adventures.category'),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0014_alter_category_unique_together.py b/backend/server/adventures/migrations/0014_alter_category_unique_together.py
deleted file mode 100644
index 79b0bdf..0000000
--- a/backend/server/adventures/migrations/0014_alter_category_unique_together.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 5.0.8 on 2024-11-17 21:43
-
-from django.conf import settings
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0013_remove_adventure_type_alter_adventure_category'),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.AlterUniqueTogether(
- name='category',
- unique_together={('name', 'user_id')},
- ),
- ]
diff --git a/backend/server/adventures/migrations/0015_transportation_destination_latitude_and_more.py b/backend/server/adventures/migrations/0015_transportation_destination_latitude_and_more.py
deleted file mode 100644
index 7971839..0000000
--- a/backend/server/adventures/migrations/0015_transportation_destination_latitude_and_more.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by Django 5.0.8 on 2024-12-19 17:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0014_alter_category_unique_together'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='transportation',
- name='destination_latitude',
- field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
- ),
- migrations.AddField(
- model_name='transportation',
- name='destination_longitude',
- field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
- ),
- migrations.AddField(
- model_name='transportation',
- name='origin_latitude',
- field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
- ),
- migrations.AddField(
- model_name='transportation',
- name='origin_longitude',
- field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0016_alter_adventureimage_image.py b/backend/server/adventures/migrations/0016_alter_adventureimage_image.py
deleted file mode 100644
index a226fe1..0000000
--- a/backend/server/adventures/migrations/0016_alter_adventureimage_image.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 5.0.8 on 2025-01-01 21:40
-
-import adventures.models
-import django_resized.forms
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0015_transportation_destination_latitude_and_more'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='adventureimage',
- name='image',
- field=django_resized.forms.ResizedImageField(crop=None, force_format='WEBP', keep_meta=True, quality=75, scale=None, size=[1920, 1080], upload_to=adventures.models.PathAndRename('images/')),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0017_adventureimage_is_primary.py b/backend/server/adventures/migrations/0017_adventureimage_is_primary.py
deleted file mode 100644
index 9a920a3..0000000
--- a/backend/server/adventures/migrations/0017_adventureimage_is_primary.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.8 on 2025-01-03 04:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0016_alter_adventureimage_image'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='adventureimage',
- name='is_primary',
- field=models.BooleanField(default=False),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0018_attachment.py b/backend/server/adventures/migrations/0018_attachment.py
deleted file mode 100644
index f41c44b..0000000
--- a/backend/server/adventures/migrations/0018_attachment.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Generated by Django 5.0.8 on 2025-01-19 00:39
-
-import django.db.models.deletion
-import uuid
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0017_adventureimage_is_primary'),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Attachment',
- fields=[
- ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
- ('file', models.FileField(upload_to='attachments/')),
- ('adventure', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='adventures.adventure')),
- ('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/0019_alter_attachment_file.py b/backend/server/adventures/migrations/0019_alter_attachment_file.py
deleted file mode 100644
index bb48fae..0000000
--- a/backend/server/adventures/migrations/0019_alter_attachment_file.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 5.0.8 on 2025-01-19 22:17
-
-import adventures.models
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0018_attachment'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='attachment',
- name='file',
- field=models.FileField(upload_to=adventures.models.PathAndRename('attachments/')),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0020_attachment_name.py b/backend/server/adventures/migrations/0020_attachment_name.py
deleted file mode 100644
index 4773250..0000000
--- a/backend/server/adventures/migrations/0020_attachment_name.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 5.0.8 on 2025-01-19 22:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0019_alter_attachment_file'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='attachment',
- name='name',
- field=models.CharField(default='', max_length=200),
- preserve_default=False,
- ),
- ]
diff --git a/backend/server/adventures/migrations/0021_alter_attachment_name.py b/backend/server/adventures/migrations/0021_alter_attachment_name.py
deleted file mode 100644
index 93b7eb3..0000000
--- a/backend/server/adventures/migrations/0021_alter_attachment_name.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.8 on 2025-01-19 22:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0020_attachment_name'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='attachment',
- name='name',
- field=models.CharField(blank=True, max_length=200, null=True),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0022_hotel.py b/backend/server/adventures/migrations/0022_hotel.py
deleted file mode 100644
index 56a6097..0000000
--- a/backend/server/adventures/migrations/0022_hotel.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated by Django 5.0.8 on 2025-02-02 15:36
-
-import django.db.models.deletion
-import uuid
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0021_alter_attachment_name'),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Hotel',
- 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)),
- ('rating', models.FloatField(blank=True, null=True)),
- ('link', models.URLField(blank=True, max_length=2083, null=True)),
- ('check_in', models.DateTimeField(blank=True, null=True)),
- ('check_out', models.DateTimeField(blank=True, null=True)),
- ('reservation_number', models.CharField(blank=True, max_length=100, null=True)),
- ('price', models.DecimalField(blank=True, decimal_places=2, max_digits=9, null=True)),
- ('latitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
- ('longitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
- ('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/0023_lodging_delete_hotel.py b/backend/server/adventures/migrations/0023_lodging_delete_hotel.py
deleted file mode 100644
index 44e502c..0000000
--- a/backend/server/adventures/migrations/0023_lodging_delete_hotel.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated by Django 5.0.8 on 2025-02-08 01:50
-
-import django.db.models.deletion
-import uuid
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0022_hotel'),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Lodging',
- fields=[
- ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
- ('name', models.CharField(max_length=200)),
- ('type', models.CharField(choices=[('hotel', 'Hotel'), ('hostel', 'Hostel'), ('resort', 'Resort'), ('bnb', 'Bed & Breakfast'), ('campground', 'Campground'), ('cabin', 'Cabin'), ('apartment', 'Apartment'), ('house', 'House'), ('villa', 'Villa'), ('motel', 'Motel'), ('other', 'Other')], default='other', max_length=100)),
- ('description', models.TextField(blank=True, null=True)),
- ('rating', models.FloatField(blank=True, null=True)),
- ('link', models.URLField(blank=True, max_length=2083, null=True)),
- ('check_in', models.DateTimeField(blank=True, null=True)),
- ('check_out', models.DateTimeField(blank=True, null=True)),
- ('reservation_number', models.CharField(blank=True, max_length=100, null=True)),
- ('price', models.DecimalField(blank=True, decimal_places=2, max_digits=9, null=True)),
- ('latitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
- ('longitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
- ('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)),
- ],
- ),
- migrations.DeleteModel(
- name='Hotel',
- ),
- ]
diff --git a/backend/server/adventures/migrations/0024_alter_attachment_file.py b/backend/server/adventures/migrations/0024_alter_attachment_file.py
deleted file mode 100644
index e63bb0e..0000000
--- a/backend/server/adventures/migrations/0024_alter_attachment_file.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 5.0.8 on 2025-03-17 01:15
-
-import adventures.models
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0023_lodging_delete_hotel'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='attachment',
- name='file',
- field=models.FileField(upload_to=adventures.models.PathAndRename('attachments/'), validators=[adventures.models.validate_file_extension]),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0025_alter_visit_end_date_alter_visit_start_date.py b/backend/server/adventures/migrations/0025_alter_visit_end_date_alter_visit_start_date.py
deleted file mode 100644
index 668e968..0000000
--- a/backend/server/adventures/migrations/0025_alter_visit_end_date_alter_visit_start_date.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 5.0.8 on 2025-03-17 21:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0024_alter_attachment_file'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='visit',
- name='end_date',
- field=models.DateTimeField(blank=True, null=True),
- ),
- migrations.AlterField(
- model_name='visit',
- name='start_date',
- field=models.DateTimeField(blank=True, null=True),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0026_visit_timezone.py b/backend/server/adventures/migrations/0026_visit_timezone.py
deleted file mode 100644
index f0642dd..0000000
--- a/backend/server/adventures/migrations/0026_visit_timezone.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.11 on 2025-05-10 14:53
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0025_alter_visit_end_date_alter_visit_start_date'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='visit',
- name='timezone',
- field=models.CharField(blank=True, choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmera', 'Africa/Asmera'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Buenos_Aires', 'America/Buenos_Aires'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Catamarca', 'America/Catamarca'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Ciudad_Juarez', 'America/Ciudad_Juarez'), ('America/Coral_Harbour', 'America/Coral_Harbour'), ('America/Cordoba', 'America/Cordoba'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Indianapolis', 'America/Indianapolis'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Jujuy', 'America/Jujuy'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Louisville', 'America/Louisville'), ('America/Lower_Princes', 'America/Lower_Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Mendoza', 'America/Mendoza'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St_Barthelemy'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Calcutta', 'Asia/Calcutta'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Katmandu', 'Asia/Katmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Rangoon', 'Asia/Rangoon'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Saigon', 'Asia/Saigon'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faeroe', 'Atlantic/Faeroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle_of_Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San_Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zurich', 'Europe/Zurich'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Ponape', 'Pacific/Ponape'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Truk', 'Pacific/Truk'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis')], max_length=50, null=True),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0027_transportation_end_timezone_and_more.py b/backend/server/adventures/migrations/0027_transportation_end_timezone_and_more.py
deleted file mode 100644
index 6331225..0000000
--- a/backend/server/adventures/migrations/0027_transportation_end_timezone_and_more.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 5.0.11 on 2025-05-10 15:40
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0026_visit_timezone'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='transportation',
- name='end_timezone',
- field=models.CharField(blank=True, choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmera', 'Africa/Asmera'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Buenos_Aires', 'America/Buenos_Aires'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Catamarca', 'America/Catamarca'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Ciudad_Juarez', 'America/Ciudad_Juarez'), ('America/Coral_Harbour', 'America/Coral_Harbour'), ('America/Cordoba', 'America/Cordoba'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Indianapolis', 'America/Indianapolis'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Jujuy', 'America/Jujuy'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Louisville', 'America/Louisville'), ('America/Lower_Princes', 'America/Lower_Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Mendoza', 'America/Mendoza'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St_Barthelemy'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Calcutta', 'Asia/Calcutta'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Katmandu', 'Asia/Katmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Rangoon', 'Asia/Rangoon'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Saigon', 'Asia/Saigon'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faeroe', 'Atlantic/Faeroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle_of_Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San_Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zurich', 'Europe/Zurich'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Ponape', 'Pacific/Ponape'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Truk', 'Pacific/Truk'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis')], max_length=50, null=True),
- ),
- migrations.AddField(
- model_name='transportation',
- name='start_timezone',
- field=models.CharField(blank=True, choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmera', 'Africa/Asmera'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Buenos_Aires', 'America/Buenos_Aires'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Catamarca', 'America/Catamarca'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Ciudad_Juarez', 'America/Ciudad_Juarez'), ('America/Coral_Harbour', 'America/Coral_Harbour'), ('America/Cordoba', 'America/Cordoba'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Indianapolis', 'America/Indianapolis'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Jujuy', 'America/Jujuy'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Louisville', 'America/Louisville'), ('America/Lower_Princes', 'America/Lower_Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Mendoza', 'America/Mendoza'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St_Barthelemy'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Calcutta', 'Asia/Calcutta'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Katmandu', 'Asia/Katmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Rangoon', 'Asia/Rangoon'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Saigon', 'Asia/Saigon'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faeroe', 'Atlantic/Faeroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle_of_Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San_Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zurich', 'Europe/Zurich'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Ponape', 'Pacific/Ponape'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Truk', 'Pacific/Truk'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis')], max_length=50, null=True),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0028_lodging_timezone.py b/backend/server/adventures/migrations/0028_lodging_timezone.py
deleted file mode 100644
index d9513f7..0000000
--- a/backend/server/adventures/migrations/0028_lodging_timezone.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.11 on 2025-05-10 15:54
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0027_transportation_end_timezone_and_more'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='lodging',
- name='timezone',
- field=models.CharField(blank=True, choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmera', 'Africa/Asmera'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Buenos_Aires', 'America/Buenos_Aires'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Catamarca', 'America/Catamarca'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Ciudad_Juarez', 'America/Ciudad_Juarez'), ('America/Coral_Harbour', 'America/Coral_Harbour'), ('America/Cordoba', 'America/Cordoba'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Indianapolis', 'America/Indianapolis'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Jujuy', 'America/Jujuy'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Louisville', 'America/Louisville'), ('America/Lower_Princes', 'America/Lower_Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Mendoza', 'America/Mendoza'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St_Barthelemy'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Calcutta', 'Asia/Calcutta'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Katmandu', 'Asia/Katmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Rangoon', 'Asia/Rangoon'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Saigon', 'Asia/Saigon'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faeroe', 'Atlantic/Faeroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle_of_Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San_Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zurich', 'Europe/Zurich'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Ponape', 'Pacific/Ponape'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Truk', 'Pacific/Truk'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis')], max_length=50, null=True),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0029_adventure_city_adventure_country_adventure_region.py b/backend/server/adventures/migrations/0029_adventure_city_adventure_country_adventure_region.py
deleted file mode 100644
index 3df78e0..0000000
--- a/backend/server/adventures/migrations/0029_adventure_city_adventure_country_adventure_region.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated by Django 5.0.11 on 2025-05-22 22:48
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0028_lodging_timezone'),
- ('worldtravel', '0015_city_insert_id_country_insert_id_region_insert_id'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='adventure',
- name='city',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='worldtravel.city'),
- ),
- migrations.AddField(
- model_name='adventure',
- name='country',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='worldtravel.country'),
- ),
- migrations.AddField(
- model_name='adventure',
- name='region',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='worldtravel.region'),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0030_set_end_date_equal_start.py b/backend/server/adventures/migrations/0030_set_end_date_equal_start.py
deleted file mode 100644
index 55d5f93..0000000
--- a/backend/server/adventures/migrations/0030_set_end_date_equal_start.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from django.db import migrations
-
-def set_end_date_equal_to_start(apps, schema_editor):
- Visit = apps.get_model('adventures', 'Visit')
- for visit in Visit.objects.filter(end_date__isnull=True):
- if visit.start_date:
- visit.end_date = visit.start_date
- visit.save()
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0029_adventure_city_adventure_country_adventure_region'),
- ]
-
- operations = [
- migrations.RunPython(set_end_date_equal_to_start),
- ]
diff --git a/backend/server/adventures/migrations/0031_adventureimage_immich_id_alter_adventureimage_image_and_more.py b/backend/server/adventures/migrations/0031_adventureimage_immich_id_alter_adventureimage_image_and_more.py
deleted file mode 100644
index 75ebb60..0000000
--- a/backend/server/adventures/migrations/0031_adventureimage_immich_id_alter_adventureimage_image_and_more.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Generated by Django 5.2.1 on 2025-06-01 16:57
-
-import adventures.models
-import django_resized.forms
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0030_set_end_date_equal_start'),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.AddField(
- model_name='adventureimage',
- name='immich_id',
- field=models.CharField(blank=True, max_length=200, null=True),
- ),
- migrations.AlterField(
- model_name='adventureimage',
- name='image',
- 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=adventures.models.PathAndRename('images/')),
- ),
- migrations.AddConstraint(
- model_name='adventureimage',
- constraint=models.CheckConstraint(condition=models.Q(models.Q(('image__isnull', False), ('immich_id__isnull', True)), models.Q(('image__isnull', True), ('immich_id__isnull', False)), _connector='OR'), name='image_xor_immich_id'),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0032_remove_adventureimage_image_xor_immich_id.py b/backend/server/adventures/migrations/0032_remove_adventureimage_image_xor_immich_id.py
deleted file mode 100644
index 2ae8076..0000000
--- a/backend/server/adventures/migrations/0032_remove_adventureimage_image_xor_immich_id.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 5.2.1 on 2025-06-01 17:18
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0031_adventureimage_immich_id_alter_adventureimage_image_and_more'),
- ]
-
- operations = [
- migrations.RemoveConstraint(
- model_name='adventureimage',
- name='image_xor_immich_id',
- ),
- ]
diff --git a/backend/server/adventures/migrations/0033_adventureimage_unique_immich_id_per_user.py b/backend/server/adventures/migrations/0033_adventureimage_unique_immich_id_per_user.py
deleted file mode 100644
index d3b1bb5..0000000
--- a/backend/server/adventures/migrations/0033_adventureimage_unique_immich_id_per_user.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 5.2.1 on 2025-06-02 02:31
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0032_remove_adventureimage_image_xor_immich_id'),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.AddConstraint(
- model_name='adventureimage',
- constraint=models.UniqueConstraint(fields=('immich_id', 'user_id'), name='unique_immich_id_per_user'),
- ),
- ]
diff --git a/backend/server/adventures/migrations/0034_remove_adventureimage_unique_immich_id_per_user.py b/backend/server/adventures/migrations/0034_remove_adventureimage_unique_immich_id_per_user.py
deleted file mode 100644
index 52b3e52..0000000
--- a/backend/server/adventures/migrations/0034_remove_adventureimage_unique_immich_id_per_user.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 5.2.1 on 2025-06-02 02:44
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0033_adventureimage_unique_immich_id_per_user'),
- ]
-
- operations = [
- migrations.RemoveConstraint(
- model_name='adventureimage',
- name='unique_immich_id_per_user',
- ),
- ]
diff --git a/backend/server/adventures/migrations/0035_remove_adventure_collection_adventure_collections.py b/backend/server/adventures/migrations/0035_remove_adventure_collection_adventure_collections.py
deleted file mode 100644
index 59d3580..0000000
--- a/backend/server/adventures/migrations/0035_remove_adventure_collection_adventure_collections.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Generated by Django 5.2.1 on 2025-06-10 03:04
-
-from django.db import migrations, models
-
-
-def migrate_collection_relationships(apps, schema_editor):
- """
- Migrate existing ForeignKey relationships to ManyToMany relationships
- """
- Adventure = apps.get_model('adventures', 'Adventure')
-
- # Get all adventures that have a collection assigned
- adventures_with_collections = Adventure.objects.filter(collection__isnull=False)
-
- for adventure in adventures_with_collections:
- # Add the existing collection to the new many-to-many field
- adventure.collections.add(adventure.collection_id)
-
-
-def reverse_migrate_collection_relationships(apps, schema_editor):
- """
- Reverse migration - convert first collection back to ForeignKey
- Note: This will only preserve the first collection if an adventure has multiple
- """
- Adventure = apps.get_model('adventures', 'Adventure')
-
- for adventure in Adventure.objects.all():
- first_collection = adventure.collections.first()
- if first_collection:
- adventure.collection = first_collection
- adventure.save()
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0034_remove_adventureimage_unique_immich_id_per_user'),
- ]
-
- operations = [
- # First, add the new ManyToMany field
- migrations.AddField(
- model_name='adventure',
- name='collections',
- field=models.ManyToManyField(blank=True, related_name='adventures', to='adventures.collection'),
- ),
-
- # Migrate existing data from old field to new field
- migrations.RunPython(
- migrate_collection_relationships,
- reverse_migrate_collection_relationships
- ),
-
- # Finally, remove the old ForeignKey field
- migrations.RemoveField(
- model_name='adventure',
- name='collection',
- ),
- ]
\ No newline at end of file
diff --git a/backend/server/adventures/migrations/migrate_images.py b/backend/server/adventures/migrations/migrate_images.py
deleted file mode 100644
index 9ef361f..0000000
--- a/backend/server/adventures/migrations/migrate_images.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from django.db import migrations
-
-def move_images_to_new_model(apps, schema_editor):
- Adventure = apps.get_model('adventures', 'Adventure')
- AdventureImage = apps.get_model('adventures', 'AdventureImage')
-
- for adventure in Adventure.objects.all():
- if adventure.image:
- AdventureImage.objects.create(
- adventure=adventure,
- image=adventure.image,
- user_id=adventure.user_id,
- )
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0001_initial'),
- ('adventures', '0002_adventureimage'),
- ]
-
- operations = [
- migrations.RunPython(move_images_to_new_model),
- migrations.RemoveField(
- model_name='Adventure',
- name='image',
- ),
- ]
\ No newline at end of file
diff --git a/backend/server/adventures/migrations/migrate_visits_categories.py b/backend/server/adventures/migrations/migrate_visits_categories.py
deleted file mode 100644
index c9afb4a..0000000
--- a/backend/server/adventures/migrations/migrate_visits_categories.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from django.db import migrations
-from django.db import migrations, models
-
-def move_images_to_new_model(apps, schema_editor):
- Adventure = apps.get_model('adventures', 'Adventure')
- Visit = apps.get_model('adventures', 'Visit')
-
- for adventure in Adventure.objects.all():
- # if the type is visited and there is no date, set note to 'No date provided.'
- note = 'No date provided.' if adventure.type == 'visited' and not adventure.date else ''
- if adventure.date or adventure.type == 'visited':
- Visit.objects.create(
- adventure=adventure,
- start_date=adventure.date,
- end_date=adventure.end_date,
- notes=note,
- )
- if adventure.type == 'visited' or adventure.type == 'planned':
- adventure.type = 'general'
- adventure.save()
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('adventures', '0007_visit_model'),
- ]
-
- operations = [
- migrations.RunPython(move_images_to_new_model),
- ]
\ No newline at end of file
diff --git a/backend/server/adventures/models.py b/backend/server/adventures/models.py
index 40bb680..524674d 100644
--- a/backend/server/adventures/models.py
+++ b/backend/server/adventures/models.py
@@ -1,524 +1,16 @@
-from django.core.exceptions import ValidationError
-import os
-from typing import Iterable
import uuid
from django.db import models
-from django.utils.deconstruct import deconstructible
-from adventures.managers import AdventureManager
-import threading
+
from django.contrib.auth import get_user_model
from django.contrib.postgres.fields import ArrayField
from django.forms import ValidationError
from django_resized import ResizedImageField
-from worldtravel.models import City, Country, Region, VisitedCity, VisitedRegion
-from django.core.exceptions import ValidationError
-from django.utils import timezone
-
-def background_geocode_and_assign(adventure_id: str):
- print(f"[Adventure Geocode Thread] Starting geocode for adventure {adventure_id}")
- try:
- adventure = Adventure.objects.get(id=adventure_id)
- if not (adventure.latitude and adventure.longitude):
- return
-
- from adventures.geocoding import reverse_geocode # or wherever you defined it
- is_visited = adventure.is_visited_status()
- result = reverse_geocode(adventure.latitude, adventure.longitude, adventure.user_id)
-
- if 'region_id' in result:
- region = Region.objects.filter(id=result['region_id']).first()
- if region:
- adventure.region = region
- if is_visited:
- VisitedRegion.objects.get_or_create(user_id=adventure.user_id, region=region)
-
- if 'city_id' in result:
- city = City.objects.filter(id=result['city_id']).first()
- if city:
- adventure.city = city
- if is_visited:
- VisitedCity.objects.get_or_create(user_id=adventure.user_id, city=city)
-
- if 'country_id' in result:
- country = Country.objects.filter(country_code=result['country_id']).first()
- if country:
- adventure.country = country
-
- # Save updated location info
- # Save updated location info, skip geocode threading
- adventure.save(update_fields=["region", "city", "country"], _skip_geocode=True)
-
- # print(f"[Adventure Geocode Thread] Successfully processed {adventure_id}: {adventure.name} - {adventure.latitude}, {adventure.longitude}")
-
- except Exception as e:
- # Optional: log or print the error
- print(f"[Adventure Geocode Thread] Error processing {adventure_id}: {e}")
-
-def validate_file_extension(value):
- import os
- from django.core.exceptions import ValidationError
- ext = os.path.splitext(value.name)[1] # [0] returns path+filename
- valid_extensions = ['.pdf', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.txt', '.png', '.jpg', '.jpeg', '.gif', '.webp', '.mp4', '.mov', '.avi', '.mkv', '.mp3', '.wav', '.flac', '.ogg', '.m4a', '.wma', '.aac', '.opus', '.zip', '.rar', '.7z', '.tar', '.gz', '.bz2', '.xz', '.zst', '.lz4', '.lzma', '.lzo', '.z', '.tar.gz', '.tar.bz2', '.tar.xz', '.tar.zst', '.tar.lz4', '.tar.lzma', '.tar.lzo', '.tar.z', '.gpx', '.md']
- if not ext.lower() in valid_extensions:
- raise ValidationError('Unsupported file extension.')
ADVENTURE_TYPES = [
- ('general', 'General 🌍'),
- ('outdoor', 'Outdoor 🏞️'),
- ('lodging', 'Lodging 🛌'),
- ('dining', 'Dining 🍽️'),
- ('activity', 'Activity 🏄'),
- ('attraction', 'Attraction 🎢'),
- ('shopping', 'Shopping 🛍️'),
- ('nightlife', 'Nightlife 🌃'),
- ('event', 'Event 🎉'),
- ('transportation', 'Transportation 🚗'),
- ('culture', 'Culture 🎭'),
- ('water_sports', 'Water Sports 🚤'),
- ('hiking', 'Hiking 🥾'),
- ('wildlife', 'Wildlife 🦒'),
- ('historical_sites', 'Historical Sites 🏛️'),
- ('music_concerts', 'Music & Concerts 🎶'),
- ('fitness', 'Fitness 🏋️'),
- ('art_museums', 'Art & Museums 🎨'),
- ('festivals', 'Festivals 🎪'),
- ('spiritual_journeys', 'Spiritual Journeys 🧘♀️'),
- ('volunteer_work', 'Volunteer Work 🤝'),
- ('other', 'Other')
-]
-
-TIMEZONES = [
- "Africa/Abidjan",
- "Africa/Accra",
- "Africa/Addis_Ababa",
- "Africa/Algiers",
- "Africa/Asmera",
- "Africa/Bamako",
- "Africa/Bangui",
- "Africa/Banjul",
- "Africa/Bissau",
- "Africa/Blantyre",
- "Africa/Brazzaville",
- "Africa/Bujumbura",
- "Africa/Cairo",
- "Africa/Casablanca",
- "Africa/Ceuta",
- "Africa/Conakry",
- "Africa/Dakar",
- "Africa/Dar_es_Salaam",
- "Africa/Djibouti",
- "Africa/Douala",
- "Africa/El_Aaiun",
- "Africa/Freetown",
- "Africa/Gaborone",
- "Africa/Harare",
- "Africa/Johannesburg",
- "Africa/Juba",
- "Africa/Kampala",
- "Africa/Khartoum",
- "Africa/Kigali",
- "Africa/Kinshasa",
- "Africa/Lagos",
- "Africa/Libreville",
- "Africa/Lome",
- "Africa/Luanda",
- "Africa/Lubumbashi",
- "Africa/Lusaka",
- "Africa/Malabo",
- "Africa/Maputo",
- "Africa/Maseru",
- "Africa/Mbabane",
- "Africa/Mogadishu",
- "Africa/Monrovia",
- "Africa/Nairobi",
- "Africa/Ndjamena",
- "Africa/Niamey",
- "Africa/Nouakchott",
- "Africa/Ouagadougou",
- "Africa/Porto-Novo",
- "Africa/Sao_Tome",
- "Africa/Tripoli",
- "Africa/Tunis",
- "Africa/Windhoek",
- "America/Adak",
- "America/Anchorage",
- "America/Anguilla",
- "America/Antigua",
- "America/Araguaina",
- "America/Argentina/La_Rioja",
- "America/Argentina/Rio_Gallegos",
- "America/Argentina/Salta",
- "America/Argentina/San_Juan",
- "America/Argentina/San_Luis",
- "America/Argentina/Tucuman",
- "America/Argentina/Ushuaia",
- "America/Aruba",
- "America/Asuncion",
- "America/Bahia",
- "America/Bahia_Banderas",
- "America/Barbados",
- "America/Belem",
- "America/Belize",
- "America/Blanc-Sablon",
- "America/Boa_Vista",
- "America/Bogota",
- "America/Boise",
- "America/Buenos_Aires",
- "America/Cambridge_Bay",
- "America/Campo_Grande",
- "America/Cancun",
- "America/Caracas",
- "America/Catamarca",
- "America/Cayenne",
- "America/Cayman",
- "America/Chicago",
- "America/Chihuahua",
- "America/Ciudad_Juarez",
- "America/Coral_Harbour",
- "America/Cordoba",
- "America/Costa_Rica",
- "America/Creston",
- "America/Cuiaba",
- "America/Curacao",
- "America/Danmarkshavn",
- "America/Dawson",
- "America/Dawson_Creek",
- "America/Denver",
- "America/Detroit",
- "America/Dominica",
- "America/Edmonton",
- "America/Eirunepe",
- "America/El_Salvador",
- "America/Fort_Nelson",
- "America/Fortaleza",
- "America/Glace_Bay",
- "America/Godthab",
- "America/Goose_Bay",
- "America/Grand_Turk",
- "America/Grenada",
- "America/Guadeloupe",
- "America/Guatemala",
- "America/Guayaquil",
- "America/Guyana",
- "America/Halifax",
- "America/Havana",
- "America/Hermosillo",
- "America/Indiana/Knox",
- "America/Indiana/Marengo",
- "America/Indiana/Petersburg",
- "America/Indiana/Tell_City",
- "America/Indiana/Vevay",
- "America/Indiana/Vincennes",
- "America/Indiana/Winamac",
- "America/Indianapolis",
- "America/Inuvik",
- "America/Iqaluit",
- "America/Jamaica",
- "America/Jujuy",
- "America/Juneau",
- "America/Kentucky/Monticello",
- "America/Kralendijk",
- "America/La_Paz",
- "America/Lima",
- "America/Los_Angeles",
- "America/Louisville",
- "America/Lower_Princes",
- "America/Maceio",
- "America/Managua",
- "America/Manaus",
- "America/Marigot",
- "America/Martinique",
- "America/Matamoros",
- "America/Mazatlan",
- "America/Mendoza",
- "America/Menominee",
- "America/Merida",
- "America/Metlakatla",
- "America/Mexico_City",
- "America/Miquelon",
- "America/Moncton",
- "America/Monterrey",
- "America/Montevideo",
- "America/Montserrat",
- "America/Nassau",
- "America/New_York",
- "America/Nome",
- "America/Noronha",
- "America/North_Dakota/Beulah",
- "America/North_Dakota/Center",
- "America/North_Dakota/New_Salem",
- "America/Ojinaga",
- "America/Panama",
- "America/Paramaribo",
- "America/Phoenix",
- "America/Port-au-Prince",
- "America/Port_of_Spain",
- "America/Porto_Velho",
- "America/Puerto_Rico",
- "America/Punta_Arenas",
- "America/Rankin_Inlet",
- "America/Recife",
- "America/Regina",
- "America/Resolute",
- "America/Rio_Branco",
- "America/Santarem",
- "America/Santiago",
- "America/Santo_Domingo",
- "America/Sao_Paulo",
- "America/Scoresbysund",
- "America/Sitka",
- "America/St_Barthelemy",
- "America/St_Johns",
- "America/St_Kitts",
- "America/St_Lucia",
- "America/St_Thomas",
- "America/St_Vincent",
- "America/Swift_Current",
- "America/Tegucigalpa",
- "America/Thule",
- "America/Tijuana",
- "America/Toronto",
- "America/Tortola",
- "America/Vancouver",
- "America/Whitehorse",
- "America/Winnipeg",
- "America/Yakutat",
- "Antarctica/Casey",
- "Antarctica/Davis",
- "Antarctica/DumontDUrville",
- "Antarctica/Macquarie",
- "Antarctica/Mawson",
- "Antarctica/McMurdo",
- "Antarctica/Palmer",
- "Antarctica/Rothera",
- "Antarctica/Syowa",
- "Antarctica/Troll",
- "Antarctica/Vostok",
- "Arctic/Longyearbyen",
- "Asia/Aden",
- "Asia/Almaty",
- "Asia/Amman",
- "Asia/Anadyr",
- "Asia/Aqtau",
- "Asia/Aqtobe",
- "Asia/Ashgabat",
- "Asia/Atyrau",
- "Asia/Baghdad",
- "Asia/Bahrain",
- "Asia/Baku",
- "Asia/Bangkok",
- "Asia/Barnaul",
- "Asia/Beirut",
- "Asia/Bishkek",
- "Asia/Brunei",
- "Asia/Calcutta",
- "Asia/Chita",
- "Asia/Colombo",
- "Asia/Damascus",
- "Asia/Dhaka",
- "Asia/Dili",
- "Asia/Dubai",
- "Asia/Dushanbe",
- "Asia/Famagusta",
- "Asia/Gaza",
- "Asia/Hebron",
- "Asia/Hong_Kong",
- "Asia/Hovd",
- "Asia/Irkutsk",
- "Asia/Jakarta",
- "Asia/Jayapura",
- "Asia/Jerusalem",
- "Asia/Kabul",
- "Asia/Kamchatka",
- "Asia/Karachi",
- "Asia/Katmandu",
- "Asia/Khandyga",
- "Asia/Krasnoyarsk",
- "Asia/Kuala_Lumpur",
- "Asia/Kuching",
- "Asia/Kuwait",
- "Asia/Macau",
- "Asia/Magadan",
- "Asia/Makassar",
- "Asia/Manila",
- "Asia/Muscat",
- "Asia/Nicosia",
- "Asia/Novokuznetsk",
- "Asia/Novosibirsk",
- "Asia/Omsk",
- "Asia/Oral",
- "Asia/Phnom_Penh",
- "Asia/Pontianak",
- "Asia/Pyongyang",
- "Asia/Qatar",
- "Asia/Qostanay",
- "Asia/Qyzylorda",
- "Asia/Rangoon",
- "Asia/Riyadh",
- "Asia/Saigon",
- "Asia/Sakhalin",
- "Asia/Samarkand",
- "Asia/Seoul",
- "Asia/Shanghai",
- "Asia/Singapore",
- "Asia/Srednekolymsk",
- "Asia/Taipei",
- "Asia/Tashkent",
- "Asia/Tbilisi",
- "Asia/Tehran",
- "Asia/Thimphu",
- "Asia/Tokyo",
- "Asia/Tomsk",
- "Asia/Ulaanbaatar",
- "Asia/Urumqi",
- "Asia/Ust-Nera",
- "Asia/Vientiane",
- "Asia/Vladivostok",
- "Asia/Yakutsk",
- "Asia/Yekaterinburg",
- "Asia/Yerevan",
- "Atlantic/Azores",
- "Atlantic/Bermuda",
- "Atlantic/Canary",
- "Atlantic/Cape_Verde",
- "Atlantic/Faeroe",
- "Atlantic/Madeira",
- "Atlantic/Reykjavik",
- "Atlantic/South_Georgia",
- "Atlantic/St_Helena",
- "Atlantic/Stanley",
- "Australia/Adelaide",
- "Australia/Brisbane",
- "Australia/Broken_Hill",
- "Australia/Darwin",
- "Australia/Eucla",
- "Australia/Hobart",
- "Australia/Lindeman",
- "Australia/Lord_Howe",
- "Australia/Melbourne",
- "Australia/Perth",
- "Australia/Sydney",
- "Europe/Amsterdam",
- "Europe/Andorra",
- "Europe/Astrakhan",
- "Europe/Athens",
- "Europe/Belgrade",
- "Europe/Berlin",
- "Europe/Bratislava",
- "Europe/Brussels",
- "Europe/Bucharest",
- "Europe/Budapest",
- "Europe/Busingen",
- "Europe/Chisinau",
- "Europe/Copenhagen",
- "Europe/Dublin",
- "Europe/Gibraltar",
- "Europe/Guernsey",
- "Europe/Helsinki",
- "Europe/Isle_of_Man",
- "Europe/Istanbul",
- "Europe/Jersey",
- "Europe/Kaliningrad",
- "Europe/Kiev",
- "Europe/Kirov",
- "Europe/Lisbon",
- "Europe/Ljubljana",
- "Europe/London",
- "Europe/Luxembourg",
- "Europe/Madrid",
- "Europe/Malta",
- "Europe/Mariehamn",
- "Europe/Minsk",
- "Europe/Monaco",
- "Europe/Moscow",
- "Europe/Oslo",
- "Europe/Paris",
- "Europe/Podgorica",
- "Europe/Prague",
- "Europe/Riga",
- "Europe/Rome",
- "Europe/Samara",
- "Europe/San_Marino",
- "Europe/Sarajevo",
- "Europe/Saratov",
- "Europe/Simferopol",
- "Europe/Skopje",
- "Europe/Sofia",
- "Europe/Stockholm",
- "Europe/Tallinn",
- "Europe/Tirane",
- "Europe/Ulyanovsk",
- "Europe/Vaduz",
- "Europe/Vatican",
- "Europe/Vienna",
- "Europe/Vilnius",
- "Europe/Volgograd",
- "Europe/Warsaw",
- "Europe/Zagreb",
- "Europe/Zurich",
- "Indian/Antananarivo",
- "Indian/Chagos",
- "Indian/Christmas",
- "Indian/Cocos",
- "Indian/Comoro",
- "Indian/Kerguelen",
- "Indian/Mahe",
- "Indian/Maldives",
- "Indian/Mauritius",
- "Indian/Mayotte",
- "Indian/Reunion",
- "Pacific/Apia",
- "Pacific/Auckland",
- "Pacific/Bougainville",
- "Pacific/Chatham",
- "Pacific/Easter",
- "Pacific/Efate",
- "Pacific/Enderbury",
- "Pacific/Fakaofo",
- "Pacific/Fiji",
- "Pacific/Funafuti",
- "Pacific/Galapagos",
- "Pacific/Gambier",
- "Pacific/Guadalcanal",
- "Pacific/Guam",
- "Pacific/Honolulu",
- "Pacific/Kiritimati",
- "Pacific/Kosrae",
- "Pacific/Kwajalein",
- "Pacific/Majuro",
- "Pacific/Marquesas",
- "Pacific/Midway",
- "Pacific/Nauru",
- "Pacific/Niue",
- "Pacific/Norfolk",
- "Pacific/Noumea",
- "Pacific/Pago_Pago",
- "Pacific/Palau",
- "Pacific/Pitcairn",
- "Pacific/Ponape",
- "Pacific/Port_Moresby",
- "Pacific/Rarotonga",
- "Pacific/Saipan",
- "Pacific/Tahiti",
- "Pacific/Tarawa",
- "Pacific/Tongatapu",
- "Pacific/Truk",
- "Pacific/Wake",
- "Pacific/Wallis"
-]
-
-LODGING_TYPES = [
- ('hotel', 'Hotel'),
- ('hostel', 'Hostel'),
- ('resort', 'Resort'),
- ('bnb', 'Bed & Breakfast'),
- ('campground', 'Campground'),
- ('cabin', 'Cabin'),
- ('apartment', 'Apartment'),
- ('house', 'House'),
- ('villa', 'Villa'),
- ('motel', 'Motel'),
- ('other', 'Other')
+ ('visited', 'Visited'),
+ ('planned', 'Planned'),
+ ('lodging', 'Lodging'),
+ ('dining', 'Dining')
]
TRANSPORTATION_TYPES = [
@@ -532,129 +24,41 @@ TRANSPORTATION_TYPES = [
('other', 'Other')
]
+
# Assuming you have a default user ID you want to use
default_user_id = 1 # Replace with an actual user ID
User = get_user_model()
-class Visit(models.Model):
- id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
- adventure = models.ForeignKey('Adventure', on_delete=models.CASCADE, related_name='visits')
- start_date = models.DateTimeField(null=True, blank=True)
- end_date = models.DateTimeField(null=True, blank=True)
- timezone = models.CharField(max_length=50, choices=[(tz, tz) for tz in TIMEZONES], null=True, blank=True)
- notes = models.TextField(blank=True, null=True)
- created_at = models.DateTimeField(auto_now_add=True)
- updated_at = models.DateTimeField(auto_now=True)
-
- def clean(self):
- if self.start_date > self.end_date:
- raise ValidationError('The start date must be before or equal to the end date.')
-
- def __str__(self):
- return f"{self.adventure.name} - {self.start_date} to {self.end_date}"
class Adventure(models.Model):
#id = models.AutoField(primary_key=True)
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
user_id = models.ForeignKey(
User, on_delete=models.CASCADE, default=default_user_id)
-
- category = models.ForeignKey('Category', on_delete=models.SET_NULL, blank=True, null=True)
+ type = models.CharField(max_length=100, choices=ADVENTURE_TYPES)
name = models.CharField(max_length=200)
location = models.CharField(max_length=200, blank=True, null=True)
activity_types = ArrayField(models.CharField(
max_length=100), blank=True, null=True)
description = models.TextField(blank=True, null=True)
rating = models.FloatField(blank=True, null=True)
- link = models.URLField(blank=True, null=True, max_length=2083)
+ link = models.URLField(blank=True, null=True)
+ image = ResizedImageField(force_format="WEBP", quality=75, null=True, blank=True, upload_to='images/')
+ date = models.DateField(blank=True, null=True)
is_public = models.BooleanField(default=False)
-
longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
-
- city = models.ForeignKey(City, on_delete=models.SET_NULL, blank=True, null=True)
- region = models.ForeignKey(Region, on_delete=models.SET_NULL, blank=True, null=True)
- country = models.ForeignKey(Country, on_delete=models.SET_NULL, blank=True, null=True)
-
- # Changed from ForeignKey to ManyToManyField
- collections = models.ManyToManyField('Collection', blank=True, related_name='adventures')
-
+ collection = models.ForeignKey('Collection', on_delete=models.CASCADE, blank=True, null=True)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
- objects = AdventureManager()
-
- def is_visited_status(self):
- current_date = timezone.now().date()
- for visit in self.visits.all():
- start_date = visit.start_date.date() if isinstance(visit.start_date, timezone.datetime) else visit.start_date
- end_date = visit.end_date.date() if isinstance(visit.end_date, timezone.datetime) else visit.end_date
- if start_date and end_date and (start_date <= current_date):
- return True
- elif start_date and not end_date and (start_date <= current_date):
- return True
- return False
-
- def clean(self, skip_shared_validation=False):
- """
- Validate model constraints.
- skip_shared_validation: Skip validation when called by shared users
- """
- # Skip validation if this is a shared user update
- if skip_shared_validation:
- return
-
- # Check collections after the instance is saved (in save method or separate validation)
- if self.pk: # Only check if the instance has been saved
- for collection in self.collections.all():
- if collection.is_public and not self.is_public:
- raise ValidationError(f'Adventures associated with a public collection must be public. Collection: {collection.name} Adventure: {self.name}')
-
- # Only enforce same-user constraint for non-shared collections
- if self.user_id != collection.user_id:
- # Check if this is a shared collection scenario
- # Allow if the adventure owner has access to the collection through sharing
- if not collection.shared_with.filter(uuid=self.user_id.uuid).exists():
- raise ValidationError(f'Adventures must be associated with collections owned by the same user or shared collections. Collection owner: {collection.user_id.username} Adventure owner: {self.user_id.username}')
-
- if self.category:
- if self.user_id != self.category.user_id:
- raise ValidationError(f'Adventures must be associated with categories owned by the same user. Category owner: {self.category.user_id.username} Adventure owner: {self.user_id.username}')
-
- def save(self, force_insert=False, force_update=False, using=None, update_fields=None, _skip_geocode=False, _skip_shared_validation=False):
- if force_insert and force_update:
- raise ValueError("Cannot force both insert and updating in model saving.")
-
- if not self.category:
- category, _ = Category.objects.get_or_create(
- user_id=self.user_id,
- name='general',
- defaults={'display_name': 'General', 'icon': '🌍'}
- )
- self.category = category
-
- result = super().save(force_insert, force_update, using, update_fields)
-
- # Validate collections after saving (since M2M relationships require saved instance)
- if self.pk:
- try:
- self.clean(skip_shared_validation=_skip_shared_validation)
- except ValidationError as e:
- # If validation fails, you might want to handle this differently
- # For now, we'll re-raise the error
- raise e
-
- # ⛔ Skip threading if called from geocode background thread
- if _skip_geocode:
- return result
-
- if self.latitude and self.longitude:
- thread = threading.Thread(target=background_geocode_and_assign, args=(str(self.id),))
- thread.daemon = True # Allows the thread to exit when the main program ends
- thread.start()
-
- return result
+ def clean(self):
+ if self.collection:
+ if self.collection.is_public and not self.is_public:
+ raise ValidationError('Adventures associated with a public collection must be public. Collection: ' + self.trip.name + ' Adventure: ' + self.name)
+ if self.user_id != self.collection.user_id:
+ raise ValidationError('Adventures must be associated with collections owned by the same user. Collection owner: ' + self.collection.user_id.username + ' Adventure owner: ' + self.user_id.username)
def __str__(self):
return self.name
@@ -672,16 +76,14 @@ class Collection(models.Model):
end_date = models.DateField(blank=True, null=True)
updated_at = models.DateTimeField(auto_now=True)
is_archived = models.BooleanField(default=False)
- shared_with = models.ManyToManyField(User, related_name='shared_with', blank=True)
- link = models.URLField(blank=True, null=True, max_length=2083)
+
# if connected adventures are private and collection is public, raise an error
def clean(self):
if self.is_public and self.pk: # Only check if the instance has a primary key
- # Updated to use the new related_name 'adventures'
- for adventure in self.adventures.all():
+ for adventure in self.adventure_set.all():
if not adventure.is_public:
- raise ValidationError(f'Public collections cannot be associated with private adventures. Collection: {self.name} Adventure: {adventure.name}')
+ raise ValidationError('Public collections cannot be associated with private adventures. Collection: ' + self.name + ' Adventure: ' + adventure.name)
def __str__(self):
return self.name
@@ -697,15 +99,8 @@ class Transportation(models.Model):
rating = models.FloatField(blank=True, null=True)
link = models.URLField(blank=True, null=True)
date = models.DateTimeField(blank=True, null=True)
- end_date = models.DateTimeField(blank=True, null=True)
- start_timezone = models.CharField(max_length=50, choices=[(tz, tz) for tz in TIMEZONES], null=True, blank=True)
- end_timezone = models.CharField(max_length=50, choices=[(tz, tz) for tz in TIMEZONES], null=True, blank=True)
flight_number = models.CharField(max_length=100, blank=True, null=True)
from_location = models.CharField(max_length=200, blank=True, null=True)
- origin_latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
- origin_longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
- destination_latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
- destination_longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
to_location = models.CharField(max_length=200, blank=True, null=True)
is_public = models.BooleanField(default=False)
collection = models.ForeignKey('Collection', on_delete=models.CASCADE, blank=True, null=True)
@@ -713,10 +108,6 @@ class Transportation(models.Model):
updated_at = models.DateTimeField(auto_now=True)
def clean(self):
- print(self.date)
- if self.date and self.end_date and self.date > self.end_date:
- raise ValidationError('The start date must be before the end date. Start date: ' + str(self.date) + ' End date: ' + str(self.end_date))
-
if self.collection:
if self.collection.is_public and not self.is_public:
raise ValidationError('Transportations associated with a public collection must be public. Collection: ' + self.collection.name + ' Transportation: ' + self.name)
@@ -791,119 +182,3 @@ class ChecklistItem(models.Model):
def __str__(self):
return self.name
-
-@deconstructible
-class PathAndRename:
- def __init__(self, path):
- self.path = path
-
- def __call__(self, instance, filename):
- ext = filename.split('.')[-1]
- # Generate a new UUID for the filename
- filename = f"{uuid.uuid4()}.{ext}"
- return os.path.join(self.path, filename)
-
-class AdventureImage(models.Model):
- id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
- user_id = models.ForeignKey(User, on_delete=models.CASCADE, default=default_user_id)
- image = ResizedImageField(
- force_format="WEBP",
- quality=75,
- upload_to=PathAndRename('images/'),
- blank=True,
- null=True,
- )
- immich_id = models.CharField(max_length=200, null=True, blank=True)
- adventure = models.ForeignKey(Adventure, related_name='images', on_delete=models.CASCADE)
- is_primary = models.BooleanField(default=False)
-
- def clean(self):
-
- # One of image or immich_id must be set, but not both
- has_image = bool(self.image and str(self.image).strip())
- has_immich_id = bool(self.immich_id and str(self.immich_id).strip())
-
- if has_image and has_immich_id:
- raise ValidationError("Cannot have both image file and Immich ID. Please provide only one.")
- if not has_image and not has_immich_id:
- raise ValidationError("Must provide either an image file or an Immich ID.")
-
- def save(self, *args, **kwargs):
- # Clean empty strings to None for proper database storage
- if not self.image:
- self.image = None
- if not self.immich_id or not str(self.immich_id).strip():
- self.immich_id = None
-
- self.full_clean() # This calls clean() method
- super().save(*args, **kwargs)
-
- def __str__(self):
- return self.image.url if self.image else f"Immich ID: {self.immich_id or 'No image'}"
-
-class Attachment(models.Model):
- id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
- user_id = models.ForeignKey(
- User, on_delete=models.CASCADE, default=default_user_id)
- file = models.FileField(upload_to=PathAndRename('attachments/'),validators=[validate_file_extension])
- adventure = models.ForeignKey(Adventure, related_name='attachments', on_delete=models.CASCADE)
- name = models.CharField(max_length=200, null=True, blank=True)
-
- def __str__(self):
- return self.file.url
-
-class Category(models.Model):
- id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
- user_id = models.ForeignKey(
- User, on_delete=models.CASCADE, default=default_user_id)
- name = models.CharField(max_length=200)
- display_name = models.CharField(max_length=200)
- icon = models.CharField(max_length=200, default='🌍')
-
- class Meta:
- verbose_name_plural = 'Categories'
- unique_together = ['name', 'user_id']
-
- def clean(self) -> None:
- self.name = self.name.lower().strip()
-
- return super().clean()
-
-
- def __str__(self):
- return self.name + ' - ' + self.display_name + ' - ' + self.icon
-
-class Lodging(models.Model):
- id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
- user_id = models.ForeignKey(
- User, on_delete=models.CASCADE, default=default_user_id)
- name = models.CharField(max_length=200)
- type = models.CharField(max_length=100, choices=LODGING_TYPES, default='other')
- description = models.TextField(blank=True, null=True)
- rating = models.FloatField(blank=True, null=True)
- link = models.URLField(blank=True, null=True, max_length=2083)
- check_in = models.DateTimeField(blank=True, null=True)
- check_out = models.DateTimeField(blank=True, null=True)
- timezone = models.CharField(max_length=50, choices=[(tz, tz) for tz in TIMEZONES], null=True, blank=True)
- reservation_number = models.CharField(max_length=100, blank=True, null=True)
- price = models.DecimalField(max_digits=9, decimal_places=2, blank=True, null=True)
- latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
- longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
- location = models.CharField(max_length=200, blank=True, null=True)
- is_public = models.BooleanField(default=False)
- collection = models.ForeignKey('Collection', on_delete=models.CASCADE, blank=True, null=True)
- created_at = models.DateTimeField(auto_now_add=True)
- updated_at = models.DateTimeField(auto_now=True)
-
- def clean(self):
- if self.check_in and self.check_out and self.check_in > self.check_out:
- raise ValidationError('The start date must be before the end date. Start date: ' + str(self.check_in) + ' End date: ' + str(self.check_out))
-
- if self.collection:
- if self.collection.is_public and not self.is_public:
- raise ValidationError('Lodging associated with a public collection must be public. Collection: ' + self.collection.name + ' Loging: ' + self.name)
- if self.user_id != self.collection.user_id:
- raise ValidationError('Lodging must be associated with collections owned by the same user. Collection owner: ' + self.collection.user_id.username + ' Lodging owner: ' + self.user_id.username)
-
- def __str__(self):
- return self.name
\ No newline at end of file
diff --git a/backend/server/adventures/permissions.py b/backend/server/adventures/permissions.py
index ce38f74..b4241c2 100644
--- a/backend/server/adventures/permissions.py
+++ b/backend/server/adventures/permissions.py
@@ -2,99 +2,29 @@ from rest_framework import permissions
class IsOwnerOrReadOnly(permissions.BasePermission):
"""
- Owners can edit, others have read-only access.
+ Custom permission to only allow owners of an object to edit it.
"""
+
def has_object_permission(self, request, view, obj):
+ # Read permissions are allowed to any request,
+ # so we'll always allow GET, HEAD or OPTIONS requests.
if request.method in permissions.SAFE_METHODS:
return True
- # obj.user_id is FK to User, compare with request.user
+
+ # Write permissions are only allowed to the owner of the object.
return obj.user_id == request.user
class IsPublicReadOnly(permissions.BasePermission):
"""
- Read-only if public or owner, write only for owner.
+ Custom permission to only allow read-only access to public objects,
+ and write access to the owner of the object.
"""
+
def has_object_permission(self, request, view, obj):
+ # Read permissions are allowed if the object is public
if request.method in permissions.SAFE_METHODS:
return obj.is_public or obj.user_id == request.user
- return obj.user_id == request.user
-
-class CollectionShared(permissions.BasePermission):
- """
- Allow full access if user is in shared_with of collection(s) or owner,
- read-only if public or shared_with,
- write only if owner or shared_with.
- """
- def has_object_permission(self, request, view, obj):
- user = request.user
- if not user or not user.is_authenticated:
- # Anonymous: only read public
- return request.method in permissions.SAFE_METHODS and obj.is_public
-
- # Check if user is in shared_with of any collections related to the obj
- # If obj is a Collection itself:
- if hasattr(obj, 'shared_with'):
- if obj.shared_with.filter(id=user.id).exists():
- return True
-
- # If obj is an Adventure (has collections M2M)
- if hasattr(obj, 'collections'):
- # Check if user is in shared_with of any related collection
- shared_collections = obj.collections.filter(shared_with=user)
- if shared_collections.exists():
- return True
-
- # Read permission if public or owner
- if request.method in permissions.SAFE_METHODS:
- return obj.is_public or obj.user_id == user
-
- # Write permission only if owner or shared user via collections
- if obj.user_id == user:
- return True
-
- if hasattr(obj, 'collections'):
- if obj.collections.filter(shared_with=user).exists():
- return True
-
- # Default deny
- return False
-
-
-class IsOwnerOrSharedWithFullAccess(permissions.BasePermission):
- """
- Full access for owners and users shared via collections,
- read-only for others if public.
- """
- def has_object_permission(self, request, view, obj):
- user = request.user
- if not user or not user.is_authenticated:
- return request.method in permissions.SAFE_METHODS and obj.is_public
-
- # If safe method (read), allow if:
- if request.method in permissions.SAFE_METHODS:
- if obj.is_public:
- return True
- if obj.user_id == user:
- return True
- # If user in shared_with of any collection related to obj
- if hasattr(obj, 'collections') and obj.collections.filter(shared_with=user).exists():
- return True
- if hasattr(obj, 'collection') and obj.collection and obj.collection.shared_with.filter(id=user.id).exists():
- return True
- if hasattr(obj, 'shared_with') and obj.shared_with.filter(id=user.id).exists():
- return True
- return False
-
- # For write methods, allow if owner or shared user
- if obj.user_id == user:
- return True
- if hasattr(obj, 'collections') and obj.collections.filter(shared_with=user).exists():
- return True
- if hasattr(obj, 'collection') and obj.collection and obj.collection.shared_with.filter(id=user.id).exists():
- return True
- if hasattr(obj, 'shared_with') and obj.shared_with.filter(id=user.id).exists():
- return True
-
- return False
+ # Write permissions are only allowed to the owner of the object
+ return obj.user_id == request.user
\ No newline at end of file
diff --git a/backend/server/adventures/serializers.py b/backend/server/adventures/serializers.py
index 622e2eb..56be627 100644
--- a/backend/server/adventures/serializers.py
+++ b/backend/server/adventures/serializers.py
@@ -1,296 +1,64 @@
-from django.utils import timezone
import os
-from .models import Adventure, AdventureImage, ChecklistItem, Collection, Note, Transportation, Checklist, Visit, Category, Attachment, Lodging
+from .models import Adventure, ChecklistItem, Collection, Note, Transportation, Checklist
from rest_framework import serializers
-from main.utils import CustomModelSerializer
-from users.serializers import CustomUserDetailsSerializer
-from worldtravel.serializers import CountrySerializer, RegionSerializer, CitySerializer
-from geopy.distance import geodesic
-from integrations.models import ImmichIntegration
-
-class AdventureImageSerializer(CustomModelSerializer):
- class Meta:
- model = AdventureImage
- fields = ['id', 'image', 'adventure', 'is_primary', 'user_id', 'immich_id']
- read_only_fields = ['id', 'user_id']
-
- def to_representation(self, instance):
- # If immich_id is set, check for user integration once
- integration = None
- if instance.immich_id:
- integration = ImmichIntegration.objects.filter(user=instance.user_id).first()
- if not integration:
- return None # Skip if Immich image but no integration
-
- # Base representation
- representation = super().to_representation(instance)
-
- # Prepare public URL once
- public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/').replace("'", "")
-
- if instance.immich_id:
- # Use Immich integration URL
- representation['image'] = f"{public_url}/api/integrations/immich/{integration.id}/get/{instance.immich_id}"
- elif instance.image:
- # Use local image URL
- representation['image'] = f"{public_url}/media/{instance.image.name}"
-
- return representation
-
-class AttachmentSerializer(CustomModelSerializer):
- extension = serializers.SerializerMethodField()
- class Meta:
- model = Attachment
- fields = ['id', 'file', 'adventure', 'extension', 'name', 'user_id']
- read_only_fields = ['id', 'user_id']
-
- def get_extension(self, obj):
- return obj.file.name.split('.')[-1]
-
- def to_representation(self, instance):
- representation = super().to_representation(instance)
- if instance.file:
- public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/')
- #print(public_url)
- # remove any ' from the url
- public_url = public_url.replace("'", "")
- representation['file'] = f"{public_url}/media/{instance.file.name}"
- return representation
-
-class CategorySerializer(serializers.ModelSerializer):
- num_adventures = serializers.SerializerMethodField()
- class Meta:
- model = Category
- fields = ['id', 'name', 'display_name', 'icon', 'num_adventures']
- read_only_fields = ['id', 'num_adventures']
-
- def validate_name(self, value):
- return value.lower()
-
- def create(self, validated_data):
- user = self.context['request'].user
- validated_data['name'] = validated_data['name'].lower()
- return Category.objects.create(user_id=user, **validated_data)
-
- def update(self, instance, validated_data):
- for attr, value in validated_data.items():
- setattr(instance, attr, value)
- if 'name' in validated_data:
- instance.name = validated_data['name'].lower()
- instance.save()
- return instance
-
- def get_num_adventures(self, obj):
- return Adventure.objects.filter(category=obj, user_id=obj.user_id).count()
-
-class VisitSerializer(serializers.ModelSerializer):
-
- class Meta:
- model = Visit
- fields = ['id', 'start_date', 'end_date', 'timezone', 'notes']
- read_only_fields = ['id']
-
-class AdventureSerializer(CustomModelSerializer):
- images = serializers.SerializerMethodField()
- visits = VisitSerializer(many=True, read_only=False, required=False)
- attachments = AttachmentSerializer(many=True, read_only=True)
- category = CategorySerializer(read_only=False, required=False)
- is_visited = serializers.SerializerMethodField()
- user = serializers.SerializerMethodField()
- country = CountrySerializer(read_only=True)
- region = RegionSerializer(read_only=True)
- city = CitySerializer(read_only=True)
- collections = serializers.PrimaryKeyRelatedField(
- many=True,
- queryset=Collection.objects.all(),
- required=False
- )
+class AdventureSerializer(serializers.ModelSerializer):
class Meta:
model = Adventure
- fields = [
- 'id', 'user_id', 'name', 'description', 'rating', 'activity_types', 'location',
- 'is_public', 'collections', 'created_at', 'updated_at', 'images', 'link', 'longitude',
- 'latitude', 'visits', 'is_visited', 'category', 'attachments', 'user', 'city', 'country', 'region'
- ]
- read_only_fields = ['id', 'created_at', 'updated_at', 'user_id', 'is_visited', 'user']
+ fields = '__all__'
+ read_only_fields = ['id', 'created_at', 'updated_at', 'user_id']
- def get_images(self, obj):
- serializer = AdventureImageSerializer(obj.images.all(), many=True, context=self.context)
- # Filter out None values from the serialized data
- return [image for image in serializer.data if image is not None]
-
- def validate_collections(self, collections):
- """Validate that collections belong to the same user"""
- if not collections:
- return collections
-
- user = self.context['request'].user
- for collection in collections:
- if collection.user_id != user and not collection.shared_with.filter(id=user.id).exists():
- raise serializers.ValidationError(
- f"Collection '{collection.name}' does not belong to the current user."
- )
- return collections
-
- def validate_category(self, category_data):
- if isinstance(category_data, Category):
- return category_data
- if category_data:
- user = self.context['request'].user
- name = category_data.get('name', '').lower()
- existing_category = Category.objects.filter(user_id=user, name=name).first()
- if existing_category:
- return existing_category
- category_data['name'] = name
- return category_data
+ def to_representation(self, instance):
+ representation = super().to_representation(instance)
+ if instance.image:
+ public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/')
+ print(public_url)
+ # remove any ' from the url
+ public_url = public_url.replace("'", "")
+ representation['image'] = f"{public_url}/media/{instance.image.name}"
+ return representation
- def get_or_create_category(self, category_data):
- user = self.context['request'].user
-
- if isinstance(category_data, Category):
- return category_data
-
- if isinstance(category_data, dict):
- name = category_data.get('name', '').lower()
- display_name = category_data.get('display_name', name)
- icon = category_data.get('icon', '🌍')
- else:
- name = category_data.name.lower()
- display_name = category_data.display_name
- icon = category_data.icon
-
- category, created = Category.objects.get_or_create(
- user_id=user,
- name=name,
- defaults={
- 'display_name': display_name,
- 'icon': icon
- }
- )
- return category
+ def validate_activity_types(self, value):
+ if value:
+ return [activity.lower() for activity in value]
+ return value
- def get_user(self, obj):
- user = obj.user_id
- return CustomUserDetailsSerializer(user).data
-
- def get_is_visited(self, obj):
- return obj.is_visited_status()
-
- def create(self, validated_data):
- visits_data = validated_data.pop('visits', None)
- category_data = validated_data.pop('category', None)
- collections_data = validated_data.pop('collections', [])
-
- print(category_data)
- adventure = Adventure.objects.create(**validated_data)
-
- # Handle visits
- for visit_data in visits_data:
- Visit.objects.create(adventure=adventure, **visit_data)
-
- # Handle category
- if category_data:
- category = self.get_or_create_category(category_data)
- adventure.category = category
-
- # Handle collections - set after adventure is saved
- if collections_data:
- adventure.collections.set(collections_data)
-
- adventure.save()
-
- return adventure
-
- def update(self, instance, validated_data):
- has_visits = 'visits' in validated_data
- visits_data = validated_data.pop('visits', [])
- category_data = validated_data.pop('category', None)
-
- collections_data = validated_data.pop('collections', None)
-
- # Update regular fields
- for attr, value in validated_data.items():
- setattr(instance, attr, value)
-
- # Handle category - ONLY allow the adventure owner to change categories
- user = self.context['request'].user
- if category_data and instance.user_id == user:
- # Only the owner can set categories
- category = self.get_or_create_category(category_data)
- instance.category = category
- # If not the owner, ignore category changes
-
- # Handle collections - only update if collections were provided
- if collections_data is not None:
- instance.collections.set(collections_data)
-
- # Handle visits
- if has_visits:
- current_visits = instance.visits.all()
- current_visit_ids = set(current_visits.values_list('id', flat=True))
-
- updated_visit_ids = set()
- for visit_data in visits_data:
- visit_id = visit_data.get('id')
- if visit_id and visit_id in current_visit_ids:
- visit = current_visits.get(id=visit_id)
- for attr, value in visit_data.items():
- setattr(visit, attr, value)
- visit.save()
- updated_visit_ids.add(visit_id)
- else:
- new_visit = Visit.objects.create(adventure=instance, **visit_data)
- updated_visit_ids.add(new_visit.id)
-
- visits_to_delete = current_visit_ids - updated_visit_ids
- instance.visits.filter(id__in=visits_to_delete).delete()
-
- # call save on the adventure to update the updated_at field and trigger any geocoding
- instance.save()
-
- return instance
-
-class TransportationSerializer(CustomModelSerializer):
- distance = serializers.SerializerMethodField()
+class TransportationSerializer(serializers.ModelSerializer):
class Meta:
model = Transportation
fields = [
'id', 'user_id', 'type', 'name', 'description', 'rating',
'link', 'date', 'flight_number', 'from_location', 'to_location',
- 'is_public', 'collection', 'created_at', 'updated_at', 'end_date',
- 'origin_latitude', 'origin_longitude', 'destination_latitude', 'destination_longitude',
- 'start_timezone', 'end_timezone', 'distance' # ✅ Add distance here
- ]
- read_only_fields = ['id', 'created_at', 'updated_at', 'user_id', 'distance']
-
- def get_distance(self, obj):
- if (
- obj.origin_latitude and obj.origin_longitude and
- obj.destination_latitude and obj.destination_longitude
- ):
- try:
- origin = (float(obj.origin_latitude), float(obj.origin_longitude))
- destination = (float(obj.destination_latitude), float(obj.destination_longitude))
- return round(geodesic(origin, destination).km, 2)
- except ValueError:
- return None
- return None
-
-class LodgingSerializer(CustomModelSerializer):
-
- class Meta:
- model = Lodging
- fields = [
- 'id', 'user_id', 'name', 'description', 'rating', 'link', 'check_in', 'check_out',
- 'reservation_number', 'price', 'latitude', 'longitude', 'location', 'is_public',
- 'collection', 'created_at', 'updated_at', 'type', 'timezone'
+ 'is_public', 'collection', 'created_at', 'updated_at'
]
read_only_fields = ['id', 'created_at', 'updated_at', 'user_id']
-class NoteSerializer(CustomModelSerializer):
+ def validate(self, data):
+ # Check if the collection is public and the transportation is not
+ collection = data.get('collection')
+ is_public = data.get('is_public', False)
+ if collection and collection.is_public and not is_public:
+ raise serializers.ValidationError(
+ 'Transportations associated with a public collection must be public.'
+ )
+
+ # Check if the user owns the collection
+ request = self.context.get('request')
+ if request and collection and collection.user_id != request.user:
+ raise serializers.ValidationError(
+ 'Transportations must be associated with collections owned by the same user.'
+ )
+
+ return data
+
+ def create(self, validated_data):
+ # Set the user_id to the current user
+ validated_data['user_id'] = self.context['request'].user
+ return super().create(validated_data)
+
+class NoteSerializer(serializers.ModelSerializer):
class Meta:
model = Note
@@ -299,18 +67,64 @@ class NoteSerializer(CustomModelSerializer):
'is_public', 'collection', 'created_at', 'updated_at'
]
read_only_fields = ['id', 'created_at', 'updated_at', 'user_id']
+
+ def validate(self, data):
+ # Check if the collection is public and the transportation is not
+ collection = data.get('collection')
+ is_public = data.get('is_public', False)
+ if collection and collection.is_public and not is_public:
+ raise serializers.ValidationError(
+ 'Notes associated with a public collection must be public.'
+ )
+
+ # Check if the user owns the collection
+ request = self.context.get('request')
+ if request and collection and collection.user_id != request.user:
+ raise serializers.ValidationError(
+ 'Notes must be associated with collections owned by the same user.'
+ )
+
+ return data
+
+ def create(self, validated_data):
+ # Set the user_id to the current user
+ validated_data['user_id'] = self.context['request'].user
+ return super().create(validated_data)
-class ChecklistItemSerializer(CustomModelSerializer):
+class ChecklistItemSerializer(serializers.ModelSerializer):
class Meta:
model = ChecklistItem
fields = [
'id', 'user_id', 'name', 'is_checked', 'checklist', 'created_at', 'updated_at'
]
read_only_fields = ['id', 'created_at', 'updated_at', 'user_id', 'checklist']
-
-class ChecklistSerializer(CustomModelSerializer):
- items = ChecklistItemSerializer(many=True, source='checklistitem_set')
+ def validate(self, data):
+ # Check if the checklist is public and the checklist item is not
+ checklist = data.get('checklist')
+ is_checked = data.get('is_checked', False)
+ if checklist and checklist.is_public and not is_checked:
+ raise serializers.ValidationError(
+ 'Checklist items associated with a public checklist must be checked.'
+ )
+
+ # Check if the user owns the checklist
+ request = self.context.get('request')
+ if request and checklist and checklist.user_id != request.user:
+ raise serializers.ValidationError(
+ 'Checklist items must be associated with checklists owned by the same user.'
+ )
+
+ return data
+
+ def create(self, validated_data):
+ # Set the user_id to the current user
+ validated_data['user_id'] = self.context['request'].user
+ return super().create(validated_data)
+
+
+class ChecklistSerializer(serializers.ModelSerializer):
+ items = ChecklistItemSerializer(many=True, source='checklistitem_set')
class Meta:
model = Checklist
fields = [
@@ -321,16 +135,8 @@ class ChecklistSerializer(CustomModelSerializer):
def create(self, validated_data):
items_data = validated_data.pop('checklistitem_set')
checklist = Checklist.objects.create(**validated_data)
-
for item_data in items_data:
- # Remove user_id from item_data to avoid constraint issues
- item_data.pop('user_id', None)
- # Set user_id from the parent checklist
- ChecklistItem.objects.create(
- checklist=checklist,
- user_id=checklist.user_id,
- **item_data
- )
+ ChecklistItem.objects.create(checklist=checklist, **item_data)
return checklist
def update(self, instance, validated_data):
@@ -348,9 +154,6 @@ class ChecklistSerializer(CustomModelSerializer):
# Update or create items
updated_item_ids = set()
for item_data in items_data:
- # Remove user_id from item_data to avoid constraint issues
- item_data.pop('user_id', None)
-
item_id = item_data.get('id')
if item_id:
if item_id in current_item_ids:
@@ -361,18 +164,10 @@ class ChecklistSerializer(CustomModelSerializer):
updated_item_ids.add(item_id)
else:
# If ID is provided but doesn't exist, create new item
- ChecklistItem.objects.create(
- checklist=instance,
- user_id=instance.user_id,
- **item_data
- )
+ ChecklistItem.objects.create(checklist=instance, **item_data)
else:
# If no ID is provided, create new item
- ChecklistItem.objects.create(
- checklist=instance,
- user_id=instance.user_id,
- **item_data
- )
+ ChecklistItem.objects.create(checklist=instance, **item_data)
# Delete items that are not in the updated data
items_to_delete = current_item_ids - updated_item_ids
@@ -388,25 +183,27 @@ class ChecklistSerializer(CustomModelSerializer):
raise serializers.ValidationError(
'Checklists associated with a public collection must be public.'
)
+
+ # Check if the user owns the checklist
+ request = self.context.get('request')
+ if request and collection and collection.user_id != request.user:
+ raise serializers.ValidationError(
+ 'Checklists must be associated with collections owned by the same user.'
+ )
+
return data
-class CollectionSerializer(CustomModelSerializer):
- adventures = AdventureSerializer(many=True, read_only=True)
+
+
+
+class CollectionSerializer(serializers.ModelSerializer):
+ adventures = AdventureSerializer(many=True, read_only=True, source='adventure_set')
transportations = TransportationSerializer(many=True, read_only=True, source='transportation_set')
notes = NoteSerializer(many=True, read_only=True, source='note_set')
checklists = ChecklistSerializer(many=True, read_only=True, source='checklist_set')
- lodging = LodgingSerializer(many=True, read_only=True, source='lodging_set')
class Meta:
model = Collection
- fields = ['id', 'description', 'user_id', 'name', 'is_public', 'adventures', 'created_at', 'start_date', 'end_date', 'transportations', 'notes', 'updated_at', 'checklists', 'is_archived', 'shared_with', 'link', 'lodging']
+ # fields are all plus the adventures field
+ fields = ['id', 'description', 'user_id', 'name', 'is_public', 'adventures', 'created_at', 'start_date', 'end_date', 'transportations', 'notes', 'updated_at', 'checklists', 'is_archived']
read_only_fields = ['id', 'created_at', 'updated_at', 'user_id']
-
- def to_representation(self, instance):
- representation = super().to_representation(instance)
- # Make it display the user uuid for the shared users instead of the PK
- shared_uuids = []
- for user in instance.shared_with.all():
- shared_uuids.append(str(user.uuid))
- representation['shared_with'] = shared_uuids
- return representation
\ No newline at end of file
diff --git a/backend/server/adventures/signals.py b/backend/server/adventures/signals.py
deleted file mode 100644
index b8501c8..0000000
--- a/backend/server/adventures/signals.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from django.db.models.signals import m2m_changed
-from django.dispatch import receiver
-from adventures.models import Adventure
-
-@receiver(m2m_changed, sender=Adventure.collections.through)
-def update_adventure_publicity(sender, instance, action, **kwargs):
- """
- Signal handler to update adventure publicity when collections are added/removed
- """
- # Only process when collections are added or removed
- if action in ('post_add', 'post_remove', 'post_clear'):
- collections = instance.collections.all()
-
- if collections.exists():
- # If any collection is public, make the adventure public
- has_public_collection = collections.filter(is_public=True).exists()
-
- if has_public_collection and not instance.is_public:
- instance.is_public = True
- instance.save(update_fields=['is_public'])
- elif not has_public_collection and instance.is_public:
- instance.is_public = False
- instance.save(update_fields=['is_public'])
diff --git a/backend/server/adventures/urls.py b/backend/server/adventures/urls.py
index d1bf6cb..8bdd6b7 100644
--- a/backend/server/adventures/urls.py
+++ b/backend/server/adventures/urls.py
@@ -1,6 +1,6 @@
from django.urls import include, path
from rest_framework.routers import DefaultRouter
-from adventures.views import *
+from .views import AdventureViewSet, ChecklistViewSet, CollectionViewSet, NoteViewSet, StatsViewSet, GenerateDescription, ActivityTypesView, TransportationViewSet
router = DefaultRouter()
router.register(r'adventures', AdventureViewSet, basename='adventures')
@@ -11,14 +11,7 @@ router.register(r'activity-types', ActivityTypesView, basename='activity-types')
router.register(r'transportations', TransportationViewSet, basename='transportations')
router.register(r'notes', NoteViewSet, basename='notes')
router.register(r'checklists', ChecklistViewSet, basename='checklists')
-router.register(r'images', AdventureImageViewSet, basename='images')
-router.register(r'reverse-geocode', ReverseGeocodeViewSet, basename='reverse-geocode')
-router.register(r'categories', CategoryViewSet, basename='categories')
-router.register(r'ics-calendar', IcsCalendarGeneratorViewSet, basename='ics-calendar')
-router.register(r'search', GlobalSearchView, basename='search')
-router.register(r'attachments', AttachmentViewSet, basename='attachments')
-router.register(r'lodging', LodgingViewSet, basename='lodging')
-router.register(r'recommendations', RecommendationsViewSet, basename='recommendations')
+
urlpatterns = [
# Include the router under the 'api/' prefix
diff --git a/backend/server/adventures/utils/file_permissions.py b/backend/server/adventures/utils/file_permissions.py
deleted file mode 100644
index b9a63f0..0000000
--- a/backend/server/adventures/utils/file_permissions.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from adventures.models import AdventureImage, Attachment
-
-protected_paths = ['images/', 'attachments/']
-
-def checkFilePermission(fileId, user, mediaType):
- if mediaType not in protected_paths:
- return True
- if mediaType == 'images/':
- try:
- # Construct the full relative path to match the database field
- image_path = f"images/{fileId}"
- # Fetch the AdventureImage object
- adventure = AdventureImage.objects.get(image=image_path).adventure
- if adventure.is_public:
- return True
- elif adventure.user_id == user:
- return True
- elif adventure.collections.exists():
- # Check if the user is in any collection's shared_with list
- for collection in adventure.collections.all():
- if collection.shared_with.filter(id=user.id).exists():
- return True
- return False
- else:
- return False
- except AdventureImage.DoesNotExist:
- return False
- elif mediaType == 'attachments/':
- try:
- # Construct the full relative path to match the database field
- attachment_path = f"attachments/{fileId}"
- # Fetch the Attachment object
- attachment = Attachment.objects.get(file=attachment_path)
- adventure = attachment.adventure
- if adventure.is_public:
- return True
- elif adventure.user_id == user:
- return True
- elif adventure.collections.exists():
- # Check if the user is in any collection's shared_with list
- for collection in adventure.collections.all():
- if collection.shared_with.filter(id=user.id).exists():
- return True
- return False
- else:
- return False
- except Attachment.DoesNotExist:
- return False
\ No newline at end of file
diff --git a/backend/server/adventures/utils/pagination.py b/backend/server/adventures/utils/pagination.py
deleted file mode 100644
index 4337190..0000000
--- a/backend/server/adventures/utils/pagination.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from rest_framework.pagination import PageNumberPagination
-
-class StandardResultsSetPagination(PageNumberPagination):
- page_size = 25
- page_size_query_param = 'page_size'
- max_page_size = 1000
\ No newline at end of file
diff --git a/backend/server/adventures/views.py b/backend/server/adventures/views.py
new file mode 100644
index 0000000..4ba7bf8
--- /dev/null
+++ b/backend/server/adventures/views.py
@@ -0,0 +1,532 @@
+import requests
+from django.db import transaction
+from rest_framework.decorators import action
+from rest_framework import viewsets
+from django.db.models.functions import Lower
+from rest_framework.response import Response
+from .models import Adventure, Checklist, Collection, Transportation, Note
+from worldtravel.models import VisitedRegion, Region, Country
+from .serializers import AdventureSerializer, CollectionSerializer, NoteSerializer, TransportationSerializer, ChecklistSerializer
+from rest_framework.permissions import IsAuthenticated
+from django.db.models import Q, Prefetch
+from .permissions import IsOwnerOrReadOnly, IsPublicReadOnly
+from rest_framework.pagination import PageNumberPagination
+from django.shortcuts import get_object_or_404
+from rest_framework import status
+
+class StandardResultsSetPagination(PageNumberPagination):
+ page_size = 25
+ page_size_query_param = 'page_size'
+ max_page_size = 1000
+
+from rest_framework.pagination import PageNumberPagination
+
+from rest_framework.decorators import action
+from rest_framework.response import Response
+from django.db.models import Q
+
+class AdventureViewSet(viewsets.ModelViewSet):
+ serializer_class = AdventureSerializer
+ permission_classes = [IsOwnerOrReadOnly, IsPublicReadOnly]
+ pagination_class = StandardResultsSetPagination
+
+ def apply_sorting(self, queryset):
+ order_by = self.request.query_params.get('order_by', 'updated_at')
+ order_direction = self.request.query_params.get('order_direction', 'asc')
+ include_collections = self.request.query_params.get('include_collections', 'true')
+
+ valid_order_by = ['name', 'type', 'date', 'rating', 'updated_at']
+ if order_by not in valid_order_by:
+ order_by = 'name'
+
+ if order_direction not in ['asc', 'desc']:
+ order_direction = 'asc'
+
+ # Apply case-insensitive sorting for the 'name' field
+ if order_by == 'name':
+ queryset = queryset.annotate(lower_name=Lower('name'))
+ ordering = 'lower_name'
+ else:
+ ordering = order_by
+
+ if order_direction == 'desc':
+ ordering = f'-{ordering}'
+
+ # reverse ordering for updated_at field
+ if order_by == 'updated_at':
+ if order_direction == 'asc':
+ ordering = '-updated_at'
+ else:
+ ordering = 'updated_at'
+
+ print(f"Ordering by: {ordering}") # For debugging
+
+ if include_collections == 'false':
+ queryset = queryset.filter(collection = None)
+
+ return queryset.order_by(ordering)
+
+ def get_queryset(self):
+ if self.action == 'retrieve':
+ # For individual adventure retrieval, include public adventures
+ return Adventure.objects.filter(
+ Q(is_public=True) | Q(user_id=self.request.user.id)
+ )
+ else:
+ # For other actions, only include user's own adventures
+ return Adventure.objects.filter(user_id=self.request.user.id)
+
+ def list(self, request, *args, **kwargs):
+ # Prevent listing all adventures
+ return Response({"detail": "Listing all adventures is not allowed."},
+ status=status.HTTP_403_FORBIDDEN)
+
+ def retrieve(self, request, *args, **kwargs):
+ queryset = self.get_queryset()
+ adventure = get_object_or_404(queryset, pk=kwargs['pk'])
+ serializer = self.get_serializer(adventure)
+ return Response(serializer.data)
+
+ def perform_create(self, serializer):
+ adventure = serializer.save(user_id=self.request.user)
+ if adventure.collection:
+ adventure.is_public = adventure.collection.is_public
+ adventure.save()
+
+ def perform_update(self, serializer):
+ adventure = serializer.save()
+ if adventure.collection:
+ adventure.is_public = adventure.collection.is_public
+ adventure.save()
+
+ def perform_create(self, serializer):
+ serializer.save(user_id=self.request.user)
+
+ @action(detail=False, methods=['get'])
+ def filtered(self, request):
+ types = request.query_params.get('types', '').split(',')
+ valid_types = ['visited', 'planned']
+ types = [t for t in types if t in valid_types]
+
+ if not types:
+ return Response({"error": "No valid types provided"}, status=400)
+
+ queryset = Adventure.objects.none()
+
+ for adventure_type in types:
+ if adventure_type in ['visited', 'planned']:
+ queryset |= Adventure.objects.filter(
+ type=adventure_type, user_id=request.user.id)
+
+ queryset = self.apply_sorting(queryset)
+ adventures = self.paginate_and_respond(queryset, request)
+ return adventures
+
+ @action(detail=False, methods=['get'])
+ def all(self, request):
+ if not request.user.is_authenticated:
+ return Response({"error": "User is not authenticated"}, status=400)
+ # include_collections = request.query_params.get('include_collections', 'false')
+ # if include_collections not in ['true', 'false']:
+ # include_collections = 'false'
+
+ # if include_collections == 'true':
+ # queryset = Adventure.objects.filter(
+ # Q(is_public=True) | Q(user_id=request.user.id)
+ # )
+ # else:
+ # queryset = Adventure.objects.filter(
+ # Q(is_public=True) | Q(user_id=request.user.id), collection=None
+ # )
+ allowed_types = ['visited', 'planned']
+ queryset = Adventure.objects.filter(
+ Q(user_id=request.user.id) & Q(type__in=allowed_types)
+ )
+
+ queryset = self.apply_sorting(queryset)
+ serializer = self.get_serializer(queryset, many=True)
+
+ return Response(serializer.data)
+
+ @action(detail=False, methods=['get'])
+ def search(self, request):
+ query = self.request.query_params.get('query', '')
+ property = self.request.query_params.get('property', 'all')
+ if len(query) < 2:
+ return Response({"error": "Query must be at least 2 characters long"}, status=400)
+
+ if property not in ['name', 'type', 'location', 'description', 'activity_types']:
+ property = 'all'
+
+ queryset = Adventure.objects.none()
+
+ if property == 'name':
+ queryset = Adventure.objects.filter(
+ (Q(name__icontains=query)) &
+ (Q(user_id=request.user.id) | Q(is_public=True))
+ )
+ elif property == 'type':
+ queryset = Adventure.objects.filter(
+ (Q(type__icontains=query)) &
+ (Q(user_id=request.user.id) | Q(is_public=True))
+ )
+ elif property == 'location':
+ queryset = Adventure.objects.filter(
+ (Q(location__icontains=query)) &
+ (Q(user_id=request.user.id) | Q(is_public=True))
+ )
+ elif property == 'description':
+ queryset = Adventure.objects.filter(
+ (Q(description__icontains=query)) &
+ (Q(user_id=request.user.id) | Q(is_public=True))
+ )
+ elif property == 'activity_types':
+ queryset = Adventure.objects.filter(
+ (Q(activity_types__icontains=query)) &
+ (Q(user_id=request.user.id) | Q(is_public=True))
+ )
+ else:
+ queryset = Adventure.objects.filter(
+ (Q(name__icontains=query) | Q(description__icontains=query) | Q(location__icontains=query) | Q(activity_types__icontains=query)) &
+ (Q(user_id=request.user.id) | Q(is_public=True))
+ )
+
+ queryset = self.apply_sorting(queryset)
+ serializer = self.get_serializer(queryset, many=True)
+ return Response(serializer.data)
+
+ def paginate_and_respond(self, queryset, request):
+ paginator = self.pagination_class()
+ page = paginator.paginate_queryset(queryset, request)
+ if page is not None:
+ serializer = self.get_serializer(page, many=True)
+ return paginator.get_paginated_response(serializer.data)
+ serializer = self.get_serializer(queryset, many=True)
+ return Response(serializer.data)
+
+class CollectionViewSet(viewsets.ModelViewSet):
+ serializer_class = CollectionSerializer
+ permission_classes = [IsOwnerOrReadOnly, IsPublicReadOnly]
+ pagination_class = StandardResultsSetPagination
+
+ # def get_queryset(self):
+ # return Collection.objects.filter(Q(user_id=self.request.user.id) & Q(is_archived=False))
+
+ def apply_sorting(self, queryset):
+ order_by = self.request.query_params.get('order_by', 'name')
+ order_direction = self.request.query_params.get('order_direction', 'asc')
+
+ valid_order_by = ['name', 'upated_at']
+ if order_by not in valid_order_by:
+ order_by = 'updated_at'
+
+ if order_direction not in ['asc', 'desc']:
+ order_direction = 'asc'
+
+ # Apply case-insensitive sorting for the 'name' field
+ if order_by == 'name':
+ queryset = queryset.annotate(lower_name=Lower('name'))
+ ordering = 'lower_name'
+ if order_direction == 'desc':
+ ordering = f'-{ordering}'
+ else:
+ order_by == 'updated_at'
+ ordering = 'updated_at'
+ if order_direction == 'asc':
+ ordering = '-updated_at'
+
+ #print(f"Ordering by: {ordering}") # For debugging
+
+ return queryset.order_by(ordering)
+
+ def list(self, request, *args, **kwargs):
+ # make sure the user is authenticated
+ if not request.user.is_authenticated:
+ return Response({"error": "User is not authenticated"}, status=400)
+ queryset = self.get_queryset()
+ queryset = self.apply_sorting(queryset)
+ collections = self.paginate_and_respond(queryset, request)
+ return collections
+
+ @action(detail=False, methods=['get'])
+ def all(self, request):
+ if not request.user.is_authenticated:
+ return Response({"error": "User is not authenticated"}, status=400)
+
+ queryset = Collection.objects.filter(
+ Q(user_id=request.user.id)
+ )
+
+ queryset = self.apply_sorting(queryset)
+ serializer = self.get_serializer(queryset, many=True)
+
+ return Response(serializer.data)
+
+ @action(detail=False, methods=['get'])
+ def archived(self, request):
+ if not request.user.is_authenticated:
+ return Response({"error": "User is not authenticated"}, status=400)
+
+ queryset = Collection.objects.filter(
+ Q(user_id=request.user.id) & Q(is_archived=True)
+ )
+
+ queryset = self.apply_sorting(queryset)
+ serializer = self.get_serializer(queryset, many=True)
+
+ return Response(serializer.data)
+
+ # this make the is_public field of the collection cascade to the adventures
+ @transaction.atomic
+ def update(self, request, *args, **kwargs):
+ partial = kwargs.pop('partial', False)
+ instance = self.get_object()
+ serializer = self.get_serializer(instance, data=request.data, partial=partial)
+ serializer.is_valid(raise_exception=True)
+
+ # Check if the 'is_public' field is present in the update data
+ if 'is_public' in serializer.validated_data:
+ new_public_status = serializer.validated_data['is_public']
+
+ # Update associated adventures to match the collection's is_public status
+ Adventure.objects.filter(collection=instance).update(is_public=new_public_status)
+
+ # do the same for transportations
+ Transportation.objects.filter(collection=instance).update(is_public=new_public_status)
+
+ # do the same for notes
+ Note.objects.filter(collection=instance).update(is_public=new_public_status)
+
+ # Log the action (optional)
+ action = "public" if new_public_status else "private"
+ print(f"Collection {instance.id} and its adventures were set to {action}")
+
+ self.perform_update(serializer)
+
+ if getattr(instance, '_prefetched_objects_cache', None):
+ # If 'prefetch_related' has been applied to a queryset, we need to
+ # forcibly invalidate the prefetch cache on the instance.
+ instance._prefetched_objects_cache = {}
+
+ return Response(serializer.data)
+
+ def get_queryset(self):
+ if self.action == 'destroy':
+ return Collection.objects.filter(user_id=self.request.user.id)
+
+ if self.action in ['update', 'partial_update']:
+ return Collection.objects.filter(user_id=self.request.user.id)
+
+ if self.action == 'retrieve':
+ return Collection.objects.filter(
+ Q(is_public=True) | Q(user_id=self.request.user.id)
+ )
+
+ # For other actions (like list), only include user's non-archived collections
+ return Collection.objects.filter(
+ Q(user_id=self.request.user.id) & Q(is_archived=False)
+ )
+
+ def perform_create(self, serializer):
+ serializer.save(user_id=self.request.user)
+
+ def paginate_and_respond(self, queryset, request):
+ paginator = self.pagination_class()
+ page = paginator.paginate_queryset(queryset, request)
+ if page is not None:
+ serializer = self.get_serializer(page, many=True)
+ return paginator.get_paginated_response(serializer.data)
+ serializer = self.get_serializer(queryset, many=True)
+ return Response(serializer.data)
+
+class StatsViewSet(viewsets.ViewSet):
+ permission_classes = [IsAuthenticated]
+
+ @action(detail=False, methods=['get'])
+ def counts(self, request):
+ visited_count = Adventure.objects.filter(
+ type='visited', user_id=request.user.id).count()
+ planned_count = Adventure.objects.filter(
+ type='planned', user_id=request.user.id).count()
+ trips_count = Collection.objects.filter(
+ user_id=request.user.id).count()
+ visited_region_count = VisitedRegion.objects.filter(
+ user_id=request.user.id).count()
+ total_regions = Region.objects.count()
+ country_count = VisitedRegion.objects.filter(
+ user_id=request.user.id).values('region__country').distinct().count()
+ total_countries = Country.objects.count()
+ return Response({
+ 'visited_count': visited_count,
+ 'planned_count': planned_count,
+ 'trips_count': trips_count,
+ 'visited_region_count': visited_region_count,
+ 'total_regions': total_regions,
+ 'country_count': country_count,
+ 'total_countries': total_countries
+ })
+
+class GenerateDescription(viewsets.ViewSet):
+ permission_classes = [IsAuthenticated]
+
+ @action(detail=False, methods=['get'],)
+ def desc(self, request):
+ name = self.request.query_params.get('name', '')
+ # un url encode the name
+ name = name.replace('%20', ' ')
+ print(name)
+ url = 'https://en.wikipedia.org/w/api.php?origin=*&action=query&prop=extracts&exintro&explaintext&format=json&titles=%s' % name
+ response = requests.get(url)
+ data = response.json()
+ data = response.json()
+ page_id = next(iter(data["query"]["pages"]))
+ extract = data["query"]["pages"][page_id]
+ if extract.get('extract') is None:
+ return Response({"error": "No description found"}, status=400)
+ return Response(extract)
+ @action(detail=False, methods=['get'],)
+ def img(self, request):
+ name = self.request.query_params.get('name', '')
+ # un url encode the name
+ name = name.replace('%20', ' ')
+ url = 'https://en.wikipedia.org/w/api.php?origin=*&action=query&prop=pageimages&format=json&piprop=original&titles=%s' % name
+ response = requests.get(url)
+ data = response.json()
+ page_id = next(iter(data["query"]["pages"]))
+ extract = data["query"]["pages"][page_id]
+ if extract.get('original') is None:
+ return Response({"error": "No image found"}, status=400)
+ return Response(extract["original"])
+
+
+class ActivityTypesView(viewsets.ViewSet):
+ permission_classes = [IsAuthenticated]
+
+ @action(detail=False, methods=['get'])
+ def types(self, request):
+ """
+ Retrieve a list of distinct activity types for adventures associated with the current user.
+
+ Args:
+ request (HttpRequest): The HTTP request object.
+
+ Returns:
+ Response: A response containing a list of distinct activity types.
+ """
+ types = Adventure.objects.filter(user_id=request.user.id).values_list('activity_types', flat=True).distinct()
+
+ allTypes = []
+
+ for i in types:
+ if not i:
+ continue
+ for x in i:
+ if x and x not in allTypes:
+ allTypes.append(x)
+
+ return Response(allTypes)
+
+class TransportationViewSet(viewsets.ModelViewSet):
+ queryset = Transportation.objects.all()
+ serializer_class = TransportationSerializer
+ permission_classes = [IsAuthenticated]
+ filterset_fields = ['type', 'is_public', 'collection']
+
+ # return error message if user is not authenticated on the root endpoint
+ def list(self, request, *args, **kwargs):
+ # Prevent listing all adventures
+ return Response({"detail": "Listing all transportations is not allowed."},
+ status=status.HTTP_403_FORBIDDEN)
+
+ @action(detail=False, methods=['get'])
+ def all(self, request):
+ if not request.user.is_authenticated:
+ return Response({"error": "User is not authenticated"}, status=400)
+ queryset = Transportation.objects.filter(
+ Q(user_id=request.user.id)
+ )
+ serializer = self.get_serializer(queryset, many=True)
+ return Response(serializer.data)
+
+
+ def get_queryset(self):
+
+ """
+ This view should return a list of all transportations
+ for the currently authenticated user.
+ """
+ user = self.request.user
+ return Transportation.objects.filter(user_id=user)
+
+ def perform_create(self, serializer):
+ serializer.save(user_id=self.request.user)
+
+class NoteViewSet(viewsets.ModelViewSet):
+ queryset = Note.objects.all()
+ serializer_class = NoteSerializer
+ permission_classes = [IsAuthenticated]
+ filterset_fields = ['is_public', 'collection']
+
+ # return error message if user is not authenticated on the root endpoint
+ def list(self, request, *args, **kwargs):
+ # Prevent listing all adventures
+ return Response({"detail": "Listing all notes is not allowed."},
+ status=status.HTTP_403_FORBIDDEN)
+
+ @action(detail=False, methods=['get'])
+ def all(self, request):
+ if not request.user.is_authenticated:
+ return Response({"error": "User is not authenticated"}, status=400)
+ queryset = Note.objects.filter(
+ Q(user_id=request.user.id)
+ )
+ serializer = self.get_serializer(queryset, many=True)
+ return Response(serializer.data)
+
+
+ def get_queryset(self):
+
+ """
+ This view should return a list of all notes
+ for the currently authenticated user.
+ """
+ user = self.request.user
+ return Note.objects.filter(user_id=user)
+
+ def perform_create(self, serializer):
+ serializer.save(user_id=self.request.user)
+
+class ChecklistViewSet(viewsets.ModelViewSet):
+ queryset = Checklist.objects.all()
+ serializer_class = ChecklistSerializer
+ permission_classes = [IsAuthenticated]
+ filterset_fields = ['is_public', 'collection']
+
+ # return error message if user is not authenticated on the root endpoint
+ def list(self, request, *args, **kwargs):
+ # Prevent listing all adventures
+ return Response({"detail": "Listing all checklists is not allowed."},
+ status=status.HTTP_403_FORBIDDEN)
+
+ @action(detail=False, methods=['get'])
+ def all(self, request):
+ if not request.user.is_authenticated:
+ return Response({"error": "User is not authenticated"}, status=400)
+ queryset = Checklist.objects.filter(
+ Q(user_id=request.user.id)
+ )
+ serializer = self.get_serializer(queryset, many=True)
+ return Response(serializer.data)
+
+
+ def get_queryset(self):
+
+ """
+ This view should return a list of all checklists
+ for the currently authenticated user.
+ """
+ user = self.request.user
+ return Checklist.objects.filter(user_id=user)
+
+ def perform_create(self, serializer):
+ serializer.save(user_id=self.request.user)
\ No newline at end of file
diff --git a/backend/server/adventures/views/__init__.py b/backend/server/adventures/views/__init__.py
deleted file mode 100644
index c9aedb0..0000000
--- a/backend/server/adventures/views/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from .activity_types_view import *
-from .adventure_image_view import *
-from .adventure_view import *
-from .category_view import *
-from .checklist_view import *
-from .collection_view import *
-from .generate_description_view import *
-from .ics_calendar_view import *
-from .note_view import *
-from .reverse_geocode_view import *
-from .stats_view import *
-from .transportation_view import *
-from .global_search_view import *
-from .attachment_view import *
-from .lodging_view import *
-from .recommendations_view import *
\ No newline at end of file
diff --git a/backend/server/adventures/views/activity_types_view.py b/backend/server/adventures/views/activity_types_view.py
deleted file mode 100644
index 438c0d0..0000000
--- a/backend/server/adventures/views/activity_types_view.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from rest_framework import viewsets
-from rest_framework.decorators import action
-from rest_framework.permissions import IsAuthenticated
-from rest_framework.response import Response
-from adventures.models import Adventure
-
-class ActivityTypesView(viewsets.ViewSet):
- permission_classes = [IsAuthenticated]
-
- @action(detail=False, methods=['get'])
- def types(self, request):
- """
- Retrieve a list of distinct activity types for adventures associated with the current user.
-
- Args:
- request (HttpRequest): The HTTP request object.
-
- Returns:
- Response: A response containing a list of distinct activity types.
- """
- types = Adventure.objects.filter(user_id=request.user.id).values_list('activity_types', flat=True).distinct()
-
- allTypes = []
-
- for i in types:
- if not i:
- continue
- for x in i:
- if x and x not in allTypes:
- allTypes.append(x)
-
- return Response(allTypes)
\ No newline at end of file
diff --git a/backend/server/adventures/views/adventure_image_view.py b/backend/server/adventures/views/adventure_image_view.py
deleted file mode 100644
index ab7f8e1..0000000
--- a/backend/server/adventures/views/adventure_image_view.py
+++ /dev/null
@@ -1,215 +0,0 @@
-from rest_framework import viewsets, status
-from rest_framework.decorators import action
-from rest_framework.permissions import IsAuthenticated
-from rest_framework.response import Response
-from django.db.models import Q
-from django.core.files.base import ContentFile
-from adventures.models import Adventure, AdventureImage
-from adventures.serializers import AdventureImageSerializer
-from integrations.models import ImmichIntegration
-import uuid
-import requests
-
-class AdventureImageViewSet(viewsets.ModelViewSet):
- serializer_class = AdventureImageSerializer
- permission_classes = [IsAuthenticated]
-
- @action(detail=True, methods=['post'])
- def image_delete(self, request, *args, **kwargs):
- return self.destroy(request, *args, **kwargs)
-
- @action(detail=True, methods=['post'])
- def toggle_primary(self, request, *args, **kwargs):
- # Makes the image the primary image for the adventure, if there is already a primary image linked to the adventure, it is set to false and the new image is set to true. make sure that the permission is set to the owner of the adventure
- if not request.user.is_authenticated:
- return Response({"error": "User is not authenticated"}, status=status.HTTP_401_UNAUTHORIZED)
-
- instance = self.get_object()
- adventure = instance.adventure
- if adventure.user_id != request.user:
- return Response({"error": "User does not own this adventure"}, status=status.HTTP_403_FORBIDDEN)
-
- # Check if the image is already the primary image
- if instance.is_primary:
- return Response({"error": "Image is already the primary image"}, status=status.HTTP_400_BAD_REQUEST)
-
- # Set the current primary image to false
- AdventureImage.objects.filter(adventure=adventure, is_primary=True).update(is_primary=False)
-
- # Set the new image to true
- instance.is_primary = True
- instance.save()
- return Response({"success": "Image set as primary image"})
-
- def create(self, request, *args, **kwargs):
- if not request.user.is_authenticated:
- return Response({"error": "User is not authenticated"}, status=status.HTTP_401_UNAUTHORIZED)
- adventure_id = request.data.get('adventure')
- try:
- adventure = Adventure.objects.get(id=adventure_id)
- except Adventure.DoesNotExist:
- return Response({"error": "Adventure not found"}, status=status.HTTP_404_NOT_FOUND)
-
- if adventure.user_id != request.user:
- # Check if the adventure has any collections
- if adventure.collections.exists():
- # Check if the user is in the shared_with list of any of the adventure's collections
- user_has_access = False
- for collection in adventure.collections.all():
- if collection.shared_with.filter(id=request.user.id).exists():
- user_has_access = True
- break
-
- if not user_has_access:
- return Response({"error": "User does not have permission to access this adventure"}, status=status.HTTP_403_FORBIDDEN)
- else:
- return Response({"error": "User does not own this adventure"}, status=status.HTTP_403_FORBIDDEN)
-
- # Handle Immich ID for shared users by downloading the image
- if (request.user != adventure.user_id and
- 'immich_id' in request.data and
- request.data.get('immich_id')):
-
- immich_id = request.data.get('immich_id')
-
- # Get the shared user's Immich integration
- try:
- user_integration = ImmichIntegration.objects.get(user_id=request.user)
- except ImmichIntegration.DoesNotExist:
- return Response({
- "error": "No Immich integration found for your account. Please set up Immich integration first.",
- "code": "immich_integration_not_found"
- }, status=status.HTTP_400_BAD_REQUEST)
-
- # Download the image from the shared user's Immich server
- try:
- immich_response = requests.get(
- f'{user_integration.server_url}/assets/{immich_id}/thumbnail?size=preview',
- headers={'x-api-key': user_integration.api_key},
- timeout=10
- )
- immich_response.raise_for_status()
-
- # Create a temporary file with the downloaded content
- content_type = immich_response.headers.get('Content-Type', 'image/jpeg')
- if not content_type.startswith('image/'):
- return Response({
- "error": "Invalid content type returned from Immich server.",
- "code": "invalid_content_type"
- }, status=status.HTTP_400_BAD_REQUEST)
-
- # Determine file extension from content type
- ext_map = {
- 'image/jpeg': '.jpg',
- 'image/png': '.png',
- 'image/webp': '.webp',
- 'image/gif': '.gif'
- }
- file_ext = ext_map.get(content_type, '.jpg')
- filename = f"immich_{immich_id}{file_ext}"
-
- # Create a Django ContentFile from the downloaded image
- image_file = ContentFile(immich_response.content, name=filename)
-
- # Modify request data to use the downloaded image instead of immich_id
- request_data = request.data.copy()
- request_data.pop('immich_id', None) # Remove immich_id
- request_data['image'] = image_file # Add the image file
-
- # Create the serializer with the modified data
- serializer = self.get_serializer(data=request_data)
- serializer.is_valid(raise_exception=True)
-
- # Save with the downloaded image
- adventure = serializer.validated_data['adventure']
- serializer.save(user_id=adventure.user_id, image=image_file)
-
- return Response(serializer.data, status=status.HTTP_201_CREATED)
-
- except requests.exceptions.RequestException:
- return Response({
- "error": f"Failed to fetch image from Immich server",
- "code": "immich_fetch_failed"
- }, status=status.HTTP_502_BAD_GATEWAY)
- except Exception:
- return Response({
- "error": f"Unexpected error processing Immich image",
- "code": "immich_processing_error"
- }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
- return super().create(request, *args, **kwargs)
-
- def update(self, request, *args, **kwargs):
- if not request.user.is_authenticated:
- return Response({"error": "User is not authenticated"}, status=status.HTTP_401_UNAUTHORIZED)
-
- adventure_id = request.data.get('adventure')
- try:
- adventure = Adventure.objects.get(id=adventure_id)
- except Adventure.DoesNotExist:
- return Response({"error": "Adventure not found"}, status=status.HTTP_404_NOT_FOUND)
-
- if adventure.user_id != request.user:
- return Response({"error": "User does not own this adventure"}, status=status.HTTP_403_FORBIDDEN)
-
- return super().update(request, *args, **kwargs)
-
- def perform_destroy(self, instance):
- print("perform_destroy")
- return super().perform_destroy(instance)
-
- def destroy(self, request, *args, **kwargs):
- print("destroy")
- if not request.user.is_authenticated:
- return Response({"error": "User is not authenticated"}, status=status.HTTP_401_UNAUTHORIZED)
-
- instance = self.get_object()
- adventure = instance.adventure
- if adventure.user_id != request.user:
- return Response({"error": "User does not own this adventure"}, status=status.HTTP_403_FORBIDDEN)
-
- return super().destroy(request, *args, **kwargs)
-
- def partial_update(self, request, *args, **kwargs):
- if not request.user.is_authenticated:
- return Response({"error": "User is not authenticated"}, status=status.HTTP_401_UNAUTHORIZED)
-
- instance = self.get_object()
- adventure = instance.adventure
- if adventure.user_id != request.user:
- return Response({"error": "User does not own this adventure"}, status=status.HTTP_403_FORBIDDEN)
-
- return super().partial_update(request, *args, **kwargs)
-
- @action(detail=False, methods=['GET'], url_path='(?P