fix(router): fix compilation errors in FRM, payouts and recon modules

Author: SanchithHegde

crates/router/src/core/fraud_check/operation/fraud_check_post.rs

@@ -398,12 +398,10 @@ impl<F: Clone + Send> UpdateTracker<FrmData, F> for FraudCheckPost {
                             last_step: frm_data.fraud_check.last_step,
                         };
                         Some(fraud_check_update)
-
                     }
                 },
             },
 
-
             FrmResponse::Checkout(_) | FrmResponse::Transaction(_) => {
                 Some(FraudCheckUpdate::ErrorUpdate {
                     status: FraudCheckStatus::TransactionFailure,

crates/router/src/core/payouts/retry.rs

@@ -1,7 +1,7 @@
 use std::{cmp::Ordering, str::FromStr, vec::IntoIter};
 
 use api_models::payouts::PayoutCreateRequest;
-use error_stack::ResultExt;
+use error_stack::{report, ResultExt};
 use router_env::{
     logger,
     tracing::{self, instrument},
@@ -83,11 +83,11 @@ pub async fn do_gsm_multiple_connector_actions(
                 retries = retries.map(|i| i - 1);
             }
             api_models::gsm::GsmDecision::Requeue => {
-                Err(errors::ApiErrorResponse::NotImplemented {
+                Err(report!(errors::ApiErrorResponse::NotImplemented {
                     message: errors::api_error_response::NotImplementedMessage::Reason(
                         "Requeue not implemented".to_string(),
                     ),
-                })?
+                }))?
             }
             api_models::gsm::GsmDecision::DoDefault => break,
         }
@@ -149,11 +149,11 @@ pub async fn do_gsm_single_connector_actions(
                 retries = retries.map(|i| i - 1);
             }
             api_models::gsm::GsmDecision::Requeue => {
-                Err(errors::ApiErrorResponse::NotImplemented {
+                Err(report!(errors::ApiErrorResponse::NotImplemented {
                     message: errors::api_error_response::NotImplementedMessage::Reason(
                         "Requeue not implemented".to_string(),
                     ),
-                })?
+                }))?
             }
             api_models::gsm::GsmDecision::DoDefault => break,
         }
@@ -223,9 +223,8 @@ pub fn get_gsm_decision(
     let option_gsm_decision = option_gsm
             .and_then(|gsm| {
                 api_models::gsm::GsmDecision::from_str(gsm.decision.as_str())
-
                     .map_err(|err| {
-                        let api_error = err.change_context(errors::ApiErrorResponse::InternalServerError)
+                        let api_error = report!(err).change_context(errors::ApiErrorResponse::InternalServerError)
                             .attach_printable("gsm decision parsing failed");
                         logger::warn!(get_gsm_decision_parse_error=?api_error, "error fetching gsm decision");
                         api_error

crates/router/src/db/fraud_check.rs

@@ -1,5 +1,5 @@
 use diesel_models::fraud_check::{self as storage, FraudCheck, FraudCheckUpdate};
-use error_stack::ResultExt;
+use error_stack::report;
 use router_env::{instrument, tracing};
 
 use super::MockDb;
@@ -43,7 +43,9 @@ impl FraudCheckInterface for Store {
         new: storage::FraudCheckNew,
     ) -> CustomResult<FraudCheck, errors::StorageError> {
         let conn = connection::pg_connection_write(self).await?;
-        new.insert(&conn).await.map_err(Into::into)
+        new.insert(&conn)
+            .await
+            .map_err(|error| report!(errors::StorageError::from(error)))
     }
 
     #[instrument(skip_all)]
@@ -55,7 +57,7 @@ impl FraudCheckInterface for Store {
         let conn = connection::pg_connection_write(self).await?;
         this.update_with_attempt_id(&conn, fraud_check)
             .await
-            .map_err(Into::into)
+            .map_err(|error| report!(errors::StorageError::from(error)))
     }
 
     #[instrument(skip_all)]
@@ -67,7 +69,7 @@ impl FraudCheckInterface for Store {
         let conn = connection::pg_connection_write(self).await?;
         FraudCheck::get_with_payment_id(&conn, payment_id, merchant_id)
             .await
-            .map_err(Into::into)
+            .map_err(|error| report!(errors::StorageError::from(error)))
     }
 
     #[instrument(skip_all)]
@@ -79,7 +81,7 @@ impl FraudCheckInterface for Store {
         let conn = connection::pg_connection_write(self).await?;
         FraudCheck::get_with_payment_id_if_present(&conn, payment_id, merchant_id)
             .await
-            .map_err(Into::into)
+            .map_err(|error| report!(errors::StorageError::from(error)))
     }
 }
 

crates/router/src/routes/recon.rs

@@ -209,11 +209,11 @@ pub async fn recon_merchant_account_update(
     }
 
     Ok(service_api::ApplicationResponse::Json(
-        response
-            .try_into()
-            .change_context(errors::ApiErrorResponse::InvalidDataValue {
+        api_types::MerchantAccountResponse::try_from(response).change_context(
+            errors::ApiErrorResponse::InvalidDataValue {
                 field_name: "merchant_account",
-            })?,
+            },
+        )?,
     ))
 }