feat(pm_list): add required fields for eps (#3169)

Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
juspay · Jan 8, 2024 · bfd8a5a · bfd8a5a
1 parent ac5349c
commit bfd8a5a
Show file tree

Hide file tree

Showing 10 changed files with 46,352 additions and 45,290 deletions.
diff --git a/crates/api_models/src/payments.rs b/crates/api_models/src/payments.rs
@@ -1173,7 +1173,7 @@ pub enum BankRedirectData {
     },
     Eps {
         /// The billing details for bank redirection
-        billing_details: BankRedirectBilling,
+        billing_details: Option<BankRedirectBilling>,
 
         /// The hyperswitch bank code for eps
         #[schema(value_type = BankNames, example = "triodos_bank")]

diff --git a/crates/router/src/configs/defaults.rs b/crates/router/src/configs/defaults.rs
diff --git a/crates/router/src/connector/aci/transformers.rs b/crates/router/src/connector/aci/transformers.rs
@@ -146,10 +146,14 @@ impl
     ) -> Result<Self, Self::Error> {
         let (item, bank_redirect_data) = value;
         let payment_data = match bank_redirect_data {
-            api_models::payments::BankRedirectData::Eps { .. } => {
+            api_models::payments::BankRedirectData::Eps { country, .. } => {
                 Self::BankRedirect(Box::new(BankRedirectionPMData {
                     payment_brand: PaymentBrand::Eps,
-                    bank_account_country: Some(api_models::enums::CountryAlpha2::AT),
+                    bank_account_country: Some(country.ok_or(
+                        errors::ConnectorError::MissingRequiredField {
+                            field_name: "eps.country",
+                        },
+                    )?),
                     bank_account_bank_name: None,
                     bank_account_bic: None,
                     bank_account_iban: None,

diff --git a/crates/router/src/connector/adyen/transformers.rs b/crates/router/src/connector/adyen/transformers.rs
@@ -2164,10 +2164,14 @@ impl<'a> TryFrom<&api_models::payments::BankRedirectData> for AdyenPaymentMethod
             api_models::payments::BankRedirectData::Eps { bank_name, .. } => Ok(
                 AdyenPaymentMethod::Eps(Box::new(BankRedirectionWithIssuer {
                     payment_type: PaymentType::Eps,
-                    issuer: bank_name
-                        .map(|bank_name| AdyenTestBankNames::try_from(&bank_name))
-                        .transpose()?
-                        .map(|adyen_bank_name| adyen_bank_name.0),
+                    issuer: Some(
+                        AdyenTestBankNames::try_from(&bank_name.ok_or(
+                            errors::ConnectorError::MissingRequiredField {
+                                field_name: "eps.bank_name",
+                            },
+                        )?)?
+                        .0,
+                    ),
                 })),
             ),
             api_models::payments::BankRedirectData::Giropay { .. } => Ok(

diff --git a/crates/router/src/connector/paypal/transformers.rs b/crates/router/src/connector/paypal/transformers.rs
@@ -290,7 +290,12 @@ fn get_payment_source(
             bank_name: _,
             country,
         } => Ok(PaymentSourceItem::Eps(RedirectRequest {
-            name: billing_details.get_billing_name()?,
+            name: billing_details
+                .clone()
+                .ok_or(errors::ConnectorError::MissingRequiredField {
+                    field_name: "eps.billing_details",
+                })?
+                .get_billing_name()?,
             country_code: country.ok_or(errors::ConnectorError::MissingRequiredField {
                 field_name: "eps.country",
             })?,

diff --git a/crates/router/src/connector/stripe/transformers.rs b/crates/router/src/connector/stripe/transformers.rs
@@ -1083,15 +1083,24 @@ impl From<&payments::BankDebitBilling> for StripeBillingAddress {
 }
 
 impl TryFrom<&payments::BankRedirectData> for StripeBillingAddress {
-    type Error = errors::ConnectorError;
+    type Error = error_stack::Report<errors::ConnectorError>;
 
     fn try_from(bank_redirection_data: &payments::BankRedirectData) -> Result<Self, Self::Error> {
         match bank_redirection_data {
             payments::BankRedirectData::Eps {
                 billing_details, ..
-            } => Ok(Self {
-                name: billing_details.billing_name.clone(),
-                ..Self::default()
+            } => Ok({
+                let billing_data = billing_details.clone().ok_or(
+                    errors::ConnectorError::MissingRequiredField {
+                        field_name: "billing_details",
+                    },
+                )?;
+                Self {
+                    name: Some(connector_util::BankRedirectBillingData::get_billing_name(
+                        &billing_data,
+                    )?),
+                    ..Self::default()
+                }
             }),
             payments::BankRedirectData::Giropay {
                 billing_details, ..

diff --git a/openapi/openapi_spec.json b/openapi/openapi_spec.json
@@ -3413,13 +3413,17 @@
               "eps": {
                 "type": "object",
                 "required": [
-                  "billing_details",
                   "bank_name",
                   "country"
                 ],
                 "properties": {
                   "billing_details": {
-                    "$ref": "#/components/schemas/BankRedirectBilling"
+                    "allOf": [
+                      {
+                        "$ref": "#/components/schemas/BankRedirectBilling"
+                      }
+                    ],
+                    "nullable": true
                   },
                   "bank_name": {
                     "$ref": "#/components/schemas/BankNames"