fix tests & gloabl app_config

Author: JulienChampagnol

app.py

@@ -8,6 +8,10 @@
 
 from src.opengeodeweb_back.routes import blueprint_routes
 from src.opengeodeweb_back.utils_functions import handle_exception
+from src.opengeodeweb_back import app_config
+
+
+print("Hello World", app_config)
 
 
 """ Global config """
@@ -17,12 +21,13 @@
 FLASK_DEBUG = True if os.environ.get("FLASK_DEBUG", default=None) == "True" else False
 
 if FLASK_DEBUG == False:
-    app.config.from_object("config.ProdConfig")
+    app.config.from_object(app_config.ProdConfig)
 else:
-    app.config.from_object("config.DevConfig")
+    app.config.from_object(app_config.DevConfig)
 
 
-PORT = int(app.config.get("PORT"))
+print(f"{app.config=}", flush=True)
+PORT = int(app.config.get("DEFAULT_PORT"))
 ORIGINS = app.config.get("ORIGINS")
 SSL = app.config.get("SSL")
 

config.py

@@ -0,0 +1,32 @@
+# Standard library imports
+import os
+import time
+
+# Third party imports
+# Local application imports
+
+class Config(object):
+    FLASK_DEBUG = os.environ.get("FLASK_DEBUG", default=False)
+    DEFAULT_PORT = "5000"
+    CORS_HEADERS = "Content-Type"
+    UPLOAD_FOLDER = "./uploads"
+    DESKTOP_APP = False
+    REQUEST_COUNTER = 0
+    LAST_REQUEST_TIME = time.time()
+    LAST_PING_TIME = time.time()
+
+
+class ProdConfig(Config):
+    SSL = None
+    ORIGINS = ""
+    MINUTES_BEFORE_TIMEOUT = "1"
+    SECONDS_BETWEEN_SHUTDOWNS = "10"
+    DATA_FOLDER_PATH = "/data/"
+
+
+class DevConfig(Config):
+    SSL = None
+    ORIGINS = "*"
+    MINUTES_BEFORE_TIMEOUT = "1"
+    SECONDS_BETWEEN_SHUTDOWNS = "10"
+    DATA_FOLDER_PATH = "./data/"

src/opengeodeweb_back/app_config.py

@@ -11,16 +11,16 @@
 
 routes = flask.Blueprint("routes", __name__)
 
-# @routes.before_request
-# def before_request():
-#     if "ping" not in flask.request.path:
-#         utils_functions.increment_request_counter(flask.current_app)
-
-# @routes.teardown_request
-# def teardown_request(exception):
-#     if "ping" not in flask.request.path:
-#         utils_functions.decrement_request_counter(flask.current_app)
-#         utils_functions.update_last_request_time(flask.current_app)
+@routes.before_request
+def before_request():
+    if "ping" not in flask.request.path:
+        utils_functions.increment_request_counter(flask.current_app)
+
+@routes.teardown_request
+def teardown_request(exception):
+    if "ping" not in flask.request.path:
+        utils_functions.decrement_request_counter(flask.current_app)
+        utils_functions.update_last_request_time(flask.current_app)
 
 schemas = os.path.join(os.path.dirname(__file__), "schemas")
 

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -13,18 +13,21 @@
 # Local application imports
 
 def increment_request_counter(current_app):
-    REQUEST_COUNTER = int(current_app.config.get("REQUEST_COUNTER"))
-    REQUEST_COUNTER += 1
-    current_app.config.update(REQUEST_COUNTER=REQUEST_COUNTER)
+    if "REQUEST_COUNTER" in current_app.config:
+        REQUEST_COUNTER = int(current_app.config.get("REQUEST_COUNTER"))
+        REQUEST_COUNTER += 1
+        current_app.config.update(REQUEST_COUNTER=REQUEST_COUNTER)
 
 def decrement_request_counter(current_app):
-    REQUEST_COUNTER = int(current_app.config.get("REQUEST_COUNTER"))
-    REQUEST_COUNTER -= 1
-    current_app.config.update(REQUEST_COUNTER=REQUEST_COUNTER)
+    if "REQUEST_COUNTER" in current_app.config:
+        REQUEST_COUNTER = int(current_app.config.get("REQUEST_COUNTER"))
+        REQUEST_COUNTER -= 1
+        current_app.config.update(REQUEST_COUNTER=REQUEST_COUNTER)
 
 def update_last_request_time(current_app):
-    LAST_REQUEST_TIME = time.time()
-    current_app.config.update(LAST_REQUEST_TIME=LAST_REQUEST_TIME)
+    if "LAST_REQUEST_TIME" in current_app.config:
+        LAST_REQUEST_TIME = time.time()
+        current_app.config.update(LAST_REQUEST_TIME=LAST_REQUEST_TIME)
 
 
 def kill_task(current_app):

src/opengeodeweb_back/utils_functions.py

@@ -1,12 +1,20 @@
 import pytest
 from app import app
+import time
 
 
 @pytest.fixture
 def client():
     app.config["TESTING"] = True
     app.config["SERVER_NAME"] = "TEST"
-    app.config["DATA_FOLDER"] = "./data/"
+    app.config["DATA_FOLDER_PATH"] = "./data/"
+    app.config["REQUEST_COUNTER"] = 0
+    app.config["LAST_REQUEST_TIME"] = time.time()
     client = app.test_client()
     client.headers = {"Content-type": "application/json", "Accept": "application/json"}
     yield client
+
+@pytest.fixture
+def app_context():
+    with app.app_context():
+        yield

tests/conftest.py

@@ -1,6 +1,23 @@
+import flask
 from src.opengeodeweb_back import utils_functions
 
 
+def test_increment_request_counter(app_context):
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
+    utils_functions.increment_request_counter(flask.current_app)
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
+
+def test_decrement_request_counter(app_context):
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
+    utils_functions.decrement_request_counter(flask.current_app)
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
+
+def test_update_last_request_time(app_context):
+    LAST_REQUEST_TIME = flask.current_app.config.get("LAST_REQUEST_TIME")
+    utils_functions.update_last_request_time(flask.current_app)
+    assert flask.current_app.config.get("LAST_REQUEST_TIME") >= LAST_REQUEST_TIME
+
+
 def test_versions():
     list_packages = [
         "OpenGeode-core",