Refactor direction backend -> frontend

database_utils.py

@@ -51,7 +51,7 @@ def reload_static_data(db):
 
 def reload_dynamic_data(db):
     print("Initializing Database with Dynamic Values...")
-
+    # Create it (if it doesn't exist!)
     db.create_all()
 
     # Clear dynamic data

formula10.py

@@ -1,8 +1,7 @@
-from typing import List
-
 from flask import Flask, render_template, request, redirect
 from model import *
 from database_utils import reload_static_data, reload_dynamic_data, export_dynamic_data
+from template_model import TemplateModel
 
 app = Flask(__name__)
 
@@ -14,11 +13,10 @@ db.init_app(app)
 
 # TODO
 # General
-# - Make user headers in race table clickable, to reach the specific page. Do the same for the season cards
+
-# - When showing correct guesses in green, show semi-correct ones in a weaker tone (probably need to prepare those here, instead of in the template)
+# - When showing correct guesses in green, show semi-correct ones in a weaker tone (probably need to prepare those here,
-# - Also show previous race results, and allow to change them. Or at least, allow editing the current one and show current state (do it like the activeuser select for results)
+#   instead of in the template)
-# - Remove whitespace from usernames + races. Sanitization should only happen inside the templates + endpoint controllers, for the URLs
+# - Show cards of previous race results, like with season guesses?
-# - Add doc comments to model
 
 # - Make the season card grid left-aligned? So e.g. 2 cards are not spread over the whole screen with large gaps?
 # - Choose "place to guess" late before the race?
@@ -33,135 +31,90 @@ db.init_app(app)
 
 
 @app.route("/")
-def index():
+def root():
-    return redirect("/race")
+    return race_active_user("Everyone")
 
 
-@app.route("/saveall")
+@app.route("/save/all", strict_slashes=False)
-def savedynamic():
+def save():
     export_dynamic_data()
     return redirect("/")
 
 
-@app.route("/loadall")
+@app.route("/load/all")
 def load():
     reload_static_data(db)
     reload_dynamic_data(db)
     return redirect("/")
 
 
-@app.route("/loadstatic")
+@app.route("/load/static")
-def reloadstatic():
+def load_static():
     reload_static_data(db)
     return redirect("/")
 
 
-@app.route("/loaddynamic")
+@app.route("/load/dynamic")
-def reloaddynamic():
+def load_dynamic():
     reload_dynamic_data(db)
     return redirect("/")
 
 
 @app.route("/race")
-def guessraceresult():
+def race_root():
     return redirect("/race/Everyone")
 
 
-@app.route("/race/<username>")
+@app.route("/race/<user_name>")
-def guessuserraceresults(username):
+def race_active_user(user_name: str):
-    users: List[User] = User.query.all()
+    model = TemplateModel()
-    activeuser: User | None = User.query.filter_by(name=username).first()  # "Everyone" should yield None
-    raceresults: List[RaceResult] = RaceResult.query.all()[::-1]
-    drivers: List[Driver] = Driver.query.all()
-
-    print(raceresults)
-
-    guesses: Dict[int, Dict[str, RaceGuess]] = dict()
-    guess: RaceGuess
-    for guess in RaceGuess.query.all():
-        if guess.race_id not in guesses:
-            guesses[guess.race_id] = dict()
-
-        guesses[guess.race_id][guess.user_id] = guess
-
-    nextid = raceresults[0].race_id + 1 if len(raceresults) > 0 else 1
-    nextrace: Race | None = Race.query.filter_by(id=nextid).first()
-
     return render_template("race.jinja",
-                           users=users,
+                           active_user=model.user_by(user_name=user_name, ignore=["Everyone"]),
-                           drivers=drivers,
+                           model=model)
-                           raceresults=raceresults,
-                           guesses=guesses,
-                           activeuser=activeuser,
-                           currentrace=nextrace)
 
 
-@app.route("/guessrace/<raceid>/<username>", methods=["POST"])
+@app.route("/race-guess/<race_name>/<user_name>", methods=["POST"])
-def guessrace(raceid, username):
+def race_guess_post(race_name: str, user_name: str):
     pxx: str | None = request.form.get("pxxselect")
     dnf: str | None = request.form.get("dnfselect")
 
     if pxx is None or dnf is None:
-        return redirect(f"/race/{username}")
+        return race_active_user(user_name)
 
-    if RaceResult.query.filter_by(race_id=raceid).first() is not None:
+    if RaceResult.query.filter_by(race_name=race_name).first() is not None:
         print("Error: Can't guess race result if the race result is already known!")
-        return redirect(f"/race/{username}")
+        return redirect(f"/race/{user_name}")
 
-    raceguess: RaceGuess | None = RaceGuess.query.filter_by(user_id=username, race_id=raceid).first()
+    raceguess: RaceGuess | None = RaceGuess.query.filter_by(user_name=user_name, race_name=race_name).first()
 
     if raceguess is None:
         raceguess = RaceGuess()
-        raceguess.user_id = username
+        raceguess.user_name = user_name
-        raceguess.race_id = raceid
+        raceguess.race_name = race_name
         db.session.add(raceguess)
 
-    raceguess.pxx_id = pxx
+    raceguess.pxx_driver_name = pxx
-    raceguess.dnf_id = dnf
+    raceguess.dnf_driver_name = dnf
     db.session.commit()
 
-    return redirect("/race")
+    return redirect("/race/Everyone")
 
 
 @app.route("/season")
-def guessseasonresults():
+def season_root():
     return redirect("/season/Everyone")
 
 
-@app.route("/season/<username>")
+@app.route("/season/<user_name>")
-def guessuserseasonresults(username):
+def season_active_user(user_name: str):
-    users: List[User] = User.query.all()
+    model = TemplateModel()
-    activeuser: User | None = User.query.filter_by(name=username).first()
-    teams: List[Team] = Team.query.all()
-    drivers: List[Driver] = Driver.query.all()
-
-    # Remove NONE driver
-    drivers = [driver for driver in drivers if driver.name != "NONE"]
-
-    guesses: Dict[str, SeasonGuess] = dict()
-    guess: SeasonGuess
-    for guess in SeasonGuess.query.all():
-        guesses[guess.user_id] = guess
-
-    driverpairs: Dict[str, List[Driver]] = dict()
-    team: Team
-    for team in teams:
-        driverpairs[team.name] = []
-    driver: Driver
-    for driver in drivers:
-        driverpairs[driver.team.name] += [driver]
-
     return render_template("season.jinja",
-                           users=users,
+                           active_user=model.user_by(user_name=user_name, ignore=["Everyone"]),
-                           teams=teams,
+                           model=model)
-                           drivers=drivers,
-                           driverpairs=driverpairs,
-                           guesses=guesses,
-                           activeuser=activeuser)
 
 
-@app.route("/guessseason/<username>", methods=["POST"])
+@app.route("/season-guess/<user_name>", methods=["POST"])
-def guessseason(username: str):
+def season_guess_post(user_name: str):
     guesses: List[str | None] = [
         request.form.get("hottakeselect"),
         request.form.get("p2select"),
@@ -177,9 +130,9 @@ def guessseason(username: str):
 
     if any(guess is None for guess in guesses + teamwinnerguesses):
         print("Error: /guessseason could not obtain request data!")
-        return redirect("/season")
+        return redirect(f"/season/{user_name}")
 
-    seasonguess: SeasonGuess | None = SeasonGuess.query.filter_by(user_id=username).first()
+    seasonguess: SeasonGuess | None = SeasonGuess.query.filter_by(user_name=user_name).first()
     teamwinners: TeamWinners | None = seasonguess.team_winners if seasonguess is not None else None
     podiumdrivers: PodiumDrivers | None = seasonguess.podium_drivers if seasonguess is not None else None
 
@@ -187,74 +140,49 @@ def guessseason(username: str):
         teamwinners = TeamWinners()
         db.session.add(teamwinners)
 
-    teamwinners.winner_ids = teamwinnerguesses  # Pylance throws error, but nullcheck is done
+    teamwinners.user_name = user_name
-    teamwinners.user_id = username
+    teamwinners.teamwinner_driver_names = teamwinnerguesses  # Pylance throws error, but nullcheck is done
     db.session.commit()
 
     if podiumdrivers is None:
         podiumdrivers = PodiumDrivers()
         db.session.add(podiumdrivers)
 
-    podiumdrivers.podium_ids = podiumdriverguesses
+    podiumdrivers.podium_driver_names = podiumdriverguesses
-    podiumdrivers.user_id = username
+    podiumdrivers.user_name = user_name
     db.session.commit()
 
-    # Refresh teamwinners + podiumdrivers to obtain IDs
-    teamwinners = TeamWinners.query.filter_by(user_id=username).first()
-    podiumdrivers = PodiumDrivers.query.filter_by(user_id=username).first()
-
     if seasonguess is None:
         seasonguess = SeasonGuess()
-        seasonguess.user_id = username
+        seasonguess.user_name = user_name
         db.session.add(seasonguess)
 
     seasonguess.hot_take = guesses[0]  # Pylance throws error but nullcheck is done
-    seasonguess.p2_constructor_id = guesses[1]  # Pylance throws error but nullcheck is done
+    seasonguess.p2_team_name = guesses[1]  # Pylance throws error but nullcheck is done
-    seasonguess.most_overtakes_id = guesses[2]  # Pylance throws error but nullcheck is done
+    seasonguess.overtake_driver_name = guesses[2]  # Pylance throws error but nullcheck is done
-    seasonguess.most_dnfs_id = guesses[3]  # Pylance throws error but nullcheck is done
+    seasonguess.dnf_driver_name = guesses[3]  # Pylance throws error but nullcheck is done
-    seasonguess.most_gained_id = guesses[4]  # Pylance throws error but nullcheck is done
+    seasonguess.gained_driver_name = guesses[4]  # Pylance throws error but nullcheck is done
-    seasonguess.most_lost_id = guesses[5]  # Pylance throws error but nullcheck is done
+    seasonguess.lost_driver_name = guesses[5]  # Pylance throws error but nullcheck is done
-    seasonguess.team_winners_id = teamwinners.id  # Pylance throws error but nullcheck is done
-    seasonguess.podium_drivers_id = podiumdrivers.id  # Pylance throws error but nullcheck is done
     db.session.commit()
 
-    return redirect("/season")
+    return redirect(f"/season/{user_name}")
 
 
-@app.route("/enter")
+@app.route("/result")
-def entercurrentraceresult():
+def result_root():
-    return redirect("/enter/Current")
+    return redirect("/result/Current")
 
 
-@app.route("/enter/<resultname>")
+@app.route("/result/<race_name>")
-def enterraceresult(resultname: str):
+def result_active_race(race_name: str):
-    drivers: List[Driver] = Driver.query.all()
+    model = TemplateModel()
-    raceresults: List[RaceResult] = RaceResult.query.all()[::-1]
-
-    # Find next race without result
-    nextid = raceresults[0].race_id + 1 if len(raceresults) > 0 else 1
-    nextrace: Race | None = Race.query.filter_by(id=nextid).first()
-
-    activeresult: RaceResult | None = None
-    if resultname != "Current":
-        # Obtain the chosen result
-        activeresult = list(filter(lambda result: result.race.grandprix == resultname, raceresults))[0]
-    else:
-        # Obtain the current result if it exists
-        activeresult = raceresults[0] if len(raceresults) > 0 and raceresults[0].race_id == nextrace else None
-
-    # Remove NONE driver
-    drivers = [driver for driver in drivers if driver.name != "NONE"]
-
     return render_template("enter.jinja",
-                           drivers=drivers,
+                           active_result=model.race_result_by(race_name=race_name),
-                           race=nextrace,
+                           model=model)
-                           results=raceresults,
-                           activeresult=activeresult)
 
 
-@app.route("/enterresult/<raceid>", methods=["POST"])
+@app.route("/result-enter/<result_race_name>", methods=["POST"])
-def enterresult(raceid):
+def result_enter_post(result_race_name: str):
     pxxs: List[str] = request.form.getlist("pxxdrivers")
     dnfs: List[str] = request.form.getlist("dnf-drivers")
     excludes: List[str] = request.form.getlist("exclude-drivers")
@@ -263,74 +191,73 @@ def enterresult(raceid):
     pxxs_dict: Dict[str, str] = {str(position + 1): driver for position, driver in enumerate(pxxs)}
     dnfs_dict: Dict[str, str] = {str(position + 1): driver for position, driver in enumerate(pxxs) if driver in dnfs}
 
-    print(pxxs_dict)
+    raceresult: RaceResult | None = RaceResult.query.filter_by(race_name=result_race_name).first()
-
-    raceresult: RaceResult | None = RaceResult.query.filter_by(race_id=raceid).first()
 
     if raceresult is None:
         raceresult = RaceResult()
         db.session.add(raceresult)
 
-    raceresult.race_id = raceid
+    raceresult.race_name = result_race_name
-    raceresult.pxx_ids = pxxs_dict
+    raceresult.pxx_driver_names = pxxs_dict
-    raceresult.dnf_ids = dnfs_dict if len(dnfs) > 0 else {"20": "NONE"}
+    raceresult.dnf_driver_names = dnfs_dict if len(dnfs) > 0 else {"20": "NONE"}
-    raceresult.exclude_ids = excludes
+    raceresult.excluded_driver_names = excludes
     db.session.commit()
 
-    race: Race | None = Race.query.filter_by(id=raceid).first()
+    race: Race | None = Race.query.filter_by(name=result_race_name).first()
     if race is None:
         print("Error: Can't redirect to /enter/<GrandPrix> because race couldn't be found")
-        return redirect("/enter")
+        return redirect(f"/result/Current")
 
-    return redirect(f"/enter/{race.grandprix}")
+    return redirect(f"/result/{race.name}")
 
 
-@app.route("/users")
+@app.route("/user")
-def manageusers():
+def user_root():
     users: List[User] = User.query.all()
 
     return render_template("users.jinja",
                            users=users)
 
 
-@app.route("/adduser", methods=["POST"])
+@app.route("/user-add", methods=["POST"])
-def adduser():
+def user_add_post():
     username: str | None = request.form.get("select-add-user")
 
     if username is None or len(username) == 0:
         print(f"Not adding user, since no username was received")
-        return redirect("/users")
+        return user_root()
 
     if len(User.query.filter_by(name=username).all()) > 0:
         print(f"Not adding user {username}: Already exists!")
-        return redirect("/users")
+        return redirect("/user")
 
     user = User()
     user.name = username
     db.session.add(user)
     db.session.commit()
 
-    return redirect("/users")
+    return redirect("/user")
 
 
-@app.route("/deleteuser", methods=["POST"])
+@app.route("/user-delete", methods=["POST"])
-def deleteuser():
+def user_delete_post():
     username = request.form.get("select-delete-user")
 
     if username is None or len(username) == 0:
         print(f"Not deleting user, since no username was received")
-        return redirect("/users")
+        return redirect("/user")
 
     if username == "Select User":
-        return redirect("/users")
+        return redirect("/user")
 
     print(f"Deleting user {username}...")
 
     User.query.filter_by(name=username).delete()
     db.session.commit()
 
-    return redirect("/users")
+    return redirect("/user")
 
 
 if __name__ == "__main__":
+    app.url_map.strict_slashes = False
     app.run(debug=True, host="0.0.0.0")

model.py

@@ -1,10 +1,11 @@
-from typing import ClassVar, List, Dict
+import json
+from datetime import datetime
+from typing import List, Dict
+from urllib.parse import quote
 
 from flask_sqlalchemy import SQLAlchemy
-from sqlalchemy import Integer, String, Boolean, DateTime, ForeignKey, PickleType
+from sqlalchemy import Integer, String, DateTime, ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column, relationship
-from datetime import datetime
-import json
 
 db = SQLAlchemy()
 
@@ -21,18 +22,20 @@ class Race(db.Model):
     __tablename__ = "race"
 
     def from_csv(self, row):
-        self.id = int(row[0])
+        self.name = str(row[0])
-        self.grandprix = str(row[1])
+        self.number = int(row[1])
-        self.number = int(row[2])
+        self.date = datetime.strptime(row[2], "%Y-%m-%d")
-        self.date = datetime.strptime(row[3], "%Y-%m-%d")
+        self.pxx = int(row[3])
-        self.pxx = int(row[4])  # This is the place that has to be guessed for this race
         return self
 
-    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    @property
-    grandprix: Mapped[str] = mapped_column(String(32))
+    def name_sanitized(self):
+        return quote(self.name)
+
+    name: Mapped[str] = mapped_column(String(64), primary_key=True)
     number: Mapped[int] = mapped_column(Integer)
     date: Mapped[datetime] = mapped_column(DateTime)
-    pxx: Mapped[int] = mapped_column(Integer)
+    pxx: Mapped[int] = mapped_column(Integer)  # This is the place to guess
 
 
 class Team(db.Model):
@@ -58,17 +61,17 @@ class Driver(db.Model):
     def from_csv(self, row):
         self.name = str(row[0])
         self.abbr = str(row[1])
-        self.team_id = str(row[2])
+        self.team_name = str(row[2])
         self.country_code = str(row[3])
         return self
 
     name: Mapped[str] = mapped_column(String(32), primary_key=True)
     abbr: Mapped[str] = mapped_column(String(3))
-    team_id: Mapped[str] = mapped_column(ForeignKey("team.name"))
+    team_name: Mapped[str] = mapped_column(ForeignKey("team.name"))
     country_code: Mapped[str] = mapped_column(String(2))  # alpha-2 code
 
     # Relationships
-    team: Mapped["Team"] = relationship("Team", foreign_keys=[team_id])
+    team: Mapped["Team"] = relationship("Team", foreign_keys=[team_name])
 
 
 ######################################
@@ -92,6 +95,10 @@ class User(db.Model):
             self.name
         ]
 
+    @property
+    def name_sanitized(self):
+        return quote(self.name)
+
     name: Mapped[str] = mapped_column(String(32), primary_key=True)
 
 
@@ -101,113 +108,119 @@ class RaceResult(db.Model):
     It stores the corresponding race and dictionaries of place-/dnf-order and a list of drivers that are excluded from the standings for this race.
     """
     __tablename__ = "raceresult"
-    __allow_unmapped__ = True
+    __allow_unmapped__ = True  # TODO: Used for json conversion, move this to some other class instead
-    __csv_header__ = ["id", "race_id", "pxx_ids_json", "dnf_ids_json", "exclude_ids_json"]
+    __csv_header__ = ["race_name", "pxx_driver_names_json", "dnf_driver_names_json", "excluded_driver_names_json"]
 
     def from_csv(self, row):
-        self.id = int(row[0])
+        self.race_name = str(row[0])
-        self.race_id = int(row[1])
+        self.pxx_driver_names_json = str(row[1])
-        self.pxx_ids_json = str(row[2])
+        self.dnf_driver_names_json = str(row[2])
-        self.dnf_ids_json = str(row[3])
+        self.excluded_driver_names_json = str(row[3])
-        self.exclude_ids_json = str(row[4])
         return self
 
     def to_csv(self):
         return [
-            self.id,
+            self.race_name,
-            self.race_id,
+            self.pxx_driver_names_json,
-            self.pxx_ids_json,
+            self.dnf_driver_names_json,
-            self.dnf_ids_json,
+            self.excluded_driver_names_json
-            self.exclude_ids_json
         ]
 
-    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    race_name: Mapped[str] = mapped_column(ForeignKey("race.name"), primary_key=True)
-    race_id: Mapped[int] = mapped_column(ForeignKey("race.id"))
+    pxx_driver_names_json: Mapped[str] = mapped_column(String(1024))
-    pxx_ids_json: Mapped[str] = mapped_column(String(1024))
+    dnf_driver_names_json: Mapped[str] = mapped_column(String(1024))
-    dnf_ids_json: Mapped[str] = mapped_column(String(1024))
+    excluded_driver_names_json: Mapped[str] = mapped_column(String(1024))
-    exclude_ids_json: Mapped[str] = mapped_column(String(1024))
 
     @property
-    def pxx_ids(self) -> Dict[str, str]:
+    def pxx_driver_names(self) -> Dict[str, str]:
-        return json.loads(self.pxx_ids_json)
+        return json.loads(self.pxx_driver_names_json)
 
-    @pxx_ids.setter
+    @pxx_driver_names.setter
-    def pxx_ids(self, new_pxx_ids: Dict[str, str]):
+    def pxx_driver_names(self, new_pxx_driver_names: Dict[str, str]):
-        self.pxx_ids_json = json.dumps(new_pxx_ids)
+        self.pxx_driver_names_json = json.dumps(new_pxx_driver_names)
 
     @property
-    def dnf_ids(self) -> Dict[str, str]:
+    def dnf_driver_names(self) -> Dict[str, str]:
-        return json.loads(self.dnf_ids_json)
+        return json.loads(self.dnf_driver_names_json)
 
-    @dnf_ids.setter
+    @dnf_driver_names.setter
-    def dnf_ids(self, new_dnf_ids: Dict[str, str]):
+    def dnf_driver_names(self, new_dnf_driver_names: Dict[str, str]):
-        self.dnf_ids_json = json.dumps(new_dnf_ids)
+        self.dnf_driver_names_json = json.dumps(new_dnf_driver_names)
 
     @property
-    def exclude_ids(self) -> List[str]:
+    def excluded_driver_names(self) -> List[str]:
-        return json.loads(self.exclude_ids_json)
+        return json.loads(self.excluded_driver_names_json)
 
-    @exclude_ids.setter
+    @excluded_driver_names.setter
-    def exclude_ids(self, new_exclude_ids: List[str]):
+    def excluded_driver_names(self, new_excluded_driver_names: List[str]):
-        self.exclude_ids_json = json.dumps(new_exclude_ids)
+        self.excluded_driver_names_json = json.dumps(new_excluded_driver_names)
 
     # Relationships
-    race: Mapped["Race"] = relationship("Race", foreign_keys=[race_id])
+    race: Mapped["Race"] = relationship("Race", foreign_keys=[race_name])
-    _pxxs: Dict[str, Driver] | None = None
+    _pxx_drivers: Dict[str, Driver] | None = None
-    _dnfs: Dict[str, Driver] | None = None
+    _dnf_drivers: Dict[str, Driver] | None = None
-    _excludes: List[Driver] | None = None
+    _excluded_drivers: List[Driver] | None = None
 
     @property
-    def pxxs(self) -> Dict[str, Driver]:
+    def pxx_drivers(self) -> Dict[str, Driver]:
-        if self._pxxs is None:
+        if self._pxx_drivers is None:
-            self._pxxs = dict()
+            self._pxx_drivers = dict()
-            for position, driver_id in self.pxx_ids.items():
+            for position, driver_name in self.pxx_driver_names.items():
-                driver = Driver.query.filter_by(name=driver_id).first()
+                driver = Driver.query.filter_by(name=driver_name).first()
                 if driver is None:
-                    raise Exception(f"Error: Couldn't find driver with id {driver_id}")
+                    raise Exception(f"Error: Couldn't find driver with id {driver_name}")
 
-                self._pxxs[position] = driver
+                self._pxx_drivers[position] = driver
 
-        return self._pxxs
+        return self._pxx_drivers
 
     @property
-    def dnfs(self) -> Dict[str, Driver]:
+    def pxx_drivers_values(self) -> List[Driver]:
-        if self._dnfs is None:
+        drivers: List[Driver] = []
-            self._dnfs = dict()
-            for position, driver_id in self.dnf_ids.items():
-                driver = Driver.query.filter_by(name=driver_id).first()
-                if driver is None:
-                    raise Exception(f"Error: Couldn't find driver with id {driver_id}")
 
-                self._dnfs[position] = driver
+        # I don't know what order dict.values() etc. will return...
+        for position in range(1, 21):
+            drivers += [self.pxx_drivers[str(position)]]
 
-        return self._dnfs
+        return drivers
 
     @property
-    def excludes(self) -> List[Driver]:
+    def dnf_drivers(self) -> Dict[str, Driver]:
-        if self._excludes is None:
+        if self._dnf_drivers is None:
-            self._excludes = []
+            self._dnf_drivers = dict()
-            for driver_id in self.exclude_ids:
+            for position, driver_name in self.dnf_driver_names.items():
-                driver = Driver.query.filter_by(name=driver_id).first()
+                driver = Driver.query.filter_by(name=driver_name).first()
                 if driver is None:
-                    raise Exception(f"Error: Couldn't find driver with id {driver_id}")
+                    raise Exception(f"Error: Couldn't find driver with id {driver_name}")
 
-                self._excludes += [driver]
+                self._dnf_drivers[position] = driver
 
-        return self._excludes
+        return self._dnf_drivers
+
+    @property
+    def excluded_drivers(self) -> List[Driver]:
+        if self._excluded_drivers is None:
+            self._excluded_drivers = []
+            for driver_name in self.excluded_driver_names:
+                driver = Driver.query.filter_by(name=driver_name).first()
+                if driver is None:
+                    raise Exception(f"Error: Couldn't find driver with id {driver_name}")
+
+                self._excluded_drivers += [driver]
+
+        return self._excluded_drivers
 
     @property
     def pxx(self) -> Driver:
         pxx_num: str = str(self.race.pxx)
-        if pxx_num not in self.pxxs:
+        if pxx_num not in self.pxx_drivers:
-            print(self.pxxs)
             raise Exception(f"Error: Position {self.race.pxx} not contained in race result")
 
-        return self.pxxs[pxx_num]
+        return self.pxx_drivers[pxx_num]
 
     @property
     def dnf(self) -> Driver:
-        return sorted(self.dnfs.items(), reverse=True)[0][1]
+        return sorted(self.dnf_drivers.items(), reverse=True)[0][1]  # SortedList[FirstElement][KeyPairValue]
 
 
 class RaceGuess(db.Model):
@@ -216,36 +229,33 @@ class RaceGuess(db.Model):
     It stores the corresponding race and the guessed drivers for PXX and DNF.
     """
     __tablename__ = "raceguess"
-    __csv_header__ = ["id", "user_id", "race_id", "pxx_id", "dnf_id"]
+    __csv_header__ = ["user_name", "race_name", "pxx_driver_name", "dnf_driver_name"]
 
     def from_csv(self, row):
-        self.id = int(row[0])
+        self.user_name = str(row[0])
-        self.user_id = str(row[1])
+        self.race_name = str(row[1])
-        self.race_id = int(row[2])
+        self.pxx_driver_name = str(row[2])
-        self.pxx_id = str(row[3])
+        self.dnf_driver_name = str(row[3])
-        self.dnf_id = str(row[4])
         return self
 
     def to_csv(self):
         return [
-            self.id,
+            self.user_name,
-            self.user_id,
+            self.race_name,
-            self.race_id,
+            self.pxx_driver_name,
-            self.pxx_id,
+            self.dnf_driver_name
-            self.dnf_id
         ]
 
-    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    user_id: Mapped[str] = mapped_column(ForeignKey("user.name"))
+    race_name: Mapped[str] = mapped_column(ForeignKey("race.name"), primary_key=True)
-    race_id: Mapped[int] = mapped_column(ForeignKey("race.id"))
+    pxx_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
-    pxx_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
+    dnf_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
-    dnf_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
 
     # Relationships
-    user: Mapped["User"] = relationship("User", foreign_keys=[user_id])
+    user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
-    race: Mapped["Race"] = relationship("Race", foreign_keys=[race_id])
+    race: Mapped["Race"] = relationship("Race", foreign_keys=[race_name])
-    pxx: Mapped["Driver"] = relationship("Driver", foreign_keys=[pxx_id])
+    pxx: Mapped["Driver"] = relationship("Driver", foreign_keys=[pxx_driver_name])
-    dnf: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_id])
+    dnf: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_driver_name])
 
 
 class TeamWinners(db.Model):
@@ -254,50 +264,46 @@ class TeamWinners(db.Model):
     """
     __tablename__ = "teamwinners"
     __allow_unmapped__ = True
-    __csv_header__ = ["id", "user_id", "winner_ids_json"]
+    __csv_header__ = ["user_name", "teamwinner_driver_names_json"]
 
     def from_csv(self, row):
-        self.id = int(row[0])
+        self.user_name = str(row[0])
-        self.user_id = str(row[1])
+        self.teamwinner_driver_names_json = str(row[1])
-        self.winner_ids_json = str(row[2])
         return self
 
     def to_csv(self):
         return [
-            self.id,
+            self.user_name,
-            self.user_id,
+            self.teamwinner_driver_names_json
-            self.winner_ids_json
         ]
 
-    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    user_id: Mapped[str] = mapped_column(ForeignKey("user.name"))
+    teamwinner_driver_names_json: Mapped[str] = mapped_column(String(1024))
-    winner_ids_json: Mapped[str] = mapped_column(String(512))
 
     @property
-    def winner_ids(self) -> List[str]:
+    def teamwinner_driver_names(self) -> List[str]:
-        return json.loads(self.winner_ids_json)
+        return json.loads(self.teamwinner_driver_names_json)
 
-    @winner_ids.setter
+    @teamwinner_driver_names.setter
-    def winner_ids(self, new_winner_ids: List[str]):
+    def teamwinner_driver_names(self, new_teamwinner_driver_names: List[str]):
-        self.winner_ids_json = json.dumps(new_winner_ids)
+        self.teamwinner_driver_names_json = json.dumps(new_teamwinner_driver_names)
 
     # Relationships
-    user: Mapped["User"] = relationship("User", foreign_keys=[user_id])
+    user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
-    _winners: List[Driver] | None = None
+    _teamwinner_drivers: List[Driver] | None = None
 
     @property
-    def winners(self) -> List[Driver]:
+    def teamwinners(self) -> List[Driver]:
-        if self._winners is None:
+        if self._teamwinner_drivers is None:
-            self._winners = []
+            self._teamwinner_drivers = []
-            for driver_id in self.winner_ids:
+            for driver_name in self.teamwinner_driver_names:
-                driver = Driver.query.filter_by(name=driver_id).first()
+                driver = Driver.query.filter_by(name=driver_name).first()
                 if driver is None:
-                    raise Exception(f"Error: Couldn't find driver with id {driver_id}")
+                    raise Exception(f"Error: Couldn't find driver with id {driver_name}")
 
-                self._winners += [driver]
+                self._teamwinner_drivers += [driver]
 
-
+        return self._teamwinner_drivers
-        return self._winners
 
 
 class PodiumDrivers(db.Model):
@@ -306,49 +312,46 @@ class PodiumDrivers(db.Model):
     """
     __tablename__ = "podiumdrivers"
     __allow_unmapped__ = True
-    __csv_header__ = ["id", "user_id", "podium_ids_json"]
+    __csv_header__ = ["user_name", "podium_driver_names_json"]
 
     def from_csv(self, row):
-        self.id = int(row[0])
+        self.user_name = str(row[0])
-        self.user_id = str(row[1])
+        self.podium_driver_names_json = str(row[1])
-        self.podium_ids_json = str(row[2])
         return self
 
     def to_csv(self):
         return [
-            self.id,
+            self.user_name,
-            self.user_id,
+            self.podium_driver_names_json
-            self.podium_ids_json
         ]
 
-    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    user_id: Mapped[str] = mapped_column(ForeignKey("user.name"))
+    podium_driver_names_json: Mapped[str] = mapped_column(String(1024))
-    podium_ids_json: Mapped[str] = mapped_column(String(512))
 
     @property
-    def podium_ids(self) -> List[str]:
+    def podium_driver_names(self) -> List[str]:
-        return json.loads(self.podium_ids_json)
+        return json.loads(self.podium_driver_names_json)
 
-    @podium_ids.setter
+    @podium_driver_names.setter
-    def podium_ids(self, new_podium_ids: List[str]):
+    def podium_driver_names(self, new_podium_driver_names: List[str]):
-        self.podium_ids_json = json.dumps(new_podium_ids)
+        self.podium_driver_names_json = json.dumps(new_podium_driver_names)
 
     # Relationships
-    user: Mapped["User"] = relationship("User", foreign_keys=[user_id])
+    user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
-    _podiums: List[Driver] | None = None
+    _podium_drivers: List[Driver] | None = None
 
     @property
-    def podiums(self) -> List[Driver]:
+    def podium_drivers(self) -> List[Driver]:
-        if self._podiums is None:
+        if self._podium_drivers is None:
-            self._podiums = []
+            self._podium_drivers = []
-            for driver_id in self.podium_ids:
+            for driver_name in self.podium_driver_names:
-                driver = Driver.query.filter_by(name=driver_id).first()
+                driver = Driver.query.filter_by(name=driver_name).first()
                 if driver is None:
-                    raise Exception(f"Error: Couldn't find driver with id {driver_id}")
+                    raise Exception(f"Error: Couldn't find driver with id {driver_name}")
 
-                self._podiums += [driver]
+                self._podium_drivers += [driver]
 
-        return self._podiums
+        return self._podium_drivers
 
 
 class SeasonGuess(db.Model):
@@ -356,54 +359,47 @@ class SeasonGuess(db.Model):
     A collection of bonus guesses for the entire season.
     """
     __tablename__ = "seasonguess"
-    __csv_header__ = ["id", "user_id",
+    __csv_header__ = ["user_name", "hot_take", "p2_team_name",
-                      "hot_take", "p2_constructor_id", "most_overtakes_id", "most_dnfs_id", "most_gained_id",
+                      "overtake_driver_name", "dnf_driver_name", "gained_driver_name", "lost_driver_name"]
-                      "most_lost_id", "team_winners_id", "podium_drivers_id"]
 
     def from_csv(self, row):
-        self.id = int(row[0])
+        self.user_name = str(row[0])  # Also used as foreign key for teamwinners + podiumdrivers
-        self.user_id = str(row[1])
+        self.hot_take = str(row[1])
-        self.hot_take = str(row[2])
+        self.p2_team_name = str(row[2])
-        self.p2_constructor_id = str(row[3])
+        self.overtake_driver_name = str(row[3])
-        self.most_overtakes_id = str(row[4])
+        self.dnf_driver_name = str(row[4])
-        self.most_dnfs_id = str(row[5])
+        self.gained_driver_name = str(row[5])
-        self.most_gained_id = str(row[6])
+        self.lost_driver_name = str(row[6])
-        self.most_lost_id = str(row[6])
-        self.team_winners_id = int(row[8])
-        self.podium_drivers_id = int(row[9])
         return self
 
     def to_csv(self):
         return [
-            self.id,
+            self.user_name,
-            self.user_id,
             self.hot_take,
-            self.p2_constructor_id,
+            self.p2_team_name,
-            self.most_overtakes_id,
+            self.overtake_driver_name,
-            self.most_dnfs_id,
+            self.dnf_driver_name,
-            self.most_gained_id,
+            self.gained_driver_name,
-            self.most_lost_id,
+            self.lost_driver_name,
-            self.team_winners_id,
-            self.podium_drivers_id
         ]
 
-    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    user_id: Mapped[str] = mapped_column(ForeignKey("user.name"))
     hot_take: Mapped[str] = mapped_column(String(512))
-    p2_constructor_id: Mapped[str] = mapped_column(ForeignKey("team.name"))
+    p2_team_name: Mapped[str] = mapped_column(ForeignKey("team.name"))
-    most_overtakes_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
+    overtake_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
-    most_dnfs_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
+    dnf_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
-    most_gained_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
+    gained_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
-    most_lost_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
+    lost_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
-    team_winners_id: Mapped[int] = mapped_column(ForeignKey("teamwinners.id"))
-    podium_drivers_id: Mapped[int] = mapped_column(ForeignKey("podiumdrivers.id"))
 
     # Relationships
-    user: Mapped["User"] = relationship("User", foreign_keys=[user_id])
+    user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
-    p2_constructor: Mapped["Team"] = relationship("Team", foreign_keys=[p2_constructor_id])
+    p2_team: Mapped["Team"] = relationship("Team", foreign_keys=[p2_team_name])
-    most_overtakes: Mapped["Driver"] = relationship("Driver", foreign_keys=[most_overtakes_id])
+    overtake_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[overtake_driver_name])
-    most_dnfs: Mapped["Driver"] = relationship("Driver", foreign_keys=[most_dnfs_id])
+    dnf_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_driver_name])
-    most_gained: Mapped["Driver"] = relationship("Driver", foreign_keys=[most_gained_id])
+    gained_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[gained_driver_name])
-    most_lost: Mapped["Driver"] = relationship("Driver", foreign_keys=[most_lost_id])
+    lost_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[lost_driver_name])
-    team_winners: Mapped["TeamWinners"] = relationship("TeamWinners", foreign_keys=[team_winners_id])
+
-    podium_drivers: Mapped["PodiumDrivers"] = relationship("PodiumDrivers", foreign_keys=[podium_drivers_id])
+    team_winners: Mapped["TeamWinners"] = relationship("TeamWinners", foreign_keys=[user_name],
+                                                       primaryjoin="SeasonGuess.user_name == TeamWinners.user_name")
+    podium_drivers: Mapped["PodiumDrivers"] = relationship("PodiumDrivers", foreign_keys=[user_name],
+                                                           primaryjoin="SeasonGuess.user_name == PodiumDrivers.user_name")

static_data/drivers.csv

@@ -1,4 +1,4 @@
-name,abbr,team_id,country_code
+name,abbr,team_name,country_code
 NONE,NON,NONE,NO
 Alexander Albon,ALB,Williams,TH
 Fernando Alonso,ALO,Aston Martin,ES

static_data/races.csv

@@ -1,24 +1,24 @@
-id,grandprix,number,date,pxx
+name,number,date,pxx
-1,Bahrain,1,2023-03-05,3
+Bahrain,1,2023-03-05,3
-2,Saudi Arabia,2,2023-03-19,17
+Saudi Arabia,2,2023-03-19,17
-3,Melbourne,3,2023-04-02,5
+Melbourne,3,2023-04-02,5
-4,Baku,4,2023-04-30,6
+Baku,4,2023-04-30,6
-5,Miami,5,2023-05-07,15
+Miami,5,2023-05-07,15
-6,Imola,6,2023-05-21,8
+Imola,6,2023-05-21,8
-7,Monaco,7,2023-05-28,9
+Monaco,7,2023-05-28,9
-8,Barcelona,8,2023-06-04,13
+Barcelona,8,2023-06-04,13
-9,Montreal,9,2023-06-18,11
+Montreal,9,2023-06-18,11
-10,Spielberg,10,2023-07-02,12
+Spielberg,10,2023-07-02,12
-11,Silverstone,11,2023-07-09,18
+Silverstone,11,2023-07-09,18
-12,Budapest,12,2023-07-23,12
+Budapest,12,2023-07-23,12
-13,Spa,13,2023-07-30,13
+Spa,13,2023-07-30,13
-14,Zandvoort,14,2023-08-27,3
+Zandvoort,14,2023-08-27,3
-15,Monza,15,2023-09-03,6
+Monza,15,2023-09-03,6
-16,Singapore,16,2023-09-17,10
+Singapore,16,2023-09-17,10
-17,Suzuka,17,2023-09-24,11
+Suzuka,17,2023-09-24,11
-18,Qatar,18,2023-10-08,3
+Qatar,18,2023-10-08,3
-19,Austin,19,2023-10-22,11
+Austin,19,2023-10-22,11
-20,Mexico,20,2023-10-29,17
+Mexico,20,2023-10-29,17
-21,Brazil,21,2023-11-05,14
+Brazil,21,2023-11-05,14
-22,Las Vegas,22,2023-11-18,8
+Las Vegas,22,2023-11-18,8
-23,Abu Dhabi,23,2023-11-26,5
+Abu Dhabi,23,2023-11-26,5

static_data/teams.csv

@@ -1,4 +1,4 @@
-team
+name
 Alpine
 Aston Martin
 Ferrari

template_model.py

@@ -0,0 +1,303 @@
+from typing import List, Iterable, Callable, TypeVar, Dict, overload, Any
+
+from sqlalchemy import desc
+
+from model import User, RaceResult, RaceGuess, Race, Driver, Team, SeasonGuess
+
+_T = TypeVar("_T")
+
+
+def find_first_or_none(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T | None:
+    """
+    Finds the first element in a sequence matching a predicate.
+    Returns None if no element is found.
+    """
+    return next(filter(predicate, iterable), None)
+
+
+def find_multiple(predicate: Callable[[_T], bool], iterable: Iterable[_T], count: int = 0) -> List[_T]:
+    """
+    Finds <count> elements in a sequence matching a predicate (finds all if <count> is 0).
+    Throws exception if more/fewer elements were found than specified.
+    """
+    filtered = list(filter(predicate, iterable))
+
+    if count != 0 and len(filtered) != count:
+        raise Exception(f"find_multiple found {len(filtered)} matching elements but expected {count}")
+
+    return filtered
+
+
+def find_single(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T:
+    """
+    Find a single element in a sequence matching a predicate.
+    Throws exception if more/less than a single element is found.
+    """
+    filtered = list(filter(predicate, iterable))
+
+    if len(filtered) != 1:
+        raise Exception(f"find_single found {len(filtered)} matching elements but expected 1")
+
+    return filtered[0]
+
+
+def find_single_or_none(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T | None:
+    """
+    Find a single element in a sequence matching a predicate if it exists.
+    Only throws exception if more than a single element is found.
+    """
+    filtered = list(filter(predicate, iterable))
+
+    if len(filtered) > 1:
+        raise Exception(f"find_single_or_none found {len(list(filtered))} matching elements but expected 0 or 1")
+
+    return filtered[0] if len(filtered) == 1 else None
+
+
+# This is inefficient (doesn't matter for small database), but very simple
+class TemplateModel:
+    """
+    This class bundles all data required from inside a template.
+    """
+
+    _all_users: List[User] | None = None
+    _all_race_results: List[RaceResult] | None = None
+    _all_race_guesses: List[RaceGuess] | None = None
+    _all_season_guesses: List[SeasonGuess] | None = None
+    _all_races: List[Race] | None = None
+    _all_drivers: List[Driver] | None = None
+    _all_teams: List[Team] | None = None
+
+    def all_users(self) -> List[User]:
+        """
+        Returns a list of all users in the database.
+        """
+        if self._all_users is None:
+            self._all_users = User.query.all()
+
+        return self._all_users
+
+    @overload
+    def user_by(self, *, user_name: str) -> User:
+        """
+        Tries to obtain the user object for a specific username.
+        """
+        return self.user_by(user_name=user_name)
+
+    @overload
+    def user_by(self, *, user_name: str, ignore: List[str]) -> User | None:
+        """
+        Tries to obtain the user object for a specific username, but ignores certain usernames.
+        """
+        return self.user_by(user_name=user_name, ignore=ignore)
+
+    def user_by(self, *, user_name: str, ignore: List[str] | None = None) -> User | None:
+        if ignore is None:
+            ignore = []
+
+        if len(ignore) > 0 and user_name in ignore:
+            return None
+
+        predicate: Callable[[User], bool] = lambda user: user.name == user_name
+        return find_single(predicate, self.all_users())
+
+    def all_race_results(self) -> List[RaceResult]:
+        """
+        Returns a list of all race results in the database, in descending order (most recent first).
+        """
+        if self._all_race_results is None:
+            self._all_race_results = RaceResult.query.join(RaceResult.race).order_by(desc(Race.number)).all()
+
+        print(self._all_race_results)
+        return self._all_race_results
+
+    def race_result_by(self, *, race_name: str) -> RaceResult | None:
+        """
+        Tries to obtain the race result corresponding to a race name.
+        """
+        predicate: Callable[[RaceResult], bool] = lambda result: result.race.name == race_name
+        return find_single_or_none(predicate, self.all_race_results())
+
+    def all_race_guesses(self) -> List[RaceGuess]:
+        """
+        Returns a list of all race guesses in the database.
+        """
+        if self._all_race_guesses is None:
+            self._all_race_guesses = RaceGuess.query.all()
+
+        return self._all_race_guesses
+
+    @overload
+    def race_guesses_by(self, *, user_name) -> List[RaceGuess]:
+        """
+        Returns a list of all race guesses made by a specific user.
+        """
+        return self.race_guesses_by(user_name=user_name)
+
+    @overload
+    def race_guesses_by(self, *, race_name) -> List[RaceGuess]:
+        """
+        Returns a list of all race guesses made for a specific race.
+        """
+        return self.race_guesses_by(race_name=race_name)
+
+    @overload
+    def race_guesses_by(self, *, user_name, race_name) -> RaceGuess | None:
+        """
+        Returns a single race guess by a specific user for a specific race, or None, if this guess doesn't exist.
+        """
+        return self.race_guesses_by(user_name=user_name, race_name=race_name)
+
+    @overload
+    def race_guesses_by(self) -> Dict[str, Dict[str, RaceGuess]]:
+        """
+        Returns a dictionary that maps race-ids to user-id - guess dictionaries.
+        """
+        return self.race_guesses_by()
+
+    def race_guesses_by(self, *, user_name=None, race_name=None) -> RaceGuess | List[RaceGuess] | Dict[str, Dict[str, RaceGuess]] | None:
+        # List of all guesses by a single user
+        if user_name is not None and race_name is None:
+            predicate: Callable[[RaceGuess], bool] = lambda guess: guess.user_name == user_name
+            return find_multiple(predicate, self.all_race_guesses())
+
+        # List of all guesses for a single race
+        if user_name is None and race_name is not None:
+            predicate: Callable[[RaceGuess], bool] = lambda guess: guess.race_name == race_name
+            return find_multiple(predicate, self.all_race_guesses())
+
+        # Guess for a single race by a single user
+        if user_name is not None and race_name is not None:
+            predicate: Callable[[RaceGuess], bool] = lambda guess: guess.user_name == user_name and guess.race_name == race_name
+            return find_single_or_none(predicate, self.all_race_guesses())
+
+        # Dict with all guesses
+        if user_name is None and race_name is None:
+            guesses_by: Dict[str, Dict[str, RaceGuess]] = dict()
+            guess: RaceGuess
+
+            for guess in self.all_race_guesses():
+                if guess.race_name not in guesses_by:
+                    guesses_by[guess.race_name] = dict()
+
+                guesses_by[guess.race_name][guess.user_name] = guess
+
+            return guesses_by
+
+        raise Exception("race_guesses_by encountered illegal combination of arguments")
+
+    def all_season_guesses(self) -> List[SeasonGuess]:
+        if self._all_season_guesses is None:
+            self._all_season_guesses = SeasonGuess.query.all()
+
+        return self._all_season_guesses
+
+    @overload
+    def season_guesses_by(self, *, user_name) -> SeasonGuess:
+        """
+        Returns the season guess made by a specific user.
+        """
+        return self.season_guesses_by(user_name=user_name)
+
+    @overload
+    def season_guesses_by(self) -> Dict[str, SeasonGuess]:
+        """
+        Returns a dictionary of season guesses mapped to usernames.
+        """
+        return self.season_guesses_by()
+
+    def season_guesses_by(self, *, user_name=None) -> SeasonGuess | Dict[str, SeasonGuess] | None:
+        if user_name is not None:
+            predicate: Callable[[SeasonGuess], bool] = lambda guess: guess.user_name == user_name
+            return find_single_or_none(predicate, self.all_season_guesses())
+
+        if user_name is None:
+            guesses_by: Dict[str, SeasonGuess] = dict()
+            guess: SeasonGuess
+
+            for guess in self.all_season_guesses():
+                guesses_by[guess.user_name] = guess
+
+            return guesses_by
+
+        raise Exception("season_guesses_by encountered illegal combination of arguments")
+
+    def all_races(self) -> List[Race]:
+        """
+        Returns a list of all races in the database.
+        """
+        if self._all_races is None:
+            self._all_races = Race.query.order_by(desc(Race.number)).all()
+
+        return self._all_races
+
+    def first_race_without_result(self) -> Race | None:
+        """
+        Returns the first race-object with no associated race result.
+        """
+        results: List[RaceResult] = self.all_race_results()
+        if len(results) == 0:
+            return self.all_races()[-1]  # all_races is sorted descending by number
+
+        most_recent_result: RaceResult = results[0]
+        predicate: Callable[[Race], bool] = lambda race: race.number == most_recent_result.race.number + 1
+
+        return find_first_or_none(predicate, self.all_races())
+
+    def all_teams(self) -> List[Team]:
+        """
+        Returns a list of all teams in the database.
+        """
+        if self._all_teams is None:
+            self._all_teams = Team.query.all()
+
+        return self._all_teams
+
+    def all_drivers(self) -> List[Driver]:
+        """
+        Returns a list of all drivers in the database, including the NONE driver.
+        """
+        if self._all_drivers is None:
+            self._all_drivers = Driver.query.all()
+
+        return self._all_drivers
+
+    def all_drivers_except_none(self) -> List[Driver]:
+        """
+        Returns a list of all drivers in the database, excluding the NONE driver.
+        """
+        predicate: Callable[[Driver], bool] = lambda driver: driver.name != "NONE"
+        return find_multiple(predicate, self.all_drivers())
+
+    @overload
+    def drivers_by(self, *, team_name) -> List[Driver]:
+        """
+        Returns a list of all drivers driving for a certain team.
+        """
+        return self.drivers_by(team_name=team_name)
+
+    @overload
+    def drivers_by(self) -> Dict[str, List[Driver]]:
+        """
+        Returns a dictionary of drivers mapped to team names.
+        """
+        return self.drivers_by()
+
+    def drivers_by(self, *, team_name=None) -> List[Driver] | Dict[str, List[Driver]]:
+        if team_name is not None:
+            predicate: Callable[[Driver], bool] = lambda driver: driver.team.name == team_name
+            return find_multiple(predicate, self.all_drivers_except_none(), 2)
+
+        if team_name is None:
+            drivers_by: Dict[str, List[Driver]] = dict()
+            driver: Driver
+            team: Team
+
+            for team in self.all_teams():
+                drivers_by[team.name] = []
+            for driver in self.all_drivers_except_none():
+                drivers_by[driver.team.name] += [driver]
+
+            return drivers_by
+
+        raise Exception("drivers_by encountered illegal combination of arguments")

templates/base.jinja

@@ -2,10 +2,16 @@
 <html lang="en">
 
 {# Simple driver dropdown. Requires list of drivers. #}
-{% macro driver_select(name='', label='') %}
+{% macro driver_select(name='', label='', include_none=true) %}
     <div class="form-floating">
         <select name="{{ name }}" class="form-select" aria-label="{{ name }}">
             <option value="" selected disabled hidden></option>
+            {% if include_none == true %}
+                {% set drivers = model.all_drivers() %}
+            {% else %}
+                {% set drivers = model.all_drivers_except_none() %}
+            {% endif %}
+
             {% for driver in drivers %}
                 <option value="{{ driver.name }}">{{ driver.abbr }}</option>
             {% endfor %}
@@ -15,12 +21,18 @@
 {% endmacro %}
 
 {# Driver dropdown where a value might be preselected. Requires list of drivers. #}
-{% macro driver_select_with_preselect(match='', name='', label='') %}
+{% macro driver_select_with_preselect(match='', name='', label='', include_none=true) %}
     <div class="form-floating">
         <select name="{{ name }}" class="form-select" aria-label="{{ name }}">
             {# Use namespace wrapper to persist scope between loop iterations #}
             {% set user_has_chosen = namespace(driverpre="false") %}
 
+            {% if include_none == true %}
+                {% set drivers = model.all_drivers() %}
+            {% else %}
+                {% set drivers = model.all_drivers_except_none() %}
+            {% endif %}
+
             {% for driver in drivers %}
                 {% if match == driver.abbr %}
                     {% set user_has_chosen.driverpre = "true" %}
@@ -44,7 +56,7 @@
     <div class="form-floating">
         <select name="{{ name }}" class="form-select" aria-label="{{ name }}">
             <option value="" selected disabled hidden></option>
-            {% for team in teams %}
+            {% for team in model.all_teams() %}
                 <option value="{{ team.name }}">{{ team.name }}</option>
             {% endfor %}
         </select>
@@ -59,7 +71,7 @@
             {# Use namespace wrapper to persist scope between loop iterations #}
             {% set user_has_chosen = namespace(teampre="false") %}
 
-            {% for team in teams %}
+            {% for team in model.all_teams() %}
                 {% if match == team.name %}
                     {% set user_has_chosen.teampre = "true" %}
                     <option selected="selected" value="{{ team.name }}">{{ team.name }}</option>
@@ -80,6 +92,7 @@
 {# Easy nav-bar entries. When a page sets the active_page variable, the current entry will be underlined #}
 {% macro nav_selector(page='', text='') %}
     <a class="nav-link text-nowrap" href="{{ page }}">{% if active_page == page %}<u>{% endif %} {{ text }}
+        {# NOTE: This should be set at the top of each template #}
         {% if active_page == page %}</u>{% endif %}</a>
 {% endmacro %}
 
@@ -98,7 +111,7 @@
     {% block head_extra %}{% endblock head_extra %}
 
     {# <script defer> #}
-    {#     {# Initialize Bootstrap Tooltips #} #}
+    {#     {# Initialize Bootstrap Tooltips #}
     {#     console.log("Initializing Tooltips...") #}
     {#     const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]') #}
     {#     const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl)) #}
@@ -121,8 +134,8 @@
 
         <div class="collapse navbar-collapse" id="navbarCollapse">
             <div class="navbar-nav me-2">
-                {{ nav_selector("/race/" ~ active_user.name | default("Everyone"), "Race Picks") }}
+                {{ nav_selector("/race", "Race Picks") }}
-                {{ nav_selector("/season/" ~ active_user.name | default("Everyone"), "Season Picks") }}
+                {{ nav_selector("/season", "Season Picks") }}
                 {{ nav_selector("/graphs", "Statistics") }}
                 {{ nav_selector("/rules", "Rules") }}
             </div>
@@ -131,14 +144,14 @@
             <div class="flex-grow-1"></div>
 
             <div class="navbar-nav">
-                {{ nav_selector("/enter", "Enter Race Result") }}
+                {{ nav_selector("/result", "Enter Race Result") }}
-                {{ nav_selector("/users", "Manage Users") }}
+                {{ nav_selector("/user", "Manage Users") }}
             </div>
         </div>
     </div>
 </nav>
 
-<div class="px-2 pt-2" style="margin-top: 32px;">
+<div class="px-2 pt-2" style="margin-top: 55px !important;">
     {% block body %}{% endblock body %}
 </div>
 

templates/enter.jinja

@@ -1,77 +1,70 @@
 {% extends 'base.jinja' %}
 
-{% set active_page = "/enter" %}
-{% set active_user = none %}
-
 {% block title %}Formula 10 - Race Result{% endblock title %}
 
+{% set active_page = "/result" %}
+
 {% block head_extra %}
     <link href="../static/style/draggable.css" rel="stylesheet">
     <script src="../static/script/draggable.js" defer></script>
 {% endblock head_extra %}
 
+{% set current_race = model.first_race_without_result() %}
+
 {% block navbar_center %}
-    {% if results | length > 0 %}
+
+    {% if model.all_race_results() | length > 0 %}
         <div class="dropdown">
             <button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown"
                     aria-expanded="false">
-                {% if activeresult is not none %}{{ activeresult.race.grandprix }}{% else %}
+                {% if active_result is not none %}
-                    {{ race.grandprix }}{% endif %}
+                    {{ active_result.race.name }}
+                {% else %}
+                    {{ current_race.name }}
+                {% endif %}
             </button>
             <ul class="dropdown-menu">
-                <li><a class="dropdown-item" href="/enter/Current">{{ race.grandprix }}</a></li>
+                <li>
+                    <a class="dropdown-item" href="/result/{{ current_race.name }}">{{ current_race.name }}</a>
+                </li>
                 <li>
                     <hr class="dropdown-divider">
                 </li>
-                {% for result in results %}
+
-                    <li><a class="dropdown-item"
+                {% for result in model.all_race_results() %}
-                           href="/enter/{{ result.race.grandprix }}">{{ result.race.grandprix }}</a>
+                    <li>
+                        <a class="dropdown-item"
+                           href="/result/{{ result.race.name }}">{{ result.race.name }}</a>
                     </li>
                 {% endfor %}
             </ul>
         </div>
     {% endif %}
+
 {% endblock navbar_center %}
 
 {% block body %}
 
-    <div class="card shadow-sm" style="width: 450px;">
+    <div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));">
-        <div class="card-body">
-            <h5 class="card-title">{% if activeresult is not none %}{{ activeresult.race.grandprix }}{% else %}
-                {{ race.grandprix }}{% endif %}</h5>
 
-            <form action="/enterresult/
+        <div class="card shadow-sm" style="width: 450px;">
-                    {% if activeresult is not none %}{{ activeresult.race.id }}{% else %}{{ race.id }}{% endif %}"
+            <div class="card-body">
-                  method="post">
-                <ul id="columns" class="list-group list-group-flush">
-                    {% if activeresult is not none %}
-                        {% for driver in activeresult.pxxs.values() %}
-                            <li class="list-group-item column p-1" draggable="true">
-                                {{ driver.name }}
 
-                                <div class="d-inline-block float-end">
+                <h5 class="card-title">{% if active_result is not none %}{{ active_result.race.name }}{% else %}
-                                    {# Driver DNFed #}
+                    {{ current_race.name }}{% endif %}</h5>
-                                    <div class="form-check form-check-reverse d-inline-block">
-                                        <input type="checkbox" class="form-check-input" value="{{ driver.name }}"
-                                               id="dnf-{{ driver.name }}" name="dnf-drivers"
-                                               {% if driver in activeresult.dnfs.values() %}checked{% endif %}>
-                                        <label for="dnf-{{ driver.name }}"
-                                               class="form-check-label text-muted">DNF</label>
-                                    </div>
 
-                                    {# Driver Excluded #}
+                <form action="/result-enter/
-                                    <div class="form-check form-check-reverse d-inline-block mx-2">
+
-                                        <input type="checkbox" class="form-check-input" value="{{ driver.name }}"
+                        {%- if active_result is not none %}{{ active_result.race.name }}{% else %}{{ current_race.name }}{% endif %}"
-                                               id="exclude-{{ driver.name }}" name="exclude-drivers"
+                      method="post">
-                                               {% if driver in activeresult.excludes %}checked{% endif %}>
+                    <ul id="columns" class="list-group list-group-flush">
-                                        <label for="exclude-{{ driver.name }}" class="form-check-label text-muted">Exclude</label>
+
-                                    </div>
+                        {% if active_result is not none %}
-                                </div>
+                            {% set drivers = active_result.pxx_drivers_values %}
+                        {% else %}
+                            {% set drivers = model.all_drivers_except_none() %}
+                        {% endif %}
 
-                                {# Standing order #}
-                                <input type="hidden" name="pxxdrivers" value="{{ driver.name }}"></li>
-                        {% endfor %}
-                    {% else %}
                         {% for driver in drivers %}
                             <li class="list-group-item column p-1" draggable="true">
                                 {{ driver.name }}
@@ -80,7 +73,8 @@
                                     {# Driver DNFed #}
                                     <div class="form-check form-check-reverse d-inline-block">
                                         <input type="checkbox" class="form-check-input" value="{{ driver.name }}"
-                                               id="dnf-{{ driver.name }}" name="dnf-drivers">
+                                               id="dnf-{{ driver.name }}" name="dnf-drivers"
+                                               {% if (active_result is not none) and (driver in active_result.dnf_drivers.values()) %}checked{% endif %}>
                                         <label for="dnf-{{ driver.name }}"
                                                class="form-check-label text-muted">DNF</label>
                                     </div>
@@ -88,20 +82,22 @@
                                     {# Driver Excluded #}
                                     <div class="form-check form-check-reverse d-inline-block mx-2">
                                         <input type="checkbox" class="form-check-input" value="{{ driver.name }}"
-                                               id="exclude-{{ driver.name }}" name="exclude-drivers">
+                                               id="exclude-{{ driver.name }}" name="exclude-drivers"
-                                        <label for="exclude-{{ driver.name }}" class="form-check-label text-muted">Exclude</label>
+                                               {% if (active_result is not none) and (driver in active_result.excluded_drivers) %}checked{% endif %}>
+                                        <label for="exclude-{{ driver.name }}"
+                                               class="form-check-label text-muted">Exclude</label>
                                     </div>
                                 </div>
 
                                 {# Standing order #}
                                 <input type="hidden" name="pxxdrivers" value="{{ driver.name }}"></li>
                         {% endfor %}
-                    {% endif %}
+                    </ul>
-                </ul>
 
-                <input type="submit" class="btn btn-danger mt-2" value="Save">
+                    <input type="submit" class="btn btn-danger mt-2 w-100" value="Save">
-            </form>
+                </form>
 
+            </div>
         </div>
     </div>
 

templates/race.jinja

@@ -1,26 +1,32 @@
 {% extends 'base.jinja' %}
 
-{% set active_page = "/race/" ~ activeuser.name | default("Everyone") %}
-{% set active_user = activeuser %}
-
 {% block title %}Formula 10 - Race{% endblock title %}
 
+{% set active_page = "/race" %}
+
 {% block navbar_center %}
-    <div class="dropdown">
+    {% if model.all_users() | length > 1 %}
-        <button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown"
+        <div class="dropdown">
-                aria-expanded="false">
+            <button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown"
-            {% if activeuser is not none %}{{ activeuser.name }}{% else %}Everyone{% endif %}
+                    aria-expanded="false">
-        </button>
+                {% if active_user is none %}
-        <ul class="dropdown-menu">
+                    Everyone
-            <li><a class="dropdown-item" href="/race/Everyone">Everyone</a></li>
+                {% else %}
-            <li>
+                    {{ active_user.name }}
-                <hr class="dropdown-divider">
+                {% endif %}
-            </li>
+            </button>
-            {% for user in users %}
+            <ul class="dropdown-menu">
-                <li><a class="dropdown-item" href="/race/{{ user.name }}">{{ user.name }}</a></li>
+                <li><a class="dropdown-item" href="/race/Everyone">Everyone</a></li>
-            {% endfor %}
+                <li>
-        </ul>
+                    <hr class="dropdown-divider">
-    </div>
+                </li>
+
+                {% for user in model.all_users() %}
+                    <li><a class="dropdown-item" href="/race/{{ user.name }}">{{ user.name }}</a></li>
+                {% endfor %}
+            </ul>
+        </div>
+    {% endif %}
 {% endblock navbar_center %}
 
 {% block body %}
@@ -30,11 +36,9 @@
         <tr>
             <th scope="col" rowspan="2" class="text-center" style="width: 200px;">Race</th>
 
-            {% if activeuser is none %}
+            <th scope="col" {% if active_user is none %}colspan="{{ model.all_users() | length }}"{% endif %}
-                <th scope="col" colspan="{{ users | length }}" class="text-center">Call</th>
+                class="text-center">Call
-            {% else %}
+            </th>
-                <th scope="col" class="text-center">Call</th>
-            {% endif %}
 
             <th scope="col" rowspan="2" class="text-center" style="width: 200px;">Result</th>
         </tr>
@@ -46,35 +50,43 @@
         <tr>
             <td>&nbsp;</td>
 
-            {% if activeuser is none %}
+            {% if active_user is none %}
-                {% for user in users %}
+                {% for user in model.all_users() %}
-                    <td class="text-center text-nowrap" style="min-width: 100px;"><a href="/race/{{ user.name }}" class="link-dark">{{ user.name }}</a></td>
+                    <td class="text-center text-nowrap" style="min-width: 100px;">
+                        <a href="/race/{{ user.name }}" class="link-dark">{{ user.name }}</a>
+                    </td>
                 {% endfor %}
             {% else %}
-                <td class="text-center text-nowrap" style="min-width: 100px;">{{ activeuser.name }}</td>
+                <td class="text-center text-nowrap" style="min-width: 100px;">{{ active_user.name }}</td>
             {% endif %}
 
             <td>&nbsp;</td>
         </tr>
 
+        {% set current_race = model.first_race_without_result() %}
+
         {# Current Result, only displayed for all users overview #}
-        {% if activeuser is none %}
+        {% if active_user is none %}
+
             <tr class="table-danger">
                 <td class="text-nowrap">
-                    <span class="fw-bold">{{ currentrace.id }}:</span> {{ currentrace.grandprix }}<br>
+                    <span class="fw-bold">{{ current_race.number }}:</span> <a href="/result" class="link-dark">{{ current_race.name }}</a><br>
-                    <small><span class="fw-bold">Guess:</span> P{{ currentrace.pxx }}</small>
+                    <small><span class="fw-bold">Guess:</span> P{{ current_race.pxx }}</small>
                 </td>
 
-                {% for user in users %}
+                {% for user in model.all_users() %}
-                    <td class="text-center text-nowrap">
+                    {% set user_guess = model.race_guesses_by(user_name=user.name, race_name=current_race.name) %}
-                        {% if (currentrace.id in guesses) and (user.name in guesses.get(currentrace.id)) %}
-                            {% set pxx = guesses.get(currentrace.id).get(user.name).pxx.abbr %}
-                            {% set dnf = guesses.get(currentrace.id).get(user.name).dnf.abbr %}
 
+                    <td class="text-center text-nowrap">
+                        {% if user_guess is not none %}
                             <ul class="list-group list-group-flush">
-                                <li class="list-group-item" style="background-color: inherit;">P{{ currentrace.pxx }}: {{ pxx }}</li>
+                                <li class="list-group-item" style="background-color: inherit;">
-                                <li class="list-group-item" style="background-color: inherit;">DNF: {{ dnf }}</li>
+                                    P{{ current_race.pxx }}: {{ user_guess.pxx.abbr }}</li>
+                                <li class="list-group-item" style="background-color: inherit;">
+                                    DNF: {{ user_guess.dnf.abbr }}</li>
                             </ul>
+                        {% else %}
+                            &nbsp;
                         {% endif %}
                     </td>
                 {% endfor %}
@@ -84,24 +96,24 @@
         {% endif %}
 
         {# Enter Guess, only displayed for single user focused view #}
-        {% if activeuser is not none %}
+        {% if active_user is not none %}
             <tr class="table-danger">
                 <td class="text-nowrap">
-                    <span class="fw-bold">{{ currentrace.id }}:</span> {{ currentrace.grandprix }}<br>
+                    <span class="fw-bold">{{ current_race.number }}:</span> {{ current_race.name }}<br>
-                    <small><span class="fw-bold">Guess:</span> P{{ currentrace.pxx }}</small>
+                    <small><span class="fw-bold">Guess:</span> P{{ current_race.pxx }}</small>
                 </td>
 
                 <td>
-                    <form action="/guessrace/{{ currentrace.id }}/{{ activeuser.name }}" method="post">
+                    <form action="/race-guess/{{ current_race.name }}/{{ active_user.name }}" method="post">
+                        {% set user_guess = model.race_guesses_by(user_name=active_user.name, race_name=current_race.name) %}
+
                         {# Driver PXX Select #}
-                        {{ driver_select_with_preselect(guesses.get(currentrace.id).get(activeuser.name).pxx.abbr if (currentrace.id in guesses and activeuser.name in guesses.get(currentrace.id)) else "",
+                        {{ driver_select_with_preselect(user_guess.pxx.abbr if user_guess is not none else "", "pxxselect", "P" ~ current_race.pxx ~ ":") }}
-                                                        "pxxselect", "P" ~ currentrace.pxx ~ ":") }}
+
+                        <div class="mt-2"></div>
 
                         {# Driver DNF Select #}
-                        <div class="mt-2">
+                        {{ driver_select_with_preselect(user_guess.dnf.abbr if user_guess is not none else "", "dnfselect", "DNF:") }}
-                            {{ driver_select_with_preselect(guesses.get(currentrace.id).get(activeuser.name).dnf.abbr if (currentrace.id in guesses and activeuser.name in guesses.get(currentrace.id)) else "",
-                                                            "dnfselect", "DNF:") }}
-                        </div>
 
                         <input type="submit" class="btn btn-danger mt-2 w-100" value="Save">
                     </form>
@@ -112,35 +124,40 @@
         {% endif %}
 
         {# Past Race Results #}
-        {% for raceresult in raceresults %}
+        {% for past_result in model.all_race_results() %}
             <tr>
                 <td class="text-nowrap">
-                    <span class="fw-bold">{{ raceresult.race.id }}:</span> {{ raceresult.race.grandprix }}<br>
+                    <span class="fw-bold">{{ past_result.race.number }}:</span> <a href="/result/{{ past_result.race.name }}" class="link-dark">{{ past_result.race.name }}</a><br>
-                    <small><span class="fw-bold">Guessed:</span> P{{ raceresult.race.pxx }}</small>
+                    <small><span class="fw-bold">Guessed:</span> P{{ past_result.race.pxx }}</small>
                 </td>
 
-                {% if activeuser is not none %}{% set users = [activeuser] %}{% endif %}
+                {% if active_user is none %}
+                    {% set users = model.all_users() %}
+                {% else %}
+                    {% set users = [active_user] %}
+                {% endif %}
                 {% for user in users %}
                     <td class="text-center text-nowrap">
-                        {% if (raceresult.race_id in guesses) and (user.name in guesses.get(raceresult.race_id)) %}
+                        {% set user_guess = model.race_guesses_by(user_name=user.name, race_name=past_result.race.name) %}
-                            {% set pxx = guesses.get(raceresult.race_id).get(user.name).pxx.abbr %}
-                            {% set dnf = guesses.get(raceresult.race_id).get(user.name).dnf.abbr %}
 
+                        {% if user_guess is not none %}
                             <ul class="list-group list-group-flush">
-                                <li class="list-group-item {% if pxx == raceresult.pxx.abbr %}text-success fw-bold{% endif %}">
+                                <li class="list-group-item {% if user_guess.pxx.abbr == past_result.pxx.abbr %}text-success fw-bold{% endif %}">
-                                    P{{ raceresult.race.pxx }}: {{ pxx }}</li>
+                                    P{{ past_result.race.pxx }}: {{ user_guess.pxx.abbr }}</li>
-                                <li class="list-group-item {% if dnf == raceresult.dnf.abbr %}text-success fw-bold{% endif %}">
+                                <li class="list-group-item {% if user_guess.dnf.abbr == past_result.dnf.abbr %}text-success fw-bold{% endif %}">
-                                    DNF: {{ dnf }}</li>
+                                    DNF: {{ user_guess.dnf.abbr }}</li>
                             </ul>
+                        {% else %}
+                            &nbsp;
                         {% endif %}
                     </td>
                 {% endfor %}
 
                 <td class="text-center text-nowrap">
                     <ul class="list-group list-group-flush">
-                        <li class="list-group-item">P{{ raceresult.race.pxx }}: {{ raceresult.pxx.abbr }}</li>
+                        <li class="list-group-item">P{{ past_result.race.pxx }}: {{ past_result.pxx.abbr }}</li>
-                        <li class="list-group-item {% if raceresult.dnf.abbr == 'NON' %}text-muted{% endif %}">
+                        <li class="list-group-item {% if past_result.dnf.abbr == 'NON' %}text-muted{% endif %}">
-                            DNF: {{ raceresult.dnf.abbr }}</li>
+                            DNF: {{ past_result.dnf.abbr }}</li>
                     </ul>
                 </td>
             </tr>

templates/season.jinja

@@ -1,82 +1,100 @@
 {% extends 'base.jinja' %}
 
-{% set active_page = "/season/" ~ activeuser.name | default("Everyone") %}
-{% set active_user = activeuser %}
-
 {% block title %}Formula 10 - Season{% endblock title %}
 
+{% set active_page = "/season" %}
+
 {% block navbar_center %}
-    <div class="dropdown">
+    {% if model.all_users() | length > 1 %}
-        <button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown"
+        <div class="dropdown">
-                aria-expanded="false">
+            <button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown"
-            {% if activeuser is not none %}{{ activeuser.name }}{% else %}Everyone{% endif %}
+                    aria-expanded="false">
-        </button>
+                {% if active_user is none %}
-        <ul class="dropdown-menu">
+                    Everyone
-            <li><a class="dropdown-item" href="/season/Everyone">Everyone</a></li>
+                {% else %}
-            <li>
+                    {{ active_user.name }}
-                <hr class="dropdown-divider">
+                {% endif %}
-            </li>
+            </button>
-            {% for user in users %}
+            <ul class="dropdown-menu">
-                <li><a class="dropdown-item" href="/season/{{ user.name }}">{{ user.name }}</a></li>
+                <li><a class="dropdown-item" href="/season/Everyone">Everyone</a></li>
-            {% endfor %}
+                <li>
-        </ul>
+                    <hr class="dropdown-divider">
-    </div>
+                </li>
+
+                {% for user in model.all_users() %}
+                    <li><a class="dropdown-item" href="/season/{{ user.name }}">{{ user.name }}</a></li>
+                {% endfor %}
+            </ul>
+        </div>
+    {% endif %}
 {% endblock navbar_center %}
 
 {% block body %}
 
-
     <div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));">
 
-        {% if activeuser is not none %}{% set users = [activeuser] %}{% endif %}
+        {% if active_user is none %}
+            {% set users = model.all_users() %}
+        {% else %}
+            {% set users = [active_user] %}
+        {% endif %}
         {% for user in users %}
 
             <div class="card mb-2 shadow-sm" style="width: 450px;">
                 <div class="card-body">
-                    {% if activeuser is not none %}
+                    {% if active_user is none %}
-                        <h5 class="card-title">{{ user.name }}</h5>
+                        <a href="/season/{{ user.name }}" class="link-dark">
+                            <h5 class="card-title">{{ user.name }}</h5>
+                        </a>
                     {% else %}
-                        <a href="/season/{{ user.name }}" class="link-dark"><h5 class="card-title">{{ user.name }}</h5></a>
+                        <h5 class="card-title">{{ user.name }}</h5>
                     {% endif %}
 
-                    <form action="/guessseason/{{ user.name }}" method="post">
+                    {% set user_guess = model.season_guesses_by(user_name=user.name) %}
+
+                    <form action="/season-guess/{{ user.name }}" method="post">
 
                         {# Hot Take #}
                         <div class="form-floating">
+                            {% if user_guess is not none %}
                                 <textarea class="form-control" id="hot-take-input-{{ user.name }}" name="hottakeselect"
-                                          style="height: 50px">{%- if (user.name in guesses) -%}
+                                          style="height: 50px">{{ user_guess.hot_take }}</textarea>
-                                    {{- guesses.get(user.name).hot_take -}}{%- endif -%}</textarea>
+                            {% else %}
+                                <textarea class="form-control" id="hot-take-input-{{ user.name }}" name="hottakeselect"
+                                          style="height: 50px"></textarea>
+                            {% endif %}
+
                             <label for="hot-take-input-{{ user.name }}" class="text-primary">Hot Take:</label>
                         </div>
 
                         {# P2 Constructor #}
                         <div class="mt-2">
-                            {{ team_select_with_preselect(guesses.get(user.name).p2_constructor.name if user.name in guesses else "",
+                            {{ team_select_with_preselect(user_guess.p2_team.name if user_guess is not none else "",
                                                           "p2select", "P2 in WCC:") }}
                         </div>
 
                         {# Most Overtakes + DNFs #}
                         <div class="input-group mt-2">
-                            {{ driver_select_with_preselect(guesses.get(user.name).most_overtakes.abbr if user.name in guesses else "",
+                            {{ driver_select_with_preselect(user_guess.overtake_driver.abbr if user_guess is not none else "",
-                                                            "overtakeselect", "Most overtakes:") }}
+                                                            "overtakeselect", "Most overtakes:", false) }}
-                            {{ driver_select_with_preselect(guesses.get(user.name).most_dnfs.abbr if user.name in guesses else "",
+                            {{ driver_select_with_preselect(user_guess.dnf_driver.abbr if user_guess is not none else "",
-                                                            "dnfselect", "Most DNFs:") }}
+                                                            "dnfselect", "Most DNFs:", false) }}
                         </div>
 
                         {# Most Gained + Lost #}
                         <div class="input-group mt-2">
-                            {{ driver_select_with_preselect(guesses.get(user.name).most_gained.abbr if user.name in guesses else "",
+                            {{ driver_select_with_preselect(user_guess.gained_driver.abbr if user_guess is not none else "",
-                                                            "gainedselect", "Most WDC places gained:") }}
+                                                            "gainedselect", "Most WDC places gained:", false) }}
-                            {{ driver_select_with_preselect(guesses.get(user.name).most_lost.abbr if user.name in guesses else "",
+                            {{ driver_select_with_preselect(user_guess.gained_driver.abbr if user_guess is not none else "",
-                                                            "lostselect", "Most WDC places lost:") }}
+                                                            "lostselect", "Most WDC places lost:", false) }}
                         </div>
 
                         {# Team-internal Winners #}
                         <h6 class="card-subtitle mt-2">Teammate battle winners:</h6>
                         <div class="grid mt-2" style="width: 450px; row-gap: 0;">
-                            {% for team in teams %}
+                            {% for team in model.all_teams() %}
-                                {% set driver_a_name = driverpairs.get(team.name)[0].name %}
+                                {% set driver_a_name = model.drivers_by(team_name=team.name)[0].name %}
-                                {% set driver_b_name = driverpairs.get(team.name)[1].name %}
+                                {% set driver_b_name = model.drivers_by(team_name=team.name)[1].name %}
 
                                 <div class="g-col-6">
                                     <div class="form-check form-check-inline">
@@ -84,7 +102,7 @@
                                                name="teamwinner-{{ team.name }}"
                                                id="teamwinner-{{ team.name }}-1-{{ user.name }}"
                                                value="{{ driver_a_name }}"
-                                               {% if (user.name in guesses) and (driver_a_name in guesses.get(user.name).team_winners.winner_ids) %}checked="checked"{% endif %}>
+                                               {% if (user_guess is not none) and (driver_a_name in user_guess.team_winners.teamwinner_driver_names) %}checked="checked"{% endif %}>
                                         <label class="form-check-label"
                                                for="teamwinner-{{ team.name }}-1-{{ user.name }}">{{ driver_a_name }}</label>
                                     </div>
@@ -96,7 +114,7 @@
                                                name="teamwinner-{{ team.name }}"
                                                id="teamwinner-{{ team.name }}-2-{{ user.name }}"
                                                value="{{ driver_b_name }}"
-                                               {% if (user.name in guesses) and (driver_b_name in guesses.get(user.name).team_winners.winner_ids) %}checked="checked"{% endif %}>
+                                               {% if (user_guess is not none) and (driver_b_name in user_guess.team_winners.teamwinner_driver_names) %}checked="checked"{% endif %}>
                                         <label class="form-check-label"
                                                for="teamwinner-{{ team.name }}-2-{{ user.name }}">{{ driver_b_name }}</label>
                                     </div>
@@ -107,9 +125,9 @@
                         {# Drivers with Podiums #}
                         <h6 class="card-subtitle mt-2">Drivers with podium(s):</h6>
                         <div class="grid mt-2" style="width: 450px; row-gap: 0;">
-                            {% for team in teams %}
+                            {% for team in model.all_teams() %}
-                                {% set driver_a_name = driverpairs.get(team.name)[0].name %}
+                                {% set driver_a_name = model.drivers_by(team_name=team.name)[0].name %}
-                                {% set driver_b_name = driverpairs.get(team.name)[1].name %}
+                                {% set driver_b_name = model.drivers_by(team_name=team.name)[1].name %}
 
                                 <div class="g-col-6">
                                     <div class="form-check form-check-inline">
@@ -117,7 +135,7 @@
                                                name="podiumdrivers"
                                                id="podium-{{ driver_a_name }}-{{ user.name }}"
                                                value="{{ driver_a_name }}"
-                                               {% if (user.name in guesses) and (driver_a_name in guesses.get(user.name).podium_drivers.podium_ids) %}checked="checked"{% endif %}>
+                                               {% if (user_guess is not none) and (driver_a_name in user_guess.podium_drivers.podium_driver_names) %}checked="checked"{% endif %}>
                                         <label class="form-check-label"
                                                for="podium-{{ driver_a_name }}-{{ user.name }}">{{ driver_a_name }}</label>
                                     </div>
@@ -129,7 +147,7 @@
                                                name="podiumdrivers"
                                                id="podium-{{ driver_b_name }}-{{ user.name }}"
                                                value="{{ driver_b_name }}"
-                                               {% if (user.name in guesses) and (driver_b_name in guesses.get(user.name).podium_drivers.podium_ids) %}checked="checked"{% endif %}>
+                                               {% if (user_guess is not none) and (driver_b_name in user_guess.podium_drivers.podium_driver_names) %}checked="checked"{% endif %}>
                                         <label class="form-check-label"
                                                for="podium-{{ driver_b_name }}-{{ user.name }}">{{ driver_b_name }}</label>
                                     </div>

templates/users.jinja

@@ -1,7 +1,6 @@
 {% extends 'base.jinja' %}
 
 {% set active_page = "/users" %}
-{% set active_user = none %}
 
 {% block title %}Formula 10 - Users{% endblock title %}
 
@@ -11,7 +10,7 @@
         <div class="card-body">
             <h5 class="card-title">Add User</h5>
 
-            <form action="/adduser" method="post">
+            <form action="/user-add" method="post">
                 <div class="input-group">
                     <div class="form-floating">
                         <input type="text" class="form-control" id="select-add-user" name="select-add-user"
@@ -42,7 +41,7 @@
             <div class="card-body">
                 <h5 class="card-title">Delete user</h5>
 
-                <form action="/deleteuser" method="post">
+                <form action="/user-delete" method="post">
                     <div class="input-group">
                         <select class="form-control form-select" aria-label="select-delete-user"
                                 name="select-delete-user">
@@ -73,10 +72,10 @@
             <h5 class="card-title">Functions that should not be public</h5>
             <h6 class="card-subtitle mb-2">(Fuck you if you click this without knowing what it does)</h6>
 
-            <a class="btn btn-outline-danger" href="/saveall">Save all data</a>
+            <a class="btn btn-outline-danger" href="/save/all">Save all data</a>
-            <a class="btn btn-outline-danger" href="/loadall">Load all data</a>
+            <a class="btn btn-outline-danger" href="/load/all">Load all data</a>
-            <a class="btn btn-outline-danger" href="/loadstatic">Load static data</a>
+            <a class="btn btn-outline-danger" href="/load/static">Load static data</a>
-            <a class="btn btn-outline-danger" href="/loaddynamic">Load dynamic data</a>
+            <a class="btn btn-outline-danger" href="/load/dynamic">Load dynamic data</a>
         </div>
     </div>