christoph/flask-formula10
1
Fork 0
Code Issues 14 Actions Packages Activity

Update database model

Browse Source
This commit is contained in:
Christoph Urlacher
2023-11-03 22:48:34 +01:00
parent 3cd1b330a2
commit d8d4b912aa
1 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
model.py
View File

@ -12,13 +12,11 @@ class GrandPrix(db.Model):
__tablename__ = "grandprix" __tablename__ = "grandprix"
def from_csv(self, row): def from_csv(self, row):
self.id = int(row[0]) self.name = str(row[0])
self.name = str(row[1]) self.country_code = str(row[1])
self.country_code = str(row[2])
return self return self
id: Mapped[int] = mapped_column(Integer, primary_key=True) name: Mapped[str] = mapped_column(String(64), primary_key=True)
name: Mapped[str] = mapped_column(String(64))
country_code: Mapped[str] = mapped_column(String(2)) # alpha-2 code country_code: Mapped[str] = mapped_column(String(2)) # alpha-2 code
# This table contains season information # This table contains season information
@ -26,11 +24,11 @@ class Season(db.Model):
__tablename__ = "season" __tablename__ = "season"
def from_csv(self, row): def from_csv(self, row):
self.id = int(row[0]) self.year = int(row[0])
self.active = bool(row[1]) self.active = bool(row[1])
return self return self
id: Mapped[int] = mapped_column(Integer, primary_key=True) year: Mapped[int] = mapped_column(Integer, primary_key=True) # This is the year
active: Mapped[bool] = mapped_column(Boolean) # Only allow guessing the current season active: Mapped[bool] = mapped_column(Boolean) # Only allow guessing the current season
# This table contains manifestations of GPs, with dates # This table contains manifestations of GPs, with dates
@ -38,15 +36,17 @@ class Race(db.Model):
__tablename__ = "race" __tablename__ = "race"
def from_csv(self, row): def from_csv(self, row):
self.id = int(row[0]) self.id = int(row[0])
self.grandprix_id = int(row[1]) self.grandprix_id = str(row[1])
self.season_id = int(row[2]) self.season_id = int(row[2])
self.date = datetime.strptime(row[3], "%y-%m-%d %H:%M") self.number = int(row[3])
self.date = datetime.strptime(row[4], "%Y-%m-%d")
return self return self
id: Mapped[int] = mapped_column(Integer, primary_key=True) id: Mapped[int] = mapped_column(Integer, primary_key=True)
grandprix_id: Mapped[int] = mapped_column(ForeignKey("grandprix.id")) grandprix_id: Mapped[str] = mapped_column(ForeignKey("grandprix.name"))
season_id: Mapped[int] = mapped_column(ForeignKey("season.id")) season_id: Mapped[int] = mapped_column(ForeignKey("season.year"))
number: Mapped[int] = mapped_column(Integer)
date: Mapped[datetime] = mapped_column(DateTime) date: Mapped[datetime] = mapped_column(DateTime)
grandprix: Mapped["GrandPrix"] = relationship("GrandPrix", foreign_keys=[grandprix_id]) grandprix: Mapped["GrandPrix"] = relationship("GrandPrix", foreign_keys=[grandprix_id])
@ -57,13 +57,11 @@ class Team(db.Model):
__tablename__ = "team" __tablename__ = "team"
def from_csv(self, row): def from_csv(self, row):
self.id = int(row[0]) self.name = str(row[0])
self.name = str(row[1]) self.country_code = str(row[1])
self.country_code = str(row[2])
return self return self
id: Mapped[int] = mapped_column(Integer, primary_key=True) name: Mapped[str] = mapped_column(String(32), primary_key=True)
name: Mapped[str] = mapped_column(String(64))
country_code: Mapped[str] = mapped_column(String(2)) # alpha-2 code country_code: Mapped[str] = mapped_column(String(2)) # alpha-2 code
# This table contains drivers and their team associations, e.g. Max Verschtappen # This table contains drivers and their team associations, e.g. Max Verschtappen
@ -71,16 +69,14 @@ class Driver(db.Model):
__tablename__ = "driver" __tablename__ = "driver"
def from_csv(self, row): def from_csv(self, row):
self.id = int(row[0]) self.name = str(row[0])
self.name = str(row[1]) self.team_id = str(row[1])
self.team_id = str(row[2]) self.country_code = str(row[2])
self.country_code = str(row[3]) self.active = bool(row[3])
self.active = bool(row[4])
return self return self
id: Mapped[int] = mapped_column(Integer, primary_key=True) name: Mapped[str] = mapped_column(String(32), primary_key=True)
name: Mapped[str] = mapped_column(String(64)) team_id: Mapped[str] = mapped_column(ForeignKey("team.name"))
team_id: Mapped[int] = mapped_column(ForeignKey("team.id"))
country_code: Mapped[str] = mapped_column(String(2)) # alpha-2 code country_code: Mapped[str] = mapped_column(String(2)) # alpha-2 code
active: Mapped[bool] = mapped_column(Boolean) # Only allow guessing active drivers active: Mapped[bool] = mapped_column(Boolean) # Only allow guessing active drivers
@ -90,16 +86,16 @@ class RaceResult(db.Model):
__tablename__ = "raceresult" __tablename__ = "raceresult"
def from_csv(self, row): def from_csv(self, row):
self.id = int(row[0]) self.id = int(row[0])
self.race_id = int(row[1]) self.race_id = str(row[1])
self.season_id = int(row[2]) self.season_id = int(row[2])
self.p10_id = int(row[3]) self.p10_id = str(row[3])
self.dnf_id = int(row[4]) self.dnf_id = str(row[4])
return self return self
id: Mapped[int] = mapped_column(Integer, primary_key=True) id: Mapped[int] = mapped_column(Integer, primary_key=True)
race_id: Mapped[int] = mapped_column(ForeignKey("race.id")) race_id: Mapped[str] = mapped_column(ForeignKey("race.id"))
season_id: Mapped[int] = mapped_column(ForeignKey("season.id")) season_id: Mapped[int] = mapped_column(ForeignKey("season.year"))
# These map to drivers # These map to drivers
# p01_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) # p01_id: Mapped[int] = mapped_column(ForeignKey("driver.id"))
@ -111,7 +107,7 @@ class RaceResult(db.Model):
# p07_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) # p07_id: Mapped[int] = mapped_column(ForeignKey("driver.id"))
# p08_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) # p08_id: Mapped[int] = mapped_column(ForeignKey("driver.id"))
# p09_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) # p09_id: Mapped[int] = mapped_column(ForeignKey("driver.id"))
p10_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) p10_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
# p11_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) # p11_id: Mapped[int] = mapped_column(ForeignKey("driver.id"))
# p12_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) # p12_id: Mapped[int] = mapped_column(ForeignKey("driver.id"))
# p13_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) # p13_id: Mapped[int] = mapped_column(ForeignKey("driver.id"))
@ -122,7 +118,7 @@ class RaceResult(db.Model):
# p18_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) # p18_id: Mapped[int] = mapped_column(ForeignKey("driver.id"))
# p19_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) # p19_id: Mapped[int] = mapped_column(ForeignKey("driver.id"))
# p20_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) # p20_id: Mapped[int] = mapped_column(ForeignKey("driver.id"))
dnf_id: Mapped[int] = mapped_column(ForeignKey("driver.id")) dnf_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
race: Mapped["Race"] = relationship("Race", foreign_keys=[race_id]) race: Mapped["Race"] = relationship("Race", foreign_keys=[race_id])
season: Mapped["Season"] = relationship("Season", foreign_keys=[season_id]) # Redundant but should make things easier season: Mapped["Season"] = relationship("Season", foreign_keys=[season_id]) # Redundant but should make things easier
@ -154,13 +150,11 @@ class User(db.Model):
__tablename__ = "user" __tablename__ = "user"
def from_csv(self, row): def from_csv(self, row):
self.id = int(row[0]) self.name = str(row[0])
self.name = str(row[1]) self.active = bool(row[1])
self.active = bool(row[2])
return self return self
id: Mapped[int] = mapped_column(Integer, primary_key=True) name: Mapped[str] = mapped_column(String(32), primary_key=True)
name: Mapped[str] = mapped_column(String(64))
active: Mapped[bool] = mapped_column(Boolean) # Only show active users active: Mapped[bool] = mapped_column(Boolean) # Only show active users
# This table contains guesses made by users # This table contains guesses made by users
@ -168,17 +162,26 @@ class Guess(db.Model):
__tablename__ = "guess" __tablename__ = "guess"
def from_csv(self, row): def from_csv(self, row):
self.id = int(row[0]) self.id = int(row[0])
self.race_id = int(row[1]) self.user_id = str(row[1])
self.season_id = int(row[2]) self.race_id = str(row[2])
self.raceresult_id = int(row[3]) self.season_id = int(row[3])
self.p10_id = str(row[4])
self.dnf_id = str(row[5])
self.raceresult_id = int(row[6])
return self return self
id: Mapped[int] = mapped_column(Integer, primary_key=True) id: Mapped[int] = mapped_column(Integer, primary_key=True)
race_id: Mapped[int] = mapped_column(ForeignKey("race.id")) user_id: Mapped[str] = mapped_column(ForeignKey("user.name"))
season_id: Mapped[int] = mapped_column(ForeignKey("season.id")) race_id: Mapped[str] = mapped_column(ForeignKey("race.id"))
season_id: Mapped[int] = mapped_column(ForeignKey("season.year"))
p10_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
dnf_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
raceresult_id: Mapped[int] = mapped_column(ForeignKey("raceresult.id")) raceresult_id: Mapped[int] = mapped_column(ForeignKey("raceresult.id"))
user: Mapped["User"] = relationship("User", foreign_keys=[user_id])
race: Mapped["Race"] = relationship("Race", foreign_keys=[race_id]) race: Mapped["Race"] = relationship("Race", foreign_keys=[race_id])
season: Mapped["Season"] = relationship("Season", foreign_keys=[season_id]) # Redundant but should make things easier season: Mapped["Season"] = relationship("Season", foreign_keys=[season_id]) # Redundant but should make things easier
p10: Mapped["Driver"] = relationship("Driver", foreign_keys=[p10_id])
dnf: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_id])
raceresult: Mapped["RaceResult"] = relationship("RaceResult", foreign_keys=[raceresult_id]) raceresult: Mapped["RaceResult"] = relationship("RaceResult", foreign_keys=[raceresult_id])