enhance: follow clippy suggestions on xsender (project-openubl#375)

carlosthe19916 · Aug 11, 2024 · 19bc2a4 · 19bc2a4
1 parent 8d418ea
commit 19bc2a4
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 33 deletions.
diff --git a/xsender/src/analyzer.rs b/xsender/src/analyzer.rs
@@ -1,4 +1,4 @@
-use log::warn;
+use anyhow::anyhow;
 
 use crate::constants::{
     BOLETA_SERIE_REGEX, FACTURA_SERIE_REGEX, GUIA_REMISION_REMITENTE_SERIE_REGEX,
@@ -71,44 +71,46 @@ pub fn filename_formatted_without_extension(
     document_type: &str,
     document_id: &str,
     ruc: &str,
-) -> Option<String> {
+) -> anyhow::Result<String> {
     match document_type {
         DocumentType::INVOICE => {
-            if FACTURA_SERIE_REGEX.is_match(document_id) {
-                Some(format!("{ruc}-{}-{document_id}", Catalog1::FACTURA))
-            } else if BOLETA_SERIE_REGEX.is_match(document_id) {
-                Some(format!("{ruc}-{}-{document_id}", Catalog1::BOLETA))
+            if FACTURA_SERIE_REGEX.as_ref()?.is_match(document_id) {
+                Ok(format!("{ruc}-{}-{document_id}", Catalog1::FACTURA))
+            } else if BOLETA_SERIE_REGEX.as_ref()?.is_match(document_id) {
+                Ok(format!("{ruc}-{}-{document_id}", Catalog1::BOLETA))
             } else {
-                warn!("Could not build filename from Invoice");
-                None
+                Err(anyhow!("Could not build filename from Invoice"))
             }
         }
-        DocumentType::CREDIT_NOTE => {
-            Some(format!("{ruc}-{}-{document_id}", Catalog1::NOTA_CREDITO))
-        }
-        DocumentType::DEBIT_NOTE => Some(format!("{ruc}-{}-{document_id}", Catalog1::NOTA_DEBITO)),
+        DocumentType::CREDIT_NOTE => Ok(format!("{ruc}-{}-{document_id}", Catalog1::NOTA_CREDITO)),
+        DocumentType::DEBIT_NOTE => Ok(format!("{ruc}-{}-{document_id}", Catalog1::NOTA_DEBITO)),
         DocumentType::VOIDED_DOCUMENTS | DocumentType::SUMMARY_DOCUMENTS => {
-            Some(format!("{ruc}-{document_id}"))
+            Ok(format!("{ruc}-{document_id}"))
         }
-        DocumentType::PERCEPTION => Some(format!("{ruc}-{}-{document_id}", Catalog1::PERCEPCION)),
-        DocumentType::RETENTION => Some(format!("{ruc}-{}-{document_id}", Catalog1::RETENCION)),
+        DocumentType::PERCEPTION => Ok(format!("{ruc}-{}-{document_id}", Catalog1::PERCEPCION)),
+        DocumentType::RETENTION => Ok(format!("{ruc}-{}-{document_id}", Catalog1::RETENCION)),
         DocumentType::DESPATCH_ADVICE => {
-            if GUIA_REMISION_REMITENTE_SERIE_REGEX.is_match(document_id) {
-                Some(format!(
+            if GUIA_REMISION_REMITENTE_SERIE_REGEX
+                .as_ref()?
+                .is_match(document_id)
+            {
+                Ok(format!(
                     "{ruc}-{}-{document_id}",
                     Catalog1::GUIA_REMISION_REMITENTE
                 ))
-            } else if GUIA_REMISION_TRANSPORTISTA_SERIE_REGEX.is_match(document_id) {
-                Some(format!(
+            } else if GUIA_REMISION_TRANSPORTISTA_SERIE_REGEX
+                .as_ref()?
+                .is_match(document_id)
+            {
+                Ok(format!(
                     "{ruc}-{}-{document_id}",
                     Catalog1::GUIA_REMISION_TRANSPORTISTA
                 ))
             } else {
-                warn!("Could not build filename from DespatchAdvice");
-                None
+                Err(anyhow!("Could not build filename from DespatchAdvice"))
             }
         }
-        _ => None,
+        _ => Err(anyhow!("Not supported document")),
     }
 }
 

diff --git a/xsender/src/client_sunat.rs b/xsender/src/client_sunat.rs
@@ -69,6 +69,10 @@ impl ClientSUNAT {
         file: &File,
         credentials: &Credentials,
     ) -> Result<SendFileResponse, ClientSunatErr> {
+        let client = HTTP_CLIENT
+            .as_ref()
+            .map_err(|_error| ClientSunatErr::Any(anyhow!("Could not initialize client")))?;
+
         match &target {
             SendFileTarget::Soap(url, action) => {
                 let envelope_body = match action {
@@ -98,8 +102,7 @@ impl ClientSUNAT {
 
                 let body = envelope.to_string_xml()?;
 
-                let response = HTTP_CLIENT
-                    .clone()
+                let response = client
                     .post(url)
                     .body(body)
                     .header("Content-Type", "text/xml; charset=utf-8")
@@ -127,6 +130,10 @@ impl ClientSUNAT {
         ticket: &str,
         credentials: &Credentials,
     ) -> Result<VerifyTicketResponse, ClientSunatErr> {
+        let client = HTTP_CLIENT
+            .as_ref()
+            .map_err(|_error| ClientSunatErr::Any(anyhow!("Could not initialize client")))?;
+
         match &target {
             VerifyTicketTarget::Soap(url) => {
                 let envelope = EnvelopeData {
@@ -137,8 +144,7 @@ impl ClientSUNAT {
 
                 let body = envelope.to_string_xml()?;
 
-                let response = HTTP_CLIENT
-                    .clone()
+                let response = client
                     .post(url)
                     .body(body)
                     .header("Content-Type", "text/xml; charset=utf-8")

diff --git a/xsender/src/constants.rs b/xsender/src/constants.rs
@@ -37,9 +37,9 @@ lazy_static::lazy_static! {
         tera
     };
 
-    pub static ref FACTURA_SERIE_REGEX: Regex = Regex::new("^[F|f].*$").expect("Invalid FACTURA_SERIE_REGEX");
-    pub static ref BOLETA_SERIE_REGEX: Regex = Regex::new("^[B|f].*$").expect("Invalid BOLETA_SERIE_REGEX");
-    pub static ref GUIA_REMISION_REMITENTE_SERIE_REGEX: Regex = Regex::new("^[T|t].*$").expect("Invalid GUIA_REMISION_REMITENTE_SERIE_REGEX");
-    pub static ref GUIA_REMISION_TRANSPORTISTA_SERIE_REGEX: Regex = Regex::new("^[V|v].*$").expect("Invalid GUIA_REMISION_TRANSPORTISTA_SERIE_REGEX");
-    pub static ref HTTP_CLIENT: Client = Client::builder().connection_verbose(true).build().expect("Could not create HTTP client");
+    pub static ref FACTURA_SERIE_REGEX: Result<Regex, regex::Error> = Regex::new("^[F|f].*$");
+    pub static ref BOLETA_SERIE_REGEX: Result<Regex, regex::Error> = Regex::new("^[B|f].*$");
+    pub static ref GUIA_REMISION_REMITENTE_SERIE_REGEX: Result<Regex, regex::Error> = Regex::new("^[T|t].*$");
+    pub static ref GUIA_REMISION_TRANSPORTISTA_SERIE_REGEX: Result<Regex, regex::Error> = Regex::new("^[V|v].*$");
+    pub static ref HTTP_CLIENT: Result<Client, reqwest::Error> = Client::builder().connection_verbose(true).build();
 }
diff --git a/xsender/src/file_sender.rs b/xsender/src/file_sender.rs
@@ -71,7 +71,7 @@ impl FileSender {
             &metadata.document_id,
             &metadata.ruc,
         )
-        .ok_or(FileSenderErr::TargetDiscovery)?;
+        .map_err(|_| FileSenderErr::TargetDiscovery)?;
 
         let send_target = send_file_target(
             &metadata.document_type,

diff --git a/xsigner/src/lib.rs b/xsigner/src/lib.rs
@@ -204,7 +204,7 @@ impl XSigner {
         let mut sigctx = XmlSecSignatureContext::new();
         sigctx.insert_key(private_key);
 
-        sigctx.sign_document(xml).expect("Failed to sign document");
+        sigctx.sign_document(xml)?;
 
         Ok(())
     }