From 528811d0d31f53a5efd3f1a988008e1ea6ac11fe Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Wed, 21 Aug 2024 18:56:51 -0400 Subject: [PATCH] Add Liechtenstein --- backend/server/adventures/apps.py | 7 +-- backend/server/adventures/scheduler.py | 56 ------------------- .../management/commands/worldtravel-seed.py | 14 ++++- 3 files changed, 14 insertions(+), 63 deletions(-) delete mode 100644 backend/server/adventures/scheduler.py diff --git a/backend/server/adventures/apps.py b/backend/server/adventures/apps.py index a8da548..37a5920 100644 --- a/backend/server/adventures/apps.py +++ b/backend/server/adventures/apps.py @@ -3,9 +3,4 @@ from django.conf import settings class AdventuresConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'adventures' - - # def ready(self): - # if settings.SCHEDULER_AUTOSTART: - # from .scheduler import start_scheduler - # start_scheduler() \ No newline at end of file + name = 'adventures' \ No newline at end of file diff --git a/backend/server/adventures/scheduler.py b/backend/server/adventures/scheduler.py deleted file mode 100644 index 1a711fd..0000000 --- a/backend/server/adventures/scheduler.py +++ /dev/null @@ -1,56 +0,0 @@ -# import logging -# from apscheduler.schedulers.background import BackgroundScheduler -# from django_apscheduler.jobstores import DjangoJobStore -# from django_apscheduler import util -# from django.conf import settings -# from django.core.management import call_command -# from django.db import connections -# from django.db.utils import OperationalError -# import time - -# logger = logging.getLogger(__name__) - -# def run_worldtravel_seed(): -# logger.info("Starting worldtravel-seed job") -# try: -# call_command('worldtravel-seed', '--force') -# logger.info("worldtravel-seed job completed successfully") -# except Exception as e: -# logger.error(f"Error in worldtravel-seed job: {str(e)}") - -# def database_ready(): -# db_conn = connections['default'] -# try: -# db_conn.cursor() -# except OperationalError: -# return False -# else: -# return True - -# @util.close_old_connections -# def start_scheduler(): -# scheduler = BackgroundScheduler(timezone=settings.TIME_ZONE) -# scheduler.add_jobstore(DjangoJobStore(), "default") - -# # Wait for the database to be ready -# retry_count = 0 -# max_retries = 2 # Set to 2 attempts -# while not database_ready(): -# if retry_count >= max_retries: -# logger.error("Database not available after 2 attempts. Scheduler not started.") -# return None -# logger.info("Database not ready. Waiting before retry...") -# time.sleep(2) # Wait for 2 seconds before retrying -# retry_count += 1 - -# scheduler.add_job( -# run_worldtravel_seed, -# trigger="interval", -# hours=24, -# id="worldtravel_seed", -# max_instances=1, -# replace_existing=True, -# ) -# logger.info("Starting scheduler...") -# scheduler.start() -# return scheduler \ No newline at end of file diff --git a/backend/server/worldtravel/management/commands/worldtravel-seed.py b/backend/server/worldtravel/management/commands/worldtravel-seed.py index f8e588d..f317bda 100644 --- a/backend/server/worldtravel/management/commands/worldtravel-seed.py +++ b/backend/server/worldtravel/management/commands/worldtravel-seed.py @@ -68,6 +68,7 @@ class Command(BaseCommand): ('Czech Republic', 'cz', 'EU'), ('Austria', 'at', 'EU'), ('Slovakia','sk','EU'), + ('Liechtenstein','li','EU'), ] regions = [ @@ -549,11 +550,22 @@ class Command(BaseCommand): ('SK-BL', 'Bratislavský kraj', 'Bratislava Region', 'sk'), ('SK-TA', 'Trnavský kraj', 'Trnava Region', 'sk'), ('SK-TC', 'Trenčiansky kraj', 'Trenčín Region', 'sk'), - ('SK-NIc', 'Nitriansky kraj', 'Nitra Region', 'sk'), + ('SK-NI', 'Nitriansky kraj', 'Nitra Region', 'sk'), ('SK-ZI', 'Žilinský kraj', 'Žilina Region', 'sk'), ('SK-BC', 'Banskobystrický kraj', 'Banská Bystrica Region', 'sk'), ('SK-PV', 'Prešovský Kraj', 'Prešov Region', 'sk'), ('SK-KI', 'Košický kraj', 'Košice Region', 'sk'), + ('LI-01', 'Balzers', 'Balzers', 'li'), + ('LI-02', 'Eschen', 'Eschen', 'li'), + ('LI-03', 'Gamprin', 'Gamprin', 'li'), + ('LI-04', 'Mauren', 'Mauren', 'li'), + ('LI-05', 'Planken', 'Planken', 'li'), + ('LI-06', 'Ruggell', 'Ruggell', 'li'), + ('LI-07', 'Schaan', 'Schaan', 'li'), + ('LI-08', 'Schellenberg', 'Schellenberg', 'li'), + ('LI-09', 'Triesen', 'Triesen', 'li'), + ('LI-10', 'Triesenberg', 'Triesenberg', 'li'), + ('LI-11', 'Vaduz', 'Vaduz', 'li'), ]