From 2d09c268b011155572dc54973d82a51c0a819b41 Mon Sep 17 00:00:00 2001
From: Sayak Bhattacharya <sayak.b@Sayak-Bhattacharya-GJQC9R9THR.local>
Date: Wed, 18 Dec 2024 16:38:33 +0530
Subject: [PATCH] chore: Resolve PR Comments

---
 .../src/connectors/jpmorgan/transformers.rs   | 517 ++----------------
 1 file changed, 37 insertions(+), 480 deletions(-)

diff --git a/crates/hyperswitch_connectors/src/connectors/jpmorgan/transformers.rs b/crates/hyperswitch_connectors/src/connectors/jpmorgan/transformers.rs
index 79ce0d64068f..9e62e06cd381 100644
--- a/crates/hyperswitch_connectors/src/connectors/jpmorgan/transformers.rs
+++ b/crates/hyperswitch_connectors/src/connectors/jpmorgan/transformers.rs
@@ -109,8 +109,8 @@ pub struct Expiry {
 #[derive(Serialize, Debug, Default, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct JpmorganMerchantSoftware {
-    company_name: String,
-    product_name: String,
+    company_name: Secret<String>,
+    product_name: Secret<String>,
 }
 
 #[derive(Default, Debug, Serialize, Deserialize)]
@@ -152,8 +152,8 @@ impl TryFrom<&JpmorganRouterData<&PaymentsAuthorizeRouterData>> for JpmorganPaym
                     map_capture_method(item.router_data.request.capture_method.unwrap_or_default());
 
                 let merchant_software = JpmorganMerchantSoftware {
-                    company_name: String::from("JPMC"),
-                    product_name: String::from("Hyperswitch"),
+                    company_name: String::from("JPMC").into(),
+                    product_name: String::from("Hyperswitch").into(),
                 };
 
                 let merchant = JpmorganMerchant { merchant_software };
@@ -243,29 +243,17 @@ pub enum JpmorganTransactionState {
     Error,
 }
 
-#[derive(Default, Debug, Serialize, Deserialize)]
+#[derive(Default, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct JpmorganPaymentsResponse {
     transaction_id: String,
-    request_id: Option<String>,
+    request_id: String,
     transaction_state: JpmorganTransactionState,
     response_status: String,
     response_code: String,
-    response_message: Option<String>,
-    payment_method_type: Option<PaymentMethodType>,
+    response_message: String,
+    payment_method_type: PaymentMethodType,
     capture_method: Option<CapMethod>,
-    is_capture: Option<bool>,
-    initiator_type: Option<String>,
-    account_on_file: Option<String>,
-    transaction_date: Option<String>,
-    approval_code: Option<String>,
-    host_message: Option<String>,
-    amount: Option<i64>,
-    currency: Option<common_enums::Currency>,
-    remaining_refundable_amount: Option<i64>,
-    remaining_auth_amount: Option<i64>,
-    host_reference_id: Option<String>,
-    merchant: Option<Merchant>,
 }
 
 #[derive(Default, Debug, Serialize, Deserialize)]
@@ -279,24 +267,24 @@ pub struct Merchant {
 #[derive(Default, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct MerchantSoftware {
-    company_name: String,
-    product_name: String,
-    version: Option<String>,
+    company_name: Secret<String>,
+    product_name: Secret<String>,
+    version: Option<Secret<String>>,
 }
 
-#[derive(Default, Debug, Serialize, Deserialize)]
+#[derive(Default, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PaymentMethodType {
     card: Option<Card>,
 }
 
-#[derive(Default, Debug, Serialize, Deserialize)]
+#[derive(Default, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Card {
     expiry: Option<ExpiryResponse>,
-    card_type: Option<String>,
-    card_type_name: Option<String>,
-    masked_account_number: Option<String>,
+    card_type: Option<Secret<String>>,
+    card_type_name: Option<Secret<String>>,
+    masked_account_number: Option<Secret<String>>,
     card_type_indicators: Option<CardTypeIndicators>,
     network_response: Option<NetworkResponse>,
 }
@@ -304,24 +292,24 @@ pub struct Card {
 #[derive(Default, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct NetworkResponse {
-    address_verification_result: Option<String>,
-    address_verification_result_code: Option<String>,
-    card_verification_result_code: Option<String>,
+    address_verification_result: Option<Secret<String>>,
+    address_verification_result_code: Option<Secret<String>>,
+    card_verification_result_code: Option<Secret<String>>,
 }
 
 #[derive(Default, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ExpiryResponse {
-    month: Option<i32>,
-    year: Option<i32>,
+    month: Option<Secret<i32>>,
+    year: Option<Secret<i32>>,
 }
 
-#[derive(Default, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CardTypeIndicators {
-    issuance_country_code: Option<String>,
+    issuance_country_code: Option<Secret<String>>,
     is_durbin_regulated: Option<bool>,
-    card_product_types: Vec<String>,
+    card_product_types: Secret<Vec<String>>,
 }
 
 impl From<JpmorganTransactionStatus> for common_enums::AttemptStatus {
@@ -387,420 +375,12 @@ impl<F, T> TryFrom<ResponseRouterData<F, JpmorganPaymentsResponse, T, PaymentsRe
     }
 }
 
-#[derive(Default, Debug, Serialize, Deserialize)]
+#[derive(Default, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct JpmorganCaptureRequest {
     capture_method: Option<CapMethod>,
-    merchant: Option<MerchantCapReq>,
-    recurring: Option<RecurringCapReq>,
-    installment: Option<InstallmentCapReq>,
-    payment_method_type: Option<PaymentMethodTypeCapReq>,
-    ship_to: Option<ShipToCapReq>,
-    initiator_type: Option<String>,
-    account_on_file: Option<String>,
-    original_transaction_id: Option<String>,
-    is_amount_final: Option<bool>,
     amount: MinorUnit,
     currency: Option<common_enums::Currency>,
-    merchant_order_number: Option<String>,
-    risk: Option<RiskCapReq>,
-    retail_addenda: Option<RetailAddendaCapReq>,
-    account_holder: Option<AccountHolderCapReq>,
-    statement_descriptor: Option<String>,
-    partial_authorization_support: Option<String>,
-    payment_request_id: Option<String>,
-    multi_capture: Option<MultiCapture>,
-    sub_merchant_supplemental_data: Option<SubMerchantSupplementalData>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SubMerchantSupplementalData {
-    pub custom_data: Option<CustomData>,
-    pub service_address: Option<ServiceAddress>,
-    pub business_information: Option<BusinessInformation>,
-    pub partner_service: Option<PartnerService>,
-    pub shipping_info: Option<ShippingInfo>,
-    pub recurring_billing: Option<RecurringBilling>,
-    pub merchant_reported_revenue: Option<MerchantReportedRevenue>,
-    pub order_information: Option<OrderInformation>,
-    pub consumer_device: Option<ConsumerDevice>,
-    pub merchant_identification: Option<MerchantIdentification>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CustomData {
-    pub external_transaction_reference_number: Option<String>,
-    pub external_transaction_type: Option<String>,
-    pub external_merchant_id: Option<String>,
-    pub merchant_order_reference_id: Option<String>,
-    pub external_batch_id: Option<String>,
-    pub merchant_expected_deposit_date: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ServiceAddress {
-    pub line1: Option<String>,
-    pub line2: Option<String>,
-    pub city: Option<String>,
-    pub state: Option<String>,
-    pub postal_code: Option<String>,
-    pub country_code: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BusinessInformation {
-    pub organization_legal_name: Option<String>,
-    pub client_business_description_text: Option<String>,
-    pub organization_d_b_a_name: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PartnerService {
-    pub external_vendor_product_name: Option<String>,
-    pub currency: Option<common_enums::Currency>,
-    pub external_monthly_service_fee_amount: Option<i64>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ShippingInfo {
-    pub shipping_carrier_name: Option<String>,
-    pub expected_merchant_product_delivery_date: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RecurringBilling {
-    pub billing_schedule_update_timestamp: Option<String>,
-    pub payment_frequency_code: Option<String>,
-    pub billing_cycle_sequence_number: Option<String>,
-    pub initiator_type: Option<String>,
-    pub billing_cycles_total_count: Option<i32>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MerchantReportedRevenue {
-    pub amount: Option<i64>,
-    pub start_date: Option<String>,
-    pub end_date: Option<String>,
-    pub currency: Option<common_enums::Currency>,
-    pub amount_type: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct OrderInformation {
-    pub order_items: Option<Vec<OrderItem>>,
-    pub receipt_url: Option<String>,
-    pub payment_notes: Option<String>,
-    pub merchant_url: Option<String>,
-    pub terms_url: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct OrderItem {
-    pub merchant_product_identifier: Option<String>,
-    pub line_item_description_text: Option<String>,
-    pub unit_price_amount: Option<i64>,
-    pub line_item_unit_quantity: Option<String>,
-    pub item_comodity_code: Option<String>,
-    pub chosen_shipping_option: Option<String>,
-    pub merchant_campaign_name: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ConsumerDevice {
-    pub session_id: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MerchantIdentification {
-    pub sub_merchant_id: Option<String>,
-    pub service_entitlement_number: Option<String>,
-    pub seller_identifier: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MultiCapture {
-    multi_capture_sequence_number: Option<String>,
-    multi_capture_record_count: Option<i32>,
-    is_final_capture: Option<bool>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct AccountHolderCapReq {
-    reference_id: Option<String>,
-    consumer_id_creation_date: String,
-    full_name: Option<String>,
-    email: Option<String>,
-    mobile: Option<PhoneNumber>,
-    phone: Option<PhoneNumber>,
-    i_p_address: Option<String>,
-    billing_address: Option<BillingAddress>,
-    national_id: Option<String>,
-    first_name: Option<String>,
-    last_name: Option<String>,
-    middle_name: Option<String>,
-    consumer_profile_info: Option<ConsumerProfileInfo>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct PhoneNumber {
-    country_code: Option<i32>,
-    phone_number: String,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct BillingAddress {
-    line1: Option<String>,
-    line2: Option<String>,
-    city: Option<String>,
-    state: Option<String>,
-    postal_code: Option<String>,
-    country_code: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct ConsumerProfileInfo {
-    consumer_profile_request_type: Option<String>,
-    legacy_consumer_profile_id: Option<String>,
-    external_consumer_profile_identifier: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RetailAddendaCapReq {
-    purchase_order_number: Option<String>,
-    order_date: Option<String>,
-    tax_amount: Option<i64>,
-    is_taxable: Option<bool>,
-    level3: Option<Level3>,
-    gratuity_amount: Option<i64>,
-    surcharge_amount: Option<i64>,
-    health_care_data: Option<HealthCareDataCapReq>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct HealthCareDataCapReq {
-    total_healthcare_amount: Option<i64>,
-    total_vision_amount: Option<i64>,
-    total_clinic_amount: Option<i64>,
-    total_dental_amount: Option<i64>,
-    total_prescription_amount: Option<i64>,
-    is_i_i_a_s: Option<bool>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Level3 {
-    total_shipping_amount: Option<i64>,
-    duty_amount: Option<i64>,
-    ship_to_address_postal_code: Option<String>,
-    ship_to_address_country_code: Option<String>,
-    ship_from_address_postal_code: Option<String>,
-    total_transaction_discount_amount: Option<i64>,
-    value_added_tax_amount: Option<i64>,
-    value_added_tax_percent: Option<String>,
-    shipping_value_added_tax_percent: Option<String>,
-    order_discount_treatment_code: Option<String>,
-    value_added_tax_invoice_reference_number: Option<String>,
-    shipping_value_added_tax_amount: Option<i64>,
-    party_tax_government_issued_identifier: Option<String>,
-    alternate_tax_amount: Option<i64>,
-    line_items: Option<LineItemsCapReq>,
-    tax_treatment_code: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct LineItemsCapReq {
-    line_item_description_text: Option<String>,
-    merchant_product_identifier: Option<String>,
-    item_commodity_code: Option<String>,
-    line_item_unit_quantity: Option<String>,
-    line_item_unit_of_measure_code: Option<String>,
-    unit_price_amount: Option<i64>,
-    tax_inclusive_line_item_total_amount: Option<i64>,
-    transaction_discount_amount: Option<i64>,
-    purchase_transaction_discount_percent: Option<String>,
-    line_item_discount_treatment_code: Option<String>,
-    line_item_detail_code: Option<String>,
-    line_item_tax_indicator: Option<bool>,
-    line_item_discount_indicator: Option<bool>,
-    line_item_taxes: Option<Vec<LineItemTaxesCapReq>>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct LineItemTaxesCapReq {
-    tax_type_code: Option<String>,
-    line_item_tax_amount: Option<i64>,
-    tax_percent: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RiskCapReq {
-    request_fraud_score: Option<bool>,
-    transaction_risk_score: Option<i32>,
-    token_risk_score: Option<i32>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ShipToCapReq {
-    shipping_description: Option<String>,
-    shipping_address: Option<ShippingAddressCapReq>,
-    full_name: Option<String>,
-    email: Option<String>,
-    mobile: Option<MobileCapReq>,
-    phone: Option<PhoneCapReq>,
-    first_name: Option<String>,
-    last_name: Option<String>,
-    middle_name: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PhoneCapReq {
-    country_code: Option<i32>,
-    phone_number: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MobileCapReq {
-    country_code: Option<i32>,
-    phone_number: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ShippingAddressCapReq {
-    line1: Option<String>,
-    line2: Option<String>,
-    city: Option<String>,
-    state: Option<String>,
-    postal_code: Option<String>,
-    country_code: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PaymentMethodTypeCapReq {
-    card: Option<CardCapReq>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CardCapReq {
-    account_number_type: Option<String>,
-    account_number: String,
-    expiry: Option<ExpiryCapReq>,
-    wallet_provider: Option<String>,
-    cvv: Option<String>,
-    original_network_transaction_id: Option<String>,
-    account_updater: Option<AccountUpdaterCapReq>,
-    authentication: Option<AuthenticationCapReq>,
-    encryption_integrity_check: Option<String>,
-    preferred_payment_network_name_list: Vec<String>,
-    merchant_sales_channel_name: Option<String>,
-    merchant_preferred_routing: Option<String>,
-    card_type_funding: Option<String>,
-    pie_key_id: Option<String>,
-    pie_phase_id: Option<String>,
-    encrypted_payload: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PaymentAuthenticationCapReq {}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AuthenticationCapReq {
-    authentication_id: Option<String>,
-    electronic_commerce_indicator: Option<String>,
-    token_authentication_value: Option<String>,
-    s_c_a_exemption_reason: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AccountUpdaterCapReq {
-    request_account_updater: Option<bool>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ExpiryCapReq {
-    month: i32,
-    year: i32,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct InstallmentCapReq {
-    installment_count: Option<i32>,
-    total_installments: Option<i32>,
-    number_of_deferrals: Option<i32>,
-    plan_id: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RecurringCapReq {
-    recurring_sequence: Option<String>,
-    agreement_id: Option<String>,
-    payment_agreement_expiry_date: Option<String>,
-    is_variable_amount: Option<bool>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MerchantCapReq {
-    merchant_software: MerchantSoftwareCapReq,
-    merchant_category_code: Option<String>,
-    merchant_logo_url: Option<String>,
-    soft_merchant: SoftMerchantCapReq,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MerchantSoftwareCapReq {
-    company_name: Option<String>,
-    product_name: Option<String>,
-    version: Option<String>,
-    software_id: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SoftMerchantCapReq {
-    name: Option<String>,
-    phone: Option<String>,
-    email: Option<String>,
-    url: Option<String>,
-    merchant_purchase_description: Option<String>,
-    visa_merchant_verification_value_id: Option<String>,
-    master_card_merchant_verification_value_id: Option<String>,
-    merchant_incorporation_status: Option<String>,
-    foreign_merchant_indicator: Option<bool>,
 }
 
 #[derive(Debug, Default, Copy, Serialize, Deserialize, Clone)]
@@ -818,29 +398,11 @@ impl TryFrom<&JpmorganRouterData<&PaymentsCaptureRouterData>> for JpmorganCaptur
         item: &JpmorganRouterData<&PaymentsCaptureRouterData>,
     ) -> Result<Self, Self::Error> {
         let capture_method =
-            map_capture_method(item.router_data.request.capture_method.unwrap_or_default());
+            Some(map_capture_method(item.router_data.request.capture_method.unwrap_or_default())?);
         Ok(Self {
-            capture_method: Some(capture_method?),
-            merchant: None,
-            recurring: None,
-            installment: None,
-            payment_method_type: None,
-            ship_to: None,
-            initiator_type: None,
-            account_on_file: None,
-            original_transaction_id: None,
-            is_amount_final: None,
+            capture_method,
             amount: item.amount,
             currency: Some(item.router_data.request.currency),
-            merchant_order_number: None,
-            risk: None,
-            retail_addenda: None,
-            account_holder: None,
-            statement_descriptor: None,
-            partial_authorization_support: None,
-            payment_request_id: None,
-            multi_capture: None,
-            sub_merchant_supplemental_data: None,
         })
     }
 }
@@ -866,9 +428,9 @@ pub struct PaymentMethodTypeCapRes {
 #[derive(Default, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CardCapRes {
-    pub card_type: Option<String>,
-    pub card_type_name: Option<String>,
-    unmasked_account_number: Option<String>,
+    pub card_type: Option<Secret<String>>,
+    pub card_type_name: Option<Secret<String>>,
+    unmasked_account_number: Option<Secret<String>>,
 }
 
 impl From<JpmorganTransactionState> for common_enums::AttemptStatus {
@@ -910,16 +472,11 @@ impl<F, T> TryFrom<ResponseRouterData<F, JpmorganCaptureResponse, T, PaymentsRes
     }
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct JpmorganPSyncResponse {
     transaction_id: String,
-    request_id: String,
     transaction_state: JpmorganTransactionState,
-    response_status: JpmorganResponseStatus,
-    response_code: String,
-    response_message: String,
-    payment_method_type: PaymentMethodType,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -960,11 +517,11 @@ impl<F, PaymentsSyncData>
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct TransactionData {
-    payment_type: Option<String>,
-    status_code: i32,
-    txn_secret: Option<String>,
+    payment_type: Option<Secret<String>>,
+    status_code: Secret<i32>,
+    txn_secret: Option<Secret<String>>,
     tid: Option<Secret<i64>>,
-    test_mode: Option<i8>,
+    test_mode: Option<Secret<i8>>,
     status: Option<JpmorganTransactionStatus>,
 }
 
@@ -1137,8 +694,8 @@ pub struct JpmorganPaymentMethodTypeCancelResponse {
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CardCancelResponse {
-    pub card_type: String,
-    pub card_type_name: String,
+    pub card_type: Secret<String>,
+    pub card_type_name: Secret<String>,
 }
 
 impl<F>