Add structured data sources into model (#57)

Author: abbiemery

src/model/array.rs

@@ -31,7 +31,7 @@ pub struct ArrayAttributes {
     pub structure: ArrayStructure,
     pub access_blob: Value,
     pub sorting: Value,
-    pub data_sources: Value,
+    pub data_sources: Option<Vec<node::DataSource>>,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, SimpleObject)]

src/model/container.rs

@@ -9,7 +9,7 @@ pub struct Container {
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, SimpleObject)]
-pub struct Structure {
+pub struct ContainerStructure {
     pub contents: Value,
     pub count: i64,
 }

src/model/event_stream.rs

@@ -37,10 +37,10 @@ pub struct EventStreamContainerAttributes {
     pub structure_family: String,
     pub specs: Vec<container::Specs>,
     pub metadata: EventStreamMetadata,
-    pub structure: container::Structure,
+    pub structure: container::ContainerStructure,
     pub access_blob: Value,
     pub sorting: Option<Vec<container::Sorting>>,
-    pub data_sources: Value,
+    pub data_sources: Option<Vec<node::DataSource>>,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, SimpleObject)]

src/model/node.rs

@@ -1,5 +1,10 @@
-use async_graphql::SimpleObject;
+use std::collections::HashMap;
+
+use async_graphql::{Enum, SimpleObject, Union};
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+use crate::model::{array, container, table};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, SimpleObject)]
 pub struct Links {
@@ -14,3 +19,46 @@ pub struct Links {
     pub search: Option<String>,
     pub full: Option<String>,
 }
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, SimpleObject)]
+pub struct DataSource {
+    #[serde(flatten)]
+    pub structure: Structure,
+    pub id: Option<u64>,
+    pub mimetype: Option<String>,
+    pub parameters: HashMap<String, Value>,
+    pub assets: Vec<Asset>,
+    management: Management,
+}
+
+#[derive(Union, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(
+    rename_all = "lowercase",
+    tag = "structure_family",
+    content = "structure"
+)]
+pub enum Structure {
+    Array(array::ArrayStructure),
+    //Awkward(AwkwardSructure),
+    Container(container::ContainerStructure),
+    //Sparse(SparseStructure),
+    Table(table::TableStructure),
+}
+
+#[derive(Enum, Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum Management {
+    External,
+    Immutable,
+    Locked,
+    Writable,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, SimpleObject)]
+pub struct Asset {
+    data_uri: String,
+    is_directory: bool,
+    parameter: Option<String>,
+    num: Option<i64>,
+    id: Option<i64>,
+}

src/model/run.rs

@@ -37,10 +37,10 @@ pub struct RunContainerAttributes {
     pub structure_family: String,
     pub specs: Vec<container::Specs>,
     pub metadata: RunMetadata,
-    pub structure: container::Structure,
+    pub structure: container::ContainerStructure,
     pub access_blob: Value,
     pub sorting: Vec<container::Sorting>,
-    pub data_sources: Value,
+    pub data_sources: Option<Vec<node::DataSource>>,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, SimpleObject)]

src/model/table.rs

@@ -33,7 +33,7 @@ pub struct TableAttributes {
     pub structure: TableStructure,
     pub access_blob: Value,
     pub sorting: Value,
-    pub data_sources: Value,
+    pub data_sources: Option<Vec<node::DataSource>>,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, SimpleObject)]