alex/voyage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: remove Globe Spin discover feature

Browse Source
This commit is contained in:
alex
2026-03-10 20:12:12 +00:00
parent 635e0df0ab
commit 4caa1d717e
23 changed files with 97 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
backend/server/worldtravel/urls.py
View File

@@ -2,18 +2,31 @@
from django.urls import include, path
from rest_framework.routers import DefaultRouter
from .views import CountryViewSet, RegionViewSet, VisitedRegionViewSet, regions_by_country, visits_by_country, cities_by_region, VisitedCityViewSet, visits_by_region, globespin
from .views import (
CountryViewSet,
RegionViewSet,
VisitedRegionViewSet,
regions_by_country,
visits_by_country,
cities_by_region,
VisitedCityViewSet,
visits_by_region,
)
router = DefaultRouter()
router.register(r'countries', CountryViewSet, basename='countries')
router.register(r'regions', RegionViewSet, basename='regions')
router.register(r'visitedregion', VisitedRegionViewSet, basename='visitedregion')
router.register(r'visitedcity', VisitedCityViewSet, basename='visitedcity')
router.register(r"countries", CountryViewSet, basename="countries")
router.register(r"regions", RegionViewSet, basename="regions")
router.register(r"visitedregion", VisitedRegionViewSet, basename="visitedregion")
router.register(r"visitedcity", VisitedCityViewSet, basename="visitedcity")
urlpatterns = [
path('', include(router.urls)),
path('<str:country_code>/regions/', regions_by_country, name='regions-by-country'),
path('<str:country_code>/visits/', visits_by_country, name='visits-by-country'),
path('regions/<str:region_id>/cities/', cities_by_region, name='cities-by-region'),
path('regions/<str:region_id>/cities/visits/', visits_by_region, name='visits-by-region'),
path('globespin/', globespin, name='globespin'),
path("", include(router.urls)),
path("<str:country_code>/regions/", regions_by_country, name="regions-by-country"),
path("<str:country_code>/visits/", visits_by_country, name="visits-by-country"),
path("regions/<str:region_id>/cities/", cities_by_region, name="cities-by-region"),
path(
"regions/<str:region_id>/cities/visits/",
visits_by_region,
name="visits-by-region",
),
]

127
backend/server/worldtravel/views.py
View File

@@ -1,6 +1,12 @@
from django.shortcuts import get_object_or_404
from .models import Country, Region, VisitedRegion, City, VisitedCity
from .serializers import CitySerializer, CountrySerializer, RegionSerializer, VisitedRegionSerializer, VisitedCitySerializer
from .serializers import (
CitySerializer,
CountrySerializer,
RegionSerializer,
VisitedRegionSerializer,
VisitedCitySerializer,
)
from rest_framework import viewsets, status
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
@@ -8,15 +14,17 @@ from rest_framework.decorators import api_view, permission_classes, action
from django.contrib.gis.geos import Point
from adventures.models import Location
@api_view(['GET'])
@api_view(["GET"])
@permission_classes([IsAuthenticated])
def regions_by_country(request, country_code):
country = get_object_or_404(Country, country_code=country_code)
regions = Region.objects.filter(country=country).order_by('name')
regions = Region.objects.filter(country=country).order_by("name")
serializer = RegionSerializer(regions, many=True)
return Response(serializer.data)
@api_view(['GET'])
@api_view(["GET"])
@permission_classes([IsAuthenticated])
def visits_by_country(request, country_code):
country = get_object_or_404(Country, country_code=country_code)
@@ -24,15 +32,17 @@ def visits_by_country(request, country_code):
serializer = VisitedRegionSerializer(visits, many=True)
return Response(serializer.data)
@api_view(['GET'])
@api_view(["GET"])
@permission_classes([IsAuthenticated])
def cities_by_region(request, region_id):
region = get_object_or_404(Region, id=region_id)
cities = City.objects.filter(region=region).order_by('name')
cities = City.objects.filter(region=region).order_by("name")
serializer = CitySerializer(cities, many=True)
return Response(serializer.data)
@api_view(['GET'])
@api_view(["GET"])
@permission_classes([IsAuthenticated])
def visits_by_region(request, region_id):
region = get_object_or_404(Region, id=region_id)
@@ -40,122 +50,127 @@ def visits_by_region(request, region_id):
serializer = VisitedCitySerializer(visits, many=True)
return Response(serializer.data)
# view called spin the globe that return a random country, a random region in that country and a random city in that region
@api_view(['GET'])
@permission_classes([IsAuthenticated])
def globespin(request):
country = Country.objects.order_by('?').first()
data = {
"country": CountrySerializer(country).data,
}
regions = Region.objects.filter(country=country)
if regions.exists():
region = regions.order_by('?').first()
data["region"] = RegionSerializer(region).data
cities = City.objects.filter(region=region)
if cities.exists():
city = cities.order_by('?').first()
data["city"] = CitySerializer(city).data
return Response(data)
class CountryViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Country.objects.all().order_by('name')
queryset = Country.objects.all().order_by("name")
serializer_class = CountrySerializer
permission_classes = [IsAuthenticated]
@action(detail=False, methods=['get'])
@action(detail=False, methods=["get"])
def check_point_in_region(self, request):
lat = float(request.query_params.get('lat'))
lon = float(request.query_params.get('lon'))
lat = float(request.query_params.get("lat"))
lon = float(request.query_params.get("lon"))
point = Point(lon, lat, srid=4326)
region = Region.objects.filter(geometry__contains=point).first()
if region:
return Response({'in_region': True, 'region_name': region.name, 'region_id': region.id})
return Response(
{"in_region": True, "region_name": region.name, "region_id": region.id}
)
else:
return Response({'in_region': False})
return Response({"in_region": False})
@action(detail=False, methods=['post'])
@action(detail=False, methods=["post"])
def region_check_all_adventures(self, request):
adventures = Location.objects.filter(user=request.user.id, type='visited')
adventures = Location.objects.filter(user=request.user.id, type="visited")
count = 0
for adventure in adventures:
if adventure.latitude is not None and adventure.longitude is not None:
try:
point = Point(float(adventure.longitude), float(adventure.latitude), srid=4326)
point = Point(
float(adventure.longitude), float(adventure.latitude), srid=4326
)
region = Region.objects.filter(geometry__contains=point).first()
if region:
if not VisitedRegion.objects.filter(user=request.user.id, region=region).exists():
VisitedRegion.objects.create(user=request.user, region=region)
if not VisitedRegion.objects.filter(
user=request.user.id, region=region
).exists():
VisitedRegion.objects.create(
user=request.user, region=region
)
count += 1
except Exception as e:
print(f"Error processing adventure {adventure.id}: {e}")
continue
return Response({'regions_visited': count})
return Response({"regions_visited": count})
class RegionViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Region.objects.all()
serializer_class = RegionSerializer
permission_classes = [IsAuthenticated]
class VisitedRegionViewSet(viewsets.ModelViewSet):
serializer_class = VisitedRegionSerializer
permission_classes = [IsAuthenticated]
def get_queryset(self):
return VisitedRegion.objects.filter(user=self.request.user.id)
def perform_create(self, serializer):
serializer.save(user=self.request.user)
def create(self, request, *args, **kwargs):
request.data['user'] = request.user
if VisitedRegion.objects.filter(user=request.user.id, region=request.data['region']).exists():
request.data["user"] = request.user
if VisitedRegion.objects.filter(
user=request.user.id, region=request.data["region"]
).exists():
return Response({"error": "Region already visited by user."}, status=400)
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
self.perform_create(serializer)
headers = self.get_success_headers(serializer.data)
return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
return Response(
serializer.data, status=status.HTTP_201_CREATED, headers=headers
)
def destroy(self, request, **kwargs):
region = get_object_or_404(Region, id=kwargs['pk'])
visited_region = VisitedRegion.objects.filter(user=request.user.id, region=region)
region = get_object_or_404(Region, id=kwargs["pk"])
visited_region = VisitedRegion.objects.filter(
user=request.user.id, region=region
)
if visited_region.exists():
visited_region.delete()
return Response(status=status.HTTP_204_NO_CONTENT)
else:
return Response({"error": "Visited region not found."}, status=status.HTTP_404_NOT_FOUND)
return Response(
{"error": "Visited region not found."}, status=status.HTTP_404_NOT_FOUND
)
class VisitedCityViewSet(viewsets.ModelViewSet):
serializer_class = VisitedCitySerializer
permission_classes = [IsAuthenticated]
def get_queryset(self):
return VisitedCity.objects.filter(user=self.request.user.id)
def perform_create(self, serializer):
serializer.save(user=self.request.user)
def create(self, request, *args, **kwargs):
request.data['user'] = request.user
request.data["user"] = request.user
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
self.perform_create(serializer)
# Ensure a VisitedRegion exists for the city
region = serializer.validated_data['city'].region
if not VisitedRegion.objects.filter(user=request.user.id, region=region).exists():
region = serializer.validated_data["city"].region
if not VisitedRegion.objects.filter(
user=request.user.id, region=region
).exists():
VisitedRegion.objects.create(user=request.user, region=region)
headers = self.get_success_headers(serializer.data)
return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
return Response(
serializer.data, status=status.HTTP_201_CREATED, headers=headers
)
def destroy(self, request, **kwargs):
city = get_object_or_404(City, id=kwargs['pk'])
city = get_object_or_404(City, id=kwargs["pk"])
visited_city = VisitedCity.objects.filter(user=request.user.id, city=city)
if visited_city.exists():
visited_city.delete()
return Response(status=status.HTTP_204_NO_CONTENT)
else:
return Response({"error": "Visited city not found."}, status=status.HTTP_404_NOT_FOUND)
return Response(
{"error": "Visited city not found."}, status=status.HTTP_404_NOT_FOUND
)