1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-24 07:19:36 +02:00

Redownload when region data version changes

This commit is contained in:
Sean Morley 2024-09-13 20:33:44 -04:00
parent 6ac3f0541f
commit cc7c04b0ec
4 changed files with 32 additions and 3 deletions

View file

@ -22,7 +22,7 @@ class AdventureAdmin(admin.ModelAdmin):
class CountryAdmin(admin.ModelAdmin):
list_display = ('name', 'country_code', 'number_of_regions')
list_filter = ('country_code', 'subregion')
list_filter = ('subregion',)
def number_of_regions(self, obj):
return Region.objects.filter(country=obj).count()
@ -32,6 +32,7 @@ class CountryAdmin(admin.ModelAdmin):
class RegionAdmin(admin.ModelAdmin):
list_display = ('name', 'country', 'number_of_visits')
list_filter = ('country',)
# list_filter = ('country', 'number_of_visits')
def number_of_visits(self, obj):

View file

@ -38,7 +38,7 @@ class Command(BaseCommand):
help = 'Imports the world travel data'
def handle(self, *args, **options):
countries_json_path = os.path.join(settings.MEDIA_ROOT, 'countries+regions.json')
countries_json_path = os.path.join(settings.MEDIA_ROOT, f'countries+regions-{COUNTRY_REGION_JSON_VERSION}.json')
if not os.path.exists(countries_json_path):
res = requests.get(f'https://raw.githubusercontent.com/dr5hn/countries-states-cities-database/{COUNTRY_REGION_JSON_VERSION}/countries%2Bstates.json')
if res.status_code == 200:

View file

@ -34,7 +34,7 @@ def visits_by_country(request, country_code):
return Response(serializer.data)
class CountryViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Country.objects.all()
queryset = Country.objects.all().order_by('name')
serializer_class = CountrySerializer
permission_classes = [IsAuthenticated]