update tests

Author: JulienChampagnol

app.py

@@ -7,7 +7,7 @@
 from werkzeug.exceptions import HTTPException
 
 from src.opengeodeweb_back.routes import blueprint_routes
-from src.opengeodeweb_back.geode_functions import handle_exception
+from src.opengeodeweb_back.utils_functions import handle_exception
 
 
 """ Global config """

src/opengeodeweb_back/geode_functions.py

@@ -8,7 +8,7 @@
 
 # Local application imports
 from .geode_objects import geode_objects_dict
-
+from . import utils_functions
 
 def geode_object_value(geode_object: str):
     return geode_objects_dict()[geode_object]
@@ -140,7 +140,7 @@ def list_geode_objects(
     key: str = None,
 ):
     return_dict = {}
-    file_extension = extension_from_filename(os.path.basename(file_absolute_path))
+    file_extension = utils_functions.extension_from_filename(os.path.basename(file_absolute_path))
     geode_objects_filtered_list = filter_geode_objects(key)
 
     for geode_object in geode_objects_filtered_list:

src/opengeodeweb_back/routes/blueprint_routes.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.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.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")
 
@@ -36,7 +36,7 @@ def teardown_request(exception):
     methods=allowed_files_json["methods"],
 )
 def allowed_files():
-    geode_functions.validate_request(flask.request, allowed_files_json)
+    utils_functions.validate_request(flask.request, allowed_files_json)
     extensions = geode_functions.list_input_extensions(
         flask.request.json["supported_feature"]
     )
@@ -83,7 +83,7 @@ def allowed_objects():
         return flask.make_response({}, 200)
 
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    geode_functions.validate_request(flask.request, allowed_objects_json)
+    utils_functions.validate_request(flask.request, allowed_objects_json)
     file_absolute_path = os.path.join(UPLOAD_FOLDER, flask.request.json["filename"])
     allowed_objects = geode_functions.list_geode_objects(
         file_absolute_path, flask.request.json["supported_feature"]
@@ -104,7 +104,7 @@ def allowed_objects():
 )
 def missing_files():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    geode_functions.validate_request(flask.request, missing_files_json)
+    utils_functions.validate_request(flask.request, missing_files_json)
 
     missing_files = geode_functions.missing_files(
         flask.request.json["input_geode_object"],
@@ -142,7 +142,7 @@ def missing_files():
     methods=geographic_coordinate_systems_json["methods"],
 )
 def crs_converter_geographic_coordinate_systems():
-    geode_functions.validate_request(flask.request, geographic_coordinate_systems_json)
+    utils_functions.validate_request(flask.request, geographic_coordinate_systems_json)
     infos = geode_functions.geographic_coordinate_systems(
         flask.request.json["input_geode_object"]
     )
@@ -172,7 +172,7 @@ def crs_converter_geographic_coordinate_systems():
 )
 def inspect_file():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    geode_functions.validate_request(flask.request, inspect_file_json)
+    utils_functions.validate_request(flask.request, inspect_file_json)
 
     secure_filename = werkzeug.utils.secure_filename(flask.request.json["filename"])
     file_path = os.path.abspath(os.path.join(UPLOAD_FOLDER, secure_filename))
@@ -197,7 +197,7 @@ def inspect_file():
 )
 def geode_objects_and_output_extensions():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    geode_functions.validate_request(
+    utils_functions.validate_request(
         flask.request, geode_objects_and_output_extensions_json
     )
     data = geode_functions.load(
@@ -229,7 +229,7 @@ def geode_objects_and_output_extensions():
 def save_viewable_file():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
-    geode_functions.validate_request(flask.request, save_viewable_file_json)
+    utils_functions.validate_request(flask.request, save_viewable_file_json)
 
     secure_filename = werkzeug.utils.secure_filename(flask.request.json["filename"])
     file_path = os.path.abspath(os.path.join(UPLOAD_FOLDER, secure_filename))

tests/test_functions.py renamed to tests/test_geode_functions.py

@@ -312,31 +312,3 @@ def test_geode_objects_output_extensions():
                         assert type(output_extension_value["is_saveable"]) is bool
 
 
-def test_versions():
-    list_packages = [
-        "OpenGeode-core",
-        "OpenGeode-IO",
-        "OpenGeode-Geosciences",
-        "OpenGeode-GeosciencesIO",
-    ]
-    versions = geode_functions.versions(list_packages)
-    assert type(versions) is list
-    for version in versions:
-        assert type(version) is dict
-
-
-def test_extension_from_filename():
-    extension = geode_functions.extension_from_filename("test.toto")
-    assert type(extension) is str
-    assert extension.count(".") == 0
-
-
-def test_handle_exception(client):
-    route = "/error"
-    response = client.post(route)
-    assert response.status_code == 500
-    data = response.get_json()
-    assert type(data) is dict
-    assert type(data["description"]) is str
-    assert type(data["name"]) is str
-    assert type(data["code"]) is int

tests/test_utils_functions.py

@@ -0,0 +1,31 @@
+from src.opengeodeweb_back import utils_functions
+
+
+def test_versions():
+    list_packages = [
+        "OpenGeode-core",
+        "OpenGeode-IO",
+        "OpenGeode-Geosciences",
+        "OpenGeode-GeosciencesIO",
+    ]
+    versions = utils_functions.versions(list_packages)
+    assert type(versions) is list
+    for version in versions:
+        assert type(version) is dict
+
+
+def test_extension_from_filename():
+    extension = utils_functions.extension_from_filename("test.toto")
+    assert type(extension) is str
+    assert extension.count(".") == 0
+
+
+def test_handle_exception(client):
+    route = "/error"
+    response = client.post(route)
+    assert response.status_code == 500
+    data = response.get_json()
+    assert type(data) is dict
+    assert type(data["description"]) is str
+    assert type(data["name"]) is str
+    assert type(data["code"]) is int