phase 5 complete, sending to QA and code review

src/types.rs

@@ -108,25 +108,20 @@ impl Default for QueryResponse {
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct DataResponse {
+    #[serde(flatten)]
     pub dataset: Dataset,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct Dataset {
-    pub dimension: DimInfo,
-    pub value: Vec<Option<f64>>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub status: Vec<String>,
-}
-
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct DimInfo {
     #[serde(default)]
     pub id: Vec<String>,
     #[serde(default)]
     pub size: Vec<usize>,
     #[serde(flatten)]
-    pub dimensions: HashMap<String, Dimension>,
+    pub extra_fields: HashMap<String, serde_json::Value>,
+    pub dimension: HashMap<String, Dimension>,
+    pub value: Vec<Option<f64>>,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
@@ -143,6 +138,7 @@ pub struct CategoryInfo {
     pub label: HashMap<String, String>,
 }
 
+#[allow(dead_code)]
 #[derive(Debug, Clone)]
 pub struct DataRow {
     pub month: String,
@@ -261,9 +257,6 @@ pub enum IngestError {
 
     #[error("API returned empty data set")]
     EmptyDataset,
-
-    #[error("Unicode decode error: {0}")]
-    UnicodeError(String),
 }
 
 pub type LookupMap = HashMap<String, HashMap<String, String>>;