save_viewable & create_point foactored in 2 fcts create_geode_object_response & save_geode_object

Author: MaxNumerique

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -235,66 +235,61 @@ def geode_objects_and_output_extensions():
 ) as file:
     save_viewable_file_json = json.load(file)
 
+def save_geode_object(geode_object, data, folder_absolute_path, id):
+    saved_native_file_path = geode_functions.save(
+        geode_object, data, folder_absolute_path, id + "." + data.native_extension()
+    )
+    saved_viewable_file_path = geode_functions.save_viewable(
+        geode_object, data, folder_absolute_path, id
+    )
+    saved_light_viewable_file_path = geode_functions.save_light_viewable(
+        geode_object, data, folder_absolute_path, "light_" + id
+    )
+    f = open(saved_light_viewable_file_path, "rb")
+    binary_light_viewable = f.read()
+    f.close()
+    return {
+        "native_file_name": os.path.basename(saved_native_file_path[0]),
+        "viewable_file_name": os.path.basename(saved_viewable_file_path[0]), 
+        "binary_light_viewable": str(binary_light_viewable, "utf-8"),
+    }
+
+def create_geode_object_response(geode_object, data, folder_absolute_path):
+    generated_id = str(uuid.uuid4()).replace("-", "")
+    name = data.name()
+    object_type = geode_functions.get_object_type(geode_object)
+
+    saved_files_info = save_geode_object(
+        geode_object, data, folder_absolute_path, generated_id
+    )
+    
+    return {
+        "name": name,
+        "native_file_name": saved_files_info["native_file_name"],
+        "viewable_file_name": saved_files_info["viewable_file_name"],
+        "id": generated_id,
+        "object_type": object_type,
+        "binary_light_viewable": saved_files_info["binary_light_viewable"],
+        "geode_object": geode_object,
+    }
 
 @routes.route(
     save_viewable_file_json["route"],
     methods=save_viewable_file_json["methods"],
 )
 def save_viewable_file():
+    utils_functions.validate_request(flask.request, save_viewable_file_json)
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
-    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))
     data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
     generated_id = str(uuid.uuid4()).replace("-", "")
-
     name = data.name()
-    native_extension = data.native_extension()
-
-    absolute_native_file_path = os.path.join(
-        UPLOAD_FOLDER, generated_id + "." + native_extension
-    )
-
-    saved_viewable_file_path = geode_functions.save_viewable(
-        flask.request.json["input_geode_object"], data, DATA_FOLDER_PATH, generated_id
-    )
-
-    saved_light_viewable_file_path = geode_functions.save_light_viewable(
-        flask.request.json["input_geode_object"],
-        data,
-        DATA_FOLDER_PATH,
-        "light_" + generated_id,
-    )
-
-    f = open(saved_light_viewable_file_path, "rb")
-    binary_light_viewable = f.read()
-    f.close()
-
-    geode_functions.save(
-        flask.request.json["input_geode_object"],
-        data,
-        DATA_FOLDER_PATH,
-        generated_id + "." + native_extension,
-    )
-    os.remove(os.path.join(UPLOAD_FOLDER, secure_filename))
-    object_type = geode_functions.get_object_type(
-        flask.request.json["input_geode_object"]
-    )
-
-    native_file_name = os.path.basename(absolute_native_file_path)
-    viewable_file_name = os.path.basename(saved_viewable_file_path)
+    object_type = geode_functions.get_object_type(flask.request.json["input_geode_object"])
     return flask.make_response(
-        {
-            "name": name,
-            "native_file_name": native_file_name,
-            "viewable_file_name": viewable_file_name,
-            "id": generated_id,
-            "object_type": object_type,
-            "binary_light_viewable": str(binary_light_viewable, "utf-8"),
-        },
-        200,
+    create_geode_object_response(flask.request.json["input_geode_object"], data, DATA_FOLDER_PATH),
+    200,
     )
 
 
@@ -318,35 +313,9 @@ def create_point():
     name = PointSet3D.name()
     generated_id = str(uuid.uuid4()).replace("-", "")
     object_type = geode_functions.get_object_type("PointSet3D")
-    saved_native_file_path = geode_functions.save(
-        "PointSet3D", PointSet3D, DATA_FOLDER_PATH, generated_id + ".og_pts3d"
-    )
-    saved_viewable_file_path = geode_functions.save_viewable(
-        "PointSet3D", PointSet3D, DATA_FOLDER_PATH, generated_id
-    )
-    saved_light_viewable_file_path = geode_functions.save_light_viewable(
-        "PointSet3D", PointSet3D, DATA_FOLDER_PATH, "light_" + generated_id
-    )
-
-    f = open(saved_light_viewable_file_path, "rb")
-    binary_light_viewable = f.read()
-    f.close()
-
-    native_file_name = os.path.basename(saved_native_file_path[0])
-    viewable_file_name = os.path.basename(saved_viewable_file_path)
-
     return flask.make_response(
-        {
-            "viewable_file_name": os.path.basename(saved_viewable_file_path),
-            "id": generated_id,
-            "name": name,
-            "native_file_name": native_file_name,
-            "viewable_file_name": viewable_file_name,
-            "object_type": object_type,
-            "geode_object": "PointSet3D",
-            "binary_light_viewable": str(binary_light_viewable, "utf-8"),
-        },
-        200,
+    create_geode_object_response("PointSet3D", PointSet3D, DATA_FOLDER_PATH),
+    200,
     )