OpenGeodeWeb-Microservice 1.3.0rc1__tar.gz → 1.3.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (22) hide show
  1. {opengeodeweb_microservice-1.3.0rc1/src/OpenGeodeWeb_Microservice.egg-info → opengeodeweb_microservice-1.3.1}/PKG-INFO +1 -1
  2. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/pyproject.toml +1 -1
  3. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1/src/OpenGeodeWeb_Microservice.egg-info}/PKG-INFO +1 -1
  4. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/opengeodeweb_microservice/database/data.py +3 -0
  5. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/tests/test_database.py +27 -0
  6. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/LICENSE +0 -0
  7. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/README.md +0 -0
  8. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/requirements.txt +0 -0
  9. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/setup.cfg +0 -0
  10. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/OpenGeodeWeb_Microservice.egg-info/SOURCES.txt +0 -0
  11. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/OpenGeodeWeb_Microservice.egg-info/dependency_links.txt +0 -0
  12. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/OpenGeodeWeb_Microservice.egg-info/requires.txt +0 -0
  13. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/OpenGeodeWeb_Microservice.egg-info/top_level.txt +0 -0
  14. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/opengeodeweb_microservice/__init__.py +0 -0
  15. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/opengeodeweb_microservice/database/__init__.py +0 -0
  16. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/opengeodeweb_microservice/database/base.py +0 -0
  17. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/opengeodeweb_microservice/database/connection.py +0 -0
  18. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/opengeodeweb_microservice/database/data_types.py +0 -0
  19. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/opengeodeweb_microservice/error.json +0 -0
  20. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/opengeodeweb_microservice/py.typed +0 -0
  21. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/src/opengeodeweb_microservice/schemas.py +0 -0
  22. {opengeodeweb_microservice-1.3.0rc1 → opengeodeweb_microservice-1.3.1}/tests/test_schemas.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: OpenGeodeWeb-Microservice
3
- Version: 1.3.0rc1
3
+ Version: 1.3.1
4
4
  Summary: Database model and ORM layer for OpenGeodeWeb ecosystem
5
5
  Author-email: Geode-solutions <team-web@geode-solutions.com>
6
6
  Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Microservice
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "OpenGeodeWeb-Microservice"
7
- version = "1.3.0-rc.1"
7
+ version = "1.3.1"
8
8
  dynamic = ["dependencies"]
9
9
  authors = [{ name = "Geode-solutions", email = "team-web@geode-solutions.com" }]
10
10
  description = "Database model and ORM layer for OpenGeodeWeb ecosystem"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: OpenGeodeWeb-Microservice
3
- Version: 1.3.0rc1
3
+ Version: 1.3.1
4
4
  Summary: Database model and ORM layer for OpenGeodeWeb ecosystem
5
5
  Author-email: Geode-solutions <team-web@geode-solutions.com>
6
6
  Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Microservice
@@ -12,6 +12,7 @@ class Data(Base):
12
12
  id: Mapped[str] = mapped_column(
13
13
  String, primary_key=True, default=lambda: str(uuid.uuid4()).replace("-", "")
14
14
  )
15
+ geode_id: Mapped[str] = mapped_column(String, nullable=False)
15
16
  geode_object: Mapped[GeodeObjectType] = mapped_column(String, nullable=False)
16
17
  viewer_object: Mapped[ViewerType] = mapped_column(String, nullable=False)
17
18
  viewer_elements_type: Mapped[ViewerElementsType] = mapped_column(
@@ -23,11 +24,13 @@ class Data(Base):
23
24
 
24
25
  @staticmethod
25
26
  def create(
27
+ geode_id: str,
26
28
  geode_object: GeodeObjectType,
27
29
  viewer_object: ViewerType,
28
30
  viewer_elements_type: ViewerElementsType,
29
31
  ) -> "Data":
30
32
  data_entry = Data(
33
+ geode_id=geode_id,
31
34
  geode_object=geode_object,
32
35
  viewer_object=viewer_object,
33
36
  viewer_elements_type=viewer_elements_type,
@@ -1,9 +1,14 @@
1
+ from sqlalchemy import select
2
+
1
3
  from opengeodeweb_microservice.database.data import Data
2
4
  from opengeodeweb_microservice.database.connection import get_session
3
5
 
6
+ GEODE_ID = "01a08187-2c4c-7e64-85c5-52c3439f0626"
7
+
4
8
 
5
9
  def test_data_crud_operations(clean_database: None) -> None:
6
10
  data = Data.create(
11
+ geode_id=GEODE_ID,
7
12
  geode_object="test_object",
8
13
  viewer_object="test_viewer",
9
14
  viewer_elements_type="test_type",
@@ -11,11 +16,13 @@ def test_data_crud_operations(clean_database: None) -> None:
11
16
  print("id", data.id, flush=True)
12
17
  assert data.id is not None
13
18
  assert isinstance(data.id, str)
19
+ assert len(data.id) == 32
14
20
 
15
21
  retrieved = Data.get(data.id)
16
22
  assert retrieved is not None
17
23
  assert isinstance(retrieved, Data)
18
24
  assert retrieved.geode_object == "test_object"
25
+ assert retrieved.geode_id == GEODE_ID
19
26
  assert retrieved.id == data.id
20
27
  non_existent = Data.get("fake_id")
21
28
  assert non_existent is None
@@ -23,6 +30,7 @@ def test_data_crud_operations(clean_database: None) -> None:
23
30
 
24
31
  def test_data_with_file_assignments(clean_database: None) -> None:
25
32
  data = Data.create(
33
+ geode_id=GEODE_ID,
26
34
  geode_object="geode_object",
27
35
  viewer_object="viewer_object",
28
36
  viewer_elements_type="test_type",
@@ -42,3 +50,22 @@ def test_data_with_file_assignments(clean_database: None) -> None:
42
50
  assert retrieved.viewable_file == "viewable.vtm"
43
51
  assert retrieved.light_viewable_file == "light.vtp"
44
52
  assert retrieved.geode_object == "geode_object"
53
+
54
+
55
+ def test_data_geode_id_is_not_unique(clean_database: None) -> None:
56
+ first = Data.create(
57
+ geode_id=GEODE_ID,
58
+ geode_object="geode_object",
59
+ viewer_object="viewer_object",
60
+ viewer_elements_type="test_type",
61
+ )
62
+ second = Data.create(
63
+ geode_id=GEODE_ID,
64
+ geode_object="geode_object",
65
+ viewer_object="viewer_object",
66
+ viewer_elements_type="test_type",
67
+ )
68
+ assert first.id != second.id
69
+ session = get_session()
70
+ rows = session.scalars(select(Data).where(Data.geode_id == GEODE_ID)).all()
71
+ assert {row.id for row in rows} == {first.id, second.id}