Large database migration

formula10/controller/admin_controller.py

@@ -2,49 +2,11 @@ from typing import List
 from urllib.parse import unquote
 from flask import redirect, render_template, request
 from werkzeug import Response
-from formula10.controller.error_controller import error_redirect
 
 from formula10.database.update_queries import update_race_result, update_user
-from formula10.database.import_export import export_dynamic_data, reload_dynamic_data, reload_season_guess_result_data, reload_static_data
+from formula10.domain.domain_model import Model
 from formula10.domain.template_model import TemplateModel
-from formula10 import ENABLE_DEBUG_ENDPOINTS, app
-
-
-@app.route("/save/all")
-def save() -> Response:
-    export_dynamic_data()
-    return redirect("/")
-
-
-@app.route("/load/all")
-def load() -> Response:
-    if not ENABLE_DEBUG_ENDPOINTS:
-        return error_redirect("Debug endpoints are disabled!")
-
-    reload_static_data()
-    reload_dynamic_data()
-    return redirect("/")
-
-
-@app.route("/load/static")
-def load_static() -> Response:
-    reload_static_data()
-    return redirect("/")
-
-
-@app.route("/load/seasonresults")
-def load_season_results() -> Response:
-    reload_season_guess_result_data()
-    return redirect("/")
-
-
-@app.route("/load/dynamic")
-def load_dynamic() -> Response:
-    if not ENABLE_DEBUG_ENDPOINTS:
-        return error_redirect("Debug endpoints are disabled!")
-
-    reload_dynamic_data()
-    return redirect("/")
+from formula10 import app
 
 
 @app.route("/result")
@@ -69,7 +31,9 @@ def result_enter_post(race_name: str) -> Response:
     dnfs: List[str] = request.form.getlist("dnf-drivers")
     excluded: List[str] = request.form.getlist("excluded-drivers")
 
-    return update_race_result(race_name, pxxs, first_dnfs, dnfs, excluded)
+    # @todo Ugly
+    race_id: int = Model().race_by(race_name=race_name).id
+    return update_race_result(race_id, pxxs, first_dnfs, dnfs, excluded)
 
 
 @app.route("/user")

formula10/controller/race_controller.py

@@ -3,6 +3,7 @@ from flask import redirect, render_template, request
 from werkzeug import Response
 
 from formula10.database.update_queries import delete_race_guess, update_race_guess
+from formula10.domain.domain_model import Model
 from formula10.domain.points_model import PointsModel
 from formula10.domain.template_model import TemplateModel
 from formula10 import app
@@ -36,7 +37,11 @@ def race_guess_post(race_name: str, user_name: str) -> Response:
     pxx: str | None = request.form.get("pxxselect")
     dnf: str | None = request.form.get("dnfselect")
 
-    return update_race_guess(race_name, user_name, pxx, dnf)
+    race_id: int = Model().race_by(race_name=race_name).id
+    user_id: int = Model().user_by(user_name=user_name).id
+    return update_race_guess(race_id, user_id,
+                             int(pxx) if pxx is not None else None,
+                             int(dnf) if dnf is not None else None)
 
 
 @app.route("/race-guess-delete/<race_name>/<user_name>", methods=["POST"])
@@ -44,4 +49,6 @@ def race_guess_delete_post(race_name: str, user_name: str) -> Response:
     race_name = unquote(race_name)
     user_name = unquote(user_name)
 
-    return delete_race_guess(race_name, user_name)
+    race_id: int = Model().race_by(race_name=race_name).id
+    user_id: int = Model().user_by(user_name=user_name).id
+    return delete_race_guess(race_id, user_id)

formula10/controller/season_controller.py

@@ -5,6 +5,7 @@ from werkzeug import Response
 
 from formula10.database.model.db_team import DbTeam
 from formula10.database.update_queries import update_season_guess
+from formula10.domain.domain_model import Model
 from formula10.domain.model.team import NONE_TEAM
 from formula10.domain.points_model import PointsModel
 from formula10.domain.template_model import TemplateModel
@@ -39,8 +40,9 @@ def season_guess_post(user_name: str) -> Response:
     ]
     # TODO: This is pretty ugly, to do queries in the controller
     team_winner_guesses: List[str | None] = [
-        request.form.get(f"teamwinner-{team.name}") for team in db.session.query(DbTeam).all() if team.name != NONE_TEAM.name
+        request.form.get(f"teamwinner-{team.id}") for team in db.session.query(DbTeam).all() if team.id != NONE_TEAM.id
     ]
     podium_driver_guesses: List[str] = request.form.getlist("podiumdrivers")
 
-    return update_season_guess(user_name, guesses, team_winner_guesses, podium_driver_guesses)
+    user_id: int = Model().user_by(user_name=user_name).id
+    return update_season_guess(user_id, guesses, team_winner_guesses, podium_driver_guesses)