Skip to content

Commit 3a03159

Browse files
committed
changed staticmethod
1 parent 8a7d7bd commit 3a03159

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/opengeodeweb_back/data.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ def create(
4141
return data_entry
4242

4343
@staticmethod
44-
def get(cls, data_id: str) -> "Data | None":
45-
return database.session.get(cls, data_id)
44+
def get(data_id: str) -> "Data | None":
45+
return database.session.get(Data, data_id)

src/opengeodeweb_back/geode_functions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def data_file_path(data_id: str, filename: str = "") -> str:
5555

5656

5757
def load_data(data_id: str):
58-
data_entry = Data.get(Data, data_id)
58+
data_entry = Data.get(data_id)
5959
if not data_entry:
6060
flask.abort(404, f"Data with id {data_id} not found")
6161

@@ -66,7 +66,7 @@ def load_data(data_id: str):
6666
def get_data_info(data_id: str) -> Data:
6767
from .data import Data
6868

69-
data_entry = Data.get(Data, data_id)
69+
data_entry = Data.get(data_id)
7070
if not data_entry:
7171
flask.abort(404, f"Data with id {data_id} not found")
7272
return data_entry

tests/test_utils_functions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def test_save_all_viewables_and_return_info(client):
118118
assert result["geode_object"] == geode_object
119119
assert result["input_files"] == input_file
120120

121-
db_entry = Data.get(Data, result["id"])
121+
db_entry = Data.get(result["id"])
122122
assert db_entry is not None
123123
assert db_entry.native_file_name == result["native_file_name"]
124124
assert db_entry.viewable_file_name == result["viewable_file_name"]
@@ -140,11 +140,11 @@ def test_save_all_viewables_commits_to_db(client):
140140
geode_object, data, input_file
141141
)
142142
data_id = result["id"]
143-
db_entry_before = Data.get(Data, data_id)
143+
db_entry_before = Data.get(data_id)
144144
assert db_entry_before is not None
145145
assert db_entry_before.native_file_name == result["native_file_name"]
146146
database.session.rollback()
147-
db_entry_after = Data.get(Data, data_id)
147+
db_entry_after = Data.get(data_id)
148148
assert (
149149
db_entry_after is not None
150150
), "database.session.commit() was not called - entry missing after rollback"

0 commit comments

Comments
 (0)