feat(utils): generate_resource_identifier_uri function

Author: vancauwe

src/catplus-common/src/graph/utils.rs

@@ -5,6 +5,7 @@ use sophia_api::{
     term::{bnode_id::BnodeId, SimpleTerm},
 };
 use uuid::Uuid;
+use crate::graph::namespaces::cat_resource;
 
 pub fn generate_bnode_term() -> SimpleTerm<'static> {
     let identifier = Uuid::new_v4().to_string();
@@ -20,3 +21,9 @@ pub(crate) fn hash_identifier(identifier: &str) -> String {
     let result = hasher.finalize();
     general_purpose::URL_SAFE_NO_PAD.encode(result)
 }
+
+pub fn generate_resource_identifier_uri(resource_id: String) -> SimpleTerm<'static> {
+    let mut uri = cat_resource::ns.clone().as_str().to_owned();
+    uri.push_str(&hash_identifier(&resource_id));
+    IriRef::new_unchecked(uri).try_into_term().expect("Failed to convert to SimpleTerm")
+}

src/catplus-common/src/models/agilent.rs

@@ -1,10 +1,10 @@
 use crate::{
     graph::{
         insert_into::{InsertIntoGraph, Link},
-        namespaces::{allodc, allores, allorole, cat, cat_resource, obo, purl, qb, qudt},
-        utils::hash_identifier,
+        namespaces::{allodc, allores, allorole, cat, obo, purl, qb, qudt},
+        utils::generate_resource_identifier_uri,
     },
-    models::{core::PeakList, enums::Unit},
+    models::{core::PeakList, enums::Unit}
 };
 
 use serde::{Deserialize, Serialize};
@@ -195,9 +195,7 @@ pub struct DeviceDocument {
 impl InsertIntoGraph for DeviceDocument {
     fn get_uri(&self) -> SimpleTerm<'static> {
         // build URI based on self.device_identifier
-        let mut uri = cat_resource::ns.clone().as_str().to_owned();
-        uri.push_str(&hash_identifier(&self.device_identifier));
-        IriRef::new_unchecked(uri).try_into_term().unwrap()
+        generate_resource_identifier_uri(self.device_identifier.clone())
     }
 
     fn insert_into(&self, graph: &mut LightGraph, iri: SimpleTerm) -> anyhow::Result<()> {
@@ -279,9 +277,7 @@ impl InsertIntoGraph for AgilentProduct {
     fn get_uri(&self) -> SimpleTerm<'static> {
         //same as in synth.rs set_product_uri function
         //same as in bravo.rs get_uri function for BravoProduct
-        let mut uri = cat_resource::ns.clone().as_str().to_owned();
-        uri.push_str(&hash_identifier(&self.product_identifier));
-        IriRef::new_unchecked(uri).try_into_term().unwrap()
+        generate_resource_identifier_uri(self.product_identifier.clone())
     }
     fn insert_into(&self, graph: &mut LightGraph, iri: SimpleTerm) -> anyhow::Result<()> {
         for (pred, value) in [

src/catplus-common/src/models/bravo.rs

@@ -1,8 +1,8 @@
 use crate::{
     graph::{
         insert_into::{InsertIntoGraph, Link},
-        namespaces::{alloprop, alloqual, allores, cat, cat_resource, purl},
-        utils::hash_identifier,
+        namespaces::{alloprop, alloqual, allores, cat, purl},
+        utils::generate_resource_identifier_uri,
     },
     models::{
         core::{Chemical, Observation, Plate, Well},
@@ -204,9 +204,7 @@ impl InsertIntoGraph for BravoProduct {
     fn get_uri(&self) -> SimpleTerm<'static> {
         //same as in synth.rs set_product_uri function
         //same as in agilent.rs get_uri function for AgilentProduct
-        let mut uri = cat_resource::ns.clone().as_str().to_owned();
-        uri.push_str(&hash_identifier(&self.sample_id));
-        IriRef::new_unchecked(uri).try_into_term().unwrap()
+        generate_resource_identifier_uri(self.sample_id.clone())
     }
     fn insert_into(&self, graph: &mut LightGraph, iri: SimpleTerm) -> anyhow::Result<()> {
         for (pred, value) in [

src/catplus-common/src/models/synth.rs

@@ -1,8 +1,8 @@
 use crate::{
     graph::{
         insert_into::{InsertIntoGraph, Link},
-        namespaces::{alloproc, alloprop, alloqual, allores, cat, cat_resource, purl, qudt},
-        utils::hash_identifier,
+        namespaces::{alloproc, alloprop, alloqual, allores, cat, purl, qudt},
+        utils::generate_resource_identifier_uri,
     },
     models::{
         core::{Chemical, Observation, Plate},
@@ -34,18 +34,14 @@ pub struct SynthBatch {
 fn set_product_uri(product_id: String) -> SimpleTerm<'static> {
     //same as in agilent.rs get_uri function for AgilentProduct
     //same as in bravo.rs get_uri function for BravoProduct
-    let mut uri = cat_resource::ns.clone().as_str().to_owned();
-    uri.push_str(&hash_identifier(&product_id));
-    IriRef::new_unchecked(uri).try_into_term().unwrap()
+    generate_resource_identifier_uri(product_id.clone())
 }
 
 impl InsertIntoGraph for SynthBatch {
     fn get_uri(&self) -> SimpleTerm<'static> {
         // build URI based on self.batch_id
-        let mut uri = cat_resource::ns.clone().as_str().to_owned();
-        uri.push_str(&hash_identifier(&self.batch_id));
-        IriRef::new_unchecked(uri).try_into_term().unwrap()
-    }
+        generate_resource_identifier_uri(self.batch_id.clone())
+}
 
     fn insert_into(&self, graph: &mut LightGraph, iri: SimpleTerm) -> anyhow::Result<()> {
         for (pred, value) in [