Revert "chore: update domain models"

This reverts commit 9eb342e.

Author: hrithikesh026

crates/hyperswitch_domain_models/src/customer.rs

@@ -246,7 +246,7 @@ impl behaviour::Conversion for Customer {
             default_billing_address: self.default_billing_address,
             default_shipping_address: self.default_shipping_address,
             version: self.version,
-            status: Some(self.status),
+            status: self.status,
         })
     }
 
@@ -259,8 +259,6 @@ impl behaviour::Conversion for Customer {
     where
         Self: Sized,
     {
-        use common_utils::ext_traits::OptionExt;
-
         let decrypted = types::crypto_operation(
             state,
             common_utils::type_name!(Self::DstType),
@@ -309,7 +307,7 @@ impl behaviour::Conversion for Customer {
             default_billing_address: item.default_billing_address,
             default_shipping_address: item.default_shipping_address,
             version: item.version,
-            status: item.status.get_required_value("status")?,
+            status: item.status,
         })
     }
 

crates/hyperswitch_domain_models/src/merchant_connector_account.rs

@@ -607,7 +607,7 @@ impl behaviour::Conversion for MerchantConnectorAccount {
                 created_at: self.created_at,
                 modified_at: self.modified_at,
                 connector_webhook_details: self.connector_webhook_details,
-                profile_id: Some(self.profile_id),
+                profile_id: self.profile_id,
                 applepay_verified_domains: self.applepay_verified_domains,
                 pm_auth_config: self.pm_auth_config,
                 status: self.status,
@@ -625,8 +625,6 @@ impl behaviour::Conversion for MerchantConnectorAccount {
         key: &Secret<Vec<u8>>,
         _key_manager_identifier: Identifier,
     ) -> CustomResult<Self, ValidationError> {
-        use common_utils::ext_traits::OptionExt;
-
         let identifier = Identifier::Merchant(other.merchant_id.clone());
 
         let decrypted_data = crypto_operation(
@@ -668,7 +666,7 @@ impl behaviour::Conversion for MerchantConnectorAccount {
             created_at: other.created_at,
             modified_at: other.modified_at,
             connector_webhook_details: other.connector_webhook_details,
-            profile_id: other.profile_id.get_required_value("prodile_id")?,
+            profile_id: other.profile_id,
             applepay_verified_domains: other.applepay_verified_domains,
             pm_auth_config: other.pm_auth_config,
             status: other.status,

crates/hyperswitch_domain_models/src/payments/payment_attempt.rs

@@ -2274,9 +2274,9 @@ impl behaviour::Conversion for PaymentAttempt {
             status,
             error_message: error.as_ref().map(|details| details.message.clone()),
             payment_method_id,
-            payment_method_type_v2: Some(payment_method_type),
+            payment_method_type_v2: payment_method_type,
             connector_payment_id,
-            authentication_type: Some(authentication_type),
+            authentication_type,
             created_at,
             modified_at,
             last_synced,
@@ -2304,7 +2304,7 @@ impl behaviour::Conversion for PaymentAttempt {
             unified_message: error
                 .as_ref()
                 .and_then(|details| details.unified_message.clone()),
-            net_amount: Some(net_amount),
+            net_amount,
             external_three_ds_authentication_attempted,
             authentication_connector,
             authentication_id,
@@ -2356,10 +2356,11 @@ impl behaviour::Conversion for PaymentAttempt {
     where
         Self: Sized,
     {
-        let connector_payment_id = storage_model
-            .get_optional_connector_transaction_id()
-            .cloned();
-        let decrypted_data = async {
+        async {
+            let connector_payment_id = storage_model
+                .get_optional_connector_transaction_id()
+                .cloned();
+
             let decrypted_data = crypto_operation(
                 state,
                 common_utils::type_name!(Self::DstType),
@@ -2375,106 +2376,102 @@ impl behaviour::Conversion for PaymentAttempt {
             .await
             .and_then(|val| val.try_into_batchoperation())?;
 
-            EncryptedPaymentAttempt::from_encryptable(decrypted_data)
+            let decrypted_data = EncryptedPaymentAttempt::from_encryptable(decrypted_data)
                 .change_context(common_utils::errors::CryptoError::DecodingFailed)
-                .attach_printable("Invalid batch operation data")
+                .attach_printable("Invalid batch operation data")?;
+
+            let payment_method_billing_address = decrypted_data
+                .payment_method_billing_address
+                .map(|billing| {
+                    billing.deserialize_inner_value(|value| value.parse_value("Address"))
+                })
+                .transpose()
+                .change_context(common_utils::errors::CryptoError::DecodingFailed)
+                .attach_printable("Error while deserializing Address")?;
+
+            let amount_details = AttemptAmountDetails {
+                net_amount: storage_model.net_amount,
+                tax_on_surcharge: storage_model.tax_on_surcharge,
+                surcharge_amount: storage_model.surcharge_amount,
+                order_tax_amount: storage_model.order_tax_amount,
+                shipping_cost: storage_model.shipping_cost,
+                amount_capturable: storage_model.amount_capturable,
+                amount_to_capture: storage_model.amount_to_capture,
+            };
+
+            let error = storage_model
+                .error_code
+                .zip(storage_model.error_message)
+                .map(|(error_code, error_message)| ErrorDetails {
+                    code: error_code,
+                    message: error_message,
+                    reason: storage_model.error_reason,
+                    unified_code: storage_model.unified_code,
+                    unified_message: storage_model.unified_message,
+                    network_advice_code: storage_model.network_advice_code,
+                    network_decline_code: storage_model.network_decline_code,
+                    network_error_message: storage_model.network_error_message,
+                });
+
+            Ok::<Self, error_stack::Report<common_utils::errors::CryptoError>>(Self {
+                payment_id: storage_model.payment_id,
+                merchant_id: storage_model.merchant_id.clone(),
+                id: storage_model.id,
+                status: storage_model.status,
+                amount_details,
+                error,
+                payment_method_id: storage_model.payment_method_id,
+                payment_method_type: storage_model.payment_method_type_v2,
+                connector_payment_id,
+                authentication_type: storage_model.authentication_type,
+                created_at: storage_model.created_at,
+                modified_at: storage_model.modified_at,
+                last_synced: storage_model.last_synced,
+                cancellation_reason: storage_model.cancellation_reason,
+                browser_info: storage_model.browser_info,
+                payment_token: storage_model.payment_token,
+                connector_metadata: storage_model.connector_metadata,
+                payment_experience: storage_model.payment_experience,
+                payment_method_data: storage_model.payment_method_data,
+                routing_result: storage_model.routing_result,
+                preprocessing_step_id: storage_model.preprocessing_step_id,
+                multiple_capture_count: storage_model.multiple_capture_count,
+                connector_response_reference_id: storage_model.connector_response_reference_id,
+                updated_by: storage_model.updated_by,
+                redirection_data: storage_model.redirection_data.map(From::from),
+                encoded_data: storage_model.encoded_data,
+                merchant_connector_id: storage_model.merchant_connector_id,
+                external_three_ds_authentication_attempted: storage_model
+                    .external_three_ds_authentication_attempted,
+                authentication_connector: storage_model.authentication_connector,
+                authentication_id: storage_model.authentication_id,
+                fingerprint_id: storage_model.fingerprint_id,
+                charges: storage_model.charges,
+                client_source: storage_model.client_source,
+                client_version: storage_model.client_version,
+                customer_acceptance: storage_model.customer_acceptance,
+                profile_id: storage_model.profile_id,
+                organization_id: storage_model.organization_id,
+                payment_method_subtype: storage_model.payment_method_subtype,
+                authentication_applied: storage_model.authentication_applied,
+                external_reference_id: storage_model.external_reference_id,
+                connector: storage_model.connector,
+                payment_method_billing_address,
+                connector_token_details: storage_model.connector_token_details,
+                card_discovery: storage_model.card_discovery,
+                feature_metadata: storage_model.feature_metadata.map(From::from),
+                processor_merchant_id: storage_model
+                    .processor_merchant_id
+                    .unwrap_or(storage_model.merchant_id),
+                created_by: storage_model
+                    .created_by
+                    .and_then(|created_by| created_by.parse::<CreatedBy>().ok()),
+                connector_request_reference_id: storage_model.connector_request_reference_id,
+            })
         }
         .await
         .change_context(ValidationError::InvalidValue {
             message: "Failed while decrypting payment attempt".to_string(),
-        })?;
-
-        let payment_method_billing_address = decrypted_data
-            .payment_method_billing_address
-            .map(|billing| billing.deserialize_inner_value(|value| value.parse_value("Address")))
-            .transpose()
-            .change_context(ValidationError::InvalidValue {
-                message: "Failed to deserialize payment_method_billing_address".to_string(),
-            })
-            .attach_printable("Error while deserializing Address")?;
-
-        let amount_details = AttemptAmountDetails {
-            net_amount: storage_model.net_amount.get_required_value("net_amount")?,
-            tax_on_surcharge: storage_model.tax_on_surcharge,
-            surcharge_amount: storage_model.surcharge_amount,
-            order_tax_amount: storage_model.order_tax_amount,
-            shipping_cost: storage_model.shipping_cost,
-            amount_capturable: storage_model.amount_capturable,
-            amount_to_capture: storage_model.amount_to_capture,
-        };
-
-        let error = storage_model
-            .error_code
-            .zip(storage_model.error_message)
-            .map(|(error_code, error_message)| ErrorDetails {
-                code: error_code,
-                message: error_message,
-                reason: storage_model.error_reason,
-                unified_code: storage_model.unified_code,
-                unified_message: storage_model.unified_message,
-                network_advice_code: storage_model.network_advice_code,
-                network_decline_code: storage_model.network_decline_code,
-                network_error_message: storage_model.network_error_message,
-            });
-
-        Ok(Self {
-            payment_id: storage_model.payment_id,
-            merchant_id: storage_model.merchant_id.clone(),
-            id: storage_model.id,
-            status: storage_model.status,
-            amount_details,
-            error,
-            payment_method_id: storage_model.payment_method_id,
-            payment_method_type: storage_model
-                .payment_method_type_v2
-                .get_required_value("payment_method_type")?,
-            connector_payment_id,
-            authentication_type: storage_model
-                .authentication_type
-                .get_required_value("authentication_type")?,
-            created_at: storage_model.created_at,
-            modified_at: storage_model.modified_at,
-            last_synced: storage_model.last_synced,
-            cancellation_reason: storage_model.cancellation_reason,
-            browser_info: storage_model.browser_info,
-            payment_token: storage_model.payment_token,
-            connector_metadata: storage_model.connector_metadata,
-            payment_experience: storage_model.payment_experience,
-            payment_method_data: storage_model.payment_method_data,
-            routing_result: storage_model.routing_result,
-            preprocessing_step_id: storage_model.preprocessing_step_id,
-            multiple_capture_count: storage_model.multiple_capture_count,
-            connector_response_reference_id: storage_model.connector_response_reference_id,
-            updated_by: storage_model.updated_by,
-            redirection_data: storage_model.redirection_data.map(From::from),
-            encoded_data: storage_model.encoded_data,
-            merchant_connector_id: storage_model.merchant_connector_id,
-            external_three_ds_authentication_attempted: storage_model
-                .external_three_ds_authentication_attempted,
-            authentication_connector: storage_model.authentication_connector,
-            authentication_id: storage_model.authentication_id,
-            fingerprint_id: storage_model.fingerprint_id,
-            charges: storage_model.charges,
-            client_source: storage_model.client_source,
-            client_version: storage_model.client_version,
-            customer_acceptance: storage_model.customer_acceptance,
-            profile_id: storage_model.profile_id,
-            organization_id: storage_model.organization_id,
-            payment_method_subtype: storage_model.payment_method_subtype,
-            authentication_applied: storage_model.authentication_applied,
-            external_reference_id: storage_model.external_reference_id,
-            connector: storage_model.connector,
-            payment_method_billing_address,
-            connector_token_details: storage_model.connector_token_details,
-            card_discovery: storage_model.card_discovery,
-            feature_metadata: storage_model.feature_metadata.map(From::from),
-            processor_merchant_id: storage_model
-                .processor_merchant_id
-                .unwrap_or(storage_model.merchant_id),
-            created_by: storage_model
-                .created_by
-                .and_then(|created_by| created_by.parse::<CreatedBy>().ok()),
-            connector_request_reference_id: storage_model.connector_request_reference_id,
         })
     }