Skip to content

Commit c107f1d

Browse files
authored
Merge pull request #238 from Geode-solutions/fix/data-name
fix(dataName): if name is not provided, doesn't take file ext
2 parents ee87aa8 + 748b863 commit c107f1d

4 files changed

Lines changed: 13 additions & 2 deletions

File tree

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,3 @@ werkzeug==3.1.2
6060
# flask
6161
# flask-cors
6262

63-
opengeodeweb-microservice==1.*,>=1.1.1

src/opengeodeweb_back/utils_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,5 +333,5 @@ def generate_native_viewable_and_light_viewable_from_file(
333333
data_path = create_data_folder_from_id(data.id)
334334
full_input_filename = geode_functions.upload_file_path(input_file)
335335
geode_object = generic_geode_object.load(full_input_filename)
336-
geode_object.builder().set_name(input_file)
336+
geode_object.builder().set_name(os.path.splitext(input_file)[0])
337337
return save_all_viewables_and_return_info(geode_object, data, data_path)

tests/data/cube.test.og_brep

463 KB
Binary file not shown.

tests/test_utils_functions.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ def test_generate_native_viewable_and_light_viewable_from_file(
207207
)
208208

209209
assert isinstance(result, dict)
210+
assert result["name"] == "test"
210211
assert isinstance(result["native_file"], str)
211212
assert result["native_file"] == "native.og_brep"
212213
assert isinstance(result["viewable_file"], str)
@@ -217,6 +218,17 @@ def test_generate_native_viewable_and_light_viewable_from_file(
217218
assert isinstance(result["binary_light_viewable"], str)
218219

219220

221+
def test_generate_native_viewable_and_light_viewable_from_file_with_multi_dots(
222+
client: FlaskClient,
223+
) -> None:
224+
app = client.application
225+
with app.app_context():
226+
result = utils_functions.generate_native_viewable_and_light_viewable_from_file(
227+
GeodeBRep.geode_object_type(), "cube.test.og_brep"
228+
)
229+
assert result["name"] == "cube.test"
230+
231+
220232
def test_send_file_multiple_returns_zip(client: FlaskClient, tmp_path: Path) -> None:
221233
app = client.application
222234
with app.app_context():

0 commit comments

Comments
 (0)