Fix teamwinners/podiumdrivers model
All checks were successful
Build Formula10 Docker Image / build-docker (push) Successful in 42s
All checks were successful
Build Formula10 Docker Image / build-docker (push) Successful in 42s
This commit is contained in:
@ -161,6 +161,8 @@ def season_guess_post(user_name: str):
|
|||||||
seasonguess.dnf_driver_name = guesses[3] # Pylance throws error but nullcheck is done
|
seasonguess.dnf_driver_name = guesses[3] # Pylance throws error but nullcheck is done
|
||||||
seasonguess.gained_driver_name = guesses[4] # Pylance throws error but nullcheck is done
|
seasonguess.gained_driver_name = guesses[4] # Pylance throws error but nullcheck is done
|
||||||
seasonguess.lost_driver_name = guesses[5] # Pylance throws error but nullcheck is done
|
seasonguess.lost_driver_name = guesses[5] # Pylance throws error but nullcheck is done
|
||||||
|
seasonguess.team_winners_id = user_name
|
||||||
|
seasonguess.podium_drivers_id = user_name
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
return redirect(f"/season/{user_name}")
|
return redirect(f"/season/{user_name}")
|
||||||
|
16
model.py
16
model.py
@ -359,7 +359,8 @@ class SeasonGuess(db.Model):
|
|||||||
"""
|
"""
|
||||||
__tablename__ = "seasonguess"
|
__tablename__ = "seasonguess"
|
||||||
__csv_header__ = ["user_name", "hot_take", "p2_team_name",
|
__csv_header__ = ["user_name", "hot_take", "p2_team_name",
|
||||||
"overtake_driver_name", "dnf_driver_name", "gained_driver_name", "lost_driver_name"]
|
"overtake_driver_name", "dnf_driver_name", "gained_driver_name", "lost_driver_name",
|
||||||
|
"team_winners_id", "podium_drivers_id"]
|
||||||
|
|
||||||
def from_csv(self, row):
|
def from_csv(self, row):
|
||||||
self.user_name = str(row[0]) # Also used as foreign key for teamwinners + podiumdrivers
|
self.user_name = str(row[0]) # Also used as foreign key for teamwinners + podiumdrivers
|
||||||
@ -369,6 +370,8 @@ class SeasonGuess(db.Model):
|
|||||||
self.dnf_driver_name = str(row[4])
|
self.dnf_driver_name = str(row[4])
|
||||||
self.gained_driver_name = str(row[5])
|
self.gained_driver_name = str(row[5])
|
||||||
self.lost_driver_name = str(row[6])
|
self.lost_driver_name = str(row[6])
|
||||||
|
self.team_winners_id = str(row[7])
|
||||||
|
self.podium_drivers_id = str(row[8])
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def to_csv(self):
|
def to_csv(self):
|
||||||
@ -380,6 +383,8 @@ class SeasonGuess(db.Model):
|
|||||||
self.dnf_driver_name,
|
self.dnf_driver_name,
|
||||||
self.gained_driver_name,
|
self.gained_driver_name,
|
||||||
self.lost_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)
|
user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
|
||||||
@ -390,6 +395,9 @@ class SeasonGuess(db.Model):
|
|||||||
gained_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
gained_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||||
lost_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
lost_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||||
|
|
||||||
|
team_winners_id: Mapped[str] = mapped_column(ForeignKey("teamwinners.user_name"))
|
||||||
|
podium_drivers_id: Mapped[str] = mapped_column(ForeignKey("podiumdrivers.user_name"))
|
||||||
|
|
||||||
# Relationships
|
# Relationships
|
||||||
user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
|
user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
|
||||||
p2_team: Mapped["Team"] = relationship("Team", foreign_keys=[p2_team_name])
|
p2_team: Mapped["Team"] = relationship("Team", foreign_keys=[p2_team_name])
|
||||||
@ -398,7 +406,5 @@ class SeasonGuess(db.Model):
|
|||||||
gained_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[gained_driver_name])
|
gained_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[gained_driver_name])
|
||||||
lost_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[lost_driver_name])
|
lost_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[lost_driver_name])
|
||||||
|
|
||||||
team_winners: Mapped["TeamWinners"] = relationship("TeamWinners", foreign_keys=[user_name],
|
team_winners: Mapped["TeamWinners"] = relationship("TeamWinners", foreign_keys=[team_winners_id])
|
||||||
primaryjoin="SeasonGuess.user_name == TeamWinners.user_name")
|
podium_drivers: Mapped["PodiumDrivers"] = relationship("PodiumDrivers", foreign_keys=[podium_drivers_id])
|
||||||
podium_drivers: Mapped["PodiumDrivers"] = relationship("PodiumDrivers", foreign_keys=[user_name],
|
|
||||||
primaryjoin="SeasonGuess.user_name == PodiumDrivers.user_name")
|
|
||||||
|
@ -108,7 +108,6 @@ class TemplateModel:
|
|||||||
if self._all_race_results is None:
|
if self._all_race_results is None:
|
||||||
self._all_race_results = RaceResult.query.join(RaceResult.race).order_by(desc(Race.number)).all()
|
self._all_race_results = RaceResult.query.join(RaceResult.race).order_by(desc(Race.number)).all()
|
||||||
|
|
||||||
print(self._all_race_results)
|
|
||||||
return self._all_race_results
|
return self._all_race_results
|
||||||
|
|
||||||
def race_result_by(self, *, race_name: str) -> RaceResult | None:
|
def race_result_by(self, *, race_name: str) -> RaceResult | None:
|
||||||
|
Reference in New Issue
Block a user