Skip to content

fix(Data): add viewer object #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BotellaA merged 1 commit into from
Oct 16, 2025
Merged

fix(Data): add viewer object #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/opengeodeweb_microservice/database/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ class Data(Base):
id: Mapped[str] = mapped_column(
String, primary_key=True, default=lambda: str(uuid.uuid4()).replace("-", "")
)
native_file_name: Mapped[str] = mapped_column(String, nullable=False)
viewable_file_name: Mapped[str] = mapped_column(String, nullable=False)
geode_object: Mapped[str] = mapped_column(String, nullable=False)
viewer_object: Mapped[str] = mapped_column(String, nullable=False)

native_file_name: Mapped[str | None] = mapped_column(String, nullable=True)
viewable_file_name: Mapped[str | None] = mapped_column(String, nullable=True)

light_viewable: Mapped[str | None] = mapped_column(String, nullable=True)
input_file: Mapped[str | None] = mapped_column(String, nullable=True)
Expand All @@ -22,19 +24,15 @@ class Data(Base):
@staticmethod
def create(
geode_object: str,
viewer_object: str,
input_file: str | None = None,
additional_files: list[str] | None = None,
) -> "Data":
input_file = input_file or ""
additional_files = additional_files or []

data_entry = Data(
geode_object=geode_object,
viewer_object=viewer_object,
input_file=input_file,
additional_files=additional_files,
native_file_name="",
viewable_file_name="",
light_viewable=None,
)

session = get_session()
Expand Down
9 changes: 7 additions & 2 deletions tests/test_database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@

def test_data_crud_operations(clean_database):
data = Data.create(
geode_object="test_object", input_file="test.txt", additional_files=[]
geode_object="test_object",
viewer_object="test_viewer",
input_file="test.txt",
additional_files=[],
)
print("id", data.id, flush=True)
assert data.id is not None
Expand All @@ -21,7 +24,9 @@ def test_data_crud_operations(clean_database):

def test_data_with_additional_files(clean_database):
files = ["file1.txt", "file2.txt"]
data = Data.create(geode_object="test_files", additional_files=files)
data = Data.create(
geode_object="test_files", viewer_object="test_viewer", additional_files=files
)
assert data.id is not None
assert isinstance(data.id, str)

Expand Down