* Implement code changes to enhance functionality and improve performance * Update nl.json Fix Dutch translations. * feat(security): add Trivy security scans for Docker images and source code * feat(security): restructure Trivy scans for improved clarity and organization * fix(dependencies): update Django version to 5.2.2 * style(workflows): standardize quotes and fix typo in frontend-test.yml * feat(workflows): add job names for clarity in backend and frontend test workflows * refactor(workflows): remove path filters from pull_request and push triggers in backend and frontend workflows * feat(workflows): add paths to push and pull_request triggers for backend and frontend workflows * refactor(workflows): simplify trigger paths for backend and frontend workflows fix(dependencies): add overrides for esbuild in frontend package.json * fix(package): add missing pnpm overrides for esbuild in package.json * fix(workflows): add missing severity parameter for Trivy filesystem scan * fix(workflows): add missing severity parameter for Docker image scans in Trivy workflow * fix(workflows): remove MEDIUM severity from Trivy scans in security workflow * added-fix-image-deletion (#681) * added-fix-image-deletion * feat(commands): add image cleanup command to find and delete unused files * fix(models): ensure associated AdventureImages are deleted and files cleaned up on Adventure deletion * fix(models): ensure associated Attachment files are deleted and their filesystem cleaned up on Adventure deletion --------- Co-authored-by: ferdousahmed <taninme@gmail.com> Co-authored-by: Sean Morley * Rename Adventures to Locations (#696) * Refactor user_id to user in adventures and related models, views, and components - Updated all instances of user_id to user in the adventures app, including models, serializers, views, and frontend components. - Adjusted queries and filters to reflect the new user field naming convention. - Ensured consistency across the codebase for user identification in adventures, collections, notes, and transportation entities. - Modified frontend components to align with the updated data structure, ensuring proper access control and rendering based on user ownership. * Refactor adventure-related views and components to use "Location" terminology - Updated GlobalSearchView to replace AdventureSerializer with LocationSerializer. - Modified IcsCalendarGeneratorViewSet to use LocationSerializer instead of AdventureSerializer. - Created new LocationImageViewSet for managing location images, including primary image toggling and image deletion. - Introduced LocationViewSet for managing locations with enhanced filtering, sorting, and sharing capabilities. - Updated ReverseGeocodeViewSet to utilize LocationSerializer. - Added ActivityTypesView to retrieve distinct activity types from locations. - Refactored user views to replace AdventureSerializer with LocationSerializer. - Updated frontend components to reflect changes from "adventure" to "location", including AdventureCard, AdventureLink, AdventureModal, and others. - Adjusted API endpoints in frontend routes to align with new location-based structure. - Ensured all references to adventures are replaced with locations across the codebase. * refactor: rename adventures to locations across the application - Updated localization files to replace adventure-related terms with location-related terms. - Refactored TypeScript types and variables from Adventure to Location in various routes and components. - Adjusted UI elements and labels to reflect the change from adventures to locations. - Ensured all references to adventures in the codebase are consistent with the new location terminology. * Refactor code structure for improved readability and maintainability * feat: Implement location details page with server-side loading and deletion functionality - Added +page.server.ts to handle server-side loading of additional location info. - Created +page.svelte for displaying location details, including images, visits, and maps. - Integrated GPX file handling and rendering on the map. - Updated map route to link to locations instead of adventures. - Refactored profile and search routes to use LocationCard instead of AdventureCard. * docs: Update terminology from "Adventure" to "Location" and enhance project overview * docs: Clarify collection examples in usage documentation * feat: Enable credentials for GPX file fetch and add CORS_ALLOW_CREDENTIALS setting * Refactor adventure references to locations across the backend and frontend - Updated CategoryViewSet to reflect location context instead of adventures. - Modified ChecklistViewSet to include locations in retrieval logic. - Changed GlobalSearchView to search for locations instead of adventures. - Adjusted IcsCalendarGeneratorViewSet to handle locations instead of adventures. - Refactored LocationImageViewSet to remove unused import. - Updated LocationViewSet to clarify public access for locations. - Changed LodgingViewSet to reference locations instead of adventures. - Modified NoteViewSet to prevent listing all locations. - Updated RecommendationsViewSet to handle locations in parsing and response. - Adjusted ReverseGeocodeViewSet to search through user locations. - Updated StatsViewSet to count locations instead of adventures. - Changed TagsView to reflect activity types for locations. - Updated TransportationViewSet to reference locations instead of adventures. - Added new translations for search results related to locations in multiple languages. - Updated dashboard and profile pages to reflect location counts instead of adventure counts. - Adjusted search routes to handle locations instead of adventures. * Update banner image * style: Update stats component background and border for improved visibility * refactor: Rename AdventureCard and AdventureModal to LocationCard and LocationModal for consistency * Import and Export Functionality (#698) * feat(backup): add BackupViewSet for data export and import functionality * Fixed frontend returning corrupt binary data * feat(import): enhance import functionality with confirmation check and improved city/region/country handling * Potential fix for code scanning alert no. 29: Information exposure through an exception Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * Refactor response handling to use arrayBuffer instead of bytes * Refactor image cleanup command to use LocationImage model and update import/export view to include backup and restore functionality * Update backup export versioning and improve data restore warning message * Enhance image navigation and localization support in modal components * Refactor location handling in Immich integration components for consistency * Enhance backup and restore functionality with improved localization and error handling * Improve accessibility by adding 'for' attribute to backup file input label --------- Co-authored-by: Christian Zäske <blitzdose@gmail.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * refactor(serializers): rename Location to Adventure and update related fields * refactor(serializers): rename Adventure to Location and update related fields * chore(requirements): update pillow version to 11.3.0 * Add PT-BR translations (#739) * Fixed frontend returning corrupt binary data * fix(adventure): enhance collection ownership validation in AdventureSerializer (#723) * Add PT-BR translations Add translation for Brazilian Portuguese to the project; Signed-off-by: Lucas Zampieri <lzampier@redhat.com> --------- Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> Co-authored-by: Christian Zäske <blitzdose@gmail.com> * fix: update date formatting for adventure items to include timezone * Image/attachment overhaul, activities, trails and integrations with Strava and Wanderer (#726) * refactor(models, views, serializers): rename LocationImage and Attachment to ContentImage and ContentAttachment, update related references * feat: Enhance collection sharing and location management features - Implemented unsharing functionality in CollectionViewSet, including removal of user-owned locations from collections. - Refactored ContentImageViewSet to support multiple content types and improved permission checks for image uploads. - Added user ownership checks in LocationViewSet for delete operations. - Enhanced collection management in the frontend to display both owned and shared collections separately. - Updated Immich integration to handle access control based on location visibility and user permissions. - Improved UI components to show creator information and manage collection links more effectively. - Added loading states and error handling in collection fetching logic. * feat: enhance transportation card and modal with image handling - Added CardCarousel component to TransportationCard for image display. - Implemented privacy indicator with Eye and EyeOff icons. - Introduced image upload functionality in TransportationModal, allowing users to upload multiple images. - Added image management features: remove image and set primary image. - Updated Transportation and Location types to include images as ContentImage array. - Enhanced UI for image upload and display in modal, including selected images preview and current images management. * feat: update CardCarousel component to handle images, name, and icon props across various cards * feat: add Discord link to AboutModal and update appVersion in config * feat: add LocationQuickStart and LocationVisits components for enhanced location selection and visit management - Implemented LocationQuickStart.svelte for searching and selecting locations on a map with reverse geocoding. - Created LocationVisits.svelte to manage visit dates and notes for locations, including timezone handling and validation. - Updated types to remove location property from Attachment type. - Modified locations page to integrate NewLocationModal for creating and editing locations, syncing updates with adventures. * feat: update button styles and add back and close functionality in location components * Collection invite system * feat: update CollectionSerializer to include 'shared_with' as a read-only field; update app version; add new background images and localization strings for invites * feat: add Strava integration with OAuth flow and activity management - Implemented IntegrationView for listing integrations including Immich, Google Maps, and Strava. - Created StravaIntegrationView for handling OAuth authorization and token exchange. - Added functionality to refresh Strava access tokens when needed. - Implemented endpoints to fetch user activities from Strava and extract essential information. - Added Strava logo asset and integrated it into the frontend settings page. - Updated settings page to display Strava integration status. - Enhanced location management to include trails with create, edit, and delete functionalities. - Updated types and localization files to support new features. * feat: enhance Strava integration with user-specific settings and management options; update localization strings * feat: update Strava integration settings and add Wanderer logo; enhance user experience with active section management * Add StravaActivity and Activity types to types.ts - Introduced StravaActivity type to represent detailed activity data from Strava. - Added Activity type to encapsulate user activities, including optional trail and GPX file information. - Updated Location type to include an array of activities associated with each visit. * feat: streamline location and activity management; enhance Strava import functionality and add activity handling in server actions * feat: add ActivityCard component and update LocationVisits to use it; modify Activity type to reference trail as string * feat: add geojson support to ActivitySerializer and ActivityCard; enhance location page with activity summaries and GPS tracks * feat: add trails property to recommendation object in collection page * feat: add Wanderer integration with authentication and management features * feat: implement Wanderer integration with trail management and UI components; enhance settings for reauthentication * feat: add measurement system field to CustomUser model and update related serializers, migrations, and UI components * feat: add measurement system support across ActivityCard, StravaActivityCard, NewLocationModal, LocationVisits, and related utility functions * feat: enhance Wanderer integration with trail data fetching and UI updates; add measurement system support * feat: add TrailCard component for displaying trail details with measurement system support * feat: add wanderer link support in TrailSerializer and TrailCard; update measurement system handling in location page * feat: integrate memcached for caching in Wanderer services; update Docker, settings, and supervisord configurations * feat: add activity statistics to user profile; include distance, moving time, elevation, and total activities * feat: enhance import/export functionality to include trails and activities; update UI components and localization * feat: integrate NewLocationModal across various components; update location handling and state management * Refactor Location and Visit types: Replace visits structure in Location with Visit type and add location, created_at, and updated_at fields to Visit * feat: enhance permissions and validation in activity, trail, and visit views; add unique constraint to CollectionInvite model * feat: sync visits when updating adventures in collection page * feat: add geojson support for attachments and refactor GPX handling in location page * chore: remove unused dependencies from pnpm-lock.yaml * feat: add Strava and Wanderer integration documentation and configuration options * Add support for Japanese and Arabic languages in localization * Add new localization strings for Russian, Swedish, and Chinese languages - Updated translations in ru.json, sv.json, and zh.json to include new phrases related to collections, activities, and integrations. - Added strings for leaving collections, loading collections, and quick start instructions. - Included new sections for invites and Strava integration with relevant messages. - Enhanced Google Maps integration descriptions for clarity. * Add localization support for activity-related features and update UI labels - Added new Russian, Swedish, and Chinese translations for activity statistics, achievements, and related terms. - Updated UI components to use localized strings for activity statistics, distance, moving time, and other relevant fields. - Enhanced user experience by ensuring all relevant buttons and labels are translated and accessible. * fix: update appVersion to reflect the latest development version * feat: add getActivityColor function and integrate activity color coding in map and location pages * feat: add support for showing activities and visited cities on the map * feat: update map page to display counts for visited cities and activities * fix: remove debug print statement from IsOwnerOrSharedWithFullAccess permission class * feat: add MapStyleSelector component and integrate basemap selection in map page * feat: enhance basemap functions with 3D terrain support and update XYZ style handling * feat: add management command to recalculate elevation data from GPX files and update activity view to handle elevation data extraction * feat: update MapStyleSelector component and enhance basemap options for improved user experience * feat: refactor activity model and admin to use sport_type, update serializers and components for improved activity handling * feat: update Activity model string representation to use sport_type instead of type * feat: update activity handling to use sport_type for color determination in map and location components * feat: Add attachments support to Transportation and Lodging types - Updated Transportation and Lodging types to include attachments array. - Enhanced localization files for multiple languages to include new strings related to attachments, lodging, and transportation. - Added error and success messages for attachment removal and upload information. - Included new prompts for creating and updating lodging and transportation details across various languages. * feat: Enhance activity statistics and breakdown by category in user profile * feat: Add SPORT_CATEGORIES for better organization of sports types and update StatsViewSet to use it * feat: Enhance CategoryDropdown for mobile responsiveness and add category creation functionality * feat: Update inspirational quote in adventure log * feat: Localize navigation labels in Navbar and add translation to en.json * feat: Update navigation elements to use anchor tags for better accessibility and add new fields to signup form * Translate login button text to support internationalization * feat: Refactor location visit status logic and add utility function for visited locations count * chore: Upgrade GitHub Actions and remove unused timezone import * fix: Update Docker image tags in GitHub Actions workflow for consistency * fix: Update Docker image build process to use BuildKit cache for improved performance * chore: Remove unused imports from stats_view.py for cleaner code * Increase background image opacity on login and signup pages for improved visibility * fix: Add postgresql-client to runtime dependencies in Dockerfile * fix: Update workflow files to include permissions for GitHub Actions * fix: Update esbuild version to ^0.25.9 in package.json and pnpm-lock.yaml for compatibility * chore: improve Chinese translation (#796) * fix: update adventure log quote and remove unused activity type field * fix: optimize import process by using get_or_create for visited cities and regions * fix: update README to reflect changes from adventures to locations and enhance feature descriptions * fix: update documentation to reflect changes from adventures to locations and enhance feature descriptions * Update google_maps_integration.md (#743) * Update google_maps_integration.md Explain APIs needed for AdventureLogs versions. Fixes #731 and #727 * Fix a typo google_maps_integration.md --------- Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> * fix: update appVersion to reflect the main branch version * fix: update image source for satellite map in documentation * Update frontend/src/lib/components/NewLocationModal.svelte Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Add localization updates for multiple languages - Japanese (ja.json): Added new activity-related phrases and checklist terms. - Korean (ko.json): Included activity breakdown and checklist enhancements. - Dutch (nl.json): Updated activity descriptions and added checklist functionalities. - Norwegian (no.json): Enhanced activity and checklist terminology. - Polish (pl.json): Added new phrases for activities and checklist management. - Brazilian Portuguese (pt-br.json): Updated activity-related terms and checklist features. - Russian (ru.json): Included new phrases for activities and checklist management. - Swedish (sv.json): Enhanced activity descriptions and checklist functionalities. - Chinese (zh.json): Added new activity-related phrases and checklist terms. * fix: enhance image upload handling to support immich_id * Add "not_enabled" message for Strava integration in multiple languages - Updated Spanish, French, Italian, Japanese, Korean, Dutch, Norwegian, Polish, Brazilian Portuguese, Russian, Swedish, and Chinese locale files to include a new message indicating that Strava integration is not enabled in the current instance. --------- Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Co-authored-by: Ycer0n <37674033+Ycer0n@users.noreply.github.com> Co-authored-by: taninme <5262715+taninme@users.noreply.github.com> Co-authored-by: ferdousahmed <taninme@gmail.com> Co-authored-by: Christian Zäske <blitzdose@gmail.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Lucas Zampieri <lcasmz54@gmail.com> Co-authored-by: pplulee <pplulee@live.cn> Co-authored-by: Cathelijne Hornstra <github@hornstra.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
589 lines
25 KiB
Python
589 lines
25 KiB
Python
import os
|
|
from .models import Location, ContentImage, ChecklistItem, Collection, Note, Transportation, Checklist, Visit, Category, ContentAttachment, Lodging, CollectionInvite, Trail, Activity
|
|
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
|
|
from adventures.utils.geojson import gpx_to_geojson
|
|
import gpxpy
|
|
import geojson
|
|
import logging
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class ContentImageSerializer(CustomModelSerializer):
|
|
class Meta:
|
|
model = ContentImage
|
|
fields = ['id', 'image', 'is_primary', 'user', 'immich_id']
|
|
read_only_fields = ['id', 'user']
|
|
|
|
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).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()
|
|
geojson = serializers.SerializerMethodField()
|
|
class Meta:
|
|
model = ContentAttachment
|
|
fields = ['id', 'file', 'extension', 'name', 'user', 'geojson']
|
|
read_only_fields = ['id', 'user']
|
|
|
|
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
|
|
|
|
def get_geojson(self, obj):
|
|
if obj.file and obj.file.name.endswith('.gpx'):
|
|
return gpx_to_geojson(obj.file)
|
|
return None
|
|
|
|
class CategorySerializer(serializers.ModelSerializer):
|
|
num_locations = serializers.SerializerMethodField()
|
|
class Meta:
|
|
model = Category
|
|
fields = ['id', 'name', 'display_name', 'icon', 'num_locations']
|
|
read_only_fields = ['id', 'num_locations']
|
|
|
|
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=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_locations(self, obj):
|
|
return Location.objects.filter(category=obj, user=obj.user).count()
|
|
|
|
class TrailSerializer(CustomModelSerializer):
|
|
provider = serializers.SerializerMethodField()
|
|
wanderer_data = serializers.SerializerMethodField()
|
|
wanderer_link = serializers.SerializerMethodField()
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super().__init__(*args, **kwargs)
|
|
self._wanderer_integration_cache = {}
|
|
|
|
class Meta:
|
|
model = Trail
|
|
fields = ['id', 'user', 'name', 'location', 'created_at','link','wanderer_id', 'provider', 'wanderer_data', 'wanderer_link']
|
|
read_only_fields = ['id', 'created_at', 'user', 'provider']
|
|
|
|
def _get_wanderer_integration(self, user):
|
|
"""Cache wanderer integration to avoid multiple database queries"""
|
|
if user.id not in self._wanderer_integration_cache:
|
|
from integrations.models import WandererIntegration
|
|
self._wanderer_integration_cache[user.id] = WandererIntegration.objects.filter(user=user).first()
|
|
return self._wanderer_integration_cache[user.id]
|
|
|
|
def get_provider(self, obj):
|
|
if obj.wanderer_id:
|
|
return 'Wanderer'
|
|
# check the link to get the provider such as Strava, AllTrails, etc.
|
|
if obj.link:
|
|
if 'strava' in obj.link:
|
|
return 'Strava'
|
|
elif 'alltrails' in obj.link:
|
|
return 'AllTrails'
|
|
elif 'komoot' in obj.link:
|
|
return 'Komoot'
|
|
elif 'outdooractive' in obj.link:
|
|
return 'Outdooractive'
|
|
return 'External Link'
|
|
|
|
def get_wanderer_data(self, obj):
|
|
if not obj.wanderer_id:
|
|
return None
|
|
|
|
# Use cached integration
|
|
integration = self._get_wanderer_integration(obj.user)
|
|
if not integration:
|
|
return None
|
|
|
|
# Fetch the Wanderer trail data
|
|
from integrations.wanderer_services import fetch_trail_by_id
|
|
try:
|
|
trail_data = fetch_trail_by_id(integration, obj.wanderer_id)
|
|
if not trail_data:
|
|
return None
|
|
|
|
# Cache the trail data and link on the object to avoid refetching
|
|
obj._wanderer_data = trail_data
|
|
base_url = integration.server_url.rstrip('/')
|
|
obj._wanderer_link = f"{base_url}/trails/{obj.wanderer_id}"
|
|
|
|
return trail_data
|
|
except Exception as e:
|
|
logger.error(f"Error fetching Wanderer trail data for {obj.wanderer_id}: {e}")
|
|
return None
|
|
|
|
def get_wanderer_link(self, obj):
|
|
if not obj.wanderer_id:
|
|
return None
|
|
|
|
# Use cached integration
|
|
integration = self._get_wanderer_integration(obj.user)
|
|
if not integration:
|
|
return None
|
|
|
|
base_url = integration.server_url.rstrip('/')
|
|
return f"{base_url}/trail/view/@{integration.username}/{obj.wanderer_id}"
|
|
|
|
|
|
class ActivitySerializer(CustomModelSerializer):
|
|
geojson = serializers.SerializerMethodField()
|
|
|
|
class Meta:
|
|
model = Activity
|
|
fields = [
|
|
'id', 'user', 'visit', 'trail', 'gpx_file', 'name', 'sport_type',
|
|
'distance', 'moving_time', 'elapsed_time', 'rest_time', 'elevation_gain',
|
|
'elevation_loss', 'elev_high', 'elev_low', 'start_date', 'start_date_local',
|
|
'timezone', 'average_speed', 'max_speed', 'average_cadence', 'calories',
|
|
'start_lat', 'start_lng', 'end_lat', 'end_lng', 'external_service_id', 'geojson'
|
|
]
|
|
read_only_fields = ['id', 'user']
|
|
|
|
def to_representation(self, instance):
|
|
representation = super().to_representation(instance)
|
|
if instance.gpx_file:
|
|
public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/').replace("'", "")
|
|
representation['gpx_file'] = f"{public_url}/media/{instance.gpx_file.name}"
|
|
return representation
|
|
|
|
def get_geojson(self, obj):
|
|
return gpx_to_geojson(obj.gpx_file)
|
|
|
|
class VisitSerializer(serializers.ModelSerializer):
|
|
|
|
activities = ActivitySerializer(many=True, read_only=True, required=False)
|
|
|
|
class Meta:
|
|
model = Visit
|
|
fields = ['id', 'start_date', 'end_date', 'timezone', 'notes', 'activities','location', 'created_at', 'updated_at']
|
|
read_only_fields = ['id', 'created_at', 'updated_at']
|
|
|
|
def create(self, validated_data):
|
|
if not validated_data.get('end_date') and validated_data.get('start_date'):
|
|
validated_data['end_date'] = validated_data['start_date']
|
|
return super().create(validated_data)
|
|
|
|
class LocationSerializer(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()
|
|
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
|
|
)
|
|
trails = TrailSerializer(many=True, read_only=True, required=False)
|
|
|
|
class Meta:
|
|
model = Location
|
|
fields = [
|
|
'id', 'name', 'description', 'rating', 'tags', 'location',
|
|
'is_public', 'collections', 'created_at', 'updated_at', 'images', 'link', 'longitude',
|
|
'latitude', 'visits', 'is_visited', 'category', 'attachments', 'user', 'city', 'country', 'region', 'trails'
|
|
]
|
|
read_only_fields = ['id', 'created_at', 'updated_at', 'user', 'is_visited']
|
|
|
|
# Makes it so the whole user object is returned in the serializer instead of just the user uuid
|
|
def to_representation(self, instance):
|
|
representation = super().to_representation(instance)
|
|
representation['user'] = CustomUserDetailsSerializer(instance.user, context=self.context).data
|
|
return representation
|
|
|
|
def get_images(self, obj):
|
|
serializer = ContentImageSerializer(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 are compatible with the location being created/updated"""
|
|
|
|
if not collections:
|
|
return collections
|
|
|
|
user = self.context['request'].user
|
|
|
|
# Get the location being updated (if this is an update operation)
|
|
location_owner = getattr(self.instance, 'user', None) if self.instance else user
|
|
|
|
# For updates, we need to check if collections are being added or removed
|
|
current_collections = set(self.instance.collections.all()) if self.instance else set()
|
|
new_collections_set = set(collections)
|
|
|
|
collections_to_add = new_collections_set - current_collections
|
|
collections_to_remove = current_collections - new_collections_set
|
|
|
|
# Validate collections being added
|
|
for collection in collections_to_add:
|
|
|
|
# Check if user has permission to use this collection
|
|
user_has_shared_access = collection.shared_with.filter(id=user.id).exists()
|
|
|
|
if collection.user != user and not user_has_shared_access:
|
|
raise serializers.ValidationError(
|
|
f"The requested collection does not belong to the current user."
|
|
)
|
|
|
|
# Check location owner compatibility - both directions
|
|
if collection.user != location_owner:
|
|
|
|
# If user owns the collection but not the location, location owner must have shared access
|
|
if collection.user == user:
|
|
location_owner_has_shared_access = collection.shared_with.filter(id=location_owner.id).exists() if location_owner else False
|
|
|
|
if not location_owner_has_shared_access:
|
|
raise serializers.ValidationError(
|
|
f"Locations must be associated with collections owned by the same user or shared collections. Collection owner: {collection.user.username} Location owner: {location_owner.username if location_owner else 'None'}"
|
|
)
|
|
|
|
# If using someone else's collection, location owner must have shared access
|
|
else:
|
|
location_owner_has_shared_access = collection.shared_with.filter(id=location_owner.id).exists() if location_owner else False
|
|
|
|
if not location_owner_has_shared_access:
|
|
raise serializers.ValidationError(
|
|
"Location cannot be added to collection unless the location owner has shared access to the collection."
|
|
)
|
|
|
|
# Validate collections being removed - allow if user owns the collection OR owns the location
|
|
for collection in collections_to_remove:
|
|
user_owns_collection = collection.user == user
|
|
user_owns_location = location_owner == user if location_owner else False
|
|
user_has_shared_access = collection.shared_with.filter(id=user.id).exists()
|
|
|
|
if not (user_owns_collection or user_owns_location or user_has_shared_access):
|
|
raise serializers.ValidationError(
|
|
"You don't have permission to remove this location from one of the collections it's linked to."
|
|
)
|
|
|
|
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=user, name=name).first()
|
|
if existing_category:
|
|
return existing_category
|
|
category_data['name'] = name
|
|
return category_data
|
|
|
|
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=user,
|
|
name=name,
|
|
defaults={
|
|
'display_name': display_name,
|
|
'icon': icon
|
|
}
|
|
)
|
|
return category
|
|
|
|
def get_is_visited(self, obj):
|
|
return obj.is_visited_status()
|
|
|
|
def create(self, validated_data):
|
|
category_data = validated_data.pop('category', None)
|
|
collections_data = validated_data.pop('collections', [])
|
|
|
|
print(category_data)
|
|
location = Location.objects.create(**validated_data)
|
|
|
|
# Handle category
|
|
if category_data:
|
|
category = self.get_or_create_category(category_data)
|
|
location.category = category
|
|
|
|
# Handle collections - set after location is saved
|
|
if collections_data:
|
|
location.collections.set(collections_data)
|
|
|
|
location.save()
|
|
|
|
return location
|
|
|
|
def update(self, instance, validated_data):
|
|
has_visits = 'visits' in validated_data
|
|
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 location owner to change categories
|
|
user = self.context['request'].user
|
|
if category_data and instance.user == 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)
|
|
|
|
# call save on the location to update the updated_at field and trigger any geocoding
|
|
instance.save()
|
|
|
|
return instance
|
|
|
|
class TransportationSerializer(CustomModelSerializer):
|
|
distance = serializers.SerializerMethodField()
|
|
images = serializers.SerializerMethodField()
|
|
attachments = serializers.SerializerMethodField()
|
|
|
|
class Meta:
|
|
model = Transportation
|
|
fields = [
|
|
'id', 'user', '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', 'images', 'attachments'
|
|
]
|
|
read_only_fields = ['id', 'created_at', 'updated_at', 'user', 'distance']
|
|
|
|
def get_images(self, obj):
|
|
serializer = ContentImageSerializer(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 get_attachments(self, obj):
|
|
serializer = AttachmentSerializer(obj.attachments.all(), many=True, context=self.context)
|
|
# Filter out None values from the serialized data
|
|
return [attachment for attachment in serializer.data if attachment is not None]
|
|
|
|
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):
|
|
images = serializers.SerializerMethodField()
|
|
attachments = serializers.SerializerMethodField()
|
|
|
|
class Meta:
|
|
model = Lodging
|
|
fields = [
|
|
'id', 'user', 'name', 'description', 'rating', 'link', 'check_in', 'check_out',
|
|
'reservation_number', 'price', 'latitude', 'longitude', 'location', 'is_public',
|
|
'collection', 'created_at', 'updated_at', 'type', 'timezone', 'images', 'attachments'
|
|
]
|
|
read_only_fields = ['id', 'created_at', 'updated_at', 'user']
|
|
|
|
def get_images(self, obj):
|
|
serializer = ContentImageSerializer(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 get_attachments(self, obj):
|
|
serializer = AttachmentSerializer(obj.attachments.all(), many=True, context=self.context)
|
|
# Filter out None values from the serialized data
|
|
return [attachment for attachment in serializer.data if attachment is not None]
|
|
|
|
class NoteSerializer(CustomModelSerializer):
|
|
|
|
class Meta:
|
|
model = Note
|
|
fields = [
|
|
'id', 'user', 'name', 'content', 'date', 'links',
|
|
'is_public', 'collection', 'created_at', 'updated_at'
|
|
]
|
|
read_only_fields = ['id', 'created_at', 'updated_at', 'user']
|
|
|
|
class ChecklistItemSerializer(CustomModelSerializer):
|
|
class Meta:
|
|
model = ChecklistItem
|
|
fields = [
|
|
'id', 'user', 'name', 'is_checked', 'checklist', 'created_at', 'updated_at'
|
|
]
|
|
read_only_fields = ['id', 'created_at', 'updated_at', 'user', 'checklist']
|
|
|
|
class ChecklistSerializer(CustomModelSerializer):
|
|
items = ChecklistItemSerializer(many=True, source='checklistitem_set')
|
|
|
|
class Meta:
|
|
model = Checklist
|
|
fields = [
|
|
'id', 'user', 'name', 'date', 'is_public', 'collection', 'created_at', 'updated_at', 'items'
|
|
]
|
|
read_only_fields = ['id', 'created_at', 'updated_at', 'user']
|
|
|
|
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 from item_data to avoid constraint issues
|
|
item_data.pop('user', None)
|
|
# Set user from the parent checklist
|
|
ChecklistItem.objects.create(
|
|
checklist=checklist,
|
|
user=checklist.user,
|
|
**item_data
|
|
)
|
|
return checklist
|
|
|
|
def update(self, instance, validated_data):
|
|
items_data = validated_data.pop('checklistitem_set', [])
|
|
|
|
# Update Checklist fields
|
|
for attr, value in validated_data.items():
|
|
setattr(instance, attr, value)
|
|
instance.save()
|
|
|
|
# Get current items
|
|
current_items = instance.checklistitem_set.all()
|
|
current_item_ids = set(current_items.values_list('id', flat=True))
|
|
|
|
# Update or create items
|
|
updated_item_ids = set()
|
|
for item_data in items_data:
|
|
# Remove user from item_data to avoid constraint issues
|
|
item_data.pop('user', None)
|
|
|
|
item_id = item_data.get('id')
|
|
if item_id:
|
|
if item_id in current_item_ids:
|
|
item = current_items.get(id=item_id)
|
|
for attr, value in item_data.items():
|
|
setattr(item, attr, value)
|
|
item.save()
|
|
updated_item_ids.add(item_id)
|
|
else:
|
|
# If ID is provided but doesn't exist, create new item
|
|
ChecklistItem.objects.create(
|
|
checklist=instance,
|
|
user=instance.user,
|
|
**item_data
|
|
)
|
|
else:
|
|
# If no ID is provided, create new item
|
|
ChecklistItem.objects.create(
|
|
checklist=instance,
|
|
user=instance.user,
|
|
**item_data
|
|
)
|
|
|
|
# Delete items that are not in the updated data
|
|
items_to_delete = current_item_ids - updated_item_ids
|
|
instance.checklistitem_set.filter(id__in=items_to_delete).delete()
|
|
|
|
return instance
|
|
|
|
def validate(self, data):
|
|
# Check if the collection is public and the checklist 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(
|
|
'Checklists associated with a public collection must be public.'
|
|
)
|
|
return data
|
|
|
|
class CollectionSerializer(CustomModelSerializer):
|
|
locations = LocationSerializer(many=True, read_only=True)
|
|
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', 'name', 'is_public', 'locations', 'created_at', 'start_date', 'end_date', 'transportations', 'notes', 'updated_at', 'checklists', 'is_archived', 'shared_with', 'link', 'lodging']
|
|
read_only_fields = ['id', 'created_at', 'updated_at', 'user', 'shared_with']
|
|
|
|
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
|
|
|
|
class CollectionInviteSerializer(serializers.ModelSerializer):
|
|
name = serializers.CharField(source='collection.name', read_only=True)
|
|
collection_owner_username = serializers.CharField(source='collection.user.username', read_only=True)
|
|
collection_user_first_name = serializers.CharField(source='collection.user.first_name', read_only=True)
|
|
collection_user_last_name = serializers.CharField(source='collection.user.last_name', read_only=True)
|
|
|
|
class Meta:
|
|
model = CollectionInvite
|
|
fields = ['id', 'collection', 'created_at', 'name', 'collection_owner_username', 'collection_user_first_name', 'collection_user_last_name']
|
|
read_only_fields = ['id', 'created_at'] |