Add path to trip CRUD operations

Author: simfr24

Makefile

@@ -24,7 +24,7 @@ start-local: start-db
 
 # run trip sync + comparison
 sync-trips:
-	env $(cat .env | xargs) POSTGRES_HOST=localhost python -c "from src.db_sync import sync_db_from_sqlite; sync_db_from_sqlite()"
+	env $$(cat .env | xargs) POSTGRES_HOST=localhost python -c "from src.db_sync import sync_db_from_sqlite; sync_db_from_sqlite()"
 
 # stop all containers
 stop:

app.py

@@ -28,6 +28,7 @@
 from io import BytesIO, StringIO
 from shapely.geometry import shape, mapping
 from shapely.ops import unary_union
+from pathlib import Path as osPath
 
 import distinctipy
 import flask_monitoringdashboard as dashboard
@@ -221,7 +222,7 @@
     delete_trip,
     update_trip_type,
     attach_ticket_to_trips,
-    delete_ticket_from_db
+    delete_ticket_from_db,
     fetch_trips_paths
 )
 from src.paths import Path
@@ -591,9 +592,14 @@ def sort_key(item):
     sorted_country_codes = dict(sorted(country_codes.items(), key=sort_key))
     return sorted_country_codes
 
+def db_lock_state():
+    """Check if database sync is currently in progress"""
+    lock_file = osPath("db_sync.lock")
+    return lock_file.exists()
 
-app.jinja_env.globals.update(get_country_codes_from_files=get_country_codes_from_files)
 
+app.jinja_env.globals.update(get_country_codes_from_files=get_country_codes_from_files)
+app.jinja_env.globals.update(db_lock_state=db_lock_state)
 
 @app.route("/api/localtime", methods=["GET"])
 def get_local_time():
@@ -2514,22 +2520,25 @@ def update_user_count():
         User.last_login >= twenty_four_hours_ago
     ).count()
     today = datetime.utcnow().date()
-    with managed_cursor(mainConn) as cursor:
-        cursor.execute("SELECT number FROM daily_active_users WHERE date = ?", (today,))
-        result = cursor.fetchone()
-        if result:
-            current_count = result["number"]
-            if active_users_count > current_count:
+    try:
+        with managed_cursor(mainConn) as cursor:
+            cursor.execute("SELECT number FROM daily_active_users WHERE date = ?", (today,))
+            result = cursor.fetchone()
+            if result:
+                current_count = result["number"]
+                if active_users_count > current_count:
+                    cursor.execute(
+                        "UPDATE daily_active_users SET number = ? WHERE date = ?",
+                        (active_users_count, today),
+                    )
+            else:
                 cursor.execute(
-                    "UPDATE daily_active_users SET number = ? WHERE date = ?",
-                    (active_users_count, today),
+                    "INSERT INTO daily_active_users (date, number) VALUES (?, ?)",
+                    (today, active_users_count),
                 )
-        else:
-            cursor.execute(
-                "INSERT INTO daily_active_users (date, number) VALUES (?, ?)",
-                (today, active_users_count),
-            )
-    mainConn.commit()
+        mainConn.commit()
+    except:
+        pass
 
 
 @app.route("/", methods=["GET", "POST"])

lang/cs.json

@@ -621,5 +621,6 @@
     "useNewRouter": "Vyzkoušejte nový router (zobrazuje elektrifikaci)",
     "news": "Zprávy Trainlog",
     "CO2": "CO₂e",
-    "donate": "Kup mi kávu"
+    "donate": "Kup mi kávu",
+    "data_migration_message": "Probíhá migrace databáze. Zápisové operace jsou dočasně zakázány."
 }

lang/da.json

@@ -621,5 +621,6 @@
     "useNewRouter": "Prøv ny router (viser elektrificering)",
     "news": "Trainlog Nyheder",
     "CO2": "CO₂e",
-    "donate": "Køb mig en kaffe"
+    "donate": "Køb mig en kaffe",
+    "data_migration_message": "En databaseoverførsel er i gang. Skriveoperationer er midlertidigt deaktiveret."
 }

lang/de.json

@@ -621,5 +621,6 @@
     "useNewRouter": "Neuen Router ausprobieren (zeigt Elektrifizierung)",
     "news": "Trainlog-Nachrichten",
     "CO2": "CO₂e",
-    "donate": "Kauf mir einen Kaffee"
+    "donate": "Kauf mir einen Kaffee",
+    "data_migration_message": "Eine Datenbankmigration ist im Gange. Schreibvorgänge sind vorübergehend deaktiviert."
 }

lang/en.json

@@ -621,5 +621,6 @@
     "useNewRouter": "Try new router (shows electrification)",
     "news": "Trainlog News",
     "CO2": "CO₂e",
-    "donate": "Buy me a coffee"
+    "donate": "Buy me a coffee",
+    "data_migration_message": "A database migration is in progress. Write operations are temporarily disabled."
 }

lang/es.json

@@ -621,5 +621,6 @@
     "useNewRouter": "Prueba el nuevo router (muestra electrificación)",
     "news": "Noticias de Trainlog",
     "CO2": "CO₂e",
-    "donate": "Cómprame un café"
+    "donate": "Cómprame un café",
+    "data_migration_message": "Una migración de base de datos está en curso. Las operaciones de escritura están temporalmente deshabilitadas."
 }

lang/et.json

@@ -621,5 +621,6 @@
     "useNewRouter": "Proovi uut ruuterit (kuvab elektrifitseerimist)",
     "news": "Trainlog Uudised",
     "CO2": "CO₂e",
-    "donate": "Osta mulle kohv"
+    "donate": "Osta mulle kohv",
+    "data_migration_message": "Andmebaasi migratsioon on pooleli. Kirjutustoimingud on ajutiselt keelatud."
 }

lang/fi.json

@@ -621,5 +621,6 @@
     "useNewRouter": "Kokeile uutta reititintä (näyttää sähköistyksen)",
     "news": "Trainlog-uutiset",
     "CO2": "CO₂e",
-    "donate": "Osta minulle kahvi"
+    "donate": "Osta minulle kahvi",
+    "data_migration_message": "Tietokannan siirto on käynnissä. Kirjoitustoiminnot ovat väliaikaisesti pois käytöstä."
 }

lang/fr.json

@@ -621,5 +621,6 @@
     "useNewRouter": "Essayer le nouveau routeur (affiche l'électrification)",
     "news": "Actualités Trainlog",
     "CO2": "CO₂e",
-    "donate": "M'offrir un café"
+    "donate": "M'offrir un café",
+    "data_migration_message": "Une migration de base de données est en cours. Les opérations d'écriture sont temporairement désactivées."
 }