From fdec3f29fcfb6bfafc3462fce9a66b78ef3f4c55 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Thu, 27 Jan 2022 12:35:50 +0100
Subject: [PATCH] Redirect CheckResponse deserialization to improve interface

---
 src/common.rs        | 38 ++++++++++++++++++++++++++++++++++----
 src/contact/check.rs | 14 ++++----------
 src/domain/check.rs  |  8 ++++----
 src/host/check.rs    | 14 ++++----------
 src/lib.rs           |  4 ++--
 tests/basic.rs       |  2 +-
 6 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/src/common.rs b/src/common.rs
index bb09e95..973b7f2 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -41,7 +41,7 @@ impl Extension for NoExtension {
 
 /// Type that represents the &lt;name&gt; tag for host check response
 #[derive(Deserialize, Debug)]
-pub struct Available {
+struct Available {
     /// The resource name
     #[serde(rename = "$value")]
     pub id: StringValue<'static>,
@@ -52,7 +52,7 @@ pub struct Available {
 
 /// Type that represents the &lt;cd&gt; tag for domain check response
 #[derive(Deserialize, Debug)]
-pub struct CheckResponseDataItem {
+struct CheckResponseDataItem {
     /// Data under the &lt;name&gt; tag
     #[serde(rename = "name", alias = "id")]
     pub resource: Available,
@@ -62,7 +62,7 @@ pub struct CheckResponseDataItem {
 
 /// Type that represents the &lt;chkData&gt; tag for host check response
 #[derive(Deserialize, Debug)]
-pub struct CheckData {
+struct CheckData {
     /// Data under the &lt;cd&gt; tag
     #[serde(rename = "cd")]
     pub list: Vec<CheckResponseDataItem>,
@@ -70,12 +70,42 @@ pub struct CheckData {
 
 /// Type that represents the &lt;resData&gt; tag for host check response
 #[derive(Deserialize, Debug)]
-pub struct CheckResponse {
+struct DeserializedCheckResponse {
     /// Data under the &lt;chkData&gt; tag
     #[serde(rename = "chkData")]
     pub check_data: CheckData,
 }
 
+#[derive(Debug)]
+pub struct Checked {
+    pub id: String,
+    pub available: bool,
+    pub reason: Option<String>,
+}
+
+#[derive(Deserialize, Debug)]
+#[serde(from = "DeserializedCheckResponse")]
+pub struct CheckResponse {
+    pub list: Vec<Checked>,
+}
+
+impl From<DeserializedCheckResponse> for CheckResponse {
+    fn from(rsp: DeserializedCheckResponse) -> Self {
+        Self {
+            list: rsp
+                .check_data
+                .list
+                .into_iter()
+                .map(|item| Checked {
+                    id: item.resource.id.0.into_owned(),
+                    available: item.resource.available,
+                    reason: item.reason.map(|r| r.0.into_owned()),
+                })
+                .collect(),
+        }
+    }
+}
+
 /// The <option> type in EPP XML login requests
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 #[serde(rename = "options")]
diff --git a/src/contact/check.rs b/src/contact/check.rs
index f3d4164..ebfede2 100644
--- a/src/contact/check.rs
+++ b/src/contact/check.rs
@@ -74,16 +74,10 @@ mod tests {
 
         assert_eq!(object.result.code, ResultCode::CommandCompletedSuccessfully);
         assert_eq!(object.result.message, SUCCESS_MSG.into());
-        assert_eq!(
-            results.check_data.list[0].resource.id,
-            "eppdev-contact-1".into()
-        );
-        assert!(!results.check_data.list[0].resource.available);
-        assert_eq!(
-            results.check_data.list[1].resource.id,
-            "eppdev-contact-2".into()
-        );
-        assert!(results.check_data.list[1].resource.available);
+        assert_eq!(results.list[0].id, "eppdev-contact-1");
+        assert!(!results.list[0].available);
+        assert_eq!(results.list[1].id, "eppdev-contact-2");
+        assert!(results.list[1].available);
         assert_eq!(object.tr_ids.client_tr_id.unwrap(), CLTRID.into());
         assert_eq!(object.tr_ids.server_tr_id, SVTRID.into());
     }
diff --git a/src/domain/check.rs b/src/domain/check.rs
index 5fe88d4..1a7d142 100644
--- a/src/domain/check.rs
+++ b/src/domain/check.rs
@@ -75,10 +75,10 @@ mod tests {
 
         assert_eq!(object.result.code, ResultCode::CommandCompletedSuccessfully);
         assert_eq!(object.result.message, SUCCESS_MSG.into());
-        assert_eq!(result.check_data.list[0].resource.id, "eppdev.com".into());
-        assert!(result.check_data.list[0].resource.available);
-        assert_eq!(result.check_data.list[1].resource.id, "eppdev.net".into());
-        assert!(!result.check_data.list[1].resource.available);
+        assert_eq!(result.list[0].id, "eppdev.com");
+        assert!(result.list[0].available);
+        assert_eq!(result.list[1].id, "eppdev.net");
+        assert!(!result.list[1].available);
         assert_eq!(object.tr_ids.client_tr_id.unwrap(), CLTRID.into());
         assert_eq!(object.tr_ids.server_tr_id, SVTRID.into());
     }
diff --git a/src/host/check.rs b/src/host/check.rs
index af3bcee..ea00076 100644
--- a/src/host/check.rs
+++ b/src/host/check.rs
@@ -79,16 +79,10 @@ mod tests {
 
         assert_eq!(object.result.code, ResultCode::CommandCompletedSuccessfully);
         assert_eq!(object.result.message, SUCCESS_MSG.into());
-        assert_eq!(
-            result.check_data.list[0].resource.id,
-            "host1.eppdev-1.com".into()
-        );
-        assert!(result.check_data.list[0].resource.available);
-        assert_eq!(
-            result.check_data.list[1].resource.id,
-            "ns1.testing.com".into()
-        );
-        assert!(!result.check_data.list[1].resource.available);
+        assert_eq!(result.list[0].id, "host1.eppdev-1.com");
+        assert!(result.list[0].available);
+        assert_eq!(result.list[1].id, "ns1.testing.com");
+        assert!(!result.list[1].available);
         assert_eq!(object.tr_ids.client_tr_id.unwrap(), CLTRID.into());
         assert_eq!(object.tr_ids.server_tr_id, SVTRID.into());
     }
diff --git a/src/lib.rs b/src/lib.rs
index 0aea2b8..1c2f897 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -71,9 +71,9 @@
 //! let response = client.transact(&domain_check, "transaction-id").await.unwrap();
 //!
 //! // print the availability results
-//! response.res_data.unwrap().check_data.list
+//! response.res_data.unwrap().list
 //!     .iter()
-//!     .for_each(|chk| println!("Domain: {}, Available: {}", chk.resource.id, chk.resource.available));
+//!     .for_each(|chk| println!("Domain: {}, Available: {}", chk.id, chk.available));
 //!
 //! // Close the connection
 //! client.transact(&Logout, "transaction-id").await.unwrap();
diff --git a/tests/basic.rs b/tests/basic.rs
index 62254a1..ca90f49 100644
--- a/tests/basic.rs
+++ b/tests/basic.rs
@@ -107,5 +107,5 @@ async fn client() {
     assert_eq!(rsp.result.code, ResultCode::CommandCompletedSuccessfully);
 
     let result = rsp.res_data().unwrap();
-    assert_eq!(result.check_data.list[0].resource.id, "eppdev.com".into());
+    assert_eq!(result.list[0].id, "eppdev.com");
 }