refactor: resolve comments

Author: swangi-kumari

api-reference/v2/openapi_spec_v2.json

@@ -19224,7 +19224,7 @@
       },
       "PaymentsRetrieveRequest": {
         "type": "object",
-        "description": "Request for Payment Status",
+        "description": "Request body for Payment Status",
         "properties": {
           "force_sync": {
             "type": "boolean",
@@ -19287,6 +19287,7 @@
       },
       "PaymentsStatusRequest": {
         "type": "object",
+        "description": "Request for Payment Status",
         "properties": {
           "force_sync": {
             "type": "boolean",

crates/api_models/src/payments.rs

@@ -271,7 +271,6 @@ pub struct PaymentsCreateIntentRequest {
     pub force_3ds_challenge: Option<bool>,
 
     /// Merchant connector details used to make payments.
-    #[schema(value_type = Option<MerchantConnectorDetails>)]
     pub merchant_connector_details: Option<MerchantConnectorDetails>,
 }
 
@@ -5371,7 +5370,6 @@ pub struct PaymentsConfirmIntentRequest {
     pub payment_token: Option<String>,
 
     /// Merchant connector details used to make payments.
-    #[schema(value_type = Option<MerchantConnectorDetails>)]
     pub merchant_connector_details: Option<MerchantConnectorDetails>,
 }
 
@@ -5547,7 +5545,6 @@ pub struct PaymentsRequest {
     pub is_iframe_redirection_enabled: Option<bool>,
 
     /// Merchant connector details used to make payments.
-    #[schema(value_type = Option<MerchantConnectorDetails>)]
     pub merchant_connector_details: Option<MerchantConnectorDetails>,
 }
 
@@ -5609,9 +5606,9 @@ impl From<&PaymentsRequest> for PaymentsConfirmIntentRequest {
 // Serialize is implemented because, this will be serialized in the api events.
 // Usually request types should not have serialize implemented.
 //
-/// Request for Payment Status
+/// Request body for Payment Status
 #[cfg(feature = "v2")]
-#[derive(Default, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
+#[derive(Debug, serde::Deserialize, serde::Serialize, ToSchema)]
 pub struct PaymentsRetrieveRequest {
     /// A boolean used to indicate if the payment status should be fetched from the connector
     /// If this is set to true, the status will be fetched from the connector
@@ -5627,12 +5624,12 @@ pub struct PaymentsRetrieveRequest {
     /// If enabled, provides whole connector response
     pub all_keys_required: Option<bool>,
     /// Merchant connector details used to make payments.
-    #[schema(value_type = Option<MerchantConnectorDetails>)]
     pub merchant_connector_details: Option<MerchantConnectorDetails>,
 }
 
 #[cfg(feature = "v2")]
 #[derive(Debug, serde::Deserialize, serde::Serialize, ToSchema)]
+/// Request for Payment Status
 pub struct PaymentsStatusRequest {
     /// A boolean used to indicate if the payment status should be fetched from the connector
     /// If this is set to true, the status will be fetched from the connector

crates/common_utils/src/id_type/merchant.rs

@@ -3,7 +3,7 @@
 //! Ids for merchant account are derived from the merchant name
 //! If there are any special characters, they are removed
 
-use std::{fmt::Display, str::FromStr};
+use std::fmt::Display;
 
 use crate::{
     date_time,
@@ -38,15 +38,6 @@ impl From<MerchantId> for router_env::opentelemetry::Value {
     }
 }
 
-impl FromStr for MerchantId {
-    type Err = error_stack::Report<ValidationError>;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let cow_string = std::borrow::Cow::Owned(s.to_string());
-        Self::try_from(cow_string)
-    }
-}
-
 impl MerchantId {
     /// Create a Merchant id from MerchantName
     pub fn from_merchant_name(merchant_name: MerchantName) -> Self {

crates/router/src/core/payments/operations/payment_get.rs

@@ -2,8 +2,6 @@ use api_models::{enums::FrmSuggestion, payments::PaymentsRetrieveRequest};
 use async_trait::async_trait;
 use common_utils::ext_traits::AsyncExt;
 use error_stack::ResultExt;
-#[cfg(feature = "v2")]
-use hyperswitch_connectors::connectors::payme;
 use hyperswitch_domain_models::payments::PaymentStatusData;
 use router_env::{instrument, tracing};
 

crates/router/src/routes/payments.rs

@@ -2886,7 +2886,7 @@ pub async fn payment_status(
         expand_attempts: payload.expand_attempts,
         param: payload.param.clone(),
         all_keys_required: payload.all_keys_required,
-        ..Default::default()
+        merchant_connector_details: None,
     };
 
     let internal_payload = internal_payload_types::PaymentsGenericRequestWithResourceId {
@@ -2966,6 +2966,7 @@ pub async fn payments_status_with_gateway_creds(
         true => Flow::PaymentsRetrieveForceSync,
         false => Flow::PaymentsRetrieve,
     };
+    tracing::Span::current().record("flow", flow.to_string());
 
     let global_payment_id = path.into_inner();
     tracing::Span::current().record("payment_id", global_payment_id.get_string_repr());