* Fixes [REQUEST] Email-based auto-linking for OIDC Fixes #921 * Add ClusterMap integration for regions and cities with fit-to-bounds functionality * Update COUNTRY_REGION_JSON_VERSION to v3.0 and modify state ID generation to use ISO2 code * fix: handle email verification required case during signup Updated the signup action to return a specific message when the backend responds with a 401 status, indicating that the signup succeeded but email verification is required. This allows the frontend to display the appropriate message using an i18n key. * feat: add Advanced Configuration documentation with optional environment variables * Fixes #511 * fix: update appVersion to v0.11.0-main-121425 and enhance socialProviders handling in settings page * feat: implement social signup controls and update documentation for new environment variables * fix: update LocationCard props and enhance restore data functionality - Changed the user prop to null in LocationCard component on the dashboard page. - Added isRestoring state to manage loading state during data restoration in settings. - Updated the restore button to show a loading spinner when a restore operation is in progress. * fix: update appVersion to v0.12.0-pre-dev-121625 * feat: implement itinerary planning feature with CollectionItineraryPlanner component and related updates * feat: add overnight lodging indicator and functionality to CollectionItineraryPlanner * feat: add compact display option to LocationCard and enhance lodging filtering in CollectionItineraryPlanner * feat(itinerary): add itinerary management features and link modal - Introduced ItineraryViewSet for managing itinerary items with create and reorder functionalities. - Added itinerary linking capabilities in CollectionModal and CollectionItineraryPlanner components. - Implemented new ItineraryLinkModal for linking existing items to specific dates. - Enhanced the frontend with new modals for creating locations, lodging, transportation, notes, and checklists. - Updated the backend to handle itinerary item creation and reordering with appropriate permissions. - Improved data handling for unscheduled items and their association with the itinerary. - Added new dependencies to the frontend for enhanced functionality. * feat(itinerary): implement auto-generate functionality for itinerary items based on dated records * feat(collection): enhance collection sharing logic and improve data handling on invite acceptance * fix: update appVersion to correct pre-dev version * feat(wikipedia): implement image selection from Wikipedia with enhanced results display * Refactor code structure for improved readability and maintainability * feat: add CollectionRecommendationView component for displaying location recommendations - Implemented CollectionRecommendationView.svelte to handle location recommendations based on user input and selected categories. - Added Recommendation and RecommendationResponse types to types.ts for better type safety and structure. - Updated collections/[id]/+page.svelte to include a new view for recommendations, allowing users to switch between different views seamlessly. * fix: update appVersion and improve button accessibility in collection views * feat: add canModify prop to collection components for user permission handling * feat: add itinerary removal functionality to various cards and update UI components - Implemented `removeFromItinerary` function in `LodgingCard`, `NoteCard`, and `TransportationCard` to allow users to remove items from their itinerary. - Replaced the trash icon with a calendar remove icon in `LocationCard`, `LodgingCard`, `NoteCard`, and `TransportationCard` for better visual representation. - Updated the dropdown menus in `LodgingCard`, `NoteCard`, and `TransportationCard` to include the new remove from itinerary option. - Enhanced `CollectionItineraryPlanner` to pass itinerary items to the respective cards. - Removed `PointSelectionModal.svelte` as it is no longer needed. - Refactored `LocationMedia.svelte` to integrate `ImageManagement` component and clean up unused code related to image handling. * feat: enhance itinerary management with deduplication and initial visit date handling * feat: add FullMap component for enhanced map functionality with clustering support - Introduced FullMap.svelte to handle map rendering, clustering, and marker management. - Updated map page to utilize FullMap component, replacing direct MapLibre usage. - Implemented clustering options and marker properties handling in FullMap. - Added utility functions for resolving theme colors and managing marker states. - Enhanced user experience with hover popups and improved loading states for location details. - Updated app version to v0.12.0-pre-dev-122225. * feat: enhance map interaction for touch devices with custom popup handling * feat: add progress tracker for folder views to display visited and planned locations * feat: add map center and zoom state management with URL synchronization * feat: add status and days until start fields to collections with filtering options * Component folder structure changes * feat: add LodgingMedia and LodgingModal components for managing lodging details and media attachments feat: implement LocationSearchMap component for interactive location searching and mapping functionality * fix: update contentType in ImageManagement component to 'lodging' for correct media handling * feat: enhance lodging management with date validation and update messages * feat: implement lodging detail page with server-side loading and image modal functionality - Added a new server-side load function to fetch lodging details by ID. - Created a new Svelte component for the lodging detail page, including image carousel and map integration. - Implemented a modal for displaying images with navigation. - Enhanced URL handling in the locations page to only read parameters. * feat: add Transportation modal component and related routes - Implemented TransportationModal component for creating and editing transportation entries. - Added server-side loading for transportation details in the new route [id]/+page.server.ts. - Created a new Svelte page for displaying transportation details with image and attachment handling. - Integrated modal for editing transportation in the transportation details page. - Updated lodging routes to include a modal for editing lodging entries. - Removed unused delete action from lodging server-side logic. * feat: add start_code and end_code fields to Transportation model and update related components * feat: implement date validation for itinerary items and add day picker modal for scheduling * Reorder town and county checks in geocoding.py Fix detection if only town exists for a location but county is no city name * Use address keys only if city is found * Make sure reverse geocoding uses correct key for cities (#938) * Reorder town and county checks in geocoding.py Fix detection if only town exists for a location but county is no city name * Use address keys only if city is found * Refactor code structure for improved readability and maintainability * Enhance collection management with modal updates and item handling * feat: integrate CollectionMap component in collections page and update map titles in lodging and transportation pages - Replaced inline map implementation with CollectionMap component in collections/[id]/+page.svelte for better modularity. - Updated the map title in lodging/[id]/+page.svelte to reflect lodging context. - Updated the map title in transportations/[id]/+page.svelte to reflect transportation context. - Added functionality to collect and render GeoJSON data from transportation attachments in transportations/[id]/+page.svelte. * chore: update copyright year to 2026 in various files * feat: enhance backup export functionality with itinerary items and export IDs * fix: improve dropdown close behavior by handling multiple event types * fix: remove unnecessary cache decorator from globespin function * feat: add initial visit date support in ChecklistModal and NoteModal, with UI suggestions for prefilled dates * feat: add details view for checklist and note cards with edit functionality * feat: add travel duration and GPX distance calculation to Transportation model and UI * feat: add primary image support to Collection model, serializers, and UI components * Refactor calendar components and enhance event detail handling - Replaced direct calendar implementation with a reusable CalendarComponent in the calendar route. - Introduced EventDetailsModal for displaying event details, improving modularity and readability. - Added functionality to fetch event details asynchronously when an event is clicked. - Implemented ICS calendar download functionality with loading state management. - Enhanced collections page to support calendar view, integrating event handling and timezone management. - Improved lodging and transportation pages to display local time for stays and trips, including timezone badges. - Cleaned up unused code and comments for better maintainability. * feat: enhance hero image handling in collection view by prioritizing primary image * chore: update .env.example to include account email verification configuration * feat: enhance LodgingCard and TransportationCard components with expandable details and improved layout * feat: add price and currency fields to locations, lodging, and transportation components - Introduced price and price_currency fields in LocationModal, LodgingDetails, LodgingModal, TransportationDetails, and TransportationModal components. - Implemented MoneyInput and CurrencyDropdown components for handling monetary values and currency selection. - Updated data structures and types to accommodate new price and currency fields across various models. - Enhanced cost summary calculations in collections and routes to display total costs by currency. - Added user preference for default currency in settings, affecting new item forms. - Updated UI to display price information in relevant components, ensuring consistent formatting and user experience. * feat: add Development Timeline link to overview and create timeline documentation * feat: enhance map functionality with search and zoom features - Updated availableViews in collection page to include map view based on lodging and transportation locations. - Added search functionality to the map page, allowing users to filter pins by name and category. - Implemented auto-zoom feature to adjust the map view based on filtered search results. - Introduced a search bar with a clear button for better user experience. * feat: enhance ISO code extraction and region matching logic in extractIsoCode function * feat: enhance extractIsoCode function with normalization for locality matching * feat: update extractIsoCode function to include additional ISO3166 levels for improved region matching * feat: enhance extractIsoCode function to handle cases without city information and update CollectionMap to bind user data * feat: add cron job for syncing visited regions and cities, enhance Docker and supervisord configurations * feat: add CollectionItineraryDay model and related functionality for itinerary day metadata management * feat: implement cleanup of out-of-range itinerary items and notify users of potential impacts on itinerary when dates change * Refactor collection page for improved localization and code clarity - Removed unused imports and consolidated cost category labels to be reactive. - Updated cost summary function to accept localized labels. - Enhanced localization for various UI elements, including buttons, headings, and statistics. - Improved user feedback messages for better clarity and consistency. - Ensured all relevant text is translatable using the i18n library. * feat: add collaborator serialization and display in collections - Implemented `_build_profile_pic_url` and `_serialize_collaborator` functions for user profile picture URLs and serialization. - Updated `CollectionSerializer` and `UltraSlimCollectionSerializer` to include collaborators in the serialized output. - Enhanced `CollectionViewSet` to prefetch shared_with users for optimized queries. - Modified frontend components to display collaborators in collection details, including profile pictures and initials. - Added new localization strings for collaborators. - Refactored map and location components to improve usability and functionality. - Updated app version to reflect new changes. * feat: add dynamic lodging icons based on type in CollectionMap component * feat: add CollectionStats component for detailed trip statistics - Implemented CollectionStats.svelte to display various statistics related to the collection, including distances, activities, and locations visited. - Enhanced CollectionMap.svelte to filter activities based on date range using new getActivityDate function. - Updated LocationSearchMap.svelte to handle airport mode for start and end locations. - Modified types.ts to include is_global property in CollectionItineraryItem for trip-wide items. - Updated +page.svelte to integrate the new stats view and manage view state accordingly. * feat: enhance itinerary management by removing old items on date change for notes and checklists; normalize date handling in CollectionMap * feat: add functionality to change day and move items to trip-wide itinerary - Implemented changeDay function in ChecklistCard, LocationCard, LodgingCard, NoteCard, and TransportationCard components to allow users to change the scheduled day of items. - Added a button to move items to the global (trip-wide) itinerary in the aforementioned components, with appropriate dispatch events. - Enhanced CollectionItineraryPlanner to handle moving items to the global itinerary and added UI elements for unscheduled items. - Updated ItineraryDayPickModal to support the deletion of source visits when moving locations. - Added new translations for "Change Day" and "Move Trip Wide" in the English locale. * fix: specify full path for python3 in cron job and add shell and path variables * fix: update appVersion to v0.12.0-pre-dev-010726 * feat: enhance CollectionItineraryPlanner and CollectionStats with dynamic links and transport type normalization * Add Dev Container + WSL install docs and link in install guide (#944) (#951) * feat: enhance internationalization support in CollectionMap and CollectionStats components - Added translation support for various labels and messages in CollectionMap.svelte and CollectionStats.svelte using svelte-i18n. - Updated English and Chinese locale files to include new translation keys for improved user experience. - Simplified the rendering of recommendation views in the collections page. * Refactor itinerary management and UI components - Updated ItineraryViewSet to handle visit updates and creations more efficiently, preserving visit IDs when moving between days. - Enhanced ChecklistCard, LodgingCard, TransportationCard, and NoteCard to include a new "Change Day" option in the actions menu. - Improved user experience in CollectionItineraryPlanner by tracking specific itinerary items being moved and ensuring only the relevant entries are deleted. - Added new location sharing options in LodgingCard and TransportationCard for Apple Maps, Google Maps, and OpenStreetMap. - Updated translations in en.json for consistency and clarity. - Minor UI adjustments for better accessibility and usability across various components. * feat: implement action menus and close event handling in card components * feat: refactor Dockerfile and supervisord configuration to remove cron and add periodic sync script * feat: enhance LocationSearchMap and TransportationDetails components with initialization handling and airport mode logic * feat: add airport and location search mode labels to localization file * feat: enhance periodic sync logging and improve airport mode handling in LocationSearchMap * feat: enhance unscheduled items display with improved card interactions and accessibility * Add dev compose for hot reload and update WSL dev container docs (#958) * feat: enhance localization for itinerary linking and transportation components * Localization: update localization files with new keys and values * fix: improve error messages for Overpass API responses * chore: update dependencies in frontend package.json and pnpm-lock.yaml - Updated @sveltejs/adapter-node from ^5.2.12 to ^5.4.0 - Updated @sveltejs/adapter-vercel from ^5.7.0 to ^6.3.0 - Updated tailwindcss from ^3.4.17 to ^3.4.19 - Updated typescript from ^5.8.3 to ^5.9.3 - Updated vite from ^5.4.19 to ^5.4.21 * chore: update dependencies in pnpm-lock.yaml to latest versions * Refactor code structure for improved readability and maintainability * Refactor code structure for improved readability and maintainability * fix: update package dependencies to resolve compatibility issues * Add "worldtravel" translations to multiple locale files - Added "worldtravel" key with translations for Spanish, French, Hungarian, Italian, Japanese, Korean, Dutch, Norwegian, Polish, Brazilian Portuguese, Russian, Slovak, Swedish, Turkish, Ukrainian, and Chinese. - Updated the navigation section in each locale file to include the new "worldtravel" entry. * Add new screenshots and update email verification message in locale file * feat: Implement data restoration functionality with file import - Added a new action `restoreData` in `+page.server.ts` to handle file uploads for restoring collections. - Enhanced the UI in `+page.svelte` to include an import button and a modal for import progress. - Integrated file input handling to trigger form submission upon file selection. - Removed unused GSAP animations from the login, profile, and signup pages for cleaner code. * feat: Add modals for creating locations and lodging from recommendations, enhance image import functionality * fix: Adjust styles to prevent horizontal scroll and enhance floating action button visibility * feat: Enhance error handling and messaging for Google Maps and OpenStreetMap geocoding functions * fix: Enhance error messaging for Google Maps access forbidden response * feat: Add User-Agent header to Google Maps API requests and refine error messaging for access forbidden response * fix: Update User-Agent header in Google Maps API requests for improved compatibility * fix: Disable proxy settings in Google Maps API request to prevent connection issues * fix: Update Trivy security scan configuration and add .trivyignore for known false positives * fix: Refactor update method to handle is_public cascading for related items * feat: Integrate django-invitations for user invitation management and update settings * feat: Add Tailwind CSS and DaisyUI plugin for styling * feat: Add Tailwind CSS and DaisyUI plugin for styling * feat: Add "Invite a User" guide and update navigation links * docs: Update "Invite a User" guide to include email configuration tip * feat: Update email invitation template for improved styling and clarity * fix: Remove trailing backslash from installation note in Unraid documentation * feat: Add export/import messages and user email verification prompts in multiple languages * Squashed commit of the following: commit a993a15b93ebb7521ae2e5cc31596b98b29fcd6c Author: Alex <div@alexe.at> Date: Mon Jan 12 20:44:47 2026 +0100 Translated using Weblate (German) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit fdc455d9424fbb0f6b72179d9eb1340411700773 Author: Ettore Atalan <atalanttore@googlemail.com> Date: Sat Jan 10 23:24:23 2026 +0100 Translated using Weblate (German) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit 5942129c55e89dd999a13d4df9c40e6e3189355c Author: Orhun <orhunavcu@gmail.com> Date: Sun Jan 11 13:05:31 2026 +0100 Translated using Weblate (Turkish) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/ commit 8712e43d8ba4a7e7fe163fb454d6577187f9a375 Author: Henrique Fonseca Veloso <henriquefv@tutamail.com> Date: Fri Jan 9 22:53:11 2026 +0100 Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/pt_BR/ commit 18ee56653470413afe8d71ecd2b5028f6e4cf118 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:57 2026 +0100 Translated using Weblate (Dutch) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nl/ commit 57783c544e583c035c8b57b5c10ca320f25f399e Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:14 2026 +0100 Translated using Weblate (Arabic) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ar/ commit fb09edfd85bc85234b1c1ba7dd499f2915093fff Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:26 2026 +0100 Translated using Weblate (Spanish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/ commit 554a207d8e454a1f7ae826e2a40d389b94be5512 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:21 2026 +0100 Translated using Weblate (German) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit b70b9db27fb8607beefeb288185601c8f5eae28d Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:02 2026 +0100 Translated using Weblate (Norwegian Bokmål) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nb_NO/ commit 3b467caa9007c553e4ae7de97f53b6e462161ea3 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:07 2026 +0100 Translated using Weblate (Polish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/pl/ commit 30fbbfba3572c8f78ec7c7e1a231e363aca1ef10 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:17 2026 +0100 Translated using Weblate (Russian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ru/ commit 8cecb492cfcac0a1f93ee8919f7b41d978d331ee Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:42 2026 +0100 Translated using Weblate (Italian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/it/ commit f0d3d41029c89bfa83d5891ee7af70241f27b7be Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:38 2026 +0100 Translated using Weblate (Hungarian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/hu/ commit 102e0f1912d010d38755a1713abb2a7f7564aafb Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:21 2026 +0100 Translated using Weblate (Slovak) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sk/ commit 428b8f18cf6195a96b55109e0221413d82415a2f Author: Максим Горпиніч <gorpinicmaksim0@gmail.com> Date: Sat Jan 10 08:55:28 2026 +0100 Translated using Weblate (Ukrainian) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/uk/ commit 1a71aaf279ecab26c0c1fede05025732e6dcfa5e Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:27 2026 +0100 Translated using Weblate (Swedish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sv/ commit 36ec3701f3a1a904e7c42ac4ffbe6a050dc6d1ed Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:43 2026 +0100 Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/zh_Hans/ commit 65d8b74b340c877cad2028b7142c783a1b568d49 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:48 2026 +0100 Translated using Weblate (Japanese) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ja/ commit 4d11d1d31022583657e93aee70301a8ffcde1340 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:52 2026 +0100 Translated using Weblate (Korean) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ko/ commit bd1135bcb965ad73cf493771b15081cc97cf513a Author: Orhun <orhunavcu@gmail.com> Date: Fri Jan 9 22:53:33 2026 +0100 Translated using Weblate (Turkish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/ commit 2c3d814119f4cf2dabd20933699f5b991f20f3e6 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:32 2026 +0100 Translated using Weblate (French) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/fr/ * Refactor code structure and remove redundant code blocks for improved readability and maintainability * fix: Correct appVersion to match the latest pre-release version * fix: Add missing vulnerability reference for jaraco.context in .trivyignore --------- Co-authored-by: Lars Lehmann <33843261+larsl-net@users.noreply.github.com> Co-authored-by: Lars Lehmann <lars@lmail.eu> Co-authored-by: Nick Petrushin <n.a.petrushin@gmail.com>
518 lines
26 KiB
Python
518 lines
26 KiB
Python
from adventures.models import Location, Collection, CollectionItineraryItem, Transportation, Note, Lodging, Visit, Checklist, Note, CollectionItineraryDay
|
|
import datetime
|
|
from django.utils.dateparse import parse_date, parse_datetime
|
|
from django.contrib.contenttypes.models import ContentType
|
|
from django.db import models
|
|
from adventures.serializers import CollectionItineraryItemSerializer, CollectionItineraryDaySerializer
|
|
from adventures.utils.itinerary import reorder_itinerary_items
|
|
from adventures.utils.autogenerate_itinerary import auto_generate_itinerary
|
|
from rest_framework import viewsets, status
|
|
from rest_framework.decorators import action
|
|
from rest_framework.response import Response
|
|
from rest_framework.exceptions import ValidationError, PermissionDenied
|
|
from adventures.permissions import IsOwnerOrSharedWithFullAccess
|
|
from django.db.models import Q
|
|
from django.db import transaction
|
|
from django.utils import timezone
|
|
|
|
class ItineraryViewSet(viewsets.ModelViewSet):
|
|
serializer_class = CollectionItineraryItemSerializer
|
|
permission_classes = [IsOwnerOrSharedWithFullAccess]
|
|
|
|
def get_queryset(self):
|
|
user = self.request.user
|
|
|
|
if not user.is_authenticated:
|
|
return CollectionItineraryItem.objects.none()
|
|
|
|
# Return itinerary items from collections the user owns or is shared with
|
|
return CollectionItineraryItem.objects.filter(
|
|
Q(collection__user=user) | Q(collection__shared_with=user)
|
|
).distinct().select_related('collection', 'collection__user').order_by('date', 'order')
|
|
|
|
def create(self, request, *args, **kwargs):
|
|
"""
|
|
Accept 'content_type' as either a ContentType PK or a model name string
|
|
(e.g. 'location', 'lodging', 'transportation', 'note', 'visit'). If a
|
|
string is provided we resolve it to the appropriate ContentType PK and
|
|
validate the referenced object exists and the user has permission to
|
|
access it.
|
|
|
|
Optional parameter 'update_item_date': if True, update the actual item's
|
|
date field to match the itinerary date.
|
|
"""
|
|
if not request.user.is_authenticated:
|
|
return Response({"error": "User is not authenticated"}, status=status.HTTP_401_UNAUTHORIZED)
|
|
|
|
data = request.data.copy()
|
|
content_type_val = data.get('content_type')
|
|
object_id = data.get('object_id')
|
|
update_item_date = data.get('update_item_date', False)
|
|
target_date = data.get('date')
|
|
is_global = data.get('is_global', False)
|
|
# Normalize is_global to boolean
|
|
if isinstance(is_global, str):
|
|
is_global = is_global.lower() in ['1', 'true', 'yes']
|
|
data['is_global'] = is_global
|
|
|
|
# Support legacy field 'location' -> treat as content_type='location'
|
|
if not content_type_val and data.get('location'):
|
|
content_type_val = 'location'
|
|
object_id = object_id or data.get('location')
|
|
data['content_type'] = content_type_val
|
|
data['object_id'] = object_id
|
|
|
|
# If content_type is provided as a string model name, map to ContentType PK
|
|
if content_type_val and isinstance(content_type_val, str):
|
|
# If it's already numeric-like, leave it
|
|
if not content_type_val.isdigit():
|
|
content_map = {
|
|
'location': Location,
|
|
'transportation': Transportation,
|
|
'note': Note,
|
|
'lodging': Lodging,
|
|
'visit': Visit,
|
|
'checklist': Checklist,
|
|
'note': Note,
|
|
}
|
|
|
|
if content_type_val not in content_map:
|
|
return Response({
|
|
'error': f"Invalid content_type. Must be one of: {', '.join(content_map.keys())}"
|
|
}, status=status.HTTP_400_BAD_REQUEST)
|
|
|
|
model_class = content_map[content_type_val]
|
|
|
|
# Validate referenced object exists
|
|
try:
|
|
content_object = model_class.objects.get(id=object_id)
|
|
except (ValueError, model_class.DoesNotExist):
|
|
return Response({'error': f"{content_type_val} not found"}, status=status.HTTP_404_NOT_FOUND)
|
|
|
|
# Permission check
|
|
permission_checker = IsOwnerOrSharedWithFullAccess()
|
|
if not permission_checker.has_object_permission(request, self, content_object):
|
|
return Response({'error': 'User does not have permission to access this content'}, status=status.HTTP_403_FORBIDDEN)
|
|
|
|
ct = ContentType.objects.get_for_model(model_class)
|
|
data['content_type'] = ct.pk
|
|
|
|
# If update_item_date is True and target_date is provided, update the item's date
|
|
if update_item_date and target_date and content_object:
|
|
# Extract just the date part if target_date is datetime
|
|
clean_date = str(target_date).split('T')[0] if 'T' in str(target_date) else str(target_date)
|
|
|
|
# For locations, create an all-day visit instead of updating a date field
|
|
if content_type_val == 'location':
|
|
# Determine start/end bounds. Support single date or optional start_date/end_date in payload.
|
|
# Prefer explicit start_date/end_date if provided, otherwise use the single target date.
|
|
start_input = data.get('start_date') or clean_date
|
|
end_input = data.get('end_date') or clean_date
|
|
|
|
def parse_bounds(val):
|
|
if not val:
|
|
return None
|
|
s = str(val)
|
|
# If datetime string provided, parse directly
|
|
if 'T' in s:
|
|
dt = parse_datetime(s)
|
|
return dt
|
|
# Otherwise parse as date and convert to datetime at start/end of day
|
|
d = parse_date(s)
|
|
if d:
|
|
return d
|
|
return None
|
|
|
|
# Normalize to date or datetime values
|
|
parsed_start = parse_bounds(start_input)
|
|
parsed_end = parse_bounds(end_input)
|
|
|
|
# If both are plain dates, convert to datetimes spanning the day
|
|
if isinstance(parsed_start, datetime.date) and not isinstance(parsed_start, datetime.datetime):
|
|
new_start = datetime.datetime.combine(parsed_start, datetime.time.min)
|
|
elif isinstance(parsed_start, datetime.datetime):
|
|
new_start = parsed_start
|
|
else:
|
|
new_start = None
|
|
|
|
if isinstance(parsed_end, datetime.date) and not isinstance(parsed_end, datetime.datetime):
|
|
new_end = datetime.datetime.combine(parsed_end, datetime.time.max)
|
|
elif isinstance(parsed_end, datetime.datetime):
|
|
new_end = parsed_end
|
|
else:
|
|
new_end = None
|
|
|
|
# If we couldn't parse bounds, fallback to the all-day target date
|
|
if not new_start or not new_end:
|
|
try:
|
|
d = parse_date(clean_date)
|
|
new_start = datetime.datetime.combine(d, datetime.time.min)
|
|
new_end = datetime.datetime.combine(d, datetime.time.max)
|
|
except Exception:
|
|
new_start = None
|
|
new_end = None
|
|
|
|
# Update existing visit or create new one
|
|
# When moving between days, update the existing visit to preserve visit ID and data
|
|
if new_start and new_end:
|
|
source_visit_id = data.get('source_visit_id')
|
|
|
|
# If source visit provided, update it
|
|
if source_visit_id:
|
|
try:
|
|
source_visit = Visit.objects.get(id=source_visit_id, location=content_object)
|
|
source_visit.start_date = new_start
|
|
source_visit.end_date = new_end
|
|
source_visit.save(update_fields=['start_date', 'end_date'])
|
|
except Visit.DoesNotExist:
|
|
# Fall back to create logic below
|
|
pass
|
|
|
|
# If no source visit or update failed, check for overlapping visits
|
|
if not source_visit_id:
|
|
# Check for exact match to avoid duplicates
|
|
exact_match = Visit.objects.filter(
|
|
location=content_object,
|
|
start_date=new_start,
|
|
end_date=new_end
|
|
).exists()
|
|
|
|
if not exact_match:
|
|
# Check for any overlapping visits
|
|
overlap_q = Q(start_date__lte=new_end) & Q(end_date__gte=new_start)
|
|
existing = Visit.objects.filter(location=content_object).filter(overlap_q).first()
|
|
|
|
if existing:
|
|
# Update existing overlapping visit
|
|
existing.start_date = new_start
|
|
existing.end_date = new_end
|
|
existing.save(update_fields=['start_date', 'end_date'])
|
|
else:
|
|
# Create new visit
|
|
Visit.objects.create(
|
|
location=content_object,
|
|
start_date=new_start,
|
|
end_date=new_end,
|
|
notes="Created from itinerary planning"
|
|
)
|
|
else:
|
|
# For other item types, update their date field and preserve duration
|
|
if content_type_val == 'transportation':
|
|
# For transportation: update date and end_date, preserving duration and times
|
|
if hasattr(content_object, 'date') and hasattr(content_object, 'end_date'):
|
|
old_date = content_object.date
|
|
old_end_date = content_object.end_date
|
|
|
|
if old_date and old_end_date:
|
|
# Extract time from original start date
|
|
original_time = old_date.time()
|
|
# Create new_date with the new date but preserve the original time
|
|
new_date = datetime.datetime.combine(parse_date(clean_date), original_time)
|
|
# Duration = end_date - date
|
|
duration = old_end_date - old_date
|
|
# Apply same duration to new date
|
|
new_end_date = new_date + duration
|
|
else:
|
|
# No original end date, set to same as start date
|
|
new_date = datetime.datetime.combine(parse_date(clean_date), datetime.time.min)
|
|
new_end_date = new_date
|
|
|
|
content_object.date = new_date
|
|
content_object.end_date = new_end_date
|
|
content_object.save(update_fields=['date', 'end_date'])
|
|
elif content_type_val == 'lodging':
|
|
# For lodging: update check_in and check_out, preserving duration and times
|
|
if hasattr(content_object, 'check_in') and hasattr(content_object, 'check_out'):
|
|
old_check_in = content_object.check_in
|
|
old_check_out = content_object.check_out
|
|
|
|
if old_check_in and old_check_out:
|
|
# Extract time from original check_in
|
|
original_time = old_check_in.time()
|
|
# Create new_check_in with the new date but preserve the original time
|
|
new_check_in = datetime.datetime.combine(parse_date(clean_date), original_time)
|
|
# Duration = check_out - check_in
|
|
duration = old_check_out - old_check_in
|
|
# Apply same duration to new check_in
|
|
new_check_out = new_check_in + duration
|
|
else:
|
|
# No original dates: check_in at midnight on selected day, check_out at midnight next day
|
|
new_check_in = datetime.datetime.combine(parse_date(clean_date), datetime.time.min)
|
|
new_check_out = new_check_in + datetime.timedelta(days=1)
|
|
|
|
content_object.check_in = new_check_in
|
|
content_object.check_out = new_check_out
|
|
content_object.save(update_fields=['check_in', 'check_out'])
|
|
else:
|
|
# For note, checklist, etc. - just update the date field
|
|
date_field = None
|
|
if hasattr(content_object, 'date'):
|
|
date_field = 'date'
|
|
elif hasattr(content_object, 'start_date'):
|
|
date_field = 'start_date'
|
|
|
|
if date_field:
|
|
setattr(content_object, date_field, clean_date)
|
|
content_object.save(update_fields=[date_field])
|
|
|
|
# Ensure order is unique for this collection+group combination (day or global)
|
|
collection_id = data.get('collection')
|
|
item_date = data.get('date')
|
|
item_order = data.get('order', 0)
|
|
|
|
# Basic XOR validation between date and is_global
|
|
if is_global and item_date:
|
|
return Response({'error': 'Global itinerary items must not include a date.'}, status=status.HTTP_400_BAD_REQUEST)
|
|
if (not is_global) and not item_date:
|
|
return Response({'error': 'Dated itinerary items must include a date.'}, status=status.HTTP_400_BAD_REQUEST)
|
|
|
|
# Validate that the itinerary date (if provided) falls within the
|
|
# collection's start_date/end_date range (if those bounds are set).
|
|
if collection_id and item_date and not is_global:
|
|
# Try parse date or datetime-like values
|
|
parsed_date = None
|
|
try:
|
|
parsed_date = parse_date(str(item_date))
|
|
except Exception:
|
|
parsed_date = None
|
|
if parsed_date is None:
|
|
try:
|
|
dt = parse_datetime(str(item_date))
|
|
if dt:
|
|
parsed_date = dt.date()
|
|
except Exception:
|
|
parsed_date = None
|
|
|
|
if parsed_date is not None:
|
|
try:
|
|
collection_obj = Collection.objects.get(id=collection_id)
|
|
except Collection.DoesNotExist:
|
|
return Response({'error': 'Collection not found'}, status=status.HTTP_404_NOT_FOUND)
|
|
|
|
if collection_obj.start_date and parsed_date < collection_obj.start_date:
|
|
return Response({'error': 'Itinerary item date is before the collection start_date'}, status=status.HTTP_400_BAD_REQUEST)
|
|
if collection_obj.end_date and parsed_date > collection_obj.end_date:
|
|
return Response({'error': 'Itinerary item date is after the collection end_date'}, status=status.HTTP_400_BAD_REQUEST)
|
|
|
|
if collection_id:
|
|
if is_global:
|
|
# Max order within global group
|
|
existing_max = CollectionItineraryItem.objects.filter(
|
|
collection_id=collection_id,
|
|
is_global=True
|
|
).aggregate(max_order=models.Max('order'))['max_order']
|
|
if existing_max is None:
|
|
existing_max = -1
|
|
if item_order is None or item_order <= existing_max:
|
|
data['order'] = existing_max + 1
|
|
elif item_date:
|
|
# Find the maximum order for this collection+date
|
|
existing_max = CollectionItineraryItem.objects.filter(
|
|
collection_id=collection_id,
|
|
date=item_date,
|
|
is_global=False
|
|
).aggregate(max_order=models.Max('order'))['max_order']
|
|
|
|
# Check if the requested order conflicts with existing items
|
|
if existing_max is not None and item_order <= existing_max:
|
|
# Assign next available order
|
|
data['order'] = existing_max + 1
|
|
|
|
# Proceed with normal serializer flow using modified data
|
|
serializer = self.get_serializer(data=data)
|
|
serializer.is_valid(raise_exception=True)
|
|
self.perform_create(serializer)
|
|
|
|
# If we updated the item's date, include the updated object in response for frontend sync
|
|
response_data = serializer.data
|
|
if update_item_date and content_type_val and object_id:
|
|
if content_type_val == 'transportation':
|
|
try:
|
|
t = Transportation.objects.get(id=object_id)
|
|
from adventures.serializers import TransportationSerializer
|
|
response_data['updated_object'] = TransportationSerializer(t).data
|
|
except Transportation.DoesNotExist:
|
|
pass
|
|
elif content_type_val == 'lodging':
|
|
try:
|
|
l = Lodging.objects.get(id=object_id)
|
|
from adventures.serializers import LodgingSerializer
|
|
response_data['updated_object'] = LodgingSerializer(l).data
|
|
except Lodging.DoesNotExist:
|
|
pass
|
|
|
|
headers = self.get_success_headers(serializer.data)
|
|
return Response(response_data, status=status.HTTP_201_CREATED, headers=headers)
|
|
|
|
@transaction.atomic
|
|
def destroy(self, request, *args, **kwargs):
|
|
"""
|
|
Override destroy to remove associated visits when deleting a location itinerary item.
|
|
|
|
When removing a location from the itinerary, any PLANNED visits (future visits) at
|
|
that location on the same date as the itinerary item should also be removed.
|
|
|
|
If preserve_visits=true query parameter is provided, visits will NOT be deleted.
|
|
This is useful when moving items to global/trip context where we want to keep the visits.
|
|
"""
|
|
instance = self.get_object()
|
|
preserve_visits = request.query_params.get('preserve_visits', 'false').lower() == 'true'
|
|
|
|
# Check if this is a location type itinerary item
|
|
location_ct = ContentType.objects.get_for_model(Location)
|
|
if instance.content_type == location_ct and instance.object_id and not preserve_visits:
|
|
try:
|
|
location = Location.objects.get(id=instance.object_id)
|
|
itinerary_date = instance.date
|
|
|
|
if itinerary_date:
|
|
# Convert itinerary date to datetime for comparison
|
|
if isinstance(itinerary_date, str):
|
|
itinerary_date = parse_date(itinerary_date)
|
|
|
|
# Find and delete visits at this location on this date
|
|
# When removing from itinerary, we remove the associated visit
|
|
visits_to_delete = Visit.objects.filter(
|
|
location=location,
|
|
start_date__date=itinerary_date
|
|
)
|
|
|
|
deleted_count = visits_to_delete.count()
|
|
if deleted_count > 0:
|
|
visits_to_delete.delete()
|
|
|
|
except Location.DoesNotExist:
|
|
# Location doesn't exist, just proceed with deleting the itinerary item
|
|
pass
|
|
|
|
# Call parent destroy to delete the itinerary item
|
|
return super().destroy(request, *args, **kwargs)
|
|
|
|
@action(detail=False, methods=['post'], url_path='reorder')
|
|
@transaction.atomic
|
|
def reorder(self, request):
|
|
"""
|
|
Reorder itinerary items in bulk.
|
|
|
|
Expected payload:
|
|
{
|
|
"items": [
|
|
{"id": "uuid", "date": "2024-01-01", "order": 0},
|
|
{"id": "uuid", "date": "2024-01-01", "order": 1},
|
|
...
|
|
]
|
|
}
|
|
"""
|
|
items_data = request.data.get('items', [])
|
|
|
|
# Delegate to reusable helper which handles validation, permission checks
|
|
# and the two-phase update to avoid unique constraint races.
|
|
updated_items = reorder_itinerary_items(request.user, items_data)
|
|
|
|
serializer = self.get_serializer(updated_items, many=True)
|
|
return Response(serializer.data, status=status.HTTP_200_OK)
|
|
|
|
@action(detail=False, methods=['post'], url_path='auto-generate')
|
|
@transaction.atomic
|
|
def auto_generate(self, request):
|
|
"""
|
|
Auto-generate itinerary items for a collection based on dated records.
|
|
|
|
Only works when:
|
|
- Collection has zero itinerary items
|
|
- Collection has dated records (visits, lodging, transportation, notes, checklists)
|
|
|
|
Expected payload:
|
|
{
|
|
"collection_id": "uuid"
|
|
}
|
|
|
|
Returns: List of created itinerary items
|
|
"""
|
|
collection_id = request.data.get('collection_id')
|
|
|
|
if not collection_id:
|
|
return Response(
|
|
{"error": "collection_id is required"},
|
|
status=status.HTTP_400_BAD_REQUEST
|
|
)
|
|
|
|
# Get collection and check permissions
|
|
try:
|
|
collection = Collection.objects.get(id=collection_id)
|
|
except Collection.DoesNotExist:
|
|
return Response(
|
|
{"error": "Collection not found"},
|
|
status=status.HTTP_404_NOT_FOUND
|
|
)
|
|
|
|
# Permission check: user must be collection owner or in shared_with
|
|
if not (collection.user == request.user or collection.shared_with.filter(id=request.user.id).exists()):
|
|
return Response(
|
|
{"error": "You do not have permission to modify this collection"},
|
|
status=status.HTTP_403_FORBIDDEN
|
|
)
|
|
|
|
try:
|
|
created_items = auto_generate_itinerary(collection)
|
|
serializer = self.get_serializer(created_items, many=True)
|
|
return Response({
|
|
"message": f"Successfully generated {len(created_items)} itinerary items",
|
|
"items": serializer.data
|
|
}, status=status.HTTP_201_CREATED)
|
|
except ValidationError as e:
|
|
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
|
|
|
|
|
|
class ItineraryDayViewSet(viewsets.ModelViewSet):
|
|
"""ViewSet for managing itinerary day metadata (names and descriptions)"""
|
|
serializer_class = CollectionItineraryDaySerializer
|
|
permission_classes = [IsOwnerOrSharedWithFullAccess]
|
|
|
|
def get_queryset(self):
|
|
user = self.request.user
|
|
|
|
if not user.is_authenticated:
|
|
return CollectionItineraryDay.objects.none()
|
|
|
|
# Return day metadata from collections the user owns or is shared with
|
|
return CollectionItineraryDay.objects.filter(
|
|
Q(collection__user=user) | Q(collection__shared_with=user)
|
|
).distinct().select_related('collection', 'collection__user').order_by('date')
|
|
|
|
def perform_create(self, serializer):
|
|
"""Ensure the user has permission to modify the collection"""
|
|
collection = serializer.validated_data.get('collection')
|
|
|
|
if not collection:
|
|
raise ValidationError("Collection is required")
|
|
|
|
# Check if user has permission to modify this collection
|
|
if not (collection.user == self.request.user or
|
|
collection.shared_with.filter(id=self.request.user.id).exists()):
|
|
raise PermissionDenied("You do not have permission to modify this collection")
|
|
|
|
serializer.save()
|
|
|
|
def perform_update(self, serializer):
|
|
"""Ensure the user has permission to modify the collection"""
|
|
instance = self.get_object()
|
|
collection = instance.collection
|
|
|
|
# Check if user has permission to modify this collection
|
|
if not (collection.user == self.request.user or
|
|
collection.shared_with.filter(id=self.request.user.id).exists()):
|
|
raise PermissionDenied("You do not have permission to modify this collection")
|
|
|
|
serializer.save()
|
|
|
|
def perform_destroy(self, instance):
|
|
"""Ensure the user has permission to modify the collection"""
|
|
collection = instance.collection
|
|
|
|
# Check if user has permission to modify this collection
|
|
if not (collection.user == self.request.user or
|
|
collection.shared_with.filter(id=self.request.user.id).exists()):
|
|
raise PermissionDenied("You do not have permission to modify this collection")
|
|
|
|
instance.delete() |