Merge pull request #986 from dbrandenstein/gfbio_collections_adjustments

Gfbio collections adjustments

services/src/datasets/external/gfbio_collections.rs

@@ -123,8 +123,6 @@ pub struct CollectionResponse {
 #[derive(Debug, Deserialize)]
 pub struct CollectionEntry {
  pub id: String,
- #[serde(rename = "parentIdentifier")]
- pub parent_identifier: String,
  pub vat: bool,
  pub datalink: Option<String>,
  pub citation: CollectionEntryCitation,
@@ -133,7 +131,6 @@ pub struct CollectionEntry {
 #[derive(Debug, Deserialize)]
 pub struct CollectionEntryCitation {
  pub title: String,
- pub source: String,
 }
 
 #[derive(Debug, Clone)]
@@ -186,14 +183,14 @@ fn gfbio_dataset_identifier_to_dataset_unit(
  dataset_identifier: &str,
 ) -> Result<(String, Option<String>)> {
  // urn:gfbio.org:abcd:{dataset}:{unit} (unit is optional)
- let id_parts: Vec<_> = dataset_identifier.split(':').collect();
+ let id_parts: Vec<_> = dataset_identifier.splitn(5, ':').collect();
 
  Ok(match id_parts.as_slice() {
- [_, _, _, dataset, unit] => (
+ ["urn", "gfbio.org", "abcd", dataset, unit] => (
  format!("urn:gfbio.org:abcd:{dataset}"),
  Some((*unit).to_string()),
  ),
- [_, _, _, dataset] => (format!("urn:gfbio.org:abcd:{dataset}"), None),
+ ["urn", "gfbio.org", "abcd", dataset] => (format!("urn:gfbio.org:abcd:{dataset}"), None),
  _ => return Err(crate::error::Error::InvalidLayerId),
  })
 }
@@ -370,9 +367,11 @@ impl GfbioCollectionsDataProvider {
  collection: &str,
  entry: CollectionEntry,
  ) -> Result<CollectionItem> {
+ let (dataset, unit) = gfbio_dataset_identifier_to_dataset_unit(&entry.id)?;
+
  let status = if entry.vat {
  let in_database = self
- .get_surrogate_key_for_gfbio_dataset(&entry.parent_identifier)
+ .get_surrogate_key_for_gfbio_dataset(&dataset)
  .await
  .is_ok();
 
@@ -385,8 +384,6 @@ impl GfbioCollectionsDataProvider {
  LayerStatus::Unavailable
  };
 
- let (dataset, unit) = gfbio_dataset_identifier_to_dataset_unit(&entry.id)?;
-
  Ok(CollectionItem::Layer(LayerListing {
  id: ProviderLayerId {
  provider_id: GFBIO_COLLECTIONS_PROVIDER_ID,