refactor(blocklist): separate utility function & kill switch for validating data in blocklist

crates/api_models/src/errors/actix.rs

@@ -17,6 +17,7 @@ impl actix_web::ResponseError for ApiErrorResponse {
             Self::MethodNotAllowed(_) => StatusCode::METHOD_NOT_ALLOWED,
             Self::NotFound(_) => StatusCode::NOT_FOUND,
             Self::BadRequest(_) => StatusCode::BAD_REQUEST,
+            Self::DomainError(_) => StatusCode::OK,
         }
     }
 

crates/api_models/src/errors/types.rs

@@ -94,6 +94,7 @@ pub enum ApiErrorResponse {
     NotFound(ApiError),
     MethodNotAllowed(ApiError),
     BadRequest(ApiError),
+    DomainError(ApiError),
 }
 
 impl ::core::fmt::Display for ApiErrorResponse {
@@ -122,6 +123,7 @@ impl ApiErrorResponse {
             | Self::NotFound(i)
             | Self::MethodNotAllowed(i)
             | Self::BadRequest(i)
+            | Self::DomainError(i)
             | Self::ConnectorError(i, _) => i,
         }
     }
@@ -139,6 +141,7 @@ impl ApiErrorResponse {
             | Self::NotFound(i)
             | Self::MethodNotAllowed(i)
             | Self::BadRequest(i)
+            | Self::DomainError(i)
             | Self::ConnectorError(i, _) => i,
         }
     }
@@ -156,6 +159,7 @@ impl ApiErrorResponse {
             | Self::NotFound(_)
             | Self::BadRequest(_) => "invalid_request",
             Self::InternalServerError(_) => "api",
+            Self::DomainError(_) => "blocked",
             Self::ConnectorError(_, _) => "connector",
         }
     }

crates/data_models/src/payments/payment_attempt.rs

@@ -308,6 +308,12 @@ pub enum PaymentAttemptUpdate {
         error_message: Option<Option<String>>,
         updated_by: String,
     },
+    BlocklistUpdate {
+        status: storage_enums::AttemptStatus,
+        error_code: Option<Option<String>>,
+        error_message: Option<Option<String>>,
+        updated_by: String,
+    },
     VoidUpdate {
         status: storage_enums::AttemptStatus,
         cancellation_reason: Option<String>,

crates/diesel_models/src/payment_attempt.rs

@@ -218,6 +218,12 @@ pub enum PaymentAttemptUpdate {
         cancellation_reason: Option<String>,
         updated_by: String,
     },
+    BlocklistUpdate {
+        status: storage_enums::AttemptStatus,
+        error_code: Option<Option<String>>,
+        error_message: Option<Option<String>>,
+        updated_by: String,
+    },
     RejectUpdate {
         status: storage_enums::AttemptStatus,
         error_code: Option<Option<String>>,
@@ -312,7 +318,7 @@ pub struct PaymentAttemptUpdateInternal {
     status: Option<storage_enums::AttemptStatus>,
     connector_transaction_id: Option<String>,
     amount_to_capture: Option<i64>,
-    connector: Option<String>,
+    connector: Option<Option<String>>,
     authentication_type: Option<storage_enums::AuthenticationType>,
     payment_method: Option<storage_enums::PaymentMethod>,
     error_message: Option<Option<String>>,
@@ -338,7 +344,7 @@ pub struct PaymentAttemptUpdateInternal {
     tax_amount: Option<i64>,
     amount_capturable: Option<i64>,
     updated_by: String,
-    merchant_connector_id: Option<String>,
+    merchant_connector_id: Option<Option<String>>,
     authentication_data: Option<serde_json::Value>,
     encoded_data: Option<String>,
     unified_code: Option<Option<String>>,
@@ -411,7 +417,7 @@ impl PaymentAttemptUpdate {
             status: status.unwrap_or(source.status),
             connector_transaction_id: connector_transaction_id.or(source.connector_transaction_id),
             amount_to_capture: amount_to_capture.or(source.amount_to_capture),
-            connector: connector.or(source.connector),
+            connector: connector.unwrap_or(source.connector),
             authentication_type: authentication_type.or(source.authentication_type),
             payment_method: payment_method.or(source.payment_method),
             error_message: error_message.unwrap_or(source.error_message),
@@ -439,7 +445,7 @@ impl PaymentAttemptUpdate {
             tax_amount: tax_amount.or(source.tax_amount),
             amount_capturable: amount_capturable.unwrap_or(source.amount_capturable),
             updated_by,
-            merchant_connector_id: merchant_connector_id.or(source.merchant_connector_id),
+            merchant_connector_id: merchant_connector_id.unwrap_or(source.merchant_connector_id),
             authentication_data: authentication_data.or(source.authentication_data),
             encoded_data: encoded_data.or(source.encoded_data),
             unified_code: unified_code.unwrap_or(source.unified_code),
@@ -527,7 +533,7 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 payment_method,
                 modified_at: Some(common_utils::date_time::now()),
                 browser_info,
-                connector,
+                connector: connector.map(Some),
                 payment_token,
                 payment_method_data,
                 payment_method_type,
@@ -538,7 +544,7 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 error_message,
                 amount_capturable,
                 updated_by,
-                merchant_connector_id,
+                merchant_connector_id: merchant_connector_id.map(Some),
                 surcharge_amount,
                 tax_amount,
                 ..Default::default()
@@ -565,6 +571,20 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 updated_by,
                 ..Default::default()
             },
+            PaymentAttemptUpdate::BlocklistUpdate {
+                status,
+                error_code,
+                error_message,
+                updated_by,
+            } => Self {
+                status: Some(status),
+                error_code,
+                connector: Some(None),
+                error_message,
+                updated_by,
+                merchant_connector_id: Some(None),
+                ..Default::default()
+            },
             PaymentAttemptUpdate::ResponseUpdate {
                 status,
                 connector,
@@ -586,7 +606,7 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 unified_message,
             } => Self {
                 status: Some(status),
-                connector,
+                connector: connector.map(Some),
                 connector_transaction_id,
                 authentication_type,
                 payment_method_id,
@@ -618,7 +638,7 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 unified_message,
                 connector_transaction_id,
             } => Self {
-                connector,
+                connector: connector.map(Some),
                 status: Some(status),
                 error_message,
                 error_code,
@@ -647,13 +667,13 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 merchant_connector_id,
             } => Self {
                 payment_token,
-                connector,
+                connector: connector.map(Some),
                 straight_through_algorithm,
                 amount_capturable,
                 surcharge_amount,
                 tax_amount,
                 updated_by,
-                merchant_connector_id,
+                merchant_connector_id: merchant_connector_id.map(Some),
                 ..Default::default()
             },
             PaymentAttemptUpdate::UnresolvedResponseUpdate {
@@ -668,7 +688,7 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 updated_by,
             } => Self {
                 status: Some(status),
-                connector,
+                connector: connector.map(Some),
                 connector_transaction_id,
                 payment_method_id,
                 modified_at: Some(common_utils::date_time::now()),
@@ -728,7 +748,7 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 authentication_data,
                 encoded_data,
                 connector_transaction_id,
-                connector,
+                connector: connector.map(Some),
                 updated_by,
                 ..Default::default()
             },

crates/router/src/compatibility/stripe/errors.rs

@@ -207,6 +207,14 @@ pub enum StripeErrorCode {
         status_code: u16,
     },
 
+    #[error(error_type = StripeErrorType::CardError, code = "", message = "{code}: {message}")]
+    PaymentBlockedError {
+        code: u16,
+        message: String,
+        status: String,
+        reason: String,
+    },
+
     #[error(error_type = StripeErrorType::HyperswitchError, code = "", message = "The connector provided in the request is incorrect or not available")]
     IncorrectConnectorNameGiven,
     #[error(error_type = StripeErrorType::HyperswitchError, code = "", message = "No such {object}: '{id}'")]
@@ -521,7 +529,17 @@ impl From<errors::ApiErrorResponse> for StripeErrorCode {
                 connector_name,
             },
             errors::ApiErrorResponse::DuplicatePaymentMethod => Self::DuplicatePaymentMethod,
-            errors::ApiErrorResponse::PaymentBlocked => Self::PaymentFailed,
+            errors::ApiErrorResponse::PaymentBlockedError {
+                code,
+                message,
+                status,
+                reason,
+            } => Self::PaymentBlockedError {
+                code,
+                message,
+                status,
+                reason,
+            },
             errors::ApiErrorResponse::ClientSecretInvalid => Self::PaymentIntentInvalidParameter {
                 param: "client_secret".to_owned(),
             },
@@ -680,6 +698,9 @@ impl actix_web::ResponseError for StripeErrorCode {
             Self::ExternalConnectorError { status_code, .. } => {
                 StatusCode::from_u16(*status_code).unwrap_or(StatusCode::INTERNAL_SERVER_ERROR)
             }
+            Self::PaymentBlockedError { code, .. } => {
+                StatusCode::from_u16(*code).unwrap_or(StatusCode::OK)
+            }
             Self::LockTimeout => StatusCode::LOCKED,
         }
     }