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

Refactor batch processing in download-countries command for clarity and safety; enhance service wait function in installer script by removing unnecessary whitespace.

Browse source
This commit is contained in:
Sean Morley 2025-05-26 18:06:06 -04:00
parent 9eaaadc0f2
commit 575669aedf
2 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

34
backend/server/worldtravel/management/commands/download-countries.py
View file

@ -308,40 +308,68 @@ class Command(BaseCommand):
def _process_batches(self, countries_to_create, regions_to_create, cities_to_create,
countries_to_update, regions_to_update, cities_to_update, batch_size):
"""Process all pending batches in a single transaction"""
"""Process all pending batches in a single transaction, safely"""
with transaction.atomic():
# Create new records
# 1. Create new countries
if countries_to_create:
self.stdout.write(f' Creating {len(countries_to_create)} countries in batches of {batch_size}...')
for i in range(0, len(countries_to_create), batch_size):
batch = countries_to_create[i:i + batch_size]
Country.objects.bulk_create(batch, ignore_conflicts=True)
# 2. Re-fetch the now-saved countries from the DB
saved_country_map = {
c.country_code: c for c in Country.objects.filter(
country_code__in=[c.country_code for c in countries_to_create]
)
}
# 3. Rebind Region.country to actual saved Country objects
for region in regions_to_create:
if isinstance(region.country, Country):
region.country = saved_country_map.get(region.country.country_code)
# 4. Create new regions
if regions_to_create:
self.stdout.write(f' Creating {len(regions_to_create)} regions in batches of {batch_size}...')
for i in range(0, len(regions_to_create), batch_size):
batch = regions_to_create[i:i + batch_size]
Region.objects.bulk_create(batch, ignore_conflicts=True)
# 5. Re-fetch the now-saved regions from the DB
saved_region_map = {
r.id: r for r in Region.objects.filter(
id__in=[r.id for r in regions_to_create]
)
}
# 6. Rebind City.region to actual saved Region objects
for city in cities_to_create:
if isinstance(city.region, Region):
city.region = saved_region_map.get(city.region.id)
# 7. Create new cities
if cities_to_create:
self.stdout.write(f' Creating {len(cities_to_create)} cities in batches of {batch_size}...')
for i in range(0, len(cities_to_create), batch_size):
batch = cities_to_create[i:i + batch_size]
City.objects.bulk_create(batch, ignore_conflicts=True)
# Update existing records
# 8. Update existing countries
if countries_to_update:
self.stdout.write(f' Updating {len(countries_to_update)} countries in batches of {batch_size}...')
for i in range(0, len(countries_to_update), batch_size):
batch = countries_to_update[i:i + batch_size]
Country.objects.bulk_update(batch, ['name', 'subregion', 'capital', 'longitude', 'latitude'])
# 9. Update existing regions
if regions_to_update:
self.stdout.write(f' Updating {len(regions_to_update)} regions in batches of {batch_size}...')
for i in range(0, len(regions_to_update), batch_size):
batch = regions_to_update[i:i + batch_size]
Region.objects.bulk_update(batch, ['name', 'country', 'longitude', 'latitude'])
# 10. Update existing cities
if cities_to_update:
self.stdout.write(f' Updating {len(cities_to_update)} cities in batches of {batch_size}...')
for i in range(0, len(cities_to_update), batch_size):

1
install_adventurelog.sh
View file

@ -484,7 +484,6 @@ wait_for_services() {
local max_attempts=30
local attempt=1
while [ $attempt -le $max_attempts ]; do
if curl -s -o /dev/null -w "%{http_code}" "$FRONTEND_ORIGIN" | grep -q "200\|404\|302"; then
log_success "Frontend is responding"