From 999149ba3103fe3f2f30f26afaf67c5695df84d5 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Thu, 27 Jan 2022 12:08:11 +0100
Subject: [PATCH] Share the Available type across domain and host

---
 src/common.rs       | 11 +++++++++++
 src/domain/check.rs | 15 ++-------------
 src/host/check.rs   | 15 ++-------------
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/common.rs b/src/common.rs
index 4e97627..7487774 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -39,6 +39,17 @@ impl Extension for NoExtension {
     type Response = NoExtension;
 }
 
+/// Type that represents the &lt;name&gt; tag for host check response
+#[derive(Deserialize, Debug)]
+pub struct Available {
+    /// The resource name
+    #[serde(rename = "$value")]
+    pub name: StringValue<'static>,
+    /// The resource (un)availability
+    #[serde(rename = "avail")]
+    pub available: bool,
+}
+
 /// 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 7416b61..cb15273 100644
--- a/src/domain/check.rs
+++ b/src/domain/check.rs
@@ -1,7 +1,7 @@
 //! Types for EPP domain check request
 
 use super::XMLNS;
-use crate::common::{NoExtension, StringValue};
+use crate::common::{NoExtension, StringValue, Available};
 use crate::request::{Command, Transaction};
 use serde::{Deserialize, Serialize};
 
@@ -46,23 +46,12 @@ pub struct DomainCheck<'a> {
 
 // Response
 
-/// Type that represents the &lt;name&gt; tag for domain check response
-#[derive(Deserialize, Debug)]
-pub struct DomainAvailable {
-    /// The domain name
-    #[serde(rename = "$value")]
-    pub name: StringValue<'static>,
-    /// The domain (un)availability
-    #[serde(rename = "avail")]
-    pub available: bool,
-}
-
 /// 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: DomainAvailable,
+    pub domain: Available,
     /// The reason for (un)availability
     pub reason: Option<StringValue<'static>>,
 }
diff --git a/src/host/check.rs b/src/host/check.rs
index 0f511c3..d0ebf35 100644
--- a/src/host/check.rs
+++ b/src/host/check.rs
@@ -3,7 +3,7 @@
 use std::fmt::Debug;
 
 use super::XMLNS;
-use crate::common::{NoExtension, StringValue};
+use crate::common::{NoExtension, StringValue, Available};
 use crate::request::{Command, Transaction};
 use serde::{Deserialize, Serialize};
 
@@ -50,23 +50,12 @@ pub struct HostCheck<'a> {
 
 // Response
 
-/// Type that represents the &lt;name&gt; tag for host check response
-#[derive(Deserialize, Debug)]
-pub struct HostAvailable {
-    /// The host name
-    #[serde(rename = "$value")]
-    pub name: StringValue<'static>,
-    /// The host (un)availability
-    #[serde(rename = "avail")]
-    pub available: bool,
-}
-
 /// 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: HostAvailable,
+    pub host: Available,
     /// The reason for (un)availability
     pub reason: Option<StringValue<'static>>,
 }