Skip to content

Commit f2e07fc

Browse files
committed
Merge branch 'feat/database' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/database
2 parents 3ebe500 + cb60e9c commit f2e07fc

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/opengeodeweb_back/data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def create(
3232
input_file = []
3333
if additional_files is None:
3434
additional_files = []
35-
35+
3636
data_entry = Data(
3737
name=name,
3838
geode_object=geode_object,

src/opengeodeweb_back/utils_functions.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ def create_data_folder_from_id(data_id: str) -> str:
155155

156156

157157
def save_all_viewables_and_return_info(
158-
geode_object: str,
159-
data: Any,
160-
input_file: List[str],
161-
additional_files: List[str] = []
158+
geode_object: str,
159+
data: Any,
160+
input_file: List[str],
161+
additional_files: List[str] = [],
162162
) -> Dict[str, Any]:
163163
data_entry = Data.create(
164164
name=data.name(),
@@ -201,23 +201,21 @@ def save_all_viewables_and_return_info(
201201

202202

203203
def generate_native_viewable_and_light_viewable_from_object(
204-
geode_object: str,
205-
data: Any
204+
geode_object: str, data: Any
206205
) -> Dict[str, Any]:
207206
return save_all_viewables_and_return_info(geode_object, data, input_file=[])
208207

209208

210209
def generate_native_viewable_and_light_viewable_from_file(
211-
geode_object: str,
212-
input_filename: str
210+
geode_object: str, input_filename: str
213211
) -> Dict[str, Any]:
214212
temp_data_entry = Data.create(
215213
name="temp",
216214
geode_object=geode_object,
217215
input_file=input_filename,
218216
additional_files=[],
219217
)
220-
218+
221219
data_path = create_data_folder_from_id(temp_data_entry.id)
222220

223221
full_input_filename = geode_functions.upload_file_path(input_filename)

tests/test_utils_functions.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,14 @@ def test_save_all_viewables_commits_to_db_properly(client):
142142
geode_object, data, input_file
143143
)
144144
data_id = result["id"]
145-
db_entry_before = database.session.get(Data,data_id)
145+
db_entry_before = database.session.get(Data, data_id)
146146
assert db_entry_before is not None
147147
assert db_entry_before.native_file_name == result["native_file_name"]
148148
database.session.rollback()
149149
db_entry_after = database.session.get(Data, data_id)
150-
assert db_entry_after is not None, "database.session.commit() was not called - entry missing after rollback"
150+
assert (
151+
db_entry_after is not None
152+
), "database.session.commit() was not called - entry missing after rollback"
151153
assert db_entry_after.native_file_name == result["native_file_name"]
152154

153155

0 commit comments

Comments
 (0)