From 853fa27c40590fc1715d42931e57923fb508f99c Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Fri, 28 Nov 2025 15:13:31 +0100 Subject: [PATCH 1/7] viewable_filename & native_filename harmonize --- src/opengeodeweb_microservice/database/data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opengeodeweb_microservice/database/data.py b/src/opengeodeweb_microservice/database/data.py index 02a02f3..657025e 100644 --- a/src/opengeodeweb_microservice/database/data.py +++ b/src/opengeodeweb_microservice/database/data.py @@ -14,8 +14,8 @@ class Data(Base): 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) + native_filename: Mapped[str | None] = mapped_column(String, nullable=True) + viewable_filename: 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) From 479bb73e29d533a1e5ab8b92154b26df6061fc06 Mon Sep 17 00:00:00 2001 From: JulienChampagnol <91873154+JulienChampagnol@users.noreply.github.com> Date: Fri, 28 Nov 2025 14:31:55 +0000 Subject: [PATCH 2/7] Apply prepare changes --- commitlint.config.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/commitlint.config.js b/commitlint.config.js index 3a29484..a397334 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1,4 +1,4 @@ -export default { +const Configuration = { extends: ["@commitlint/config-angular"], rules: { "scope-empty": [2, "never"], @@ -12,5 +12,8 @@ export default { "subject-full-stop": [0], "type-case": [0], "type-empty": [0], + "type-enum": [2, "always", ["feat", "fix", "perf"]], }, } + +export default Configuration From f95b98ad1d846c3c0a3b7641d38f3c546405a166 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Fri, 28 Nov 2025 15:33:23 +0100 Subject: [PATCH 3/7] fix(Api): harmonize args across ecosystem From cffcd1a82f0adfb82ced3771ef201c6ec826ba38 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Fri, 28 Nov 2025 15:42:59 +0100 Subject: [PATCH 4/7] input_filename & additional_filenames --- src/opengeodeweb_microservice/database/data.py | 14 +++++++------- tests/test_database.py | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/opengeodeweb_microservice/database/data.py b/src/opengeodeweb_microservice/database/data.py index 657025e..3d24cce 100644 --- a/src/opengeodeweb_microservice/database/data.py +++ b/src/opengeodeweb_microservice/database/data.py @@ -17,22 +17,22 @@ class Data(Base): native_filename: Mapped[str | None] = mapped_column(String, nullable=True) viewable_filename: 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) - additional_files: Mapped[list[str] | None] = mapped_column(JSON, nullable=True) + light_viewable_filename: Mapped[str | None] = mapped_column(String, nullable=True) + input_filename: Mapped[str | None] = mapped_column(String, nullable=True) + additional_filenames: Mapped[list[str] | None] = mapped_column(JSON, nullable=True) @staticmethod def create( geode_object: str, viewer_object: str, - input_file: str | None = None, - additional_files: list[str] | None = None, + input_filename: str | None = None, + additional_filenames: list[str] | None = None, ) -> "Data": data_entry = Data( geode_object=geode_object, viewer_object=viewer_object, - input_file=input_file, - additional_files=additional_files, + input_filename=input_filename, + additional_filenames=additional_filenames, ) session = get_session() diff --git a/tests/test_database.py b/tests/test_database.py index 0329b9b..176b50a 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -5,8 +5,8 @@ def test_data_crud_operations(clean_database): data = Data.create( geode_object="test_object", viewer_object="test_viewer", - input_file="test.txt", - additional_files=[], + input_filename="test.txt", + additional_filenames=[], ) print("id", data.id, flush=True) assert data.id is not None @@ -16,7 +16,7 @@ def test_data_crud_operations(clean_database): assert retrieved is not None assert isinstance(retrieved, Data) assert retrieved.geode_object == "test_object" - assert retrieved.input_file == "test.txt" + assert retrieved.input_filename == "test.txt" assert retrieved.id == data.id non_existent = Data.get("fake_id") assert non_existent is None @@ -25,7 +25,7 @@ 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", viewer_object="test_viewer", additional_files=files + geode_object="test_files", viewer_object="test_viewer", additional_filenames=files ) assert data.id is not None assert isinstance(data.id, str) @@ -33,5 +33,5 @@ def test_data_with_additional_files(clean_database): retrieved = Data.get(data.id) assert retrieved is not None assert isinstance(retrieved, Data) - assert retrieved.additional_files == files + assert retrieved.additional_filenames == files assert retrieved.geode_object == "test_files" From e1e5cea99fe4137e47f68ff7739a4df70c9a988f Mon Sep 17 00:00:00 2001 From: JulienChampagnol <91873154+JulienChampagnol@users.noreply.github.com> Date: Fri, 28 Nov 2025 14:43:32 +0000 Subject: [PATCH 5/7] Apply prepare changes --- tests/test_database.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_database.py b/tests/test_database.py index 176b50a..ce54b3e 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -25,7 +25,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", viewer_object="test_viewer", additional_filenames=files + geode_object="test_files", + viewer_object="test_viewer", + additional_filenames=files, ) assert data.id is not None assert isinstance(data.id, str) From 97df6fe72d5c90fc88d2464774d17a922342f421 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Fri, 28 Nov 2025 15:57:00 +0100 Subject: [PATCH 6/7] swith to file --- src/opengeodeweb_microservice/database/data.py | 18 +++++++++--------- tests/test_database.py | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/opengeodeweb_microservice/database/data.py b/src/opengeodeweb_microservice/database/data.py index 3d24cce..8605bb5 100644 --- a/src/opengeodeweb_microservice/database/data.py +++ b/src/opengeodeweb_microservice/database/data.py @@ -14,25 +14,25 @@ class Data(Base): geode_object: Mapped[str] = mapped_column(String, nullable=False) viewer_object: Mapped[str] = mapped_column(String, nullable=False) - native_filename: Mapped[str | None] = mapped_column(String, nullable=True) - viewable_filename: Mapped[str | None] = mapped_column(String, nullable=True) + native_file: Mapped[str | None] = mapped_column(String, nullable=True) + viewable_file: Mapped[str | None] = mapped_column(String, nullable=True) - light_viewable_filename: Mapped[str | None] = mapped_column(String, nullable=True) - input_filename: Mapped[str | None] = mapped_column(String, nullable=True) - additional_filenames: Mapped[list[str] | None] = mapped_column(JSON, nullable=True) + light_viewable_file: Mapped[str | None] = mapped_column(String, nullable=True) + input_file: Mapped[str | None] = mapped_column(String, nullable=True) + additional_files: Mapped[list[str] | None] = mapped_column(JSON, nullable=True) @staticmethod def create( geode_object: str, viewer_object: str, - input_filename: str | None = None, - additional_filenames: list[str] | None = None, + input_file: str | None = None, + additional_files: list[str] | None = None, ) -> "Data": data_entry = Data( geode_object=geode_object, viewer_object=viewer_object, - input_filename=input_filename, - additional_filenames=additional_filenames, + input_file=input_file, + additional_files=additional_files, ) session = get_session() diff --git a/tests/test_database.py b/tests/test_database.py index 176b50a..0329b9b 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -5,8 +5,8 @@ def test_data_crud_operations(clean_database): data = Data.create( geode_object="test_object", viewer_object="test_viewer", - input_filename="test.txt", - additional_filenames=[], + input_file="test.txt", + additional_files=[], ) print("id", data.id, flush=True) assert data.id is not None @@ -16,7 +16,7 @@ def test_data_crud_operations(clean_database): assert retrieved is not None assert isinstance(retrieved, Data) assert retrieved.geode_object == "test_object" - assert retrieved.input_filename == "test.txt" + assert retrieved.input_file == "test.txt" assert retrieved.id == data.id non_existent = Data.get("fake_id") assert non_existent is None @@ -25,7 +25,7 @@ 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", viewer_object="test_viewer", additional_filenames=files + geode_object="test_files", viewer_object="test_viewer", additional_files=files ) assert data.id is not None assert isinstance(data.id, str) @@ -33,5 +33,5 @@ def test_data_with_additional_files(clean_database): retrieved = Data.get(data.id) assert retrieved is not None assert isinstance(retrieved, Data) - assert retrieved.additional_filenames == files + assert retrieved.additional_files == files assert retrieved.geode_object == "test_files" From a536394b4e66c31147de34f865d898dc57e1f0b2 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Fri, 28 Nov 2025 16:01:04 +0100 Subject: [PATCH 7/7] additional_files --- tests/test_database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_database.py b/tests/test_database.py index d17dbce..e7a1898 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -27,7 +27,7 @@ def test_data_with_additional_files(clean_database): data = Data.create( geode_object="test_files", viewer_object="test_viewer", - additional_filenames=files, + additional_files=files, ) assert data.id is not None assert isinstance(data.id, str)