feat(users): obtain product_type from the request body

Author: tsdk02

crates/api_models/src/user/dashboard_metadata.rs

@@ -103,13 +103,7 @@ pub struct ProdIntent {
     pub poc_contact: Option<String>,
     pub comments: Option<String>,
     pub is_completed: bool,
-}
-
-#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
-pub struct ProdIntentWithProductType {
-    #[serde(flatten)]
-    pub prod_intent: ProdIntent,
-    pub product_type: MerchantProductType,
+    pub product_type: Option<MerchantProductType>,
 }
 
 #[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]

crates/router/src/core/user/dashboard_metadata.rs

@@ -1,8 +1,6 @@
 use std::str::FromStr;
 
-use api_models::user::dashboard_metadata::{
-    self as api, GetMultipleMetaDataPayload, ProdIntentWithProductType,
-};
+use api_models::user::dashboard_metadata::{self as api, GetMultipleMetaDataPayload};
 #[cfg(feature = "email")]
 use common_enums::EntityType;
 use common_utils::pii;
@@ -463,42 +461,14 @@ async fn insert_metadata(
                 pii::Email::from_str(inner_poc_email)
                     .change_context(UserErrors::EmailParsingError)?;
             }
-            let key_manager_state = &(state).into();
-            let merchant_key_store = state
-                .store
-                .get_merchant_key_store_by_merchant_id(
-                    key_manager_state,
-                    &user.merchant_id.clone(),
-                    &state.store.get_master_key().to_vec().into(),
-                )
-                .await
-                .change_context(UserErrors::InternalServerError)
-                .attach_printable("Failed to retrieve merchant key store by merchant_id")?;
-            let merchant_account = state
-                .store
-                .find_merchant_account_by_merchant_id(
-                    key_manager_state,
-                    &user.merchant_id.clone(),
-                    &merchant_key_store,
-                )
-                .await
-                .change_context(UserErrors::InternalServerError)
-                .attach_printable("Failed to retrieve merchant account by merchant_id")?;
-            // The product type field in the merchant account table is nullable, and if the corresponding value is null, the default orchestration product type is considered.
-            let product_type = merchant_account.product_type.unwrap_or_default();
-
-            let data_value = ProdIntentWithProductType {
-                prod_intent: data.clone(),
-                product_type,
-            };
 
             let mut metadata = utils::insert_merchant_scoped_metadata_to_db(
                 state,
                 user.user_id.clone(),
                 user.merchant_id.clone(),
                 user.org_id.clone(),
                 metadata_key,
-                data_value.clone(),
+                data.clone(),
             )
             .await;
 
@@ -509,7 +479,7 @@ async fn insert_metadata(
                     user.merchant_id.clone(),
                     user.org_id.clone(),
                     metadata_key,
-                    data_value.clone(),
+                    data.clone(),
                 )
                 .await
                 .change_context(UserErrors::InternalServerError);
@@ -532,7 +502,7 @@ async fn insert_metadata(
                     .await?;
                     let email_contents = email_types::BizEmailProd::new(
                         state,
-                        data_value,
+                        data,
                         theme.as_ref().map(|theme| theme.theme_id.clone()),
                         theme
                             .map(|theme| theme.email_config())

crates/router/src/services/email/types.rs

@@ -1,4 +1,4 @@
-use api_models::user::dashboard_metadata::ProdIntentWithProductType;
+use api_models::user::dashboard_metadata::ProdIntent;
 use common_enums::{EntityType, MerchantProductType};
 use common_utils::{errors::CustomResult, pii, types::theme::EmailThemeConfig};
 use error_stack::ResultExt;
@@ -567,7 +567,7 @@ pub struct BizEmailProd {
 impl BizEmailProd {
     pub fn new(
         state: &SessionState,
-        data: ProdIntentWithProductType,
+        data: ProdIntent,
         theme_id: Option<String>,
         theme_config: EmailThemeConfig,
     ) -> UserResult<Self> {
@@ -576,18 +576,17 @@ impl BizEmailProd {
                 state.conf.email.prod_intent_recipient_email.clone(),
             )?,
             settings: state.conf.clone(),
-            user_name: data.prod_intent.poc_name.unwrap_or_default().into(),
-            poc_email: data.prod_intent.poc_email.unwrap_or_default(),
-            legal_business_name: data.prod_intent.legal_business_name.unwrap_or_default(),
+            user_name: data.poc_name.unwrap_or_default().into(),
+            poc_email: data.poc_email.unwrap_or_default(),
+            legal_business_name: data.legal_business_name.unwrap_or_default(),
             business_location: data
-                .prod_intent
                 .business_location
                 .unwrap_or(common_enums::CountryAlpha2::AD)
                 .to_string(),
-            business_website: data.prod_intent.business_website.unwrap_or_default(),
+            business_website: data.business_website.unwrap_or_default(),
             theme_id,
             theme_config,
-            product_type: data.product_type,
+            product_type: data.product_type.unwrap_or_default(),
         })
     }
 }