From dd1c9c1e66a93757e47481f5ededf9e45aeaca2c Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Thu, 27 Jan 2022 12:20:55 +0100
Subject: [PATCH] Share CheckResponse types for domain and host resources

---
 src/common.rs       | 26 ++++++++++++++++++++++++
 src/domain/check.rs | 48 +++++++--------------------------------------
 src/host/check.rs   | 42 +++++++--------------------------------
 src/lib.rs          |  4 ++--
 tests/basic.rs      |  5 +----
 5 files changed, 43 insertions(+), 82 deletions(-)

diff --git a/src/common.rs b/src/common.rs
index 7487774..df43b09 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -50,6 +50,32 @@ pub struct Available {
     pub available: bool,
 }
 
+/// Type that represents the &lt;cd&gt; tag for domain check response
+#[derive(Deserialize, Debug)]
+pub struct CheckResponseDataItem {
+    /// Data under the &lt;name&gt; tag
+    #[serde(rename = "name")]
+    pub resource: Available,
+    /// The reason for (un)availability
+    pub reason: Option<StringValue<'static>>,
+}
+
+/// Type that represents the &lt;chkData&gt; tag for host check response
+#[derive(Deserialize, Debug)]
+pub struct CheckData {
+    /// Data under the &lt;cd&gt; tag
+    #[serde(rename = "cd")]
+    pub list: Vec<CheckResponseDataItem>,
+}
+
+/// Type that represents the &lt;resData&gt; tag for host check response
+#[derive(Deserialize, Debug)]
+pub struct CheckResponse {
+    /// Data under the &lt;chkData&gt; tag
+    #[serde(rename = "chkData")]
+    pub check_data: CheckData,
+}
+
 /// The <option> type in EPP XML login requests
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 #[serde(rename = "options")]
diff --git a/src/domain/check.rs b/src/domain/check.rs
index cb15273..ee1e0ad 100644
--- a/src/domain/check.rs
+++ b/src/domain/check.rs
@@ -1,14 +1,14 @@
 //! Types for EPP domain check request
 
 use super::XMLNS;
-use crate::common::{NoExtension, StringValue, Available};
+use crate::common::{CheckResponse, NoExtension, StringValue};
 use crate::request::{Command, Transaction};
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 
 impl<'a> Transaction<NoExtension> for DomainCheck<'a> {}
 
 impl<'a> Command for DomainCheck<'a> {
-    type Response = DomainCheckResponse;
+    type Response = CheckResponse;
     const COMMAND: &'static str = "check";
 }
 
@@ -44,34 +44,6 @@ pub struct DomainCheck<'a> {
     list: DomainList<'a>,
 }
 
-// Response
-
-/// Type that represents the &lt;cd&gt; tag for domain check response
-#[derive(Deserialize, Debug)]
-pub struct DomainCheckResponseDataItem {
-    /// Data under the &lt;name&gt; tag
-    #[serde(rename = "name")]
-    pub domain: Available,
-    /// The reason for (un)availability
-    pub reason: Option<StringValue<'static>>,
-}
-
-/// Type that represents the &lt;chkData&gt; tag for domain check response
-#[derive(Deserialize, Debug)]
-pub struct DomainCheckResponseData {
-    /// Data under the &lt;cd&gt; tag
-    #[serde(rename = "cd")]
-    pub domain_list: Vec<DomainCheckResponseDataItem>,
-}
-
-/// Type that represents the &lt;resData&gt; tag for domain check response
-#[derive(Deserialize, Debug)]
-pub struct DomainCheckResponse {
-    /// Data under the &lt;chkData&gt; tag
-    #[serde(rename = "chkData")]
-    pub check_data: DomainCheckResponseData,
-}
-
 #[cfg(test)]
 mod tests {
     use super::DomainCheck;
@@ -103,16 +75,10 @@ mod tests {
 
         assert_eq!(object.result.code, ResultCode::CommandCompletedSuccessfully);
         assert_eq!(object.result.message, SUCCESS_MSG.into());
-        assert_eq!(
-            result.check_data.domain_list[0].domain.name,
-            "eppdev.com".into()
-        );
-        assert!(result.check_data.domain_list[0].domain.available);
-        assert_eq!(
-            result.check_data.domain_list[1].domain.name,
-            "eppdev.net".into()
-        );
-        assert!(!result.check_data.domain_list[1].domain.available);
+        assert_eq!(result.check_data.list[0].resource.name, "eppdev.com".into());
+        assert!(result.check_data.list[0].resource.available);
+        assert_eq!(result.check_data.list[1].resource.name, "eppdev.net".into());
+        assert!(!result.check_data.list[1].resource.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 d0ebf35..5ab9a2b 100644
--- a/src/host/check.rs
+++ b/src/host/check.rs
@@ -3,14 +3,14 @@
 use std::fmt::Debug;
 
 use super::XMLNS;
-use crate::common::{NoExtension, StringValue, Available};
+use crate::common::{CheckResponse, NoExtension, StringValue};
 use crate::request::{Command, Transaction};
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 
 impl<'a> Transaction<NoExtension> for HostCheck<'a> {}
 
 impl<'a> Command for HostCheck<'a> {
-    type Response = HostCheckResponse;
+    type Response = CheckResponse;
     const COMMAND: &'static str = "check";
 }
 
@@ -48,34 +48,6 @@ pub struct HostCheck<'a> {
     list: HostList<'a>,
 }
 
-// Response
-
-/// Type that represents the &lt;cd&gt; tag for host check response
-#[derive(Deserialize, Debug)]
-pub struct HostCheckDataItem {
-    /// Data under the &lt;name&gt; tag
-    #[serde(rename = "name")]
-    pub host: Available,
-    /// The reason for (un)availability
-    pub reason: Option<StringValue<'static>>,
-}
-
-/// Type that represents the &lt;chkData&gt; tag for host check response
-#[derive(Deserialize, Debug)]
-pub struct HostCheckData {
-    /// Data under the &lt;cd&gt; tag
-    #[serde(rename = "cd")]
-    pub host_list: Vec<HostCheckDataItem>,
-}
-
-/// Type that represents the &lt;resData&gt; tag for host check response
-#[derive(Deserialize, Debug)]
-pub struct HostCheckResponse {
-    /// Data under the &lt;chkData&gt; tag
-    #[serde(rename = "chkData")]
-    pub check_data: HostCheckData,
-}
-
 #[cfg(test)]
 mod tests {
     use super::HostCheck;
@@ -108,15 +80,15 @@ mod tests {
         assert_eq!(object.result.code, ResultCode::CommandCompletedSuccessfully);
         assert_eq!(object.result.message, SUCCESS_MSG.into());
         assert_eq!(
-            result.check_data.host_list[0].host.name,
+            result.check_data.list[0].resource.name,
             "host1.eppdev-1.com".into()
         );
-        assert!(result.check_data.host_list[0].host.available);
+        assert!(result.check_data.list[0].resource.available);
         assert_eq!(
-            result.check_data.host_list[1].host.name,
+            result.check_data.list[1].resource.name,
             "ns1.testing.com".into()
         );
-        assert!(!result.check_data.host_list[1].host.available);
+        assert!(!result.check_data.list[1].resource.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 59d3323..bbfeac8 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.domain_list
+//! response.res_data.unwrap().check_data.list
 //!     .iter()
-//!     .for_each(|chk| println!("Domain: {}, Available: {}", chk.domain.name, chk.domain.available));
+//!     .for_each(|chk| println!("Domain: {}, Available: {}", chk.resource.name, chk.resource.available));
 //!
 //! // Close the connection
 //! client.transact(&Logout, "transaction-id").await.unwrap();
diff --git a/tests/basic.rs b/tests/basic.rs
index 9a9621b..8e889be 100644
--- a/tests/basic.rs
+++ b/tests/basic.rs
@@ -107,8 +107,5 @@ async fn client() {
     assert_eq!(rsp.result.code, ResultCode::CommandCompletedSuccessfully);
 
     let result = rsp.res_data().unwrap();
-    assert_eq!(
-        result.check_data.domain_list[0].domain.name,
-        "eppdev.com".into()
-    );
+    assert_eq!(result.check_data.list[0].resource.name, "eppdev.com".into());
 }