MSRV error resolved

juspay · May 10, 2024 · 1b31b63 · 1b31b63
1 parent db1737b
commit 1b31b63
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 52 deletions.
diff --git a/crates/api_models/src/payouts.rs b/crates/api_models/src/payouts.rs
@@ -8,6 +8,7 @@ use masking::Secret;
 use serde::{Deserialize, Serialize};
 use time::PrimitiveDateTime;
 use utoipa::ToSchema;
+
 use crate::{enums as api_enums, payments};
 
 #[derive(Debug, Deserialize, Serialize, Clone, ToSchema)]

diff --git a/crates/router/src/connector/payone.rs b/crates/router/src/connector/payone.rs
@@ -175,41 +175,17 @@ impl ConnectorCommon for Payone {
         event_builder.map(|i| i.set_response_body(&response));
         router_env::logger::info!(connector_response=?response);
 
-        let default_status = response.status.unwrap_or_default().to_string();
-        match response.errors {
-            Some(errs) => {
-                if let Some(e) = errs.first() {
-                    Ok(ErrorResponse {
-                        status_code: res.status_code,
-                        code: e.code.clone(),
-                        message: e.message.clone(),
-                        reason: None,
-                        attempt_status: None,
-                        connector_transaction_id: None,
-                    })
-                } else {
-                    Ok(ErrorResponse {
-                        status_code: res.status_code,
-                        code: default_status,
-                        message: response.message.unwrap_or_default(),
-                        reason: None,
-                        attempt_status: None,
-                        connector_transaction_id: None,
-                    })
-                }
-            }
-            None => Ok(ErrorResponse {
-                status_code: res.status_code,
-                code: default_status,
-                message: response.message.unwrap_or_default(),
-                reason: None,
-                attempt_status: None,
-                connector_transaction_id: None,
-            }),
-        }
+        let error = response.errors.first().unwrap();
+        Ok(ErrorResponse {
+            status_code: error.http_status_code,
+            code: error.code.clone(),
+            message: error.message.clone(),
+            reason: None,
+            attempt_status: None,
+            connector_transaction_id: None,
+        })
     }
 }
-
 impl ConnectorValidation for Payone {}
 
 impl ConnectorIntegration<api::Session, types::PaymentsSessionData, types::PaymentsResponseData>

diff --git a/crates/router/src/connector/payone/transformers.rs b/crates/router/src/connector/payone/transformers.rs
@@ -13,7 +13,6 @@ use crate::{
 
 type Error = error_stack::Report<errors::ConnectorError>;
 use crate::connector::utils::CardData;
-
 #[cfg(feature = "payouts")]
 use crate::{
     connector::utils::RouterData,
@@ -53,21 +52,15 @@ impl<T>
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct ErrorResponse {
-    pub timestamp: Option<String>,
-    pub errors: Option<Vec<SubError>>,
-    pub status: Option<i32>,
-    pub error: Option<String>,
-    pub error_description: Option<String>,
-    pub message: Option<String>,
-    pub path: Option<String>,
+    pub errors: Vec<SubError>,
+    pub error_id: Option<i32>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct SubError {
     pub code: String,
     pub message: String,
-    pub path: Option<String>,
-    pub field: Option<String>,
+    pub http_status_code: u16,
 }
 
 // Auth Struct
@@ -236,13 +229,13 @@ impl TryFrom<&PayoutMethodData> for Card {
         }
     }
 }
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq)]
-pub struct PayoneErrorResponse {
-    pub status_code: u16,
-    pub code: String,
-    pub message: String,
-    pub reason: Option<String>,
-}
+// #[derive(Default, Debug, Serialize, Deserialize, PartialEq)]
+// pub struct PayoneErrorResponse {
+//     pub status_code: u16,
+//     pub code: String,
+//     pub message: String,
+//     pub reason: Option<String>,
+// }
 
 #[cfg(feature = "payouts")]
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]

diff --git a/crates/router/src/core/payments/flows.rs b/crates/router/src/core/payments/flows.rs
@@ -1017,7 +1017,6 @@ default_imp_for_payouts!(
     connector::Opennode,
     connector::Payeezy,
     connector::Payme,
-    connector::Payone,
     connector::Payu,
     connector::Placetopay,
     connector::Powertranz,
@@ -1279,7 +1278,6 @@ default_imp_for_payouts_fulfill!(
     connector::Opennode,
     connector::Payeezy,
     connector::Payme,
-    connector::Payone,
     connector::Payu,
     connector::Placetopay,
     connector::Powertranz,