Merge pull request #18 from pbs-data-solutions/user-native

Add parser for user native

Author: sanders41

README.md

@@ -10,4 +10,4 @@ deserializing to Python classes with PyO3.
 
 - [x] Subject native XML
 - [x] Site Native XML
-- [ ] User Native XML
+- [x] User Native XML

src/lib.rs

@@ -176,7 +176,11 @@ pub struct Field {
     #[serde(alias = "type")]
     pub field_type: String,
 
-    pub data_type: String,
+    #[serde(
+        default = "default_string_none",
+        deserialize_with = "deserialize_empty_string_as_none"
+    )]
+    pub data_type: Option<String>,
     pub error_code: String,
     pub when_created: DateTime<Utc>,
     pub keep_history: bool,
@@ -195,7 +199,12 @@ pub struct Field {
     #[serde(alias = "type")]
     pub field_type: String,
 
-    pub data_type: String,
+    #[serde(
+        default = "default_string_none",
+        deserialize_with = "deserialize_empty_string_as_none"
+    )]
+    pub data_type: Option<String>,
+
     pub error_code: String,
     pub when_created: DateTime<Utc>,
     pub keep_history: bool,
@@ -218,7 +227,7 @@ impl Field {
     }
 
     #[getter]
-    fn data_type(&self) -> PyResult<String> {
+    fn data_type(&self) -> PyResult<Option<String>> {
         Ok(self.data_type.clone())
     }
 
@@ -328,3 +337,206 @@ impl State {
         to_py_datetime_option(py, &self.date_signed)
     }
 }
+
+#[cfg(not(feature = "python"))]
+#[derive(Debug, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct Form {
+    pub name: String,
+
+    #[serde(
+        default = "default_datetime_none",
+        deserialize_with = "deserialize_empty_string_as_none_datetime"
+    )]
+    pub last_modified: Option<DateTime<Utc>>,
+
+    #[serde(
+        default = "default_string_none",
+        deserialize_with = "deserialize_empty_string_as_none"
+    )]
+    pub who_last_modified_name: Option<String>,
+
+    #[serde(
+        default = "default_string_none",
+        deserialize_with = "deserialize_empty_string_as_none"
+    )]
+    pub who_last_modified_role: Option<String>,
+
+    pub when_created: usize,
+    pub has_errors: bool,
+    pub has_warnings: bool,
+    pub locked: bool,
+
+    #[serde(
+        default = "default_string_none",
+        deserialize_with = "deserialize_empty_string_as_none"
+    )]
+    pub user: Option<String>,
+
+    #[serde(
+        default = "default_datetime_none",
+        deserialize_with = "deserialize_empty_string_as_none_datetime"
+    )]
+    pub date_time_changed: Option<DateTime<Utc>>,
+
+    pub form_title: String,
+    pub form_index: usize,
+
+    #[serde(
+        default = "default_string_none",
+        deserialize_with = "deserialize_empty_string_as_none"
+    )]
+    pub form_group: Option<String>,
+
+    pub form_state: String,
+
+    #[serde(rename = "state", default)]
+    pub states: Option<Vec<State>>,
+
+    #[serde(rename = "category", default)]
+    pub categories: Option<Vec<Category>>,
+}
+
+#[cfg(feature = "python")]
+#[derive(Clone, Debug, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+#[pyclass]
+pub struct Form {
+    pub name: String,
+
+    #[serde(
+        default = "default_datetime_none",
+        deserialize_with = "deserialize_empty_string_as_none_datetime"
+    )]
+    pub last_modified: Option<DateTime<Utc>>,
+
+    #[serde(
+        default = "default_string_none",
+        deserialize_with = "deserialize_empty_string_as_none"
+    )]
+    pub who_last_modified_name: Option<String>,
+
+    #[serde(
+        default = "default_string_none",
+        deserialize_with = "deserialize_empty_string_as_none"
+    )]
+    pub who_last_modified_role: Option<String>,
+
+    pub when_created: usize,
+    pub has_errors: bool,
+    pub has_warnings: bool,
+    pub locked: bool,
+
+    #[serde(
+        default = "default_string_none",
+        deserialize_with = "deserialize_empty_string_as_none"
+    )]
+    pub user: Option<String>,
+
+    #[serde(
+        default = "default_datetime_none",
+        deserialize_with = "deserialize_empty_string_as_none_datetime"
+    )]
+    pub date_time_changed: Option<DateTime<Utc>>,
+
+    pub form_title: String,
+    pub form_index: usize,
+
+    #[serde(
+        default = "default_string_none",
+        deserialize_with = "deserialize_empty_string_as_none"
+    )]
+    pub form_group: Option<String>,
+
+    pub form_state: String,
+
+    #[serde(rename = "state", default)]
+    pub states: Option<Vec<State>>,
+
+    #[serde(rename = "category", default)]
+    pub categories: Option<Vec<Category>>,
+}
+
+#[cfg(feature = "python")]
+#[pymethods]
+impl Form {
+    #[getter]
+    fn name(&self) -> PyResult<String> {
+        Ok(self.name.clone())
+    }
+
+    #[getter]
+    fn last_modified<'py>(&self, py: Python<'py>) -> PyResult<Option<Bound<'py, PyDateTime>>> {
+        to_py_datetime_option(py, &self.last_modified)
+    }
+
+    #[getter]
+    fn who_last_modified_name(&self) -> PyResult<Option<String>> {
+        Ok(self.who_last_modified_name.clone())
+    }
+
+    #[getter]
+    fn who_last_modified_role(&self) -> PyResult<Option<String>> {
+        Ok(self.who_last_modified_role.clone())
+    }
+
+    #[getter]
+    fn when_created(&self) -> PyResult<usize> {
+        Ok(self.when_created)
+    }
+
+    #[getter]
+    fn has_errors(&self) -> PyResult<bool> {
+        Ok(self.has_errors)
+    }
+
+    #[getter]
+    fn has_warnings(&self) -> PyResult<bool> {
+        Ok(self.has_warnings)
+    }
+
+    #[getter]
+    fn locked(&self) -> PyResult<bool> {
+        Ok(self.locked)
+    }
+
+    #[getter]
+    fn user(&self) -> PyResult<Option<String>> {
+        Ok(self.user.clone())
+    }
+
+    #[getter]
+    fn date_time_changed<'py>(&self, py: Python<'py>) -> PyResult<Option<Bound<'py, PyDateTime>>> {
+        to_py_datetime_option(py, &self.date_time_changed)
+    }
+
+    #[getter]
+    fn form_title(&self) -> PyResult<String> {
+        Ok(self.form_title.clone())
+    }
+
+    #[getter]
+    fn form_index(&self) -> PyResult<usize> {
+        Ok(self.form_index)
+    }
+
+    #[getter]
+    fn form_group(&self) -> PyResult<Option<String>> {
+        Ok(self.form_group.clone())
+    }
+
+    #[getter]
+    fn form_state(&self) -> PyResult<String> {
+        Ok(self.form_state.clone())
+    }
+
+    #[getter]
+    fn states(&self) -> PyResult<Option<Vec<State>>> {
+        Ok(self.states.clone())
+    }
+
+    #[getter]
+    fn categories(&self) -> PyResult<Option<Vec<Category>>> {
+        Ok(self.categories.clone())
+    }
+}

src/native/common.rs

@@ -2,3 +2,4 @@ mod common;
 mod deserializers;
 pub mod site_native;
 pub mod subject_native;
+pub mod user_native;