Skip to content

Commit f903281

Browse files
committed
Merge branch 'feat/input_file' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/input_file
2 parents 9bfb697 + dfcd994 commit f903281

File tree

6 files changed

+22
-11
lines changed

6 files changed

+22
-11
lines changed

src/opengeodeweb_back/geode_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,4 +301,4 @@ def create_coordinate_system(
301301
# def file_exists_in_data(data_id: str, filename: str) -> bool:
302302
# """Vérifie si un fichier existe dans le dossier de données."""
303303
# file_path = data_file_path(data_id, filename)
304-
# return os.path.exists(file_path)
304+
# return os.path.exists(file_path)

src/opengeodeweb_back/routes/blueprint_routes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ def save_viewable_file():
247247
data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
248248
return flask.make_response(
249249
utils_functions.generate_native_viewable_and_light_viewable(
250-
flask.request.json["input_geode_object"],
250+
flask.request.json["input_geode_object"],
251251
data,
252-
original_filename=flask.request.json["filename"]
252+
original_filename=flask.request.json["filename"],
253253
),
254254
200,
255255
)

src/opengeodeweb_back/utils_functions.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ def handle_exception(e):
144144
return response
145145

146146

147-
def generate_native_viewable_and_light_viewable(geode_object, data, original_filename=None):
147+
def generate_native_viewable_and_light_viewable(
148+
geode_object, data, original_filename=None
149+
):
148150
generated_id = str(uuid.uuid4()).replace("-", "")
149151
DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
150152
data_path = os.path.join(DATA_FOLDER_PATH, generated_id)

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ def app_context():
3737

3838
@pytest.fixture
3939
def test_id():
40-
return TEST_ID
40+
return TEST_ID

tests/test_geode_functions.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,20 @@ def test_geode_object_output_extensions():
157157
for input_extension in input_extensions:
158158
print(f"\t{input_extension=}")
159159
file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
160-
additional = geode_functions.additional_files(geode_object, file_absolute_path)
160+
additional = geode_functions.additional_files(
161+
geode_object, file_absolute_path
162+
)
161163
has_missing_files = any(
162-
f.is_missing for f in additional.mandatory_files + additional.optional_files
164+
f.is_missing
165+
for f in additional.mandatory_files + additional.optional_files
163166
)
164167
if has_missing_files:
165-
print(f"\t\tMandatory files: {[f.filename for f in additional.mandatory_files]}")
166-
print(f"\t\tAdditional files: {[f.filename for f in additional.optional_files]}")
168+
print(
169+
f"\t\tMandatory files: {[f.filename for f in additional.mandatory_files]}"
170+
)
171+
print(
172+
f"\t\tAdditional files: {[f.filename for f in additional.optional_files]}"
173+
)
167174
if geode_functions.is_loadable(geode_object, file_absolute_path):
168175
data = geode_functions.load(geode_object, file_absolute_path)
169176
geode_objets_and_output_extensions = (
@@ -199,7 +206,8 @@ def test_get_inspector_children():
199206
geode_object, file_absolute_path
200207
)
201208
has_missing_files = any(
202-
f.is_missing for f in additional.mandatory_files + additional.optional_files
209+
f.is_missing
210+
for f in additional.mandatory_files + additional.optional_files
203211
)
204212
if has_missing_files:
205213
mandatory_files = [f.filename for f in additional.mandatory_files]

tests/test_routes.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ def test_upload_file(client, filename="test.og_brep"):
5252
)
5353
assert response.status_code == 201
5454

55+
5556
def test_missing_files(client):
5657
route = f"/missing_files"
5758

@@ -313,4 +314,4 @@ def test_create_point(client):
313314
assert type(id) is str
314315

315316
# Test all params
316-
test_utils.test_route_wrong_params(client, route, get_full_data)
317+
test_utils.test_route_wrong_params(client, route, get_full_data)

0 commit comments

Comments
 (0)