Skip to content

Commit 5c90a33

Browse files
committed
Merge branch 'feat/database' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/database
2 parents b8e6ffc + 4088ff4 commit 5c90a33

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

mypy.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[mypy]
2+
strict = True
3+
files = src/

src/opengeodeweb_back/data.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ class Data(database.Model):
88
__tablename__ = "datas"
99

1010
id = database.Column(
11-
String,
12-
primary_key=True,
13-
default=lambda: str(uuid.uuid4()).replace("-", "")
11+
String, primary_key=True, default=lambda: str(uuid.uuid4()).replace("-", "")
1412
)
1513
name = database.Column(String, nullable=False)
1614
native_file_name = database.Column(String, nullable=False)
@@ -39,7 +37,7 @@ def create(
3937
viewable_file_name="",
4038
light_viewable="",
4139
)
42-
40+
4341
database.session.add(data_entry)
4442
database.session.flush()
4543
return data_entry

src/opengeodeweb_back/utils_functions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def save_all_viewables_and_return_info(
164164
name=data.name(),
165165
geode_object=geode_object,
166166
input_file=input_file,
167-
additional_files=additional_files
167+
additional_files=additional_files,
168168
)
169169
data_path = create_data_folder_from_id(data_entry.id)
170170
saved_native_file_path = geode_functions.save(
@@ -184,7 +184,7 @@ def save_all_viewables_and_return_info(
184184
data_entry.native_file_name = os.path.basename(saved_native_file_path[0])
185185
data_entry.viewable_file_name = os.path.basename(saved_viewable_file_path)
186186
data_entry.light_viewable = os.path.basename(saved_light_viewable_file_path)
187-
187+
188188
database.session.commit()
189189

190190
return {

tests/test_utils_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def test_save_all_viewables_and_return_info(client):
117117
assert isinstance(result["object_type"], str)
118118
assert isinstance(result["binary_light_viewable"], str)
119119
assert result["geode_object"] == geode_object
120-
assert result["input_files"] == input_file
120+
assert result["input_files"] == input_file
121121

122122
db_entry = database.session.get(Data, result["id"])
123123
assert db_entry is not None

0 commit comments

Comments
 (0)