Split frontend model from backend model

formula10/database/common_queries.py

@@ -0,0 +1,23 @@
+from formula10.database.model.db_driver import DbDriver
+from formula10.database.model.db_race_result import DbRaceResult
+from formula10.database.model.db_user import DbUser
+from formula10 import db
+
+def race_has_result(race_name: str) -> bool:
+    return db.session.query(DbRaceResult).filter_by(race_name=race_name).first() is not None
+
+
+def user_exists_and_enabled(user_name: str) -> bool:
+    return db.session.query(DbUser).filter_by(name=user_name, enabled=True).first() is not None
+
+
+def user_exists_and_disabled(user_name: str) -> bool:
+    return db.session.query(DbUser).filter_by(name=user_name, enabled=False).first() is not None
+
+
+def find_single_driver_strict(driver_name: str) -> DbDriver:
+    db_driver: DbDriver | None = db.session.query(DbDriver).filter_by(name=driver_name).first()
+    if db_driver is None:
+        raise Exception(f"Could not find driver with name {driver_name} in database")
+
+    return db_driver

formula10/database/common_query_util.py

@@ -1,10 +0,0 @@
-from formula10.database.model.race_result import RaceResult
-from formula10.database.model.user import User
-from formula10 import db
-
-def race_has_result(race_name: str) -> bool:
-    return db.session.query(RaceResult).filter_by(race_name=race_name).first() is not None
-
-
-def user_exists(user_name: str) -> bool:
-    return db.session.query(User).filter_by(name=user_name).first() is not None

formula10/database/import_export.py

@@ -2,16 +2,14 @@ import csv
 import os.path
 from typing import List, Any
 
-from formula10.database.model.driver import Driver
-from formula10.database.model.podium_drivers import PodiumDrivers
-from formula10.database.model.race import Race
-from formula10.database.model.race_guess import RaceGuess
-from formula10.database.model.race_result import RaceResult
-from formula10.database.model.season_guess import SeasonGuess
-from formula10.database.model.team import Team
-from formula10.database.model.team_winners import TeamWinners
-from formula10.database.model.user import User
 from formula10 import db
+from formula10.database.model.db_driver import DbDriver
+from formula10.database.model.db_race import DbRace
+from formula10.database.model.db_race_guess import DbRaceGuess
+from formula10.database.model.db_race_result import DbRaceResult
+from formula10.database.model.db_season_guess import DbSeasonGuess
+from formula10.database.model.db_team import DbTeam
+from formula10.database.model.db_user import DbUser
 
 
 def load_csv(filename: str) -> List[List[str]]:
@@ -44,17 +42,17 @@ def reload_static_data():
     db.create_all()
 
     # Clear static data
-    db.session.query(Team).delete()
-    db.session.query(Driver).delete()
-    db.session.query(Race).delete()
+    db.session.query(DbTeam).delete()
+    db.session.query(DbDriver).delete()
+    db.session.query(DbRace).delete()
 
     # Reload static data
     for row in load_csv("data/static_import/teams.csv"):
-        db.session.add(Team.from_csv(row))
+        db.session.add(DbTeam.from_csv(row))
     for row in load_csv("data/static_import/drivers.csv"):
-        db.session.add(Driver.from_csv(row))
+        db.session.add(DbDriver.from_csv(row))
     for row in load_csv("data/static_import/races.csv"):
-        db.session.add(Race.from_csv(row))
+        db.session.add(DbRace.from_csv(row))
 
     db.session.commit()
 
@@ -65,26 +63,20 @@ def reload_dynamic_data():
     db.create_all()
 
     # Clear dynamic data
-    db.session.query(User).delete()
-    db.session.query(RaceResult).delete()
-    db.session.query(RaceGuess).delete()
-    db.session.query(TeamWinners).delete()
-    db.session.query(PodiumDrivers).delete()
-    db.session.query(SeasonGuess).delete()
+    db.session.query(DbUser).delete()
+    db.session.query(DbRaceResult).delete()
+    db.session.query(DbRaceGuess).delete()
+    db.session.query(DbSeasonGuess).delete()
 
     # Reload dynamic data
     for row in load_csv("data/dynamic_export/users.csv"):
-        db.session.add(User.from_csv(row))
+        db.session.add(DbUser.from_csv(row))
     for row in load_csv("data/dynamic_export/raceresults.csv"):
-        db.session.add(RaceResult.from_csv(row))
+        db.session.add(DbRaceResult.from_csv(row))
     for row in load_csv("data/dynamic_export/raceguesses.csv"):
-        db.session.add(RaceGuess.from_csv(row))
-    for row in load_csv("data/dynamic_export/teamwinners.csv"):
-        db.session.add(TeamWinners.from_csv(row))
-    for row in load_csv("data/dynamic_export/podiumdrivers.csv"):
-        db.session.add(PodiumDrivers.from_csv(row))
+        db.session.add(DbRaceGuess.from_csv(row))
     for row in load_csv("data/dynamic_export/seasonguesses.csv"):
-        db.session.add(SeasonGuess.from_csv(row))
+        db.session.add(DbSeasonGuess.from_csv(row))
 
     db.session.commit()
 
@@ -92,16 +84,12 @@ def reload_dynamic_data():
 def export_dynamic_data():
     print("Exporting Userdata...")
 
-    users: List[User] = db.session.query(User).all()
-    raceresults: List[RaceResult] = db.session.query(RaceResult).all()
-    raceguesses: List[RaceGuess] = db.session.query(RaceGuess).all()
-    teamwinners: List[TeamWinners] = db.session.query(TeamWinners).all()
-    podiumdrivers: List[PodiumDrivers] = db.session.query(PodiumDrivers).all()
-    seasonguesses: List[SeasonGuess] = db.session.query(SeasonGuess).all()
+    users: List[DbUser] = db.session.query(DbUser).all()
+    raceresults: List[DbRaceResult] = db.session.query(DbRaceResult).all()
+    raceguesses: List[DbRaceGuess] = db.session.query(DbRaceGuess).all()
+    seasonguesses: List[DbSeasonGuess] = db.session.query(DbSeasonGuess).all()
 
     write_csv("data/dynamic_export/users.csv", users)
     write_csv("data/dynamic_export/raceresults.csv", raceresults)
     write_csv("data/dynamic_export/raceguesses.csv", raceguesses)
-    write_csv("data/dynamic_export/teamwinners.csv", teamwinners)
-    write_csv("data/dynamic_export/podiumdrivers.csv", podiumdrivers)
     write_csv("data/dynamic_export/seasonguesses.csv", seasonguesses)

formula10/database/model/db_driver.py

@@ -2,25 +2,27 @@ from typing import List
 from sqlalchemy import String, ForeignKey
 from sqlalchemy.orm import mapped_column, Mapped, relationship
 
-from formula10.database.model.team import Team
+from formula10.database.model.db_team import DbTeam
 from formula10 import db
 
 
-class Driver(db.Model):
+class DbDriver(db.Model):
     """
     A F1 driver.
     It stores the corresponding team + name abbreviation.
     """
     __tablename__ = "driver"
 
-    @staticmethod
-    def from_csv(row: List[str]):
-        driver: Driver = Driver()
-        driver.name = str(row[0])
-        driver.abbr = str(row[1])
-        driver.team_name = str(row[2])
-        driver.country_code = str(row[3])
-        return driver
+    def __init__(self, *, name: str):
+        self.name = name  # Primary key
+
+    @classmethod
+    def from_csv(cls, row: List[str]):
+        db_driver: DbDriver = cls(name=str(row[0]))
+        db_driver.abbr = str(row[1])
+        db_driver.team_name = str(row[2])
+        db_driver.country_code = str(row[3])
+        return db_driver
 
     name: Mapped[str] = mapped_column(String(32), primary_key=True)
     abbr: Mapped[str] = mapped_column(String(4))
@@ -28,4 +30,4 @@ class Driver(db.Model):
     country_code: Mapped[str] = mapped_column(String(2))  # alpha-2 code
 
     # Relationships
-    team: Mapped["Team"] = relationship("Team", foreign_keys=[team_name])
+    team: Mapped[DbTeam] = relationship("DbTeam", foreign_keys=[team_name])

formula10/database/model/db_race.py

@@ -1,31 +1,32 @@
 from datetime import datetime
 from typing import List
-from urllib.parse import quote
 from sqlalchemy import DateTime, Integer, String
 from sqlalchemy.orm import Mapped, mapped_column
 
 from formula10 import db
 
 
-class Race(db.Model):
+class DbRace(db.Model):
     """
     A single race at a certain date and GrandPrix in the calendar.
     It stores the place to guess for this race.
     """
     __tablename__ = "race"
 
-    @staticmethod
-    def from_csv(row: List[str]):
-        race: Race = Race()
-        race.name = str(row[0])
-        race.number = int(row[1])
-        race.date = datetime.strptime(row[2], "%Y-%m-%d")
-        race.pxx = int(row[3])
-        return race
+    def __init__(self, *, name: str, number: int, date: datetime, pxx: int):
+        self.name = name  # Primary key
 
-    @property
-    def name_sanitized(self) -> str:
-        return quote(self.name)
+        self.number = number
+        self.date = date
+        self.pxx = pxx
+
+    @classmethod
+    def from_csv(cls, row: List[str]):
+        db_race: DbRace = cls(name=str(row[0]),
+                              number=int(row[1]),
+                              date=datetime.strptime(row[2], "%Y-%m-%d"),
+                              pxx=int(row[3]))
+        return db_race
 
     name: Mapped[str] = mapped_column(String(64), primary_key=True)
     number: Mapped[int] = mapped_column(Integer)

formula10/database/model/db_race_guess.py

@@ -0,0 +1,51 @@
+from typing import Any, List
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from formula10.database.model.db_user import DbUser
+from formula10.database.model.db_race import DbRace
+from formula10.database.model.db_driver import DbDriver
+from formula10 import db
+
+
+class DbRaceGuess(db.Model):
+    """
+    A guess a user made for a race.
+    It stores the corresponding race and the guessed drivers for PXX and DNF.
+    """
+    __tablename__ = "raceguess"
+    __csv_header__ = ["user_name", "race_name", "pxx_driver_name", "dnf_driver_name"]
+
+    def __init__(self, *, user_name: str, race_name: str, pxx_driver_name: str, dnf_driver_name: str):
+        self.user_name = user_name  # Primary key
+        self.race_name = race_name  # Primary key
+
+        self.dnf_driver_name = dnf_driver_name
+        self.pxx_driver_name = pxx_driver_name
+
+    @classmethod
+    def from_csv(cls, row: List[str]):
+        db_race_guess: DbRaceGuess = cls(user_name=str(row[0]),
+                                         race_name=str(row[1]),
+                                         pxx_driver_name=str(row[2]),
+                                         dnf_driver_name=str(row[3]))
+        return db_race_guess
+
+    def to_csv(self) -> List[Any]:
+        return [
+            self.user_name,
+            self.race_name,
+            self.pxx_driver_name,
+            self.dnf_driver_name
+        ]
+
+    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
+    race_name: Mapped[str] = mapped_column(ForeignKey("race.name"), primary_key=True)
+    pxx_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
+    dnf_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
+
+    # Relationships
+    user: Mapped[DbUser] = relationship("DbUser", foreign_keys=[user_name])
+    race: Mapped[DbRace] = relationship("DbRace", foreign_keys=[race_name])
+    pxx: Mapped[DbDriver] = relationship("DbDriver", foreign_keys=[pxx_driver_name])
+    dnf: Mapped[DbDriver] = relationship("DbDriver", foreign_keys=[dnf_driver_name])

formula10/database/model/db_race_result.py

@@ -0,0 +1,49 @@
+from typing import Any, List
+from sqlalchemy import ForeignKey, String
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from formula10.database.model.db_race import DbRace
+from formula10 import db
+
+class DbRaceResult(db.Model):
+    """
+    The result of a past race.
+    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"
+    __csv_header__ = ["race_name", "pxx_driver_names_json", "first_dnf_driver_names_json", "dnf_driver_names_json", "excluded_driver_names_json"]
+
+    def __init__(self, *, race_name: str, pxx_driver_names_json: str, first_dnf_driver_names_json: str, dnf_driver_names_json: str, excluded_driver_names_json: str):
+        self.race_name = race_name  # Primary key
+
+        self.pxx_driver_names_json = pxx_driver_names_json
+        self.first_dnf_driver_names_json = first_dnf_driver_names_json
+        self.dnf_driver_names_json = dnf_driver_names_json
+        self.excluded_driver_names_json = excluded_driver_names_json
+
+    @classmethod
+    def from_csv(cls, row: List[str]):
+        db_race_result: DbRaceResult = cls(race_name=str(row[0]),
+                                           pxx_driver_names_json=str(row[1]),
+                                           first_dnf_driver_names_json=str(row[2]),
+                                           dnf_driver_names_json=str(row[3]),
+                                           excluded_driver_names_json=str(row[4]))
+        return db_race_result
+
+    def to_csv(self) -> List[Any]:
+        return [
+            self.race_name,
+            self.pxx_driver_names_json,
+            self.first_dnf_driver_names_json,
+            self.dnf_driver_names_json,
+            self.excluded_driver_names_json
+        ]
+
+    race_name: Mapped[str] = mapped_column(ForeignKey("race.name"), primary_key=True)
+    pxx_driver_names_json: Mapped[str] = mapped_column(String(1024))
+    first_dnf_driver_names_json: Mapped[str] = mapped_column(String(1024))
+    dnf_driver_names_json: Mapped[str] = mapped_column(String(1024))
+    excluded_driver_names_json: Mapped[str] = mapped_column(String(1024))
+
+    # Relationships
+    race: Mapped[DbRace] = relationship("DbRace", foreign_keys=[race_name])

formula10/database/model/db_season_guess.py

@@ -0,0 +1,67 @@
+from typing import Any, List
+from sqlalchemy import ForeignKey, String
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from formula10.database.model.db_driver import DbDriver
+from formula10.database.model.db_team import DbTeam
+from formula10.database.model.db_user import DbUser
+from formula10 import db
+
+class DbSeasonGuess(db.Model):
+    """
+    A collection of bonus guesses for the entire season.
+    """
+    __tablename__ = "seasonguess"
+    __csv_header__ = ["user_name", "hot_take", "p2_team_name",
+                      "overtake_driver_name", "dnf_driver_name", "gained_driver_name", "lost_driver_name",
+                      "team_winners_driver_names_json", "podium_drivers_driver_names_json"]
+
+    def __init__(self, *, user_name: str, team_winners_driver_names_json: str, podium_drivers_driver_names_json: str):
+        self.user_name = user_name  # Primary key
+
+        self.team_winners_driver_names_json = team_winners_driver_names_json
+        self.podium_drivers_driver_names_json = podium_drivers_driver_names_json
+
+    @classmethod
+    def from_csv(cls, row: List[str]):
+        db_season_guess: DbSeasonGuess = cls(user_name=str(row[0]),
+                                             team_winners_driver_names_json=str(row[7]),
+                                             podium_drivers_driver_names_json=str(row[8]))
+        db_season_guess.hot_take = str(row[1])
+        db_season_guess.p2_team_name = str(row[2])
+        db_season_guess.overtake_driver_name = str(row[3])
+        db_season_guess.dnf_driver_name = str(row[4])
+        db_season_guess.gained_driver_name = str(row[5])
+        db_season_guess.lost_driver_name = str(row[6])
+        return db_season_guess
+
+    def to_csv(self) -> List[Any]:
+        return [
+            self.user_name,
+            self.hot_take,
+            self.p2_team_name,
+            self.overtake_driver_name,
+            self.dnf_driver_name,
+            self.gained_driver_name,
+            self.lost_driver_name,
+            self.team_winners_driver_names_json,
+            self.podium_drivers_driver_names_json
+        ]
+
+    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
+    hot_take: Mapped[str | None] = mapped_column(String(512), nullable=True)
+    p2_team_name: Mapped[str | None] = mapped_column(ForeignKey("team.name"), nullable=True)
+    overtake_driver_name: Mapped[str | None] = mapped_column(ForeignKey("driver.name"), nullable=True)
+    dnf_driver_name: Mapped[str | None] = mapped_column(ForeignKey("driver.name"), nullable=True)
+    gained_driver_name: Mapped[str | None] = mapped_column(ForeignKey("driver.name"), nullable=True)
+    lost_driver_name: Mapped[str | None] = mapped_column(ForeignKey("driver.name"), nullable=True)
+    team_winners_driver_names_json: Mapped[str] = mapped_column(String(1024))
+    podium_drivers_driver_names_json: Mapped[str] = mapped_column(String(1024))
+
+    # Relationships
+    user: Mapped[DbUser] = relationship("DbUser", foreign_keys=[user_name])
+    p2_team: Mapped[DbTeam | None] = relationship("DbTeam", foreign_keys=[p2_team_name])
+    overtake_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[overtake_driver_name])
+    dnf_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[dnf_driver_name])
+    gained_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[gained_driver_name])
+    lost_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[lost_driver_name])

formula10/database/model/db_team.py

@@ -4,16 +4,19 @@ from sqlalchemy.orm import Mapped, mapped_column
 
 from formula10 import db
 
-class Team(db.Model):
+
+class DbTeam(db.Model):
     """
     A constructor/team (name only).
     """
     __tablename__ = "team"
 
-    @staticmethod
-    def from_csv(row: List[str]):
-        team: Team = Team()
-        team.name = str(row[0])
-        return team
+    def __init__(self, *, name: str):
+        self.name = name  # Primary key
+
+    @classmethod
+    def from_csv(cls, row: List[str]):
+        db_team: DbTeam = cls(name=str(row[0]))
+        return db_team
 
     name: Mapped[str] = mapped_column(String(32), primary_key=True)

formula10/database/model/db_user.py

@@ -0,0 +1,32 @@
+from typing import Any, List
+from sqlalchemy import Boolean, String
+from sqlalchemy.orm import Mapped, mapped_column
+
+from formula10 import db
+
+
+class DbUser(db.Model):
+    """
+    A user that can guess races (name only).
+    """
+    __tablename__ = "user"
+    __csv_header__ = ["name", "enabled"]
+
+    def __init__(self, *, name: str, enabled: bool):
+        self.name = name  # Primary key
+
+        self.enabled = enabled
+
+    @classmethod
+    def from_csv(cls, row: List[str]):
+        db_user: DbUser = cls(name=str(row[0]), enabled=bool(row[1]))
+        return db_user
+
+    def to_csv(self) -> List[Any]:
+        return [
+            self.name,
+            self.enabled
+        ]
+
+    name: Mapped[str] = mapped_column(String(32), primary_key=True)
+    enabled: Mapped[bool] = mapped_column(Boolean)

formula10/database/model/podium_drivers.py

@@ -1,60 +0,0 @@
-import json
-from typing import Any, List
-from sqlalchemy import ForeignKey, String
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from formula10.database.model.user import User
-from formula10.database.model.driver import Driver
-from formula10 import db
-
-
-class PodiumDrivers(db.Model):
-    """
-    A guessed list of each driver that will reach at least a single podium.
-    """
-    __tablename__ = "podiumdrivers"
-    __allow_unmapped__ = True
-    __csv_header__ = ["user_name", "podium_driver_names_json"]
-
-    def __init__(self, user_name: str):
-        self.user_name = user_name
-
-    @staticmethod
-    def from_csv(row: List[str]):
-        podium_drivers: PodiumDrivers = PodiumDrivers(str(row[0]))
-        podium_drivers.podium_driver_names_json = str(row[1])
-        return podium_drivers
-
-    def to_csv(self) -> List[Any]:
-        return [
-            self.user_name,
-            self.podium_driver_names_json
-        ]
-
-    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    podium_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
-
-    @property
-    def podium_driver_names(self) -> List[str]:
-        return json.loads(self.podium_driver_names_json)
-
-    @podium_driver_names.setter
-    def podium_driver_names(self, new_podium_driver_names: List[str]):
-        self.podium_driver_names_json = json.dumps(new_podium_driver_names)
-
-    # Relationships
-    user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
-    _podium_drivers: List[Driver] | None = None
-
-    @property
-    def podium_drivers(self) -> List[Driver]:
-        if self._podium_drivers is None:
-            self._podium_drivers = list()
-            for driver_name in self.podium_driver_names:
-                driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
-                if driver is None:
-                    raise Exception(f"Error: Couldn't find driver with id {driver_name}")
-
-                self._podium_drivers.append(driver)
-
-        return self._podium_drivers

formula10/database/model/race_guess.py

@@ -1,46 +0,0 @@
-from typing import Any, List
-from sqlalchemy import ForeignKey
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from formula10.database.model.user import User
-from formula10.database.model.race import Race
-from formula10.database.model.driver import Driver
-from formula10 import db
-
-class RaceGuess(db.Model):
-    """
-    A guess a user made for a race.
-    It stores the corresponding race and the guessed drivers for PXX and DNF.
-    """
-    __tablename__ = "raceguess"
-    __csv_header__ = ["user_name", "race_name", "pxx_driver_name", "dnf_driver_name"]
-
-    def __init__(self, user_name: str, race_name: str):
-        self.user_name = user_name  # Primary key
-        self.race_name = race_name  # Primery key
-
-    @staticmethod
-    def from_csv(row: List[str]):
-        race_guess: RaceGuess = RaceGuess(str(row[0]), str(row[1]))
-        race_guess.pxx_driver_name = str(row[2])
-        race_guess.dnf_driver_name = str(row[3])
-        return race_guess
-
-    def to_csv(self) -> List[Any]:
-        return [
-            self.user_name,
-            self.race_name,
-            self.pxx_driver_name,
-            self.dnf_driver_name
-        ]
-
-    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    race_name: Mapped[str] = mapped_column(ForeignKey("race.name"), primary_key=True)
-    pxx_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
-    dnf_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
-
-    # Relationships
-    user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
-    race: Mapped["Race"] = relationship("Race", foreign_keys=[race_name])
-    pxx: Mapped["Driver"] = relationship("Driver", foreign_keys=[pxx_driver_name])
-    dnf: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_driver_name])

formula10/database/model/race_result.py

@@ -1,171 +0,0 @@
-import json
-from typing import Any, Dict, List
-from sqlalchemy import ForeignKey, String
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from formula10.database.model.driver import Driver
-from formula10.database.model.race import Race
-from formula10 import db
-
-class RaceResult(db.Model):
-    """
-    The result of a past race.
-    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  # TODO: Used for json conversion, move this to some other class instead
-    __csv_header__ = ["race_name", "pxx_driver_names_json", "first_dnf_driver_names_json", "dnf_driver_names_json", "excluded_driver_names_json"]
-
-    def __init__(self, race_name: str):
-        self.race_name = race_name  # Primary key
-
-    @staticmethod
-    def from_csv(row: List[str]):
-        race_result: RaceResult = RaceResult(str(row[0]))
-        race_result.pxx_driver_names_json = str(row[1])
-        race_result.first_dnf_driver_names_json = str(row[2])
-        race_result.dnf_driver_names_json = str(row[3])
-        race_result.excluded_driver_names_json = str(row[4])
-        return race_result
-
-    def to_csv(self) -> List[Any]:
-        return [
-            self.race_name,
-            self.pxx_driver_names_json,
-            self.first_dnf_driver_names_json,
-            self.dnf_driver_names_json,
-            self.excluded_driver_names_json
-        ]
-
-    race_name: Mapped[str] = mapped_column(ForeignKey("race.name"), primary_key=True)
-    pxx_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
-    first_dnf_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
-    dnf_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
-    excluded_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
-
-    @property
-    def pxx_driver_names(self) -> Dict[str, str]:
-        return json.loads(self.pxx_driver_names_json)
-
-    @pxx_driver_names.setter
-    def pxx_driver_names(self, new_pxx_driver_names: Dict[str, str]):
-        self.pxx_driver_names_json = json.dumps(new_pxx_driver_names)
-
-    @property
-    def first_dnf_driver_names(self) -> List[str]:
-        return json.loads(self.first_dnf_driver_names_json)
-
-    @first_dnf_driver_names.setter
-    def first_dnf_driver_names(self, new_first_dnf_driver_names: List[str]):
-        self.first_dnf_driver_names_json = json.dumps(new_first_dnf_driver_names)
-
-    @property
-    def dnf_driver_names(self) -> List[str]:
-        return json.loads(self.dnf_driver_names_json)
-
-    @dnf_driver_names.setter
-    def dnf_driver_names(self, new_dnf_driver_names: List[str]):
-        self.dnf_driver_names_json = json.dumps(new_dnf_driver_names)
-
-    @property
-    def excluded_driver_names(self) -> List[str]:
-        return json.loads(self.excluded_driver_names_json)
-
-    @excluded_driver_names.setter
-    def excluded_driver_names(self, new_excluded_driver_names: List[str]):
-        self.excluded_driver_names_json = json.dumps(new_excluded_driver_names)
-
-    # Relationships
-    race: Mapped["Race"] = relationship("Race", foreign_keys=[race_name])
-    _pxx_drivers: Dict[str, Driver] | None = None
-    _first_dnf_drivers: List[Driver] | None = None
-    _dnf_drivers: List[Driver] | None = None
-    _excluded_drivers: List[Driver] | None = None
-
-    @property
-    def pxx_drivers(self) -> Dict[str, Driver]:
-        if self._pxx_drivers is None:
-            self._pxx_drivers = dict()
-            for position, driver_name in self.pxx_driver_names.items():
-                driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
-                if driver is None:
-                    raise Exception(f"Error: Couldn't find driver with id {driver_name}")
-
-                self._pxx_drivers[position] = driver
-
-        return self._pxx_drivers
-
-    def pxx_driver(self, offset: int = 0) -> Driver | None:
-        pxx_num: str = str(self.race.pxx + offset)
-
-        if pxx_num not in self.pxx_drivers:
-            raise Exception(f"Position {pxx_num} not found in RaceResult.pxx_drivers")
-
-        if self.pxx_drivers[pxx_num].name in self.excluded_driver_names:
-            none_driver: Driver | None = db.session.query(Driver).filter_by(name="None").first()
-            if none_driver is None:
-                raise Exception(f"NONE-driver not found in database")
-
-            return none_driver
-
-
-        return self.pxx_drivers[pxx_num]
-
-    def pxx_driver_position_string(self, driver_name: str) -> str:
-        for position, driver in self.pxx_driver_names.items():
-            if driver == driver_name and driver not in self.excluded_driver_names:
-                return f"P{position}"
-
-        return "NC"
-
-    @property
-    def all_positions(self) -> List[Driver]:
-        return [
-            self.pxx_drivers[str(position)] for position in range(1, 21)
-        ]
-
-    @property
-    def first_dnf_drivers(self) -> List[Driver]:
-        if self._first_dnf_drivers is None:
-            self._first_dnf_drivers = list()
-            for driver_name in self.first_dnf_driver_names:
-                driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
-                if driver is None:
-                    raise Exception(f"Error: Couldn't find driver with id {driver_name}")
-
-                self._first_dnf_drivers.append(driver)
-
-            if len(self._first_dnf_drivers) == 0:
-                none_driver: Driver | None = db.session.query(Driver).filter_by(name="None").first()
-                if none_driver is None:
-                    raise Exception("NONE-driver not found in database")
-
-                self._first_dnf_drivers.append(none_driver)
-
-        return self._first_dnf_drivers
-
-    @property
-    def dnf_drivers(self) -> List[Driver]:
-        if self._dnf_drivers is None:
-            self._dnf_drivers = list()
-            for driver_name in self.dnf_driver_names:
-                driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
-                if driver is None:
-                    raise Exception(f"Error: Couldn't find driver with id {driver_name}")
-
-                self._dnf_drivers.append(driver)
-
-        return self._dnf_drivers
-
-    @property
-    def excluded_drivers(self) -> List[Driver]:
-        if self._excluded_drivers is None:
-            self._excluded_drivers = list()
-            for driver_name in self.excluded_driver_names:
-                driver: Driver | None = db.session.query(Driver).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.append(driver)
-
-        return self._excluded_drivers

formula10/database/model/season_guess.py

@@ -1,81 +0,0 @@
-from typing import Any, List
-from sqlalchemy import ForeignKey, String
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from formula10.database.model.driver import Driver
-from formula10.database.model.podium_drivers import PodiumDrivers
-from formula10.database.model.team import Team
-from formula10.database.model.team_winners import TeamWinners
-from formula10.database.model.user import User
-from formula10 import db
-
-class SeasonGuess(db.Model):
-    """
-    A collection of bonus guesses for the entire season.
-    """
-    __tablename__ = "seasonguess"
-    __csv_header__ = ["user_name", "hot_take", "p2_team_name",
-                      "overtake_driver_name", "dnf_driver_name", "gained_driver_name", "lost_driver_name",
-                      "team_winners_id", "podium_drivers_id"]
-
-    def __init__(self, user_name: str, team_winners_user_name: str | None = None, podium_drivers_user_name: str | None = None):
-        self.user_name = user_name  # Primary key
-
-        # Although this is the same username, handle separately, in case they don't exist in the database yet
-        if team_winners_user_name is not None:
-            if user_name != team_winners_user_name:
-                raise Exception(f"SeasonGuess for {user_name} was supplied TeamWinners for {team_winners_user_name}")
-
-            self.team_winners_id = team_winners_user_name
-
-        if podium_drivers_user_name is not None:
-            if user_name != podium_drivers_user_name:
-                raise Exception(f"SeasonGuess for {user_name} was supplied PodiumDrivers for {podium_drivers_user_name}")
-
-            self.podium_drivers_id = podium_drivers_user_name
-
-    @staticmethod
-    def from_csv(row: List[str]):
-        season_guess: SeasonGuess = SeasonGuess(str(row[0]), team_winners_user_name=str(row[7]), podium_drivers_user_name=str(row[8]))
-        season_guess.hot_take = str(row[1])
-        season_guess.p2_team_name = str(row[2])
-        season_guess.overtake_driver_name = str(row[3])
-        season_guess.dnf_driver_name = str(row[4])
-        season_guess.gained_driver_name = str(row[5])
-        season_guess.lost_driver_name = str(row[6])
-        return season_guess
-
-    def to_csv(self) -> List[Any]:
-        return [
-            self.user_name,
-            self.hot_take,
-            self.p2_team_name,
-            self.overtake_driver_name,
-            self.dnf_driver_name,
-            self.gained_driver_name,
-            self.lost_driver_name,
-            self.team_winners_id,
-            self.podium_drivers_id
-        ]
-
-    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    hot_take: Mapped[str] = mapped_column(String(512), nullable=True)
-    p2_team_name: Mapped[str] = mapped_column(ForeignKey("team.name"), nullable=True)
-    overtake_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
-    dnf_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
-    gained_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
-    lost_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
-
-    team_winners_id: Mapped[str] = mapped_column(ForeignKey("teamwinners.user_name"))
-    podium_drivers_id: Mapped[str] = mapped_column(ForeignKey("podiumdrivers.user_name"))
-
-    # Relationships
-    user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
-    p2_team: Mapped["Team"] = relationship("Team", foreign_keys=[p2_team_name])
-    overtake_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[overtake_driver_name])
-    dnf_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_driver_name])
-    gained_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[gained_driver_name])
-    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])

formula10/database/model/team_winners.py

@@ -1,59 +0,0 @@
-import json
-from typing import Any, List
-from sqlalchemy import ForeignKey, String
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from formula10.database.model.driver import Driver
-from formula10.database.model.user import User
-from formula10 import db
-
-class TeamWinners(db.Model):
-    """
-    A guessed list of each best driver per team.
-    """
-    __tablename__ = "teamwinners"
-    __allow_unmapped__ = True
-    __csv_header__ = ["user_name", "teamwinner_driver_names_json"]
-
-    def __init__(self, user_name: str):
-        self.user_name = user_name  # Primary key
-
-    @staticmethod
-    def from_csv(row: List[str]):
-        team_winners: TeamWinners = TeamWinners(str(row[0]))
-        team_winners.teamwinner_driver_names_json = str(row[1])
-        return team_winners
-
-    def to_csv(self) -> List[Any]:
-        return [
-            self.user_name,
-            self.teamwinner_driver_names_json
-        ]
-
-    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    teamwinner_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
-
-    @property
-    def teamwinner_driver_names(self) -> List[str]:
-        return json.loads(self.teamwinner_driver_names_json)
-
-    @teamwinner_driver_names.setter
-    def teamwinner_driver_names(self, new_teamwinner_driver_names: List[str]):
-        self.teamwinner_driver_names_json = json.dumps(new_teamwinner_driver_names)
-
-    # Relationships
-    user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
-    _teamwinner_drivers: List[Driver] | None = None
-
-    @property
-    def teamwinners(self) -> List[Driver]:
-        if self._teamwinner_drivers is None:
-            self._teamwinner_drivers = list()
-            for driver_name in self.teamwinner_driver_names:
-                driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
-                if driver is None:
-                    raise Exception(f"Error: Couldn't find driver with id {driver_name}")
-
-                self._teamwinner_drivers.append(driver)
-
-        return self._teamwinner_drivers

formula10/database/model/user.py

@@ -1,32 +0,0 @@
-from typing import Any, List
-from urllib.parse import quote
-from sqlalchemy import String
-from sqlalchemy.orm import Mapped, mapped_column
-
-from formula10 import db
-
-class User(db.Model):
-    """
-    A user that can guess races (name only).
-    """
-    __tablename__ = "user"
-    __csv_header__ = ["name"]
-
-    def __init__(self, name: str):
-        self.name = name  # Primary key
-
-    @staticmethod
-    def from_csv(row: List[str]):
-        user: User = User(str(row[0]))
-        return user
-
-    def to_csv(self) -> List[Any]:
-        return [
-            self.name
-        ]
-
-    @property
-    def name_sanitized(self) -> str:
-        return quote(self.name)
-
-    name: Mapped[str] = mapped_column(String(32), primary_key=True)

formula10/database/update_queries.py

@@ -1,32 +1,31 @@
+import json
 from typing import Dict, List, cast
 from urllib.parse import quote
 from flask import redirect
 from werkzeug import Response
 
-from formula10.database.common_query_util import race_has_result, user_exists
-from formula10.database.model.podium_drivers import PodiumDrivers
-from formula10.database.model.race_guess import RaceGuess
-from formula10.database.model.race_result import RaceResult
-from formula10.database.model.season_guess import SeasonGuess
-from formula10.database.model.team_winners import TeamWinners
-from formula10.database.model.user import User
-from formula10.database.validation_util import any_is_none, positions_are_contiguous
+from formula10.database.common_queries import race_has_result, user_exists_and_disabled, user_exists_and_enabled
+from formula10.database.model.db_race_guess import DbRaceGuess
+from formula10.database.model.db_race_result import DbRaceResult
+from formula10.database.model.db_season_guess import DbSeasonGuess
+from formula10.database.model.db_user import DbUser
+from formula10.database.validation import any_is_none, positions_are_contiguous
 from formula10 import db
 
 
-def find_or_create_race_guess(user_name: str, race_name: str) -> RaceGuess:
+def find_or_create_race_guess(user_name: str, race_name: str) -> DbRaceGuess:
     # There can be a single RaceGuess at most, since (user_name, race_name) is the composite primary key
-    race_guess: RaceGuess | None = db.session.query(RaceGuess).filter_by(user_name=user_name, race_name=race_name).first()
+    race_guess: DbRaceGuess | None = db.session.query(DbRaceGuess).filter_by(user_name=user_name, race_name=race_name).first()
     if race_guess is not None:
         return race_guess
 
     # Insert a new RaceGuess
-    race_guess = RaceGuess(user_name=user_name, race_name=race_name)
+    race_guess = DbRaceGuess(user_name=user_name, race_name=race_name, pxx_driver_name="TEMP", dnf_driver_name="TEMP")
     db.session.add(race_guess)
     db.session.commit()
 
     # Double check if database insertion worked and obtain any values set by the database
-    race_guess = db.session.query(RaceGuess).filter_by(user_name=user_name, race_name=race_name).first()
+    race_guess = db.session.query(DbRaceGuess).filter_by(user_name=user_name, race_name=race_name).first()
     if race_guess is None:
         raise Exception("Failed adding RaceGuess to the database")
 
@@ -46,7 +45,7 @@ def update_race_guess(race_name: str, user_name: str, pxx_select: str | None, dn
     if race_has_result(race_name):
         return redirect(f"/race/{quote(user_name)}")
 
-    race_guess: RaceGuess = find_or_create_race_guess(user_name, race_name)
+    race_guess: DbRaceGuess = find_or_create_race_guess(user_name, race_name)
     race_guess.pxx_driver_name = pxx_driver_name
     race_guess.dnf_driver_name = dnf_driver_name
 
@@ -60,70 +59,25 @@ def delete_race_guess(race_name: str, user_name: str) -> Response:
     if race_has_result(race_name):
         return redirect(f"/race/{quote(user_name)}")
 
-    db.session.query(RaceGuess).filter_by(race_name=race_name, user_name=user_name).delete()
+    db.session.query(DbRaceGuess).filter_by(race_name=race_name, user_name=user_name).delete()
     db.session.commit()
 
     return redirect("/race/Everyone")
 
 
-def find_or_create_team_winners(user_name: str) -> TeamWinners:
-    # There can be a single TeamWinners at most, since user_name is the primary key
-    team_winners: TeamWinners | None = db.session.query(TeamWinners).filter_by(user_name=user_name).first()
-    if team_winners is not None:
-        return team_winners
-
-    team_winners = TeamWinners(user_name=user_name)
-    db.session.add(team_winners)
-    db.session.commit()
-
-    # Double check if database insertion worked and obtain any values set by the database
-    team_winners = db.session.query(TeamWinners).filter_by(user_name=user_name).first()
-    if team_winners is None:
-        raise Exception("Failed adding TeamWinners to the database")
-
-    return team_winners
-
-
-def find_or_create_podium_drivers(user_name: str) -> PodiumDrivers:
-    # There can be a single PodiumDrivers at most, since user_name is the primary key
-    podium_drivers: PodiumDrivers | None = db.session.query(PodiumDrivers).filter_by(user_name=user_name).first()
-    if podium_drivers is not None:
-        return podium_drivers
-
-    podium_drivers = PodiumDrivers(user_name=user_name)
-    db.session.add(podium_drivers)
-    db.session.commit()
-
-    # Double check if database insertion worked and obtain any values set by the database
-    podium_drivers = db.session.query(PodiumDrivers).filter_by(user_name=user_name).first()
-    if podium_drivers is None:
-        raise Exception("Failed adding PodiumDrivers to the database")
-
-    return podium_drivers
-
-
-def find_or_create_season_guess(user_name: str) -> SeasonGuess:
+def find_or_create_season_guess(user_name: str) -> DbSeasonGuess:
     # There can be a single SeasonGuess at most, since user_name is the primary key
-    season_guess: SeasonGuess | None = db.session.query(SeasonGuess).filter_by(user_name=user_name).first()
+    season_guess: DbSeasonGuess | None = db.session.query(DbSeasonGuess).filter_by(user_name=user_name).first()
     if season_guess is not None:
-        # There can't be more than a single one, since both also use user_name as primary key
-        if db.session.query(TeamWinners).filter_by(user_name=user_name).first() is None:
-            raise Exception(f"SeasonGuess for {user_name} is missing associated TeamWinners")
-        if db.session.query(PodiumDrivers).filter_by(user_name=user_name).first() is None:
-            raise Exception(f"SeasonGuess for {user_name} is missing associated PodiumDrivers")
-
         return season_guess
 
     # Insert a new SeasonGuess
-    team_winners: TeamWinners = find_or_create_team_winners(user_name)
-    podium_drivers: PodiumDrivers = find_or_create_podium_drivers(user_name)
-
-    season_guess = SeasonGuess(user_name=user_name, team_winners_user_name=team_winners.user_name, podium_drivers_user_name=podium_drivers.user_name)
+    season_guess = DbSeasonGuess(user_name=user_name, team_winners_driver_names_json=json.dumps(["TEMP"]), podium_drivers_driver_names_json=json.dumps(["TEMP"]))
     db.session.add(season_guess)
     db.session.commit()
 
     # Double check if database insertion worked and obtain any values set by the database
-    season_guess = db.session.query(SeasonGuess).filter_by(user_name=user_name).first()
+    season_guess = db.session.query(DbSeasonGuess).filter_by(user_name=user_name).first()
     if season_guess is None:
         raise Exception("Failed adding SeasonGuess to the database")
 
@@ -133,33 +87,37 @@ def find_or_create_season_guess(user_name: str) -> SeasonGuess:
 def update_season_guess(user_name: str, guesses: List[str | None], team_winner_guesses: List[str | None], podium_driver_guesses: List[str]) -> Response:
     # Pylance marks type errors here, but those are intended. Columns are marked nullable.
 
-    season_guess: SeasonGuess = find_or_create_season_guess(user_name)
+    season_guess: DbSeasonGuess = find_or_create_season_guess(user_name)
     season_guess.hot_take = guesses[0]  # type: ignore
     season_guess.p2_team_name = guesses[1]  # type: ignore
     season_guess.overtake_driver_name = guesses[2]  # type: ignore
     season_guess.dnf_driver_name = guesses[3]  # type: ignore
     season_guess.gained_driver_name = guesses[4]  # type: ignore
     season_guess.lost_driver_name = guesses[5]  # type: ignore
-    season_guess.team_winners.teamwinner_driver_names = team_winner_guesses  # type: ignore
-    season_guess.podium_drivers.podium_driver_names = podium_driver_guesses
+    season_guess.team_winners_driver_names_json = json.dumps(team_winner_guesses)
+    season_guess.podium_drivers_driver_names_json = json.dumps(podium_driver_guesses)
 
     db.session.commit()
 
     return redirect(f"/season/Everyone")
 
 
-def find_or_create_race_result(race_name: str) -> RaceResult:
+def find_or_create_race_result(race_name: str) -> DbRaceResult:
     # There can be a single RaceResult at most, since race_name is the primary key
-    race_result: RaceResult | None = db.session.query(RaceResult).filter_by(race_name=race_name).first()
+    race_result: DbRaceResult | None = db.session.query(DbRaceResult).filter_by(race_name=race_name).first()
     if race_result is not None:
         return race_result
 
-    race_result = RaceResult(race_name=race_name)
+    race_result = DbRaceResult(race_name=race_name,
+                               pxx_driver_names_json=json.dumps(["TEMP"]),
+                               first_dnf_driver_names_json=json.dumps(["TEMP"]),
+                               dnf_driver_names_json=json.dumps(["TEMP"]),
+                               excluded_driver_names_json=json.dumps(["TEMP"]))
     db.session.add(race_result)
     db.session.commit()
 
     # Double check if database insertion worked and obtain any values set by the database
-    race_result = db.session.query(RaceResult).filter_by(race_name=race_name).first()
+    race_result = db.session.query(DbRaceResult).filter_by(race_name=race_name).first()
     if race_result is None:
         raise Exception("Failed adding RaceResult to the database")
 
@@ -185,11 +143,15 @@ def update_race_result(race_name: str, pxx_driver_names_list: List[str], first_d
         if driver_name not in dnf_driver_names_list:
             dnf_driver_names_list.append(driver_name)
 
-    race_result: RaceResult = find_or_create_race_result(race_name)
-    race_result.pxx_driver_names = pxx_driver_names
-    race_result.first_dnf_driver_names = first_dnf_driver_names_list
-    race_result.dnf_driver_names = dnf_driver_names_list
-    race_result.excluded_driver_names = excluded_driver_names_list
+    # There can't be dnfs but no initial dnfs
+    if len(dnf_driver_names_list) > 0 and len(first_dnf_driver_names_list) == 0:
+        return redirect(f"/result/{quote(race_name)}")
+
+    race_result: DbRaceResult = find_or_create_race_result(race_name)
+    race_result.pxx_driver_names_json = json.dumps(pxx_driver_names)
+    race_result.first_dnf_driver_names_json = json.dumps(first_dnf_driver_names_list)
+    race_result.dnf_driver_names_json = json.dumps(dnf_driver_names_list)
+    race_result.excluded_driver_names_json = json.dumps(excluded_driver_names_list)
 
     db.session.commit()
 
@@ -207,21 +169,32 @@ def update_user(user_name: str | None, add: bool = False, delete: bool = False)
         return redirect("/user")
 
     if add:
-        if user_exists(user_name):
+        if user_exists_and_enabled(user_name):
             return redirect("/user")
 
-        user: User = User(name=user_name)
-        db.session.add(user)
+        elif user_exists_and_disabled(user_name):
+            disabled_user: DbUser | None = db.session.query(DbUser).filter_by(name=user_name, enabled=False).first()
+            if disabled_user is None:
+                raise Exception("update_user couldn't reenable user")
+
+            disabled_user.enabled = True
+
+        else:
+            user: DbUser = DbUser(name=user_name, enabled=True)
+            db.session.add(user)
+
         db.session.commit()
 
         return redirect("/user")
 
     if delete:
-        if not user_exists(user_name):
-            return redirect("/user")
+        if user_exists_and_enabled(user_name):
+            enabled_user: DbUser | None = db.session.query(DbUser).filter_by(name=user_name, enabled=True).first()
+            if enabled_user is None:
+                raise Exception("update_user couldn't disable user")
 
-        db.session.query(User).filter_by(name=user_name).delete()
-        db.session.commit()
+            enabled_user.enabled = False
+            db.session.commit()
 
         return redirect("/user")
 

formula10/database/validation.py

@@ -22,7 +22,7 @@ def positions_are_contiguous(positions: List[str]) -> bool:
     return positions_sorted[0] + len(positions_sorted) - 1 == positions_sorted[-1]
 
 
-def find_first_or_none(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T | None:
+def find_first_else_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.
@@ -30,7 +30,13 @@ def find_first_or_none(predicate: Callable[[_T], bool], iterable: Iterable[_T])
     return next(filter(predicate, iterable), None)
 
 
-def find_multiple(predicate: Callable[[_T], bool], iterable: Iterable[_T], count: int = 0) -> List[_T]:
+def find_multiple(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> List[_T]:
+    filtered = list(filter(predicate, iterable))
+
+    return filtered
+
+
+def find_multiple_strict(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.
@@ -43,7 +49,7 @@ def find_multiple(predicate: Callable[[_T], bool], iterable: Iterable[_T], count
     return filtered
 
 
-def find_single(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T:
+def find_single_strict(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.
@@ -56,7 +62,7 @@ def find_single(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T:
     return filtered[0]
 
 
-def find_single_or_none(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T | None:
+def find_single_or_none_strict(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.