fix(connector): Add attempt_status in field in error_response (#2794)

juspay · Nov 8, 2023 · 5642fef · 5642fef
1 parent 6678689
commit 5642fef
Show file tree

Hide file tree

Showing 70 changed files with 140 additions and 15 deletions.
diff --git a/connector-template/mod.rs b/connector-template/mod.rs
@@ -105,6 +105,7 @@ impl ConnectorCommon for {{project-name | downcase | pascal_case}} {
             code: response.code,
             message: response.message,
             reason: response.reason,
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/aci.rs b/crates/router/src/connector/aci.rs
@@ -78,6 +78,7 @@ impl ConnectorCommon for Aci {
                     .collect::<Vec<String>>()
                     .join("; ")
             }),
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/adyen.rs b/crates/router/src/connector/adyen.rs
@@ -73,6 +73,7 @@ impl ConnectorCommon for Adyen {
             code: response.error_code,
             message: response.message,
             reason: None,
+            attempt_status: None,
         })
     }
 }
@@ -251,6 +252,7 @@ impl
             code: response.error_code,
             message: response.message,
             reason: None,
+            attempt_status: None,
         })
     }
 }
@@ -366,6 +368,7 @@ impl
             code: response.error_code,
             message: response.message,
             reason: None,
+            attempt_status: None,
         })
     }
 }
@@ -533,6 +536,7 @@ impl
             code: response.error_code,
             message: response.message,
             reason: None,
+            attempt_status: None,
         })
     }
 
@@ -699,6 +703,7 @@ impl
             code: response.error_code,
             message: response.message,
             reason: None,
+            attempt_status: None,
         })
     }
 }
@@ -896,6 +901,7 @@ impl
             code: response.error_code,
             message: response.message,
             reason: None,
+            attempt_status: None,
         })
     }
 }
@@ -1399,6 +1405,7 @@ impl services::ConnectorIntegration<api::Execute, types::RefundsData, types::Ref
             code: response.error_code,
             message: response.message,
             reason: None,
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/adyen/transformers.rs b/crates/router/src/connector/adyen/transformers.rs
@@ -2900,6 +2900,7 @@ pub fn get_adyen_response(
                 .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),
             reason: response.refusal_reason,
             status_code,
+            attempt_status: None,
         })
     } else {
         None
@@ -2991,6 +2992,7 @@ pub fn get_redirection_response(
                 .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),
             reason: None,
             status_code,
+            attempt_status: None,
         })
     } else {
         None
@@ -3052,6 +3054,7 @@ pub fn get_present_to_shopper_response(
                 .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),
             reason: None,
             status_code,
+            attempt_status: None,
         })
     } else {
         None
@@ -3101,6 +3104,7 @@ pub fn get_qr_code_response(
                 .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),
             reason: None,
             status_code,
+            attempt_status: None,
         })
     } else {
         None
@@ -3138,6 +3142,7 @@ pub fn get_redirection_error_response(
         message: response.refusal_reason.clone(),
         reason: Some(response.refusal_reason),
         status_code,
+        attempt_status: None,
     });
     // We don't get connector transaction id for redirections in Adyen.
     let payments_response_data = types::PaymentsResponseData::TransactionResponse {

diff --git a/crates/router/src/connector/airwallex.rs b/crates/router/src/connector/airwallex.rs
@@ -93,6 +93,7 @@ impl ConnectorCommon for Airwallex {
             code: response.code,
             message: response.message,
             reason: response.source,
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/authorizedotnet.rs b/crates/router/src/connector/authorizedotnet.rs
@@ -893,13 +893,15 @@ fn get_error_response(
                     message: error.error_text.to_owned(),
                     reason: Some(error.error_text),
                     status_code,
+                    attempt_status: None,
                 })
             })
             .unwrap_or_else(|| types::ErrorResponse {
                 code: consts::NO_ERROR_CODE.to_string(), // authorizedotnet sends 200 in case of bad request so this are hard coded to NO_ERROR_CODE and NO_ERROR_MESSAGE
                 message: consts::NO_ERROR_MESSAGE.to_string(),
                 reason: None,
                 status_code,
+                attempt_status: None,
             })),
         Some(authorizedotnet::TransactionResponse::AuthorizedotnetTransactionResponseError(_))
         | None => {
@@ -909,6 +911,7 @@ fn get_error_response(
                 message: message.to_string(),
                 reason: Some(message.to_string()),
                 status_code,
+                attempt_status: None,
             })
         }
     }

diff --git a/crates/router/src/connector/authorizedotnet/transformers.rs b/crates/router/src/connector/authorizedotnet/transformers.rs
@@ -573,6 +573,7 @@ impl<F, T>
                         message: error.error_text.clone(),
                         reason: None,
                         status_code: item.http_code,
+                        attempt_status: None,
                     })
                 });
                 let metadata = transaction_response
@@ -647,6 +648,7 @@ impl<F, T>
                         message: error.error_text.clone(),
                         reason: None,
                         status_code: item.http_code,
+                        attempt_status: None,
                     })
                 });
                 let metadata = transaction_response
@@ -789,6 +791,7 @@ impl<F> TryFrom<types::RefundsResponseRouterData<F, AuthorizedotnetRefundRespons
                 message: error.error_text.clone(),
                 reason: None,
                 status_code: item.http_code,
+                attempt_status: None,
             })
         });
 
@@ -1021,6 +1024,7 @@ fn get_err_response(status_code: u16, message: ResponseMessages) -> types::Error
         message: message.message[0].text.clone(),
         reason: None,
         status_code,
+        attempt_status: None,
     }
 }
 

diff --git a/crates/router/src/connector/bambora.rs b/crates/router/src/connector/bambora.rs
@@ -95,6 +95,7 @@ impl ConnectorCommon for Bambora {
             code: response.code.to_string(),
             message: response.message,
             reason: Some(serde_json::to_string(&response.details).unwrap_or_default()),
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/bankofamerica.rs b/crates/router/src/connector/bankofamerica.rs
@@ -111,6 +111,7 @@ impl ConnectorCommon for Bankofamerica {
             code: response.code,
             message: response.message,
             reason: response.reason,
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/bitpay.rs b/crates/router/src/connector/bitpay.rs
@@ -120,6 +120,7 @@ impl ConnectorCommon for Bitpay {
                 .unwrap_or_else(|| consts::NO_ERROR_CODE.to_string()),
             message: response.error,
             reason: response.message,
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/bluesnap.rs b/crates/router/src/connector/bluesnap.rs
@@ -126,30 +126,36 @@ impl ConnectorCommon for Bluesnap {
                         .map(|error_code_message| error_code_message.error_message)
                         .unwrap_or(consts::NO_ERROR_MESSAGE.to_string()),
                     reason: Some(reason),
+                    attempt_status: None,
                 }
             }
             bluesnap::BluesnapErrors::Auth(error_res) => ErrorResponse {
                 status_code: res.status_code,
                 code: error_res.error_code.clone(),
                 message: error_res.error_name.clone().unwrap_or(error_res.error_code),
                 reason: Some(error_res.error_description),
+                attempt_status: None,
             },
             bluesnap::BluesnapErrors::General(error_response) => {
-                let error_res = if res.status_code == 403
+                let (error_res, attempt_status) = if res.status_code == 403
                     && error_response.contains(BLUESNAP_TRANSACTION_NOT_FOUND)
                 {
-                    format!(
-                        "{} in bluesnap dashboard",
-                        consts::REQUEST_TIMEOUT_PAYMENT_NOT_FOUND
+                    (
+                        format!(
+                            "{} in bluesnap dashboard",
+                            consts::REQUEST_TIMEOUT_PAYMENT_NOT_FOUND
+                        ),
+                        Some(enums::AttemptStatus::Failure), // when bluesnap throws 403 for payment not found, we update the payment status to failure.
                     )
                 } else {
-                    error_response.clone()
+                    (error_response.clone(), None)
                 };
                 ErrorResponse {
                     status_code: res.status_code,
                     code: consts::NO_ERROR_CODE.to_string(),
                     message: error_response,
                     reason: Some(error_res),
+                    attempt_status,
                 }
             }
         };

diff --git a/crates/router/src/connector/boku.rs b/crates/router/src/connector/boku.rs
@@ -130,6 +130,7 @@ impl ConnectorCommon for Boku {
                 code: response.code,
                 message: response.message,
                 reason: response.reason,
+                attempt_status: None,
             }),
             Err(_) => get_xml_deserialized(res),
         }
@@ -651,6 +652,7 @@ fn get_xml_deserialized(res: Response) -> CustomResult<ErrorResponse, errors::Co
                 code: consts::NO_ERROR_CODE.to_string(),
                 message: consts::UNSUPPORTED_ERROR_MESSAGE.to_string(),
                 reason: Some(response_data),
+                attempt_status: None,
             })
         }
     }

diff --git a/crates/router/src/connector/braintree.rs b/crates/router/src/connector/braintree.rs
@@ -132,13 +132,15 @@ impl ConnectorCommon for Braintree {
                     code,
                     message,
                     reason: Some(response.api_error_response.message),
+                    attempt_status: None,
                 })
             }
             Ok(braintree::ErrorResponse::BraintreeErrorResponse(response)) => Ok(ErrorResponse {
                 status_code: res.status_code,
                 code: consts::NO_ERROR_CODE.to_string(),
                 message: consts::NO_ERROR_MESSAGE.to_string(),
                 reason: Some(response.errors),
+                attempt_status: None,
             }),
             Err(error_msg) => {
                 logger::error!(deserialization_error =? error_msg);

diff --git a/crates/router/src/connector/braintree/braintree_graphql_transformers.rs b/crates/router/src/connector/braintree/braintree_graphql_transformers.rs
@@ -316,6 +316,7 @@ fn get_error_response<T>(
         message: error_msg.unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),
         reason: error_reason,
         status_code: http_code,
+        attempt_status: None,
     })
 }
 

diff --git a/crates/router/src/connector/cashtocode.rs b/crates/router/src/connector/cashtocode.rs
@@ -119,6 +119,7 @@ impl ConnectorCommon for Cashtocode {
             code: response.error.to_string(),
             message: response.error_description,
             reason: None,
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/cashtocode/transformers.rs b/crates/router/src/connector/cashtocode/transformers.rs
@@ -217,6 +217,7 @@ impl<F, T>
                     status_code: item.http_code,
                     message: error_data.error_description,
                     reason: None,
+                    attempt_status: None,
                 }),
             ),
             CashtocodePaymentsResponse::CashtoCodeData(response_data) => {

diff --git a/crates/router/src/connector/checkout.rs b/crates/router/src/connector/checkout.rs
@@ -131,6 +131,7 @@ impl ConnectorCommon for Checkout {
                 .error_codes
                 .map(|errors| errors.join(" & "))
                 .or(response.error_type),
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/checkout/transformers.rs b/crates/router/src/connector/checkout/transformers.rs
@@ -576,6 +576,7 @@ impl TryFrom<types::PaymentsResponseRouterData<PaymentsResponse>>
                     .clone()
                     .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),
                 reason: item.response.response_summary,
+                attempt_status: None,
             })
         } else {
             None
@@ -623,6 +624,7 @@ impl TryFrom<types::PaymentsSyncResponseRouterData<PaymentsResponse>>
                     .clone()
                     .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),
                 reason: item.response.response_summary,
+                attempt_status: None,
             })
         } else {
             None

diff --git a/crates/router/src/connector/coinbase.rs b/crates/router/src/connector/coinbase.rs
@@ -108,6 +108,7 @@ impl ConnectorCommon for Coinbase {
             code: response.error.error_type,
             message: response.error.message,
             reason: response.error.code,
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/cryptopay.rs b/crates/router/src/connector/cryptopay.rs
@@ -167,6 +167,7 @@ impl ConnectorCommon for Cryptopay {
             code: response.error.code,
             message: response.error.message,
             reason: response.error.reason,
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/cybersource.rs b/crates/router/src/connector/cybersource.rs
@@ -136,6 +136,7 @@ impl ConnectorCommon for Cybersource {
             code,
             message,
             reason: Some(connector_reason),
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/cybersource/transformers.rs b/crates/router/src/connector/cybersource/transformers.rs
@@ -367,6 +367,7 @@ impl<F, T>
                     message: error.message,
                     reason: Some(error.reason),
                     status_code: item.http_code,
+                    attempt_status: None,
                 }),
                 _ => Ok(types::PaymentsResponseData::TransactionResponse {
                     resource_id: types::ResponseId::ConnectorTransactionId(

diff --git a/crates/router/src/connector/dlocal.rs b/crates/router/src/connector/dlocal.rs
@@ -135,6 +135,7 @@ impl ConnectorCommon for Dlocal {
             code: response.code.to_string(),
             message: response.message,
             reason: response.param,
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/dummyconnector.rs b/crates/router/src/connector/dummyconnector.rs
@@ -111,6 +111,7 @@ impl<const T: u8> ConnectorCommon for DummyConnector<T> {
             code: response.error.code,
             message: response.error.message,
             reason: response.error.reason,
+            attempt_status: None,
         })
     }
 }

diff --git a/crates/router/src/connector/fiserv.rs b/crates/router/src/connector/fiserv.rs
@@ -151,13 +151,15 @@ impl ConnectorCommon for Fiserv {
                         message: first_error.message.to_owned(),
                         reason: first_error.field.to_owned(),
                         status_code: res.status_code,
+                        attempt_status: None,
                     })
             })
             .unwrap_or(types::ErrorResponse {
                 code: consts::NO_ERROR_CODE.to_string(),
                 message: consts::NO_ERROR_MESSAGE.to_string(),
                 reason: None,
                 status_code: res.status_code,
+                attempt_status: None,
             }))
     }
 }

diff --git a/crates/router/src/connector/forte.rs b/crates/router/src/connector/forte.rs
@@ -130,6 +130,7 @@ impl ConnectorCommon for Forte {
             code,
             message,
             reason: None,
+            attempt_status: None,
         })
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,6 +78,7 @@ impl ConnectorCommon for Aci { @@
                         .collect::<Vec<String>>()
                         .join("; ")
                 }),
+                attempt_status: None,
             })
         }
     }
@@ Expand Down @@