Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-23 14:59:36 +02:00
Code Issues Releases Activity

fix: mark visited cities based on locations

Browse source
This commit is contained in:
Lars Lehmann 2025-01-14 21:44:10 +01:00
parent 5965b82780
commit af4026300b
No known key found for this signature in database
GPG key ID: BC832CCD9A8BAE4D
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backend/server/adventures/views.py
View file

@ -1221,6 +1221,8 @@ class ReverseGeocodeViewSet(viewsets.ViewSet):
# searches through all of the users adventures, if the serialized data is_visited, is true, runs reverse geocode on the adventures and if a region is found, marks it as visited. Use the extractIsoCode function to get the region # searches through all of the users adventures, if the serialized data is_visited, is true, runs reverse geocode on the adventures and if a region is found, marks it as visited. Use the extractIsoCode function to get the region
new_region_count = 0 new_region_count = 0
new_regions = {} new_regions = {}
new_city_count = 0
new_cities = {}
adventures = Adventure.objects.filter(user_id=self.request.user) adventures = Adventure.objects.filter(user_id=self.request.user)
serializer = AdventureSerializer(adventures, many=True) serializer = AdventureSerializer(adventures, many=True)
for adventure, serialized_adventure in zip(adventures, serializer.data): for adventure, serialized_adventure in zip(adventures, serializer.data):
@ -1234,17 +1236,25 @@ class ReverseGeocodeViewSet(viewsets.ViewSet):
data = response.json() data = response.json()
except requests.exceptions.JSONDecodeError: except requests.exceptions.JSONDecodeError:
return Response({"error": "Invalid response from geocoding service"}, status=400) return Response({"error": "Invalid response from geocoding service"}, status=400)
region = self.extractIsoCode(data) extracted_region = self.extractIsoCode(data)
if 'error' not in region: if 'error' not in extracted_region:
region = Region.objects.filter(id=region['id']).first() region = Region.objects.filter(id=extracted_region['region_id']).first()
visited_region = VisitedRegion.objects.filter(region=region, user_id=self.request.user).first() visited_region = VisitedRegion.objects.filter(region=region, user_id=self.request.user).first()
if not visited_region: if not visited_region:
visited_region = VisitedRegion(region=region, user_id=self.request.user) visited_region = VisitedRegion(region=region, user_id=self.request.user)
visited_region.save() visited_region.save()
new_region_count += 1 new_region_count += 1
new_regions[region.id] = region.name new_regions[region.id] = region.name
return Response({"new_regions": new_region_count, "regions": new_regions})
if extracted_region['city_id'] is not None:
city = City.objects.filter(id=extracted_region['city_id']).first()
visited_city = VisitedCity.objects.filter(city=city, user_id=self.request.user).first()
if not visited_city:
visited_city = VisitedCity(city=city, user_id=self.request.user)
visited_city.save()
new_city_count += 1
new_cities[city.id] = city.name
return Response({"new_regions": new_region_count, "regions": new_regions, "new_cities": new_city_count, "cities": new_cities})
from django.http import HttpResponse from django.http import HttpResponse
from rest_framework import viewsets from rest_framework import viewsets