mirror of
https://github.com/seanmorley15/AdventureLog.git
synced 2025-07-23 06:49:37 +02:00
493a13995c
* 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
73 lines
3.1 KiB
Python
73 lines
3.1 KiB
Python
from rest_framework import viewsets
|
|
from rest_framework.response import Response
|
|
from rest_framework.permissions import IsAuthenticated
|
|
from django.db.models import Q
|
|
from django.contrib.postgres.search import SearchVector, SearchQuery
|
|
from adventures.models import Location, Collection
|
|
from adventures.serializers import LocationSerializer, CollectionSerializer
|
|
from worldtravel.models import Country, Region, City, VisitedCity, VisitedRegion
|
|
from worldtravel.serializers import CountrySerializer, RegionSerializer, CitySerializer, VisitedCitySerializer, VisitedRegionSerializer
|
|
from users.models import CustomUser as User
|
|
from users.serializers import CustomUserDetailsSerializer as UserSerializer
|
|
|
|
class GlobalSearchView(viewsets.ViewSet):
|
|
permission_classes = [IsAuthenticated]
|
|
|
|
def list(self, request):
|
|
search_term = request.query_params.get('query', '').strip()
|
|
if not search_term:
|
|
return Response({"error": "Search query is required"}, status=400)
|
|
|
|
# Initialize empty results
|
|
results = {
|
|
"locations": [],
|
|
"collections": [],
|
|
"users": [],
|
|
"countries": [],
|
|
"regions": [],
|
|
"cities": [],
|
|
"visited_regions": [],
|
|
"visited_cities": []
|
|
}
|
|
|
|
# Locations: Full-Text Search
|
|
locations = Location.objects.annotate(
|
|
search=SearchVector('name', 'description', 'location')
|
|
).filter(search=SearchQuery(search_term), user=request.user)
|
|
results["locations"] = LocationSerializer(locations, many=True).data
|
|
|
|
# Collections: Partial Match Search
|
|
collections = Collection.objects.filter(
|
|
Q(name__icontains=search_term) & Q(user=request.user)
|
|
)
|
|
results["collections"] = CollectionSerializer(collections, many=True).data
|
|
|
|
# Users: Public Profiles Only
|
|
users = User.objects.filter(
|
|
(Q(username__icontains=search_term) |
|
|
Q(first_name__icontains=search_term) |
|
|
Q(last_name__icontains=search_term)) & Q(public_profile=True)
|
|
)
|
|
results["users"] = UserSerializer(users, many=True).data
|
|
|
|
# Countries: Full-Text Search
|
|
countries = Country.objects.annotate(
|
|
search=SearchVector('name', 'country_code')
|
|
).filter(search=SearchQuery(search_term))
|
|
results["countries"] = CountrySerializer(countries, many=True).data
|
|
|
|
# Regions and Cities: Partial Match Search
|
|
regions = Region.objects.filter(Q(name__icontains=search_term))
|
|
results["regions"] = RegionSerializer(regions, many=True).data
|
|
|
|
cities = City.objects.filter(Q(name__icontains=search_term))
|
|
results["cities"] = CitySerializer(cities, many=True).data
|
|
|
|
# Visited Regions and Cities
|
|
visited_regions = VisitedRegion.objects.filter(user=request.user)
|
|
results["visited_regions"] = VisitedRegionSerializer(visited_regions, many=True).data
|
|
|
|
visited_cities = VisitedCity.objects.filter(user=request.user)
|
|
results["visited_cities"] = VisitedCitySerializer(visited_cities, many=True).data
|
|
|
|
return Response(results)
|