fix/format

Author: awasthi21

crates/common_enums/src/enums.rs

@@ -7278,7 +7278,7 @@ pub enum MerchantDecision {
     strum::EnumIter,
     ToSchema,
 )]
-#[router_derive::diesel_enum(storage_type = "db_enum")]
+#[router_derive::diesel_enum(storage_type = "text")]
 #[serde(rename_all = "snake_case")]
 #[strum(serialize_all = "snake_case")]
 pub enum TaxStatus {

crates/diesel_models/src/enums.rs

@@ -24,10 +24,9 @@ pub mod diesel_exports {
         DbRoutingAlgorithmKind as RoutingAlgorithmKind, DbRoutingApproach as RoutingApproach,
         DbScaExemptionType as ScaExemptionType,
         DbSuccessBasedRoutingConclusiveState as SuccessBasedRoutingConclusiveState,
-        DbTaxStatus as TaxStatus, DbTokenizationFlag as TokenizationFlag,
-        DbTotpStatus as TotpStatus, DbTransactionType as TransactionType,
-        DbUserRoleVersion as UserRoleVersion, DbUserStatus as UserStatus,
-        DbWebhookDeliveryAttempt as WebhookDeliveryAttempt,
+        DbTokenizationFlag as TokenizationFlag, DbTotpStatus as TotpStatus,
+        DbTransactionType as TransactionType, DbUserRoleVersion as UserRoleVersion,
+        DbUserStatus as UserStatus, DbWebhookDeliveryAttempt as WebhookDeliveryAttempt,
     };
 }
 

crates/diesel_models/src/schema.rs

@@ -1073,7 +1073,7 @@ diesel::table! {
         is_payment_id_from_merchant -> Nullable<Bool>,
         #[max_length = 64]
         payment_channel -> Nullable<Varchar>,
-        tax_status -> Nullable<TaxStatus>,
+        tax_status -> Nullable<Varchar>,
         discount_amount -> Nullable<Int8>,
         shipping_amount_tax -> Nullable<Int8>,
         duty_amount -> Nullable<Int8>,

crates/diesel_models/src/schema_v2.rs

@@ -1005,7 +1005,7 @@ diesel::table! {
         is_payment_id_from_merchant -> Nullable<Bool>,
         #[max_length = 64]
         payment_channel -> Nullable<Varchar>,
-        tax_status -> Nullable<TaxStatus>,
+        tax_status -> Nullable<Varchar>,
         discount_amount -> Nullable<Int8>,
         shipping_amount_tax -> Nullable<Int8>,
         duty_amount -> Nullable<Int8>,

crates/router/src/core/payments/transformers.rs

@@ -1234,37 +1234,37 @@ where
         .connector_mandate_detail
         .as_ref()
         .and_then(|detail| detail.get_connector_mandate_request_reference_id());
-
-    let l2_l3_data = if state.conf.l2_l3_data_config.enabled {
+    let order_details = payment_data
+        .payment_intent
+        .order_details
+        .as_ref()
+        .map(|order_details| {
+            order_details
+                .iter()
+                .map(|data| {
+                    data.to_owned()
+                        .parse_value("OrderDetailsWithAmount")
+                        .change_context(errors::ApiErrorResponse::InvalidDataValue {
+                            field_name: "OrderDetailsWithAmount",
+                        })
+                        .attach_printable("Unable to parse OrderDetailsWithAmount")
+                })
+                .collect::<Result<Vec<_>, _>>()
+        })
+        .transpose()?;
+    let l2_l3_data = state.conf.l2_l3_data_config.enabled.then(|| {
         let shipping_address = unified_address.get_shipping();
         let billing_address = unified_address.get_payment_billing();
 
-        Some(types::L2L3Data {
+        types::L2L3Data {
             customer_order_date: payment_data.payment_intent.customer_order_date,
             tax_status: payment_data.payment_intent.tax_status,
             customer_tax_registration_id: customer.as_ref().and_then(|c| {
                 c.tax_registration_id
                     .as_ref()
                     .map(|e| e.clone().into_inner())
             }),
-            order_details: payment_data
-                .payment_intent
-                .order_details
-                .as_ref()
-                .map(|order_details| {
-                    order_details
-                        .iter()
-                        .map(|data| {
-                            data.to_owned()
-                                .parse_value("OrderDetailsWithAmount")
-                                .change_context(errors::ApiErrorResponse::InvalidDataValue {
-                                    field_name: "OrderDetailsWithAmount",
-                                })
-                                .attach_printable("Unable to parse OrderDetailsWithAmount")
-                        })
-                        .collect::<Result<Vec<_>, _>>()
-                })
-                .transpose()?,
+            order_details: order_details.clone(),
             discount_amount: payment_data.payment_intent.discount_amount,
             shipping_cost: payment_data.payment_intent.shipping_cost,
             shipping_amount_tax: payment_data.payment_intent.shipping_amount_tax,
@@ -1282,21 +1282,23 @@ where
                 .and_then(|addr| addr.address.as_ref())
                 .and_then(|details| details.origin_zip.clone()),
             shipping_state: shipping_address
+                .as_ref()
                 .and_then(|addr| addr.address.as_ref())
                 .and_then(|details| details.state.clone()),
             shipping_country: shipping_address
+                .as_ref()
                 .and_then(|addr| addr.address.as_ref())
                 .and_then(|details| details.country),
             shipping_destination_zip: shipping_address
+                .as_ref()
                 .and_then(|addr| addr.address.as_ref())
                 .and_then(|details| details.zip.clone()),
             billing_address_city: billing_address
+                .as_ref()
                 .and_then(|addr| addr.address.as_ref())
                 .and_then(|details| details.city.clone()),
-        })
-    } else {
-        None
-    };
+        }
+    });
     crate::logger::debug!("unified address details {:?}", unified_address);
 
     router_data = types::RouterData {

migrations/2025-07-31-181024_add_l2_l3_fields_to_payment_intent/down.sql

@@ -6,4 +6,3 @@ DROP COLUMN IF EXISTS shipping_amount_tax,
 DROP COLUMN IF EXISTS duty_amount,
 DROP COLUMN IF EXISTS customer_order_date;
 
-DROP TYPE IF EXISTS "TaxStatus";

migrations/2025-07-31-181024_add_l2_l3_fields_to_payment_intent/up.sql

@@ -1,8 +1,7 @@
 -- Your SQL goes here
-CREATE TYPE "TaxStatus" AS ENUM ('taxable', 'exempt');
 
 ALTER TABLE payment_intent
-ADD COLUMN IF NOT EXISTS tax_status "TaxStatus",
+ADD COLUMN IF NOT EXISTS tax_status VARCHAR ,
 ADD COLUMN IF NOT EXISTS discount_amount BIGINT,
 ADD COLUMN IF NOT EXISTS shipping_amount_tax BIGINT,
 ADD COLUMN IF NOT EXISTS duty_amount BIGINT,