Finish restructuring files
All checks were successful
Build Formula10 Docker Image / build-docker (push) Successful in 14s
All checks were successful
Build Formula10 Docker Image / build-docker (push) Successful in 14s
This commit is contained in:
10
formula10/database/common_query_util.py
Normal file
10
formula10/database/common_query_util.py
Normal file
@ -0,0 +1,10 @@
|
||||
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
|
107
formula10/database/import_export_util.py
Normal file
107
formula10/database/import_export_util.py
Normal file
@ -0,0 +1,107 @@
|
||||
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
|
||||
|
||||
|
||||
def load_csv(filename: str) -> List[List[str]]:
|
||||
if not os.path.exists(filename):
|
||||
print(f"Could not load data from file {filename}, as it doesn't exist!")
|
||||
return []
|
||||
|
||||
with open(filename, "r", newline="") as file:
|
||||
reader = csv.reader(file, delimiter=",")
|
||||
next(reader, None) # skip header
|
||||
return list(reader)
|
||||
|
||||
|
||||
def write_csv(filename: str, objects: List[Any]):
|
||||
if len(objects) == 0:
|
||||
print(f"Could not write objects to file {filename}, as no objects were given!")
|
||||
return
|
||||
|
||||
with open(filename, "w", newline="") as file:
|
||||
writer = csv.writer(file, delimiter=",")
|
||||
writer.writerow(objects[0].__csv_header__)
|
||||
for obj in objects:
|
||||
writer.writerow(obj.to_csv())
|
||||
|
||||
|
||||
# Reload static database data, this has to be called from the app context
|
||||
def reload_static_data():
|
||||
print("Initializing Database with Static Values...")
|
||||
# Create it (if it doesn't exist!)
|
||||
db.create_all()
|
||||
|
||||
# Clear static data
|
||||
db.session.query(Team).delete()
|
||||
db.session.query(Driver).delete()
|
||||
db.session.query(Race).delete()
|
||||
|
||||
# Reload static data
|
||||
for row in load_csv("../../data/static_import/teams.csv"):
|
||||
db.session.add(Team.from_csv(row))
|
||||
for row in load_csv("../../data/static_import/drivers.csv"):
|
||||
db.session.add(Driver.from_csv(row))
|
||||
for row in load_csv("../../data/static_import/races.csv"):
|
||||
db.session.add(Race.from_csv(row))
|
||||
|
||||
db.session.commit()
|
||||
|
||||
|
||||
def reload_dynamic_data():
|
||||
print("Initializing Database with Dynamic Values...")
|
||||
# Create it (if it doesn't exist!)
|
||||
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()
|
||||
|
||||
# Reload dynamic data
|
||||
for row in load_csv("../../data/dynamic_export/users.csv"):
|
||||
db.session.add(User.from_csv(row))
|
||||
for row in load_csv("../../data/dynamic_export/raceresults.csv"):
|
||||
db.session.add(RaceResult.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))
|
||||
for row in load_csv("../../data/dynamic_export/seasonguesses.csv"):
|
||||
db.session.add(SeasonGuess.from_csv(row))
|
||||
|
||||
db.session.commit()
|
||||
|
||||
|
||||
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()
|
||||
|
||||
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)
|
31
formula10/database/model/driver.py
Normal file
31
formula10/database/model/driver.py
Normal file
@ -0,0 +1,31 @@
|
||||
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 import db
|
||||
|
||||
|
||||
class Driver(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
|
||||
|
||||
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
|
||||
|
||||
# Relationships
|
||||
team: Mapped["Team"] = relationship("Team", foreign_keys=[team_name])
|
60
formula10/database/model/podium_drivers.py
Normal file
60
formula10/database/model/podium_drivers.py
Normal file
@ -0,0 +1,60 @@
|
||||
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
|
33
formula10/database/model/race.py
Normal file
33
formula10/database/model/race.py
Normal file
@ -0,0 +1,33 @@
|
||||
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):
|
||||
"""
|
||||
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
|
||||
|
||||
@property
|
||||
def name_sanitized(self) -> str:
|
||||
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) # This is the place to guess
|
46
formula10/database/model/race_guess.py
Normal file
46
formula10/database/model/race_guess.py
Normal file
@ -0,0 +1,46 @@
|
||||
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])
|
171
formula10/database/model/race_result.py
Normal file
171
formula10/database/model/race_result.py
Normal file
@ -0,0 +1,171 @@
|
||||
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
|
81
formula10/database/model/season_guess.py
Normal file
81
formula10/database/model/season_guess.py
Normal file
@ -0,0 +1,81 @@
|
||||
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])
|
19
formula10/database/model/team.py
Normal file
19
formula10/database/model/team.py
Normal file
@ -0,0 +1,19 @@
|
||||
from typing import List
|
||||
from sqlalchemy import String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from formula10 import db
|
||||
|
||||
class Team(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
|
||||
|
||||
name: Mapped[str] = mapped_column(String(32), primary_key=True)
|
59
formula10/database/model/team_winners.py
Normal file
59
formula10/database/model/team_winners.py
Normal file
@ -0,0 +1,59 @@
|
||||
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
|
32
formula10/database/model/user.py
Normal file
32
formula10/database/model/user.py
Normal file
@ -0,0 +1,32 @@
|
||||
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)
|
228
formula10/database/update_query_util.py
Normal file
228
formula10/database/update_query_util.py
Normal file
@ -0,0 +1,228 @@
|
||||
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 import db
|
||||
|
||||
|
||||
def find_or_create_race_guess(user_name: str, race_name: str) -> RaceGuess:
|
||||
# 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()
|
||||
if race_guess is not None:
|
||||
return race_guess
|
||||
|
||||
# Insert a new RaceGuess
|
||||
race_guess = RaceGuess(user_name=user_name, race_name=race_name)
|
||||
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()
|
||||
if race_guess is None:
|
||||
raise Exception("Failed adding RaceGuess to the database")
|
||||
|
||||
return race_guess
|
||||
|
||||
|
||||
def update_race_guess(race_name: str, user_name: str, pxx_select: str | None, dnf_select: str | None) -> Response:
|
||||
if any_is_none(pxx_select, dnf_select):
|
||||
return redirect(f"/race/{quote(user_name)}")
|
||||
|
||||
pxx_driver_name: str = cast(str, pxx_select)
|
||||
dnf_driver_name: str = cast(str, dnf_select)
|
||||
|
||||
# TODO: Date-lock this. Otherwise there is a period of time after the race
|
||||
# but before the result where guesses can still be entered
|
||||
# We can't guess for races that are already over
|
||||
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.pxx_driver_name = pxx_driver_name
|
||||
race_guess.dnf_driver_name = dnf_driver_name
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/race/Everyone")
|
||||
|
||||
|
||||
def delete_race_guess(race_name: str, user_name: str) -> Response:
|
||||
# Don't change guesses that are already over
|
||||
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.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:
|
||||
# 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()
|
||||
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)
|
||||
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()
|
||||
if season_guess is None:
|
||||
raise Exception("Failed adding SeasonGuess to the database")
|
||||
|
||||
return season_guess
|
||||
|
||||
|
||||
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.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
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return redirect(f"/season/Everyone")
|
||||
|
||||
|
||||
def find_or_create_race_result(race_name: str) -> RaceResult:
|
||||
# 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()
|
||||
if race_result is not None:
|
||||
return race_result
|
||||
|
||||
race_result = RaceResult(race_name=race_name)
|
||||
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()
|
||||
if race_result is None:
|
||||
raise Exception("Failed adding RaceResult to the database")
|
||||
|
||||
return race_result
|
||||
|
||||
|
||||
def update_race_result(race_name: str, pxx_driver_names_list: List[str], first_dnf_driver_names_list: List[str], dnf_driver_names_list: List[str], excluded_driver_names_list: List[str]) -> Response:
|
||||
# Use strings as keys, as these dicts will be serialized to json
|
||||
pxx_driver_names: Dict[str, str] = {
|
||||
str(position + 1): driver for position, driver in enumerate(pxx_driver_names_list)
|
||||
}
|
||||
|
||||
# Not counted drivers have to be at the end
|
||||
excluded_driver_names: Dict[str, str] = {
|
||||
str(position + 1): driver for position, driver in enumerate(pxx_driver_names_list)
|
||||
if driver in excluded_driver_names_list
|
||||
}
|
||||
if len(excluded_driver_names) > 0 and (not "20" in excluded_driver_names or not positions_are_contiguous(list(excluded_driver_names.keys()))):
|
||||
return redirect(f"/result/{quote(race_name)}")
|
||||
|
||||
# First DNF drivers have to be contained in DNF drivers
|
||||
for driver_name in first_dnf_driver_names_list:
|
||||
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
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return redirect(f"/result/{quote(race_name)}")
|
||||
|
||||
|
||||
def update_user(user_name: str | None, add: bool = False, delete: bool = False) -> Response:
|
||||
if user_name is None or len(user_name) < 3:
|
||||
return redirect("/user")
|
||||
|
||||
if not add and not delete:
|
||||
return redirect("/user")
|
||||
|
||||
if add and delete:
|
||||
return redirect("/user")
|
||||
|
||||
if add:
|
||||
if user_exists(user_name):
|
||||
return redirect("/user")
|
||||
|
||||
user: User = User(name=user_name)
|
||||
db.session.add(user)
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/user")
|
||||
|
||||
if delete:
|
||||
if not user_exists(user_name):
|
||||
return redirect("/user")
|
||||
|
||||
db.session.query(User).filter_by(name=user_name).delete()
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/user")
|
||||
|
||||
raise Exception("update_user received illegal combination of arguments")
|
69
formula10/database/validation_util.py
Normal file
69
formula10/database/validation_util.py
Normal file
@ -0,0 +1,69 @@
|
||||
from typing import Any, Callable, Iterable, List, TypeVar
|
||||
|
||||
_T = TypeVar("_T")
|
||||
|
||||
|
||||
def any_is_none(*args: Any) -> bool:
|
||||
for arg in args:
|
||||
if arg is None:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
def positions_are_contiguous(positions: List[str]) -> bool:
|
||||
if len(positions) == 0:
|
||||
return True
|
||||
|
||||
positions_unique = set(positions) # Remove duplicates
|
||||
positions_sorted: List[int] = sorted([int(position) for position in positions_unique])
|
||||
|
||||
# [2, 3, 4, 5]: 2 + 3 == 5
|
||||
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:
|
||||
"""
|
||||
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
|
Reference in New Issue
Block a user