From da8c780e63eab9446ceecbeb8cb3ef4f863f0d97 Mon Sep 17 00:00:00 2001
From: Ivo Spijkerman <ivo@spijkerman.nl>
Date: Wed, 15 Sep 2021 16:45:16 +0200
Subject: [PATCH] NOJIRA use cache library instead of doing it ourselves

---
 src/main.py          | 15 ++++-----------
 src/requirements.txt |  1 +
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main.py b/src/main.py
index b3db7c8..6d8585b 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1,6 +1,7 @@
 import datetime
 from typing import Optional
 
+from cachetools import cached, TTLCache
 from flask import render_template
 
 from models.dto import DTO
@@ -8,14 +9,9 @@ from repository import Repository
 
 _repository: Optional[Repository] = None
 
-_cache_moment = datetime.datetime.now() - datetime.timedelta(days=1)
-_cache_value = DTO()
-
 
 def process(_) -> str:
     global _repository
-    global _cache_value
-    global _cache_moment
 
     if not _repository:
         _repository = Repository(
@@ -24,12 +20,8 @@ def process(_) -> str:
             spreadsheet_range='Friet bestelling!A2:F',
         )
 
-    rerun_if_later_than = _cache_moment + datetime.timedelta(seconds=10)
-    now = datetime.datetime.now()
-    if now > rerun_if_later_than:
-        _cache_value = _get_data()
-        _cache_moment = datetime.datetime.now()
-    return render_template('frietlijst.html', dto=_cache_value)
+    data = _get_data()
+    return render_template('frietlijst.html', dto=data)
 
 
 def anonymize_name(name: str) -> str:
@@ -41,6 +33,7 @@ def anonymize_name(name: str) -> str:
     return result
 
 
+@cached(cache=TTLCache(maxsize=2, ttl=10))
 def _get_data() -> DTO:
     cutoff = datetime.datetime.now() - datetime.timedelta(days=4)
 
diff --git a/src/requirements.txt b/src/requirements.txt
index bec1799..2278ad6 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,3 +1,4 @@
+cachetools==4.2.2
 flask==2.0.1
 google-api-python-client==2.20.0
 google-auth-httplib2==0.1.0