refactor(payment_intent_v2): payment intent fields refactoring

crates/common_enums/src/enums.rs

@@ -3212,3 +3212,30 @@ pub enum DeleteStatus {
     Active,
     Redacted,
 }
+
+/// Whether 3ds authentication is requested or not
+#[derive(Clone, Debug, PartialEq, serde::Serialize)]
+pub enum External3dsAuthenticationRequest {
+    /// Request for 3ds authentication
+    Enable,
+    /// Skip 3ds authentication
+    Skip,
+}
+
+/// Whether payment link is requested to be enabled or not for this transaction
+#[derive(Clone, Debug, PartialEq, serde::Serialize)]
+pub enum EnablePaymentLinkRequest {
+    /// Request for enabling payment link
+    Enable,
+    /// Skip enabling payment link
+    Skip,
+}
+
+/// Whether mit exemption is requested or not
+#[derive(Clone, Debug, PartialEq, serde::Serialize)]
+pub enum MitExemptionRequest {
+    /// Request for applying MIT exemption
+    Apply,
+    /// Skip applying MIT exemption
+    Skip,
+}

crates/common_enums/src/transformers.rs

@@ -1991,6 +1991,61 @@ mod custom_serde {
     }
 }
 
+impl From<Option<bool>> for super::External3dsAuthenticationRequest {
+    fn from(value: Option<bool>) -> Self {
+        match value {
+            Some(true) => Self::Enable,
+            _ => Self::Skip,
+        }
+    }
+}
+
+/// Get the boolean value of the `External3dsAuthenticationRequest`.
+impl super::External3dsAuthenticationRequest {
+    pub fn as_bool(&self) -> bool {
+        match self {
+            Self::Enable => true,
+            Self::Skip => false,
+        }
+    }
+}
+
+impl super::EnablePaymentLinkRequest {
+    pub fn as_bool(&self) -> bool {
+        match self {
+            Self::Enable => true,
+            Self::Skip => false,
+        }
+    }
+}
+
+impl From<Option<bool>> for super::EnablePaymentLinkRequest {
+    fn from(value: Option<bool>) -> Self {
+        match value {
+            Some(true) => Self::Enable,
+            _ => Self::Skip,
+        }
+    }
+}
+
+impl From<Option<bool>> for super::MitExemptionRequest {
+    fn from(value: Option<bool>) -> Self {
+        match value {
+            Some(true) => Self::Apply,
+            _ => Self::Skip,
+        }
+    }
+}
+
+impl super::MitExemptionRequest {
+    pub fn as_bool(&self) -> bool {
+        match self {
+            Self::Apply => true,
+            Self::Skip => false,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     #![allow(clippy::unwrap_used)]

crates/common_utils/src/id_type.rs

@@ -11,6 +11,7 @@ mod payment;
 mod profile;
 mod routing;
 
+#[cfg(feature = "v2")]
 mod global_id;
 
 pub use customer::CustomerId;
@@ -21,6 +22,8 @@ use diesel::{
     serialize::{Output, ToSql},
     sql_types,
 };
+#[cfg(feature = "v2")]
+pub use global_id::{payment::PaymentGlobalId, CellId};
 pub use merchant::MerchantId;
 pub use merchant_connector_account::MerchantConnectorAccountId;
 pub use organization::OrganizationId;
@@ -151,6 +154,7 @@ impl<const MAX_LENGTH: u8, const MIN_LENGTH: u8> LengthId<MAX_LENGTH, MIN_LENGTH
         Self(alphanumeric_id)
     }
 
+    #[cfg(feature = "v2")]
     /// Create a new LengthId from aplhanumeric id
     pub(crate) fn from_alphanumeric_id(
         alphanumeric_id: AlphaNumericId,

crates/common_utils/src/id_type/global_id.rs

@@ -1,4 +1,5 @@
 #![allow(unused)]
+pub mod payment;
 
 use diesel::{backend::Backend, deserialize::FromSql, serialize::ToSql, sql_types};
 use error_stack::ResultExt;
@@ -32,8 +33,9 @@ impl GlobalEntity {
     }
 }
 
+/// Cell identifier for an instance / deployment of application
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub(crate) struct CellId(LengthId<CELL_IDENTIFIER_LENGTH, CELL_IDENTIFIER_LENGTH>);
+pub struct CellId(LengthId<CELL_IDENTIFIER_LENGTH, CELL_IDENTIFIER_LENGTH>);
 
 #[derive(Debug, Error, PartialEq, Eq)]
 pub enum CellIdError {

crates/common_utils/src/id_type/global_id/payment.rs

@@ -0,0 +1,38 @@
+/// A global id that can be used to identify a payment
+#[derive(
+    Debug,
+    Clone,
+    Hash,
+    PartialEq,
+    Eq,
+    serde::Serialize,
+    serde::Deserialize,
+    diesel::expression::AsExpression,
+)]
+#[diesel(sql_type = diesel::sql_types::Text)]
+pub struct PaymentGlobalId(super::GlobalId);
+
+// Database related implementations so that this field can be used directly in the database tables
+crate::impl_queryable_id_type!(PaymentGlobalId);
+
+impl<DB> diesel::serialize::ToSql<diesel::sql_types::Text, DB> for PaymentGlobalId
+where
+    DB: diesel::backend::Backend,
+    super::GlobalId: diesel::serialize::ToSql<diesel::sql_types::Text, DB>,
+{
+    fn to_sql<'b>(
+        &'b self,
+        out: &mut diesel::serialize::Output<'b, '_, DB>,
+    ) -> diesel::serialize::Result {
+        self.0.to_sql(out)
+    }
+}
+impl<DB> diesel::deserialize::FromSql<diesel::sql_types::Text, DB> for PaymentGlobalId
+where
+    DB: diesel::backend::Backend,
+    super::GlobalId: diesel::deserialize::FromSql<diesel::sql_types::Text, DB>,
+{
+    fn from_sql(value: DB::RawValue<'_>) -> diesel::deserialize::Result<Self> {
+        super::GlobalId::from_sql(value).map(Self)
+    }
+}

crates/common_utils/src/id_type/payment.rs

@@ -1,7 +1,7 @@
 use crate::{
     errors::{CustomResult, ValidationError},
     generate_id_with_default_len,
-    id_type::{global_id, AlphaNumericId, LengthId},
+    id_type::{AlphaNumericId, LengthId},
 };
 
 crate::id_type!(
@@ -15,23 +15,10 @@ crate::impl_debug_id_type!(PaymentId);
 crate::impl_default_id_type!(PaymentId, "pay");
 crate::impl_try_from_cow_str_id_type!(PaymentId, "payment_id");
 
+// Database related implementations so that this field can be used directly in the database tables
 crate::impl_queryable_id_type!(PaymentId);
 crate::impl_to_sql_from_sql_id_type!(PaymentId);
 
-/// A global id that can be used to identify a payment
-#[derive(
-    Debug,
-    Clone,
-    Hash,
-    PartialEq,
-    Eq,
-    serde::Serialize,
-    serde::Deserialize,
-    diesel::expression::AsExpression,
-)]
-#[diesel(sql_type = diesel::sql_types::Text)]
-pub struct PaymentGlobalId(global_id::GlobalId);
-
 impl PaymentId {
     /// Get the hash key to be stored in redis
     pub fn get_hash_key_for_kv_store(&self) -> String {