chore: addressal of comments

Author: prajjwalkumar17

crates/api_models/src/payments.rs

@@ -2933,9 +2933,7 @@ impl Address {
 
 // used by customers also, could be moved outside
 /// Address details
-#[derive(
-    Clone, Default, Debug, Eq, serde::Deserialize, serde::Serialize, Setter, PartialEq, ToSchema,
-)]
+#[derive(Clone, Default, Debug, Eq, serde::Deserialize, serde::Serialize, PartialEq, ToSchema)]
 #[serde(deny_unknown_fields)]
 pub struct AddressDetails {
     /// The address city

crates/diesel_models/src/payment_intent.rs

@@ -59,8 +59,8 @@ pub struct PaymentIntent {
     pub request_external_three_ds_authentication: Option<bool>,
     pub charges: Option<pii::SecretSerdeValue>,
     pub frm_metadata: Option<pii::SecretSerdeValue>,
-    pub billing_address_details: Option<Encryption>,
     pub customer_details: Option<Encryption>,
+    pub billing_address_details: Option<Encryption>,
 }
 
 #[derive(
@@ -116,8 +116,8 @@ pub struct PaymentIntentNew {
     pub request_external_three_ds_authentication: Option<bool>,
     pub charges: Option<pii::SecretSerdeValue>,
     pub frm_metadata: Option<pii::SecretSerdeValue>,
-    pub billing_address_details: Option<Encryption>,
     pub customer_details: Option<Encryption>,
+    pub billing_address_details: Option<Encryption>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -253,8 +253,8 @@ pub struct PaymentIntentUpdateInternal {
     pub fingerprint_id: Option<String>,
     pub request_external_three_ds_authentication: Option<bool>,
     pub frm_metadata: Option<pii::SecretSerdeValue>,
-    pub billing_address_details: Option<Encryption>,
     pub customer_details: Option<Encryption>,
+    pub billing_address_details: Option<Encryption>,
 }
 
 impl PaymentIntentUpdate {
@@ -290,8 +290,8 @@ impl PaymentIntentUpdate {
             fingerprint_id,
             request_external_three_ds_authentication,
             frm_metadata,
-            billing_address_details,
             customer_details,
+            billing_address_details,
         } = self.into();
         PaymentIntent {
             amount: amount.unwrap_or(source.amount),
@@ -329,8 +329,8 @@ impl PaymentIntentUpdate {
             request_external_three_ds_authentication: request_external_three_ds_authentication
                 .or(source.request_external_three_ds_authentication),
             frm_metadata: frm_metadata.or(source.frm_metadata),
-            billing_address_details: billing_address_details.or(source.billing_address_details),
             customer_details: customer_details.or(source.customer_details),
+            billing_address_details: billing_address_details.or(source.billing_address_details),
             ..source
         }
     }

crates/hyperswitch_domain_models/src/payments/payment_attempt.rs

@@ -529,8 +529,8 @@ impl behaviour::Conversion for PaymentIntent {
             request_external_three_ds_authentication: self.request_external_three_ds_authentication,
             charges: self.charges,
             frm_metadata: self.frm_metadata,
-            billing_address_details: self.billing_address_details.map(Encryption::from),
             customer_details: self.customer_details.map(Encryption::from),
+            billing_address_details: self.billing_address_details.map(Encryption::from),
         })
     }
 
@@ -588,14 +588,14 @@ impl behaviour::Conversion for PaymentIntent {
                     .request_external_three_ds_authentication,
                 charges: storage_model.charges,
                 frm_metadata: storage_model.frm_metadata,
-                billing_address_details: storage_model
-                    .billing_address_details
-                    .async_lift(inner_decrypt)
-                    .await?,
                 customer_details: storage_model
                     .customer_details
                     .async_lift(inner_decrypt)
                     .await?,
+                billing_address_details: storage_model
+                    .billing_address_details
+                    .async_lift(inner_decrypt)
+                    .await?,
             })
         }
         .await
@@ -649,8 +649,8 @@ impl behaviour::Conversion for PaymentIntent {
             request_external_three_ds_authentication: self.request_external_three_ds_authentication,
             charges: self.charges,
             frm_metadata: self.frm_metadata,
-            billing_address_details: self.billing_address_details.map(Encryption::from),
             customer_details: self.customer_details.map(Encryption::from),
+            billing_address_details: self.billing_address_details.map(Encryption::from),
         })
     }
 }

crates/hyperswitch_domain_models/src/payments/payment_intent.rs

@@ -133,8 +133,8 @@ pub struct PaymentIntentNew {
     pub session_expiry: Option<PrimitiveDateTime>,
     pub request_external_three_ds_authentication: Option<bool>,
     pub charges: Option<pii::SecretSerdeValue>,
-    pub billing_address_details: Option<Encryptable<Secret<serde_json::Value>>>,
     pub customer_details: Option<Encryptable<Secret<serde_json::Value>>>,
+    pub billing_address_details: Option<Encryptable<Secret<serde_json::Value>>>,
 }
 
 #[derive(Debug, Clone, Serialize)]
@@ -271,8 +271,8 @@ pub struct PaymentIntentUpdateInternal {
     pub session_expiry: Option<PrimitiveDateTime>,
     pub request_external_three_ds_authentication: Option<bool>,
     pub frm_metadata: Option<pii::SecretSerdeValue>,
-    pub billing_address_details: Option<Encryptable<Secret<serde_json::Value>>>,
     pub customer_details: Option<Encryptable<Secret<serde_json::Value>>>,
+    pub billing_address_details: Option<Encryptable<Secret<serde_json::Value>>>,
 }
 
 impl From<PaymentIntentUpdate> for PaymentIntentUpdateInternal {
@@ -693,8 +693,8 @@ impl From<PaymentIntentUpdateInternal> for diesel_models::PaymentIntentUpdateInt
             fingerprint_id,
             request_external_three_ds_authentication,
             frm_metadata,
-            billing_address_details,
             customer_details,
+            billing_address_details,
         } = value;
 
         Self {
@@ -728,8 +728,8 @@ impl From<PaymentIntentUpdateInternal> for diesel_models::PaymentIntentUpdateInt
             fingerprint_id,
             request_external_three_ds_authentication,
             frm_metadata,
-            billing_address_details: billing_address_details.map(Encryption::from),
             customer_details: customer_details.map(Encryption::from),
+            billing_address_details: billing_address_details.map(Encryption::from),
         }
     }
 }

crates/router/src/core/payments/operations/payment_confirm.rs

@@ -1215,8 +1215,11 @@ impl<F: Clone> UpdateTracker<F, PaymentData<F>, api::PaymentsRequest> for Paymen
         );
 
         let billing_address = payment_data.address.get_payment_billing();
-        let billing_address_details =
-            async { create_encrypted_data(key_store, billing_address).await }.await;
+        let billing_address_details = billing_address
+            .async_and_then(|billing| async {
+                create_encrypted_data(key_store, billing.address.clone()).await
+            })
+            .await;
         let m_payment_data_payment_intent = payment_data.payment_intent.clone();
         let m_customer_id = customer_id.clone();
         let m_shipping_address_id = shipping_address_id.clone();

crates/router/src/core/payments/operations/payment_update.rs

@@ -1,7 +1,9 @@
 use std::marker::PhantomData;
 
 use api_models::{
-    enums::FrmSuggestion, mandates::RecurringDetails, payments::RequestSurchargeDetails,
+    enums::FrmSuggestion,
+    mandates::RecurringDetails,
+    payments::{Address, RequestSurchargeDetails},
 };
 use async_trait::async_trait;
 use common_utils::{
@@ -218,10 +220,11 @@ impl<F: Send + Clone> GetTracker<F, PaymentData<F>, api::PaymentsRequest> for Pa
         )
         .await?;
 
-        payment_intent.billing_address_details = billing_address
+        let billing_details: Option<Address> = billing_address.as_ref().map(From::from);
+        payment_intent.billing_address_details = billing_details
             .clone()
-            .async_and_then(|_| async {
-                create_encrypted_data(key_store, billing_address.clone()).await
+            .async_and_then(|billing_details| async move {
+                create_encrypted_data(key_store, billing_details.address.clone()).await
             })
             .await;
 
@@ -440,7 +443,7 @@ impl<F: Send + Clone> GetTracker<F, PaymentData<F>, api::PaymentsRequest> for Pa
             customer_acceptance,
             address: PaymentAddress::new(
                 shipping_address.as_ref().map(From::from),
-                billing_address.as_ref().map(From::from),
+                billing_details,
                 payment_method_billing.as_ref().map(From::from),
                 business_profile.use_billing_as_payment_method_billing,
             ),