Skip to content

Commit 89a4ef3

Browse files
authored
Merge pull request #196 from Geode-solutions/fix/db-viewer-object
fix(Data): add viewer object
2 parents 64248b8 + a552555 commit 89a4ef3

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

src/opengeodeweb_back/utils_functions.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ def generate_native_viewable_and_light_viewable_from_object(
224224
) -> dict[str, str | list[str]]:
225225
data_entry = Data.create(
226226
geode_object=geode_object,
227+
viewer_object=geode_functions.get_object_type(geode_object),
227228
input_file="",
228229
additional_files=[],
229230
)
@@ -236,6 +237,7 @@ def generate_native_viewable_and_light_viewable_from_file(
236237
) -> dict[str, str | list[str]]:
237238
data_entry = Data.create(
238239
geode_object=geode_object,
240+
viewer_object=geode_functions.get_object_type(geode_object),
239241
input_file=input_filename,
240242
additional_files=[],
241243
)

tests/test_models_routes.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def test_extract_brep_uuids(client, test_id):
3535
with client.application.app_context():
3636
data_entry = Data.create(
3737
geode_object="BRep",
38+
viewer_object=geode_functions.get_object_type("BRep"),
3839
input_file=brep_filename,
3940
)
4041
data_entry.native_file_name = brep_filename

tests/test_routes.py

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,11 @@ def get_full_data():
171171

172172
def test_texture_coordinates(client, test_id):
173173
with client.application.app_context():
174-
data = Data.create(geode_object="PolygonalSurface3D", input_file="hat.vtp")
174+
data = Data.create(
175+
geode_object="PolygonalSurface3D",
176+
viewer_object=geode_functions.get_object_type("PolygonalSurface3D"),
177+
input_file="hat.vtp",
178+
)
175179
data.native_file_name = "hat.vtp"
176180
session = get_session()
177181
if session:
@@ -195,7 +199,11 @@ def test_vertex_attribute_names(client, test_id):
195199
route = f"/opengeodeweb_back/vertex_attribute_names"
196200

197201
with client.application.app_context():
198-
data = Data.create(geode_object="PolygonalSurface3D", input_file="test.vtp")
202+
data = Data.create(
203+
geode_object="PolygonalSurface3D",
204+
viewer_object=geode_functions.get_object_type("PolygonalSurface3D"),
205+
input_file="test.vtp",
206+
)
199207
data.native_file_name = "test.vtp"
200208
session = get_session()
201209
if session:
@@ -217,7 +225,11 @@ def test_polygon_attribute_names(client, test_id):
217225
route = f"/opengeodeweb_back/polygon_attribute_names"
218226

219227
with client.application.app_context():
220-
data = Data.create(geode_object="PolygonalSurface3D", input_file="test.vtp")
228+
data = Data.create(
229+
geode_object="PolygonalSurface3D",
230+
viewer_object=geode_functions.get_object_type("PolygonalSurface3D"),
231+
input_file="test.vtp",
232+
)
221233
data.native_file_name = "test.vtp"
222234
session = get_session()
223235
if session:
@@ -239,7 +251,11 @@ def test_polyhedron_attribute_names(client, test_id):
239251
route = f"/opengeodeweb_back/polyhedron_attribute_names"
240252

241253
with client.application.app_context():
242-
data = Data.create(geode_object="PolyhedralSolid3D", input_file="test.vtu")
254+
data = Data.create(
255+
geode_object="PolyhedralSolid3D",
256+
viewer_object=geode_functions.get_object_type("PolyhedralSolid3D"),
257+
input_file="test.vtu",
258+
)
243259
data.native_file_name = "test.vtu"
244260
session = get_session()
245261
if session:

tests/test_utils_functions.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ def test_save_all_viewables_and_return_info(client):
105105

106106
data_entry = Data.create(
107107
geode_object=geode_object,
108+
viewer_object=geode_functions.get_object_type(geode_object),
108109
input_file=input_file,
109110
additional_files=additional_files,
110111
)
@@ -146,6 +147,7 @@ def test_save_all_viewables_commits_to_db(client):
146147

147148
data_entry = Data.create(
148149
geode_object=geode_object,
150+
viewer_object=geode_functions.get_object_type(geode_object),
149151
input_file=input_file,
150152
additional_files=[],
151153
)

0 commit comments

Comments
 (0)