Merge pull request #336 from gaiaresources/BDRSPS-1038

BDRSPS-1038 Ensure that every chunk has a dataset type triple
gaiaresources · Nov 19, 2024 · 28e38f7 · 28e38f7
2 parents bb8759b + 7a673ee
commit 28e38f7
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 10 deletions.
diff --git a/abis_mapping/templates/incidental_occurrence_data_v3/mapping.py b/abis_mapping/templates/incidental_occurrence_data_v3/mapping.py
@@ -188,8 +188,11 @@ def apply_mapping(
         graph = utils.rdf.create_graph()
 
         # Check if Dataset IRI Supplied
-        if not dataset_iri:
-            # Create Dataset IRI
+        if dataset_iri:
+            # If supplied, add just the dataset type.
+            graph.add((dataset_iri, a, utils.namespaces.TERN.Dataset))
+        else:
+            # If not supplied, create example "default" Dataset IRI
             dataset_iri = utils.rdf.uri(f"dataset/{self.DATASET_DEFAULT_NAME}", base_iri)
 
             # Add Example Default Dataset if not Supplied
@@ -221,6 +224,8 @@ def apply_mapping(
 
                     # Initialise New Graph
                     graph = utils.rdf.create_graph()
+                    # Every chunk should have this node
+                    graph.add((dataset_iri, a, utils.namespaces.TERN.Dataset))
 
             # Yield
             yield graph

diff --git a/abis_mapping/templates/survey_metadata_v2/mapping.py b/abis_mapping/templates/survey_metadata_v2/mapping.py
@@ -146,8 +146,11 @@ def apply_mapping(
         graph = utils.rdf.create_graph()
 
         # Check if Dataset IRI Supplied
-        if not dataset_iri:
-            # Create Dataset IRI
+        if dataset_iri:
+            # If supplied, add just the dataset type.
+            graph.add((dataset_iri, a, utils.namespaces.TERN.Dataset))
+        else:
+            # If not supplied, create example "default" Dataset IRI
             dataset_iri = utils.rdf.uri(f"dataset/{self.DATASET_DEFAULT_NAME}", base_iri)
 
             # Add the default dataset

diff --git a/abis_mapping/templates/survey_occurrence_data_v2/mapping.py b/abis_mapping/templates/survey_occurrence_data_v2/mapping.py
@@ -311,8 +311,11 @@ def apply_mapping(
         graph = utils.rdf.create_graph()
 
         # Check if Dataset IRI Supplied
-        if not dataset_iri:
-            # Create Dataset IRI
+        if dataset_iri:
+            # If supplied, add just the dataset type.
+            graph.add((dataset_iri, a, utils.namespaces.TERN.Dataset))
+        else:
+            # If not supplied, create example "default" Dataset IRI
             dataset_iri = utils.rdf.uri(f"dataset/{self.DATASET_DEFAULT_NAME}", base_iri)
 
             # Add Example Default Dataset if not Supplied
@@ -346,6 +349,8 @@ def apply_mapping(
 
                     # Initialise New Graph
                     graph = utils.rdf.create_graph()
+                    # Every chunk should have this node
+                    graph.add((dataset_iri, a, utils.namespaces.TERN.Dataset))
 
             # Yield
             yield graph

diff --git a/abis_mapping/templates/survey_site_data_v2/mapping.py b/abis_mapping/templates/survey_site_data_v2/mapping.py
@@ -228,8 +228,11 @@ def apply_mapping(
         graph = utils.rdf.create_graph()
 
         # Check if Dataset IRI Supplied
-        if not dataset_iri:
-            # Create Dataset IRI
+        if dataset_iri:
+            # If supplied, add just the dataset type.
+            graph.add((dataset_iri, a, utils.namespaces.TERN.Dataset))
+        else:
+            # If not supplied, create example "default" Dataset IRI
             dataset_iri = utils.rdf.uri(f"dataset/{self.DATASET_DEFAULT_NAME}", base_iri)
 
             # Add the default dataset

diff --git a/abis_mapping/templates/survey_site_visit_data_v2/mapping.py b/abis_mapping/templates/survey_site_visit_data_v2/mapping.py
@@ -249,8 +249,11 @@ def apply_mapping(
         graph_has_data: bool = False
 
         # Check if Dataset IRI Supplied
-        if not dataset_iri:
-            # Create Dataset IRI
+        if dataset_iri:
+            # If supplied, add just the dataset type.
+            graph.add((dataset_iri, a, utils.namespaces.TERN.Dataset))
+        else:
+            # If not supplied, create example "default" Dataset IRI
             dataset_iri = utils.rdf.uri(f"dataset/{self.DATASET_DEFAULT_NAME}", base_iri)
 
             # Add the default dataset
@@ -280,6 +283,8 @@ def apply_mapping(
                     # Initialise New Graph for next chunk
                     graph = utils.rdf.create_graph()
                     graph_has_data = False
+                    # Every chunk should have this node
+                    graph.add((dataset_iri, a, utils.namespaces.TERN.Dataset))
 
             # yield final chunk, or whole graph if not chunking.
             if chunk_size is None or graph_has_data: