chore: make changes to diesel models

Author: hrithikesh026

crates/diesel_models/src/customers.rs

@@ -114,7 +114,7 @@ impl From<CustomerNew> for Customer {
             default_shipping_address: customer_new.default_shipping_address,
             id: customer_new.id,
             version: customer_new.version,
-            status: customer_new.status,
+            status: Some(customer_new.status),
         }
     }
 }
@@ -164,7 +164,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>,
-    pub status: DeleteStatus,
+    pub status: Option<DeleteStatus>,
     pub id: common_utils::id_type::GlobalCustomerId,
 }
 
@@ -276,7 +276,7 @@ impl CustomerUpdateInternal {
                 .map_or(source.default_billing_address, Some),
             default_shipping_address: default_shipping_address
                 .map_or(source.default_shipping_address, Some),
-            status: status.unwrap_or(source.status),
+            status: status.or(source.status),
             ..source
         }
     }

crates/diesel_models/src/merchant_connector_account.rs

@@ -91,7 +91,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>>,
-    pub profile_id: id_type::ProfileId,
+    pub profile_id: Option<id_type::ProfileId>,
     #[diesel(deserialize_as = super::OptionalDieselArray<String>)]
     pub applepay_verified_domains: Option<Vec<String>>,
     pub pm_auth_config: Option<pii::SecretSerdeValue>,

crates/diesel_models/src/payment_attempt.rs

@@ -48,7 +48,7 @@ pub struct PaymentAttempt {
     pub error_message: Option<String>,
     pub surcharge_amount: Option<MinorUnit>,
     pub payment_method_id: Option<id_type::GlobalPaymentMethodId>,
-    pub authentication_type: storage_enums::AuthenticationType,
+    pub authentication_type: Option<storage_enums::AuthenticationType>,
     #[serde(with = "common_utils::custom_serde::iso8601")]
     pub created_at: PrimitiveDateTime,
     #[serde(with = "common_utils::custom_serde::iso8601")]
@@ -73,7 +73,7 @@ pub struct PaymentAttempt {
     pub encoded_data: Option<masking::Secret<String>>,
     pub unified_code: Option<String>,
     pub unified_message: Option<String>,
-    pub net_amount: MinorUnit,
+    pub net_amount: Option<MinorUnit>,
     pub external_three_ds_authentication_attempted: Option<bool>,
     pub authentication_connector: Option<String>,
     pub authentication_id: Option<id_type::AuthenticationId>,
@@ -94,7 +94,7 @@ pub struct PaymentAttempt {
     pub processor_merchant_id: Option<id_type::MerchantId>,
     pub created_by: Option<String>,
     pub connector_request_reference_id: Option<String>,
-    pub payment_method_type_v2: storage_enums::PaymentMethod,
+    pub payment_method_type_v2: Option<storage_enums::PaymentMethod>,
     pub connector_payment_id: Option<ConnectorTransactionId>,
     pub payment_method_subtype: storage_enums::PaymentMethodType,
     pub routing_result: Option<serde_json::Value>,
@@ -892,8 +892,8 @@ impl PaymentAttemptUpdateInternal {
             status,
             authentication_type,
             error_message,
-            connector_payment_id,
-            modified_at,
+            connector_payment_id: _,
+            modified_at: _,
             browser_info,
             error_code,
             connector_metadata,
@@ -924,7 +924,7 @@ impl PaymentAttemptUpdateInternal {
             error_message: error_message.or(source.error_message),
             surcharge_amount: source.surcharge_amount,
             payment_method_id: payment_method_id.or(source.payment_method_id),
-            authentication_type: authentication_type.unwrap_or(source.authentication_type),
+            authentication_type: authentication_type.or(source.authentication_type),
             created_at: source.created_at,
             modified_at: common_utils::date_time::now(),
             last_synced: source.last_synced,

crates/diesel_models/src/payment_intent.rs

@@ -20,7 +20,7 @@ pub struct PaymentIntent {
     pub merchant_id: common_utils::id_type::MerchantId,
     pub status: storage_enums::IntentStatus,
     pub amount: MinorUnit,
-    pub currency: storage_enums::Currency,
+    pub currency: Option<storage_enums::Currency>,
     pub amount_captured: Option<MinorUnit>,
     pub customer_id: Option<common_utils::id_type::GlobalCustomerId>,
     pub description: Option<common_utils::types::Description>,
@@ -40,13 +40,13 @@ pub struct PaymentIntent {
     pub connector_metadata: Option<pii::SecretSerdeValue>,
     pub feature_metadata: Option<FeatureMetadata>,
     pub attempt_count: i16,
-    pub profile_id: common_utils::id_type::ProfileId,
+    pub profile_id: Option<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>,
-    pub session_expiry: PrimitiveDateTime,
+    pub session_expiry: Option<PrimitiveDateTime>,
     pub request_external_three_ds_authentication: Option<bool>,
     pub frm_metadata: Option<pii::SecretSerdeValue>,
     pub customer_details: Option<Encryption>,
@@ -689,7 +689,7 @@ impl PaymentIntentUpdateInternal {
                 None => source.active_attempt_id,
             },
             amount: amount.unwrap_or(source.amount),
-            currency: currency.unwrap_or(source.currency),
+            currency: currency.or(source.currency),
             shipping_cost: shipping_cost.or(source.shipping_cost),
             tax_details: tax_details.or(source.tax_details),
             skip_external_tax_calculation: skip_external_tax_calculation
@@ -717,7 +717,7 @@ impl PaymentIntentUpdateInternal {
             payment_link_config: payment_link_config.or(source.payment_link_config),
             request_incremental_authorization: request_incremental_authorization
                 .or(source.request_incremental_authorization),
-            session_expiry: session_expiry.unwrap_or(source.session_expiry),
+            session_expiry: session_expiry.or(source.session_expiry),
             frm_metadata: frm_metadata.or(source.frm_metadata),
             request_external_three_ds_authentication: request_external_three_ds_authentication
                 .or(source.request_external_three_ds_authentication),

crates/diesel_models/src/refund.rs

@@ -115,7 +115,7 @@ pub struct Refund {
     pub processor_refund_data: Option<String>,
     pub processor_transaction_data: Option<String>,
     pub id: common_utils::id_type::GlobalRefundId,
-    pub merchant_reference_id: common_utils::id_type::RefundReferenceId,
+    pub merchant_reference_id: Option<common_utils::id_type::RefundReferenceId>,
     pub connector_id: Option<common_utils::id_type::MerchantConnectorAccountId>,
 }
 

crates/diesel_models/src/schema_v2.rs

@@ -369,7 +369,7 @@ diesel::table! {
         merchant_reference_id -> Nullable<Varchar>,
         default_billing_address -> Nullable<Bytea>,
         default_shipping_address -> Nullable<Bytea>,
-        status -> DeleteStatus,
+        status -> Nullable<DeleteStatus>,
         #[max_length = 64]
         id -> Varchar,
     }
@@ -781,7 +781,7 @@ diesel::table! {
         connector_webhook_details -> Nullable<Jsonb>,
         frm_config -> Nullable<Array<Nullable<Jsonb>>>,
         #[max_length = 64]
-        profile_id -> Varchar,
+        profile_id -> Nullable<Varchar>,
         applepay_verified_domains -> Nullable<Array<Nullable<Text>>>,
         pm_auth_config -> Nullable<Jsonb>,
         status -> ConnectorStatus,
@@ -842,7 +842,7 @@ diesel::table! {
         surcharge_amount -> Nullable<Int8>,
         #[max_length = 64]
         payment_method_id -> Nullable<Varchar>,
-        authentication_type -> AuthenticationType,
+        authentication_type -> Nullable<AuthenticationType>,
         created_at -> Timestamp,
         modified_at -> Timestamp,
         last_synced -> Nullable<Timestamp>,
@@ -873,7 +873,7 @@ diesel::table! {
         unified_code -> Nullable<Varchar>,
         #[max_length = 1024]
         unified_message -> Nullable<Varchar>,
-        net_amount -> Int8,
+        net_amount -> Nullable<Int8>,
         external_three_ds_authentication_attempted -> Nullable<Bool>,
         #[max_length = 64]
         authentication_connector -> Nullable<Varchar>,
@@ -905,7 +905,7 @@ diesel::table! {
         created_by -> Nullable<Varchar>,
         #[max_length = 255]
         connector_request_reference_id -> Nullable<Varchar>,
-        payment_method_type_v2 -> Varchar,
+        payment_method_type_v2 -> Nullable<Varchar>,
         #[max_length = 128]
         connector_payment_id -> Nullable<Varchar>,
         #[max_length = 64]
@@ -939,7 +939,7 @@ diesel::table! {
         merchant_id -> Varchar,
         status -> IntentStatus,
         amount -> Int8,
-        currency -> Currency,
+        currency -> Nullable<Currency>,
         amount_captured -> Nullable<Int8>,
         #[max_length = 64]
         customer_id -> Nullable<Varchar>,
@@ -960,15 +960,15 @@ diesel::table! {
         feature_metadata -> Nullable<Json>,
         attempt_count -> Int2,
         #[max_length = 64]
-        profile_id -> Varchar,
+        profile_id -> Nullable<Varchar>,
         #[max_length = 255]
         payment_link_id -> Nullable<Varchar>,
         #[max_length = 32]
         updated_by -> Varchar,
         surcharge_applicable -> Nullable<Bool>,
         request_incremental_authorization -> Nullable<RequestIncrementalAuthorization>,
         authorization_count -> Nullable<Int4>,
-        session_expiry -> Timestamp,
+        session_expiry -> Nullable<Timestamp>,
         request_external_three_ds_authentication -> Nullable<Bool>,
         frm_metadata -> Nullable<Jsonb>,
         customer_details -> Nullable<Bytea>,
@@ -1259,7 +1259,7 @@ diesel::table! {
         #[max_length = 64]
         id -> Varchar,
         #[max_length = 64]
-        merchant_reference_id -> Varchar,
+        merchant_reference_id -> Nullable<Varchar>,
         #[max_length = 64]
         connector_id -> Nullable<Varchar>,
     }