Large database migration

formula10/database/model/db_driver.py

@@ -1,5 +1,4 @@
-from typing import List
-from sqlalchemy import String, ForeignKey
+from sqlalchemy import Integer, String, ForeignKey
 from sqlalchemy.orm import mapped_column, Mapped, relationship
 
 from formula10.database.model.db_team import DbTeam
@@ -13,21 +12,14 @@ class DbDriver(db.Model):
     """
     __tablename__ = "driver"
 
-    def __init__(self, *, name: str):
-        self.name = name  # Primary key
+    def __init__(self, *, id: int):
+        self.id = id  # 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))
-    team_name: Mapped[str] = mapped_column(ForeignKey("team.name"))
-    country_code: Mapped[str] = mapped_column(String(2))  # alpha-2 code
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=False)
+    name: Mapped[str] = mapped_column(String(32), nullable=False, unique=True)
+    abbr: Mapped[str] = mapped_column(String(4), nullable=False, unique=True)
+    team_id: Mapped[str] = mapped_column(ForeignKey("team.id"), nullable=False)
+    country_code: Mapped[str] = mapped_column(String(2), nullable=False)  # alpha-2 code
 
     # Relationships
-    team: Mapped[DbTeam] = relationship("DbTeam", foreign_keys=[team_name])
+    team: Mapped[DbTeam] = relationship("DbTeam", foreign_keys=[team_id])

formula10/database/model/db_race.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from typing import List
 from sqlalchemy import DateTime, Integer, String
 from sqlalchemy.orm import Mapped, mapped_column
 
@@ -13,22 +12,11 @@ class DbRace(db.Model):
     """
     __tablename__ = "race"
 
-    def __init__(self, *, name: str, number: int, date: datetime, pxx: int):
-        self.name = name  # Primary key
+    def __init__(self, *, id: int):
+        self.id = id  # Primary key
 
-        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(str(row[2]), "%Y-%m-%d-%H-%M"),
-                              pxx=int(row[3]))
-        return db_race
-
-    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)  # This is the place to guess
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=False)
+    name: Mapped[str] = mapped_column(String(64), nullable=False, unique=True)
+    number: Mapped[int] = mapped_column(Integer, nullable=False, unique=True)
+    date: Mapped[datetime] = mapped_column(DateTime, nullable=False, unique=True)
+    pxx: Mapped[int] = mapped_column(Integer, nullable=False)  # This is the place to guess

formula10/database/model/db_race_guess.py

@@ -1,4 +1,3 @@
-from typing import Any, List
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -14,38 +13,18 @@ class DbRaceGuess(db.Model):
     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
+    def __init__(self, *, user_id: int, race_id: int):
+        self.user_id = user_id  # Primary key
+        self.race_id = race_id  # 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"))
+    user_id: Mapped[int] = mapped_column(ForeignKey("user.id"), primary_key=True)
+    race_id: Mapped[int] = mapped_column(ForeignKey("race.id"), primary_key=True)
+    pxx_driver_id: Mapped[int] = mapped_column(ForeignKey("driver.id"), nullable=False)
+    dnf_driver_id: Mapped[int] = mapped_column(ForeignKey("driver.id"), nullable=False)
 
     # 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])
+    user: Mapped[DbUser] = relationship("DbUser", foreign_keys=[user_id])
+    race: Mapped[DbRace] = relationship("DbRace", foreign_keys=[race_id])
+    pxx: Mapped[DbDriver] = relationship("DbDriver", foreign_keys=[pxx_driver_id])
+    dnf: Mapped[DbDriver] = relationship("DbDriver", foreign_keys=[dnf_driver_id])

formula10/database/model/db_race_result.py

@@ -1,4 +1,3 @@
-from typing import Any, List
 from sqlalchemy import ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -11,39 +10,15 @@ class DbRaceResult(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"
-    __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
+    def __init__(self, *, race_id: int):
+        self.race_id = race_id  # 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))
+    race_id: Mapped[int] = mapped_column(ForeignKey("race.id"), primary_key=True)
+    pxx_driver_ids_json: Mapped[str] = mapped_column(String(1024), nullable=False)
+    first_dnf_driver_ids_json: Mapped[str] = mapped_column(String(1024), nullable=False)
+    dnf_driver_ids_json: Mapped[str] = mapped_column(String(1024), nullable=False)
+    excluded_driver_ids_json: Mapped[str] = mapped_column(String(1024), nullable=False)
 
     # Relationships
-    race: Mapped[DbRace] = relationship("DbRace", foreign_keys=[race_name])
+    race: Mapped[DbRace] = relationship("DbRace", foreign_keys=[race_id])

formula10/database/model/db_season_guess.py

@@ -1,4 +1,3 @@
-from typing import Any, List
 from sqlalchemy import ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -12,56 +11,24 @@ 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
+    def __init__(self, *, user_id: int):
+        self.user_id = user_id  # 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)
+    user_id: Mapped[int] = mapped_column(ForeignKey("user.id"), 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))
+    p2_team_id: Mapped[int | None] = mapped_column(ForeignKey("team.id"), nullable=True)
+    overtake_driver_id: Mapped[int | None] = mapped_column(ForeignKey("driver.id"), nullable=True)
+    dnf_driver_id: Mapped[int | None] = mapped_column(ForeignKey("driver.id"), nullable=True)
+    gained_driver_id: Mapped[int | None] = mapped_column(ForeignKey("driver.id"), nullable=True)
+    lost_driver_id: Mapped[int | None] = mapped_column(ForeignKey("driver.id"), nullable=True)
+    team_winners_driver_ids_json: Mapped[str] = mapped_column(String(1024))
+    podium_drivers_driver_ids_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])
+    user: Mapped[DbUser] = relationship("DbUser", foreign_keys=[user_id])
+    p2_team: Mapped[DbTeam | None] = relationship("DbTeam", foreign_keys=[p2_team_id])
+    overtake_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[overtake_driver_id])
+    dnf_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[dnf_driver_id])
+    gained_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[gained_driver_id])
+    lost_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[lost_driver_id])

formula10/database/model/db_season_guess_result.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from sqlalchemy import Boolean, ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -12,33 +10,13 @@ class DbSeasonGuessResult(db.Model):
     """
 
     __tablename__ = "seasonguessresult"
-    __csv_header__ = ["user_name", "hot_take_correct", "overtakes_correct"]
 
-    def __init__(self, *, user_name: str, hot_take_correct: bool, overtakes_correct: bool):
-        self.user_name = user_name  # Primary key
+    def __init__(self, *, user_id: int):
+        self.user_id = user_id  # Primary key
 
-        self.hot_take_correct = hot_take_correct
-        self.overtakes_correct = overtakes_correct
-
-    @classmethod
-    def from_csv(cls, row: List[str]):
-        db_season_guess_result: DbSeasonGuessResult = cls(user_name=str(row[0]),
-                                                          hot_take_correct=True if str(row[1])=="True" else False,
-                                                          overtakes_correct=True if str(row[2])=="True" else False)
-
-        return db_season_guess_result
-
-    # This object can't be edited from the page context
-    # def to_csv(self) -> List[Any]:
-    #     return [
-    #         self.user_name,
-    #         self.hot_take_correct,
-    #         self.overtakes_correct
-    #     ]
-
-    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    hot_take_correct: Mapped[bool] = mapped_column(Boolean)
-    overtakes_correct: Mapped[bool] = mapped_column(Boolean)
+    user_id: Mapped[int] = mapped_column(ForeignKey("user.id"), primary_key=True)
+    hot_take_correct: Mapped[bool] = mapped_column(Boolean, nullable=False)
+    overtakes_correct: Mapped[bool] = mapped_column(Boolean, nullable=False)
 
     # Relationships
-    user: Mapped[DbUser] = relationship("DbUser", foreign_keys=[user_name])
+    user: Mapped[DbUser] = relationship("DbUser", foreign_keys=[user_id])

formula10/database/model/db_team.py

@@ -1,5 +1,4 @@
-from typing import List
-from sqlalchemy import String
+from sqlalchemy import Integer, String
 from sqlalchemy.orm import Mapped, mapped_column
 
 from formula10 import db
@@ -11,12 +10,8 @@ class DbTeam(db.Model):
     """
     __tablename__ = "team"
 
-    def __init__(self, *, name: str):
-        self.name = name  # Primary key
+    def __init__(self, *, id: int):
+        self.id = id  # 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)
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=False)
+    name: Mapped[str] = mapped_column(String(32), nullable=False, unique=True)

formula10/database/model/db_user.py

@@ -1,5 +1,4 @@
-from typing import Any, List
-from sqlalchemy import Boolean, String
+from sqlalchemy import Boolean, Integer, String
 from sqlalchemy.orm import Mapped, mapped_column
 
 from formula10 import db
@@ -10,24 +9,11 @@ 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
+    def __init__(self, *, id: int | None):
+        if id is not None:
+            self.id = id  # Primary key
 
-        self.enabled = enabled
-
-    @classmethod
-    def from_csv(cls, row: List[str]):
-        db_user: DbUser = cls(name=str(row[0]),
-                              enabled=True if str(row[1])=="True" else False)
-        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)
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    name: Mapped[str] = mapped_column(String(32), nullable=False, unique=True)
+    enabled: Mapped[bool] = mapped_column(Boolean, nullable=False)