Skip to content

Commit 900440c

Browse files
committed
feat(input_file): removed unused params
1 parent a8895e9 commit 900440c

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/opengeodeweb_back/utils_functions.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,17 +189,15 @@ def generate_native_viewable_and_light_viewable_from_object(
189189
geode_object,
190190
data
191191
):
192-
base_data_folder = flask.current_app.config["DATA_FOLDER_PATH"]
193-
generated_id, data_path = create_unique_data_folder(base_data_folder)
192+
generated_id, data_path = create_unique_data_folder()
194193
return save_all_viewables_and_return_info(geode_object, data, generated_id, data_path)
195194

196195

197196
def generate_native_viewable_and_light_viewable_from_file(
198197
geode_object,
199198
input_filename
200199
):
201-
base_data_folder = flask.current_app.config["DATA_FOLDER_PATH"]
202-
generated_id, data_path = create_unique_data_folder(base_data_folder)
200+
generated_id, data_path = create_unique_data_folder()
203201

204202
full_input_filename = geode_functions.upload_file_path(input_filename)
205203
copied_full_path = os.path.join(data_path, werkzeug.utils.secure_filename(input_filename))

tests/test_utils_functions.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ def test_create_unique_data_folder(client):
7878
generated_id, data_path = utils_functions.create_unique_data_folder()
7979
assert isinstance(generated_id, str)
8080
assert re.fullmatch(r"[0-9a-f]{32}", generated_id)
81-
assert os.path.isdir(data_path)
81+
assert os.path.exists(data_path)
82+
assert data_path.startswith(flask.current_app.config["DATA_FOLDER_PATH"])
8283
assert generated_id in data_path
8384
shutil.rmtree(data_path, ignore_errors=True)
8485
assert not os.path.exists(data_path)
@@ -90,14 +91,13 @@ def test_save_all_viewables_and_return_info(client):
9091
with app.app_context():
9192
geode_object = "BRep"
9293
data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
93-
generated_id, data_path = utils_functions.create_unique_data_folder(
94-
flask.current_app.config["DATA_FOLDER_PATH"]
95-
)
94+
generated_id, data_path = utils_functions.create_unique_data_folder()
9695
additional_files = ["additional_file.txt"]
9796

9897
result = utils_functions.save_all_viewables_and_return_info(
9998
geode_object, data, generated_id, data_path, additional_files
10099
)
100+
101101
assert isinstance(result, dict)
102102
assert result["name"] == data.name()
103103
assert result["native_file_name"].startswith("native.")
@@ -114,11 +114,13 @@ def test_generate_native_viewable_and_light_viewable_from_object(client):
114114
with app.app_context():
115115
geode_object = "BRep"
116116
data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
117+
117118
result = (
118119
utils_functions.generate_native_viewable_and_light_viewable_from_object(
119120
geode_object, data
120121
)
121122
)
123+
122124
assert isinstance(result, dict)
123125
assert isinstance(result["name"], str)
124126
assert isinstance(result["native_file_name"], str)
@@ -141,6 +143,7 @@ def test_generate_native_viewable_and_light_viewable_from_file(client):
141143
result = utils_functions.generate_native_viewable_and_light_viewable_from_file(
142144
geode_object, input_filename
143145
)
146+
144147
assert isinstance(result, dict)
145148
assert isinstance(result["name"], str)
146149
assert isinstance(result["native_file_name"], str)

0 commit comments

Comments
 (0)