chore: reorder v2 migrations folders

crates/common_enums/src/enums.rs

@@ -7989,6 +7989,7 @@ pub enum UIWidgetFormLayout {
     Clone,
     Copy,
     Debug,
+    Default,
     Eq,
     PartialEq,
     serde::Deserialize,
@@ -8001,6 +8002,7 @@ pub enum UIWidgetFormLayout {
 #[strum(serialize_all = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum DeleteStatus {
+    #[default]
     Active,
     Redacted,
 }

crates/diesel_models/src/business_profile.rs

@@ -402,10 +402,10 @@ pub struct Profile {
     pub three_ds_decision_manager_config: Option<common_types::payments::DecisionManagerRecord>,
     pub should_collect_cvv_during_payment:
         Option<primitive_wrappers::ShouldCollectCvvDuringPayment>,
-    pub is_external_vault_enabled: Option<bool>,
-    pub external_vault_connector_details: Option<ExternalVaultConnectorDetails>,
     pub revenue_recovery_retry_algorithm_type: Option<common_enums::RevenueRecoveryAlgorithmType>,
     pub revenue_recovery_retry_algorithm_data: Option<RevenueRecoveryAlgorithmData>,
+    pub is_external_vault_enabled: Option<bool>,
+    pub external_vault_connector_details: Option<ExternalVaultConnectorDetails>,
 }
 
 impl Profile {

crates/diesel_models/src/customers.rs

@@ -6,7 +6,9 @@ use time::PrimitiveDateTime;
 #[cfg(feature = "v1")]
 use crate::schema::customers;
 #[cfg(feature = "v2")]
-use crate::{enums::DeleteStatus, schema_v2::customers};
+use crate::{
+    diesel_impl::RequiredFromNullableWithDefault, enums::DeleteStatus, schema_v2::customers,
+};
 
 #[cfg(feature = "v1")]
 #[derive(
@@ -164,6 +166,7 @@ pub struct Customer {
     pub merchant_reference_id: Option<common_utils::id_type::CustomerId>,
     pub default_billing_address: Option<Encryption>,
     pub default_shipping_address: Option<Encryption>,
+    #[diesel(deserialize_as = RequiredFromNullableWithDefault<DeleteStatus>)]
     pub status: DeleteStatus,
     pub id: common_utils::id_type::GlobalCustomerId,
 }

crates/diesel_models/src/lib.rs

@@ -61,6 +61,8 @@ pub mod user_key_store;
 pub mod user_role;
 
 use diesel_impl::{DieselArray, OptionalDieselArray};
+#[cfg(feature = "v2")]
+use diesel_impl::{RequiredFromNullable, RequiredFromNullableWithDefault};
 
 pub type StorageResult<T> = error_stack::Result<T, errors::DatabaseError>;
 pub type PgPooledConn = async_bb8_diesel::Connection<diesel::PgConnection>;
@@ -71,7 +73,6 @@ pub use self::{
     payment_intent::*, payment_method::*, payout_attempt::*, payouts::*, process_tracker::*,
     refund::*, reverse_lookup::*, user_authentication_method::*,
 };
-
 /// The types and implementations provided by this module are required for the schema generated by
 /// `diesel_cli` 2.0 to work with the types defined in Rust code. This is because
 /// [`diesel`][diesel] 2.0 [changed the nullability of array elements][diesel-2.0-array-nullability],
@@ -83,13 +84,18 @@ pub use self::{
 /// [diesel-2.0-array-nullability]: https://diesel.rs/guides/migration_guide.html#2-0-0-nullability-of-array-elements
 #[doc(hidden)]
 pub(crate) mod diesel_impl {
+    #[cfg(feature = "v2")]
+    use common_utils::{id_type, types};
     use diesel::{
         deserialize::FromSql,
         pg::Pg,
         sql_types::{Array, Nullable},
         Queryable,
     };
 
+    #[cfg(feature = "v2")]
+    use crate::enums;
+
     pub struct DieselArray<T>(Vec<Option<T>>);
 
     impl<T> From<DieselArray<T>> for Vec<T> {
@@ -130,6 +136,119 @@ pub(crate) mod diesel_impl {
             Ok(Self(row))
         }
     }
+    #[cfg(feature = "v2")]
+    /// If the DB value is null, this wrapper will return an error when deserializing.
+    ///
+    /// This is useful when you want to ensure that a field is always present, even if the database
+    /// value is NULL. If the database column contains a NULL value, an error will be returned.
+    pub struct RequiredFromNullable<T>(T);
+
+    #[cfg(feature = "v2")]
+    impl<T> RequiredFromNullable<T> {
+        /// Extracts the inner value from the wrapper
+        pub fn into_inner(self) -> T {
+            self.0
+        }
+    }
+
+    #[cfg(feature = "v2")]
+    impl<T, ST, DB> Queryable<Nullable<ST>, DB> for RequiredFromNullable<T>
+    where
+        DB: diesel::backend::Backend,
+        T: Queryable<ST, DB>,
+        Option<T::Row>: FromSql<Nullable<ST>, DB>,
+        ST: diesel::sql_types::SingleValue,
+    {
+        type Row = Option<T::Row>;
+
+        fn build(row: Self::Row) -> diesel::deserialize::Result<Self> {
+            match row {
+                Some(inner_row) => {
+                    let value = T::build(inner_row)?;
+                    Ok(Self(value))
+                }
+                None => Err("Cannot deserialize NULL value for required field. Check if the database column that should not be NULL contains a NULL value.".into()),
+            }
+        }
+    }
+
+    #[cfg(feature = "v2")]
+    /// If the DB value is null, this wrapper will provide a default value for the type `T`.
+    ///
+    /// This is useful when you want to ensure that a field is always present, even if the database
+    /// value is NULL. The default value is provided by the `Default` trait implementation of `T`.
+    pub struct RequiredFromNullableWithDefault<T>(T);
+    #[cfg(feature = "v2")]
+    impl<T> RequiredFromNullableWithDefault<T> {
+        /// Extracts the inner value from the wrapper
+        pub fn into_inner(self) -> T {
+            self.0
+        }
+    }
+    #[cfg(feature = "v2")]
+    impl<T, ST, DB> Queryable<Nullable<ST>, DB> for RequiredFromNullableWithDefault<T>
+    where
+        DB: diesel::backend::Backend,
+        T: Queryable<ST, DB>,
+        T: Default,
+        Option<T::Row>: FromSql<Nullable<ST>, DB>,
+        ST: diesel::sql_types::SingleValue,
+    {
+        type Row = Option<T::Row>;
+
+        fn build(row: Self::Row) -> diesel::deserialize::Result<Self> {
+            match row {
+                Some(inner_row) => {
+                    let value = T::build(inner_row)?;
+                    Ok(Self(value))
+                }
+                None => Ok(Self(T::default())),
+            }
+        }
+    }
+
+    #[cfg(feature = "v2")]
+    /// Macro to implement From trait for types wrapped in RequiredFromNullable
+    #[macro_export]
+    macro_rules! impl_from_required_from_nullable {
+        ($($type:ty),* $(,)?) => {
+            $(
+                impl From<$crate::RequiredFromNullable<$type>> for $type {
+                    fn from(wrapper: $crate::RequiredFromNullable<$type>) -> Self {
+                        wrapper.into_inner()
+                    }
+                }
+            )*
+        };
+    }
+
+    #[cfg(feature = "v2")]
+    /// Macro to implement From trait for types wrapped in RequiredFromNullableWithDefault
+    #[macro_export]
+    macro_rules! impl_from_required_from_nullable_with_default {
+        ($($type:ty),* $(,)?) => {
+            $(
+                impl From<$crate::RequiredFromNullableWithDefault<$type>> for $type {
+                    fn from(wrapper: $crate::RequiredFromNullableWithDefault<$type>) -> Self {
+                        wrapper.into_inner()
+                    }
+                }
+            )*
+        };
+    }
+    #[cfg(feature = "v2")]
+    crate::impl_from_required_from_nullable_with_default!(enums::DeleteStatus);
+
+    #[cfg(feature = "v2")]
+    crate::impl_from_required_from_nullable!(
+        enums::AuthenticationType,
+        types::MinorUnit,
+        enums::PaymentMethod,
+        enums::Currency,
+        id_type::ProfileId,
+        time::PrimitiveDateTime,
+        id_type::RefundReferenceId,
+    );
 }
 
 pub(crate) mod metrics {

crates/diesel_models/src/merchant_connector_account.rs

@@ -64,6 +64,9 @@ impl MerchantConnectorAccount {
     }
 }
 
+#[cfg(feature = "v2")]
+use crate::RequiredFromNullable;
+
 #[cfg(feature = "v2")]
 #[derive(
     Clone,
@@ -91,6 +94,7 @@ pub struct MerchantConnectorAccount {
     pub connector_webhook_details: Option<pii::SecretSerdeValue>,
     #[diesel(deserialize_as = super::OptionalDieselArray<pii::SecretSerdeValue>)]
     pub frm_config: Option<Vec<pii::SecretSerdeValue>>,
+    #[diesel(deserialize_as = RequiredFromNullable<id_type::ProfileId>)]
     pub profile_id: id_type::ProfileId,
     #[diesel(deserialize_as = super::OptionalDieselArray<String>)]
     pub applepay_verified_domains: Option<Vec<String>>,

crates/diesel_models/src/payment_attempt.rs

@@ -15,7 +15,7 @@ use crate::enums as storage_enums;
 #[cfg(feature = "v1")]
 use crate::schema::payment_attempt;
 #[cfg(feature = "v2")]
-use crate::schema_v2::payment_attempt;
+use crate::{schema_v2::payment_attempt, RequiredFromNullable};
 
 common_utils::impl_to_sql_from_sql_json!(ConnectorMandateReferenceId);
 #[derive(
@@ -48,6 +48,7 @@ pub struct PaymentAttempt {
     pub error_message: Option<String>,
     pub surcharge_amount: Option<MinorUnit>,
     pub payment_method_id: Option<id_type::GlobalPaymentMethodId>,
+    #[diesel(deserialize_as = RequiredFromNullable<storage_enums::AuthenticationType>)]
     pub authentication_type: storage_enums::AuthenticationType,
     #[serde(with = "common_utils::custom_serde::iso8601")]
     pub created_at: PrimitiveDateTime,
@@ -73,6 +74,7 @@ pub struct PaymentAttempt {
     pub encoded_data: Option<masking::Secret<String>>,
     pub unified_code: Option<String>,
     pub unified_message: Option<String>,
+    #[diesel(deserialize_as = RequiredFromNullable<MinorUnit>)]
     pub net_amount: MinorUnit,
     pub external_three_ds_authentication_attempted: Option<bool>,
     pub authentication_connector: Option<String>,
@@ -93,6 +95,8 @@ pub struct PaymentAttempt {
     pub charges: Option<common_types::payments::ConnectorChargeResponseData>,
     pub processor_merchant_id: Option<id_type::MerchantId>,
     pub created_by: Option<String>,
+    pub connector_request_reference_id: Option<String>,
+    #[diesel(deserialize_as = RequiredFromNullable<storage_enums::PaymentMethod>)]
     pub payment_method_type_v2: storage_enums::PaymentMethod,
     pub connector_payment_id: Option<ConnectorTransactionId>,
     pub payment_method_subtype: storage_enums::PaymentMethodType,
@@ -114,7 +118,6 @@ pub struct PaymentAttempt {
     pub network_decline_code: Option<String>,
     /// A string indicating how to proceed with an network error if payment gateway provide one. This is used to understand the network error code better.
     pub network_error_message: Option<String>,
-    pub connector_request_reference_id: Option<String>,
 }
 
 #[cfg(feature = "v1")]

crates/diesel_models/src/payment_intent.rs

@@ -11,6 +11,8 @@ use crate::schema::payment_intent;
 use crate::schema_v2::payment_intent;
 #[cfg(feature = "v2")]
 use crate::types::{FeatureMetadata, OrderDetailsWithAmount};
+#[cfg(feature = "v2")]
+use crate::RequiredFromNullable;
 use crate::{business_profile::PaymentLinkBackgroundImageConfig, enums as storage_enums};
 
 #[cfg(feature = "v2")]
@@ -20,6 +22,7 @@ pub struct PaymentIntent {
     pub merchant_id: common_utils::id_type::MerchantId,
     pub status: storage_enums::IntentStatus,
     pub amount: MinorUnit,
+    #[diesel(deserialize_as = RequiredFromNullable<storage_enums::Currency>)]
     pub currency: storage_enums::Currency,
     pub amount_captured: Option<MinorUnit>,
     pub customer_id: Option<common_utils::id_type::GlobalCustomerId>,
@@ -40,12 +43,14 @@ pub struct PaymentIntent {
     pub connector_metadata: Option<pii::SecretSerdeValue>,
     pub feature_metadata: Option<FeatureMetadata>,
     pub attempt_count: i16,
+    #[diesel(deserialize_as = RequiredFromNullable<common_utils::id_type::ProfileId>)]
     pub profile_id: common_utils::id_type::ProfileId,
     pub payment_link_id: Option<String>,
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
     pub request_incremental_authorization: Option<RequestIncrementalAuthorization>,
     pub authorization_count: Option<i32>,
+    #[diesel(deserialize_as = RequiredFromNullable<PrimitiveDateTime>)]
     pub session_expiry: PrimitiveDateTime,
     pub request_external_three_ds_authentication: Option<bool>,
     pub frm_metadata: Option<pii::SecretSerdeValue>,