From 3193446131dbe3548b5856bc0d440a8d5a7cd7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Wed, 25 Nov 2020 11:14:36 +0100
Subject: [PATCH] Better cache configuration

---
 app/main/routes.py | 9 +++++++--
 config.py          | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/main/routes.py b/app/main/routes.py
index 54d32a2..687c63b 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -10,14 +10,14 @@ from app.main import bp
 from app.main.matplotlib_service import create_range_figure
 
 
-@cache.cached(key_prefix="countries_in_receivers")
+@cache.cached()
 def get_countries_in_receivers():
     query = db.session.query(Country.iso2).filter(Country.gid == Receiver.country_id).order_by(Country.iso2).distinct(Country.iso2)
 
     return [{"iso2": country[0]} for country in query.all()]
 
 
-@cache.cached(key_prefix="countries_in_takeoff_landings")
+@cache.cached()
 def get_used_countries():
     query = db.session.query(Country.iso2).filter(Country.gid == TakeoffLanding.country_id).order_by(Country.iso2).distinct(Country.iso2)
     return [{"iso2": country[0]} for country in query.all()]
@@ -44,6 +44,7 @@ def get_dates_for_airport(sel_airport):
 
 @bp.route("/")
 @bp.route("/index.html")
+@cache.cached()
 def index():
     today_beginning = datetime.combine(date.today(), time())
 
@@ -67,6 +68,7 @@ def index():
 
 
 @bp.route("/senders.html", methods=["GET", "POST"])
+@cache.cached()
 def senders():
     senders = db.session.query(Sender) \
         .options(db.joinedload(Sender.infos)) \
@@ -98,6 +100,7 @@ def range_view():
 
 
 @bp.route("/receivers.html")
+@cache.cached()
 def receivers():
     sel_country = request.args.get("country")
 
@@ -214,6 +217,7 @@ def download_flight():
 
 
 @bp.route("/sender_ranking.html")
+@cache.cached()
 def sender_ranking():
     sender_statistics = db.session.query(SenderStatistic) \
         .filter(db.and_(SenderStatistic.date == date.today(), SenderStatistic.is_trustworthy == db.true())) \
@@ -227,6 +231,7 @@ def sender_ranking():
 
 
 @bp.route("/receiver_ranking.html")
+@cache.cached()
 def receiver_ranking():
     receiver_statistics = db.session.query(ReceiverStatistic) \
         .filter(db.and_(ReceiverStatistic.date == date.today(), ReceiverStatistic.is_trustworthy == db.true())) \
diff --git a/config.py b/config.py
index 7b9d681..7e82e94 100644
--- a/config.py
+++ b/config.py
@@ -5,7 +5,7 @@ class BaseConfig:
     SECRET_KEY = "i-like-ogn"
 
     # Flask-Cache stuff
-    CACHE_TYPE = "simple"
+    CACHE_TYPE = "redis"
     CACHE_DEFAULT_TIMEOUT = 300
 
     # Redis stuff