From 6796f4b2070523c9eb61f3604d1133787ee8a2ed Mon Sep 17 00:00:00 2001
From: ChUrl <christoph.urlacher@protonmail.com>
Date: Sat, 4 Nov 2023 00:27:58 +0100
Subject: [PATCH] Load new static data

---
 database_utils.py | 31 +++++++++++++------------------
 formula10.py      | 16 ++--------------
 2 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/database_utils.py b/database_utils.py
index d4ac4ff..f2215c1 100644
--- a/database_utils.py
+++ b/database_utils.py
@@ -21,32 +21,27 @@ def reload_static_data(db):
     db.create_all()
 
     # Clear static data
-    Team.query.delete()
+    Circuit.query.delete()
+    Constructor.query.delete()
     Driver.query.delete()
-    GrandPrix.query.delete()
-    Season.query.delete()
     Race.query.delete()
-    RaceResult.query.delete()
-    User.query.delete()
-    Guess.query.delete()
+    Season.query.delete()
 
     # Reload static data
-    for row in load_csv("teams"):
-        db.session.add(Team().from_csv(row))
+    for row in load_csv("circuits"):
+        db.session.add(Circuit().from_csv(row))
+    for row in load_csv("constructors"):
+        db.session.add(Constructor().from_csv(row))
     for row in load_csv("drivers"):
         db.session.add(Driver().from_csv(row))
-    for row in load_csv("grandsprix"):
-        db.session.add(GrandPrix().from_csv(row))
-    for row in load_csv("seasons"):
-        db.session.add(Season().from_csv(row))
     for row in load_csv("races"):
         db.session.add(Race().from_csv(row))
-    for row in load_csv("raceresults"):
-        db.session.add(RaceResult().from_csv(row))
-    for row in load_csv("users"):
-        db.session.add(User().from_csv(row))
-    for row in load_csv("guesses"):
-        db.session.add(Guess().from_csv(row))
+    for row in load_csv("seasons"):
+        db.session.add(Season().from_csv(row))
+    for row in load_csv("status"):
+        db.session.add(Status().from_csv(row))
+    for row in load_csv("results"):
+        db.session.add(Result().from_csv(row))
 
     db.session.commit()
 
diff --git a/formula10.py b/formula10.py
index a38fbb7..cbb8dda 100644
--- a/formula10.py
+++ b/formula10.py
@@ -12,21 +12,9 @@ db.init_app(app)
 
 @app.route("/")
 def index():
-    users = User.query.all()
-    raceresults = RaceResult.query.filter_by(season_id=2023).all()
-
-    guesses = dict()
-    for raceresult in raceresults:
-        guesses[raceresult.race_id] = dict()
-    for guess in Guess.query.filter_by(season_id=2023).all():
-        guesses[guess.race_id][guess.user_id] = guess
-
-    return render_template("index.jinja", users=users, raceresults=raceresults, guesses=guesses)
-
-@app.route("/reload")
-def reload():
     reload_static_data(db)
-    return redirect("/")
+
+    return render_template("index.jinja")
 
 # @app.route("/teams", methods=["GET", "POST"])
 # def teams():