Refactor contact update models

epp-client/src/contact.rs

@@ -2,3 +2,4 @@ pub mod check;
 pub mod create;
 pub mod delete;
 pub mod info;
+pub mod update;

epp-client/src/contact/update.rs

@@ -6,6 +6,7 @@ use crate::contact::info::EppContactInfoResponse;
 use crate::epp::object::data::{ContactAuthInfo, ContactStatus, Phone, PostalInfo};
 use crate::epp::object::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
+use crate::epp::response::EppCommandResponse;
 use crate::epp::xml::EPP_CONTACT_XMLNS;
 use crate::error;
 use serde::{Deserialize, Serialize};
@@ -19,7 +20,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// use epp_client::config::{EppClientConfig, EppClientConnection};
 /// use epp_client::EppClient;
-/// use epp_client::epp::{EppContactUpdate, EppContactUpdateResponse};
+/// use epp_client::contact::update::{EppContactUpdate, EppContactUpdateResponse};
 /// use epp_client::epp::generate_client_tr_id;
 /// use epp_client::epp::object::data::ContactStatus;
 ///
@@ -68,59 +69,13 @@ use serde::{Deserialize, Serialize};
 ///     client.logout().await.unwrap();
 /// }
 /// ```
-pub type EppContactUpdate = EppObject<Command<ContactUpdate>>;
+pub type EppContactUpdate = EppObject<Command<ContactUpdateRequest>>;
-
-/// Type for elements under the &lt;chg&gt; tag for contact update request
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ContactChangeInfo {
-    #[serde(rename = "contact:postalInfo", alias = "postalInfo")]
-    postal_info: Option<PostalInfo>,
-    #[serde(rename = "contact:voice", alias = "voice")]
-    voice: Option<Phone>,
-    #[serde(rename = "contact:fax", alias = "fax")]
-    fax: Option<Phone>,
-    #[serde(rename = "contact:email", alias = "email")]
-    email: Option<StringValue>,
-    #[serde(rename = "contact:authInfo", alias = "authInfo")]
-    auth_info: Option<ContactAuthInfo>,
-}
-
-/// Type for list of elements of the &lt;status&gt; tag for contact update request
-#[derive(Serialize, Deserialize, Debug)]
-pub struct StatusList {
-    #[serde(rename = "contact:status", alias = "status")]
-    status: Vec<ContactStatus>,
-}
-
-/// Type for elements under the contact &lt;update&gt; tag
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ContactUpdateData {
-    #[serde(rename = "xmlns:contact", alias = "xmlns")]
-    xmlns: String,
-    #[serde(rename = "contact:id", alias = "id")]
-    id: StringValue,
-    #[serde(rename = "contact:add", alias = "add")]
-    add_statuses: Option<StatusList>,
-    #[serde(rename = "contact:rem", alias = "rem")]
-    remove_statuses: Option<StatusList>,
-    #[serde(rename = "contact:chg", alias = "chg")]
-    change_info: Option<ContactChangeInfo>,
-}
-
-#[derive(Serialize, Deserialize, Debug, ElementName)]
-#[element_name(name = "update")]
-/// Type for EPP XML &lt;update&gt; command for contacts
-pub struct ContactUpdate {
-    /// The data under the &lt;update&gt; tag for the contact update
-    #[serde(rename = "contact:update", alias = "update")]
-    contact: ContactUpdateData,
-}
 
 impl EppContactUpdate {
     /// Creates a new EppObject for contact update corresponding to the &lt;epp&gt; tag in EPP XML
     pub fn new(id: &str, client_tr_id: &str) -> EppContactUpdate {
-        let contact_update = ContactUpdate {
+        let contact_update = ContactUpdateRequest {
-            contact: ContactUpdateData {
+            contact: ContactUpdateRequestData {
                 xmlns: EPP_CONTACT_XMLNS.to_string(),
                 id: id.into(),
                 add_statuses: None,
@@ -128,7 +83,10 @@ impl EppContactUpdate {
                 change_info: None,
             },
         };
-        EppObject::build(Command::<ContactUpdate>::new(contact_update, client_tr_id))
+        EppObject::build(Command::<ContactUpdateRequest>::new(
+            contact_update,
+            client_tr_id,
+        ))
     }
 
     /// Sets the data for the &lt;chg&gt; tag for the contact update request
@@ -187,3 +145,52 @@ impl EppContactUpdate {
         }
     }
 }
+
+/// Type that represents the &lt;epp&gt; tag for the EPP XML contact update response
+pub type EppContactUpdateResponse = EppCommandResponse;
+
+/// Type for elements under the &lt;chg&gt; tag for contact update request
+#[derive(Serialize, Deserialize, Debug)]
+pub struct ContactChangeInfo {
+    #[serde(rename = "contact:postalInfo", alias = "postalInfo")]
+    postal_info: Option<PostalInfo>,
+    #[serde(rename = "contact:voice", alias = "voice")]
+    voice: Option<Phone>,
+    #[serde(rename = "contact:fax", alias = "fax")]
+    fax: Option<Phone>,
+    #[serde(rename = "contact:email", alias = "email")]
+    email: Option<StringValue>,
+    #[serde(rename = "contact:authInfo", alias = "authInfo")]
+    auth_info: Option<ContactAuthInfo>,
+}
+
+/// Type for list of elements of the &lt;status&gt; tag for contact update request
+#[derive(Serialize, Deserialize, Debug)]
+pub struct StatusList {
+    #[serde(rename = "contact:status", alias = "status")]
+    status: Vec<ContactStatus>,
+}
+
+/// Type for elements under the contact &lt;update&gt; tag
+#[derive(Serialize, Deserialize, Debug)]
+pub struct ContactUpdateRequestData {
+    #[serde(rename = "xmlns:contact", alias = "xmlns")]
+    xmlns: String,
+    #[serde(rename = "contact:id", alias = "id")]
+    id: StringValue,
+    #[serde(rename = "contact:add", alias = "add")]
+    add_statuses: Option<StatusList>,
+    #[serde(rename = "contact:rem", alias = "rem")]
+    remove_statuses: Option<StatusList>,
+    #[serde(rename = "contact:chg", alias = "chg")]
+    change_info: Option<ContactChangeInfo>,
+}
+
+#[derive(Serialize, Deserialize, Debug, ElementName)]
+#[element_name(name = "update")]
+/// Type for EPP XML &lt;update&gt; command for contacts
+pub struct ContactUpdateRequest {
+    /// The data under the &lt;update&gt; tag for the contact update
+    #[serde(rename = "contact:update", alias = "update")]
+    contact: ContactUpdateRequestData,
+}

epp-client/src/epp.rs

@@ -5,7 +5,6 @@ pub mod request;
 pub mod response;
 pub mod xml;
 
-pub use request::contact::update::*;
 pub use request::host::check::*;
 pub use request::host::create::*;
 pub use request::host::delete::*;
@@ -14,7 +13,6 @@ pub use request::host::update::*;
 pub use request::message::ack::*;
 pub use request::message::poll::*;
 
-pub use response::contact::update::*;
 pub use response::host::check::*;
 pub use response::host::create::*;
 pub use response::host::delete::*;

epp-client/src/epp/request.rs

@@ -1,6 +1,5 @@
 //! Types for EPP requests
 
-pub mod contact;
 pub mod host;
 pub mod message;
 

epp-client/src/epp/request/contact.rs

@@ -1,3 +0,0 @@
-//! Types for EPP contact requests
-
-pub mod update;

epp-client/src/epp/response.rs

@@ -1,6 +1,5 @@
 //! Types for EPP responses
 
-pub mod contact;
 pub mod host;
 pub mod message;
 

epp-client/src/epp/response/contact.rs

@@ -1,3 +0,0 @@
-//! Types for EPP contact responses
-
-pub mod update;

epp-client/src/epp/response/contact/update.rs

@@ -1,6 +0,0 @@
-//! Types for EPP contact update response
-
-use crate::epp::response::EppCommandResponse;
-
-/// Type that represents the <epp> tag for the EPP XML contact update response
-pub type EppContactUpdateResponse = EppCommandResponse;

epp-client/src/tests/de.rs

@@ -7,6 +7,7 @@ mod response {
     use crate::contact::create::EppContactCreateResponse;
     use crate::contact::delete::EppContactDeleteResponse;
     use crate::contact::info::EppContactInfoResponse;
+    use crate::contact::update::EppContactUpdateResponse;
     use crate::domain::check::EppDomainCheckResponse;
     use crate::domain::create::EppDomainCreateResponse;
     use crate::domain::delete::EppDomainDeleteResponse;

epp-client/src/tests/se.rs

@@ -7,6 +7,7 @@ mod request {
     use crate::contact::create::EppContactCreate;
     use crate::contact::delete::EppContactDelete;
     use crate::contact::info::EppContactInfo;
+    use crate::contact::update::EppContactUpdate;
     use crate::domain::check::EppDomainCheck;
     use crate::domain::create::EppDomainCreate;
     use crate::domain::delete::EppDomainDelete;