fix(core): Replace euclid enum with RoutableConnectors enum (#2994)

Signed-off-by: chikke srujan <121822803+srujanchikke@users.noreply.github.com>
Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
This commit is contained in:
chikke srujan
2023-11-28 20:34:30 +05:30
committed by GitHub
parent 1c5a9b5452
commit ff6a0dd0b5
18 changed files with 153 additions and 449 deletions

View File

@ -81,7 +81,7 @@ pub async fn payments_operation_core<F, Req, Op, FData, Ctx>(
req: Req,
call_connector_action: CallConnectorAction,
auth_flow: services::AuthFlow,
eligible_connectors: Option<Vec<api_models::enums::RoutableConnectors>>,
eligible_connectors: Option<Vec<common_enums::RoutableConnectors>>,
header_payload: HeaderPayload,
) -> RouterResult<(
PaymentData<F>,

View File

@ -1,15 +1,15 @@
use api_models::{self, enums as api_enums, routing as routing_types};
use api_models::{self, routing as routing_types};
use diesel_models::enums as storage_enums;
use euclid::{enums as dsl_enums, frontend::ast as dsl_ast};
use crate::types::transformers::{ForeignFrom, ForeignInto};
use crate::types::transformers::ForeignFrom;
impl ForeignFrom<routing_types::RoutableConnectorChoice> for dsl_ast::ConnectorChoice {
fn foreign_from(from: routing_types::RoutableConnectorChoice) -> Self {
Self {
// #[cfg(feature = "backwards_compatibility")]
// choice_kind: from.choice_kind.foreign_into(),
connector: from.connector.foreign_into(),
connector: from.connector,
#[cfg(not(feature = "connector_choice_mca_id"))]
sub_label: from.sub_label,
}
@ -52,72 +52,3 @@ impl ForeignFrom<storage_enums::MandateDataType> for dsl_enums::MandateType {
}
}
}
impl ForeignFrom<api_enums::RoutableConnectors> for dsl_enums::Connector {
fn foreign_from(from: api_enums::RoutableConnectors) -> Self {
match from {
#[cfg(feature = "dummy_connector")]
api_enums::RoutableConnectors::DummyConnector1 => Self::DummyConnector1,
#[cfg(feature = "dummy_connector")]
api_enums::RoutableConnectors::DummyConnector2 => Self::DummyConnector2,
#[cfg(feature = "dummy_connector")]
api_enums::RoutableConnectors::DummyConnector3 => Self::DummyConnector3,
#[cfg(feature = "dummy_connector")]
api_enums::RoutableConnectors::DummyConnector4 => Self::DummyConnector4,
#[cfg(feature = "dummy_connector")]
api_enums::RoutableConnectors::DummyConnector5 => Self::DummyConnector5,
#[cfg(feature = "dummy_connector")]
api_enums::RoutableConnectors::DummyConnector6 => Self::DummyConnector6,
#[cfg(feature = "dummy_connector")]
api_enums::RoutableConnectors::DummyConnector7 => Self::DummyConnector7,
api_enums::RoutableConnectors::Aci => Self::Aci,
api_enums::RoutableConnectors::Adyen => Self::Adyen,
api_enums::RoutableConnectors::Airwallex => Self::Airwallex,
api_enums::RoutableConnectors::Authorizedotnet => Self::Authorizedotnet,
api_enums::RoutableConnectors::Bambora => Self::Bambora,
api_enums::RoutableConnectors::Bankofamerica => Self::Bankofamerica,
api_enums::RoutableConnectors::Bitpay => Self::Bitpay,
api_enums::RoutableConnectors::Bluesnap => Self::Bluesnap,
api_enums::RoutableConnectors::Boku => Self::Boku,
api_enums::RoutableConnectors::Braintree => Self::Braintree,
api_enums::RoutableConnectors::Cashtocode => Self::Cashtocode,
api_enums::RoutableConnectors::Checkout => Self::Checkout,
api_enums::RoutableConnectors::Coinbase => Self::Coinbase,
api_enums::RoutableConnectors::Cryptopay => Self::Cryptopay,
api_enums::RoutableConnectors::Cybersource => Self::Cybersource,
api_enums::RoutableConnectors::Dlocal => Self::Dlocal,
api_enums::RoutableConnectors::Fiserv => Self::Fiserv,
api_enums::RoutableConnectors::Forte => Self::Forte,
api_enums::RoutableConnectors::Globalpay => Self::Globalpay,
api_enums::RoutableConnectors::Globepay => Self::Globepay,
api_enums::RoutableConnectors::Gocardless => Self::Gocardless,
api_enums::RoutableConnectors::Helcim => Self::Helcim,
api_enums::RoutableConnectors::Iatapay => Self::Iatapay,
api_enums::RoutableConnectors::Klarna => Self::Klarna,
api_enums::RoutableConnectors::Mollie => Self::Mollie,
api_enums::RoutableConnectors::Multisafepay => Self::Multisafepay,
api_enums::RoutableConnectors::Nexinets => Self::Nexinets,
api_enums::RoutableConnectors::Nmi => Self::Nmi,
api_enums::RoutableConnectors::Noon => Self::Noon,
api_enums::RoutableConnectors::Nuvei => Self::Nuvei,
api_enums::RoutableConnectors::Opennode => Self::Opennode,
api_enums::RoutableConnectors::Payme => Self::Payme,
api_enums::RoutableConnectors::Paypal => Self::Paypal,
api_enums::RoutableConnectors::Payu => Self::Payu,
api_enums::RoutableConnectors::Powertranz => Self::Powertranz,
api_enums::RoutableConnectors::Prophetpay => Self::Prophetpay,
api_enums::RoutableConnectors::Rapyd => Self::Rapyd,
api_enums::RoutableConnectors::Shift4 => Self::Shift4,
api_enums::RoutableConnectors::Square => Self::Square,
api_enums::RoutableConnectors::Stax => Self::Stax,
api_enums::RoutableConnectors::Stripe => Self::Stripe,
api_enums::RoutableConnectors::Trustpay => Self::Trustpay,
api_enums::RoutableConnectors::Tsys => Self::Tsys,
api_enums::RoutableConnectors::Volt => Self::Volt,
api_enums::RoutableConnectors::Wise => Self::Wise,
api_enums::RoutableConnectors::Worldline => Self::Worldline,
api_enums::RoutableConnectors::Worldpay => Self::Worldpay,
api_enums::RoutableConnectors::Zen => Self::Zen,
}
}
}

View File

@ -9,7 +9,6 @@ use common_utils::{
};
use diesel_models::enums as storage_enums;
use error_stack::{IntoReport, ResultExt};
use euclid::enums as dsl_enums;
use masking::{ExposeInterface, PeekInterface};
use super::domain;
@ -174,25 +173,11 @@ impl ForeignFrom<storage_enums::MandateDataType> for api_models::payments::Manda
}
}
impl ForeignTryFrom<api_enums::Connector> for api_enums::RoutableConnectors {
impl ForeignTryFrom<api_enums::Connector> for common_enums::RoutableConnectors {
type Error = error_stack::Report<common_utils::errors::ValidationError>;
fn foreign_try_from(from: api_enums::Connector) -> Result<Self, Self::Error> {
Ok(match from {
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector1 => Self::DummyConnector1,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector2 => Self::DummyConnector2,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector3 => Self::DummyConnector3,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector4 => Self::DummyConnector4,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector5 => Self::DummyConnector5,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector6 => Self::DummyConnector6,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector7 => Self::DummyConnector7,
api_enums::Connector::Aci => Self::Aci,
api_enums::Connector::Adyen => Self::Adyen,
api_enums::Connector::Airwallex => Self::Airwallex,
@ -253,79 +238,24 @@ impl ForeignTryFrom<api_enums::Connector> for api_enums::RoutableConnectors {
api_enums::Connector::Worldline => Self::Worldline,
api_enums::Connector::Worldpay => Self::Worldpay,
api_enums::Connector::Zen => Self::Zen,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector1 => Self::DummyConnector1,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector2 => Self::DummyConnector2,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector3 => Self::DummyConnector3,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector4 => Self::DummyConnector4,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector5 => Self::DummyConnector5,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector6 => Self::DummyConnector6,
#[cfg(feature = "dummy_connector")]
api_enums::Connector::DummyConnector7 => Self::DummyConnector7,
})
}
}
impl ForeignFrom<dsl_enums::Connector> for api_enums::RoutableConnectors {
fn foreign_from(from: dsl_enums::Connector) -> Self {
match from {
#[cfg(feature = "dummy_connector")]
dsl_enums::Connector::DummyConnector1 => Self::DummyConnector1,
#[cfg(feature = "dummy_connector")]
dsl_enums::Connector::DummyConnector2 => Self::DummyConnector2,
#[cfg(feature = "dummy_connector")]
dsl_enums::Connector::DummyConnector3 => Self::DummyConnector3,
#[cfg(feature = "dummy_connector")]
dsl_enums::Connector::DummyConnector4 => Self::DummyConnector4,
#[cfg(feature = "dummy_connector")]
dsl_enums::Connector::DummyConnector5 => Self::DummyConnector5,
#[cfg(feature = "dummy_connector")]
dsl_enums::Connector::DummyConnector6 => Self::DummyConnector6,
#[cfg(feature = "dummy_connector")]
dsl_enums::Connector::DummyConnector7 => Self::DummyConnector7,
dsl_enums::Connector::Aci => Self::Aci,
dsl_enums::Connector::Adyen => Self::Adyen,
dsl_enums::Connector::Airwallex => Self::Airwallex,
dsl_enums::Connector::Authorizedotnet => Self::Authorizedotnet,
dsl_enums::Connector::Bambora => Self::Bambora,
dsl_enums::Connector::Bankofamerica => Self::Bankofamerica,
dsl_enums::Connector::Bitpay => Self::Bitpay,
dsl_enums::Connector::Bluesnap => Self::Bluesnap,
dsl_enums::Connector::Boku => Self::Boku,
dsl_enums::Connector::Braintree => Self::Braintree,
dsl_enums::Connector::Cashtocode => Self::Cashtocode,
dsl_enums::Connector::Checkout => Self::Checkout,
dsl_enums::Connector::Coinbase => Self::Coinbase,
dsl_enums::Connector::Cryptopay => Self::Cryptopay,
dsl_enums::Connector::Cybersource => Self::Cybersource,
dsl_enums::Connector::Dlocal => Self::Dlocal,
dsl_enums::Connector::Fiserv => Self::Fiserv,
dsl_enums::Connector::Forte => Self::Forte,
dsl_enums::Connector::Globalpay => Self::Globalpay,
dsl_enums::Connector::Globepay => Self::Globepay,
dsl_enums::Connector::Gocardless => Self::Gocardless,
dsl_enums::Connector::Helcim => Self::Helcim,
dsl_enums::Connector::Iatapay => Self::Iatapay,
dsl_enums::Connector::Klarna => Self::Klarna,
dsl_enums::Connector::Mollie => Self::Mollie,
dsl_enums::Connector::Multisafepay => Self::Multisafepay,
dsl_enums::Connector::Nexinets => Self::Nexinets,
dsl_enums::Connector::Nmi => Self::Nmi,
dsl_enums::Connector::Noon => Self::Noon,
dsl_enums::Connector::Nuvei => Self::Nuvei,
dsl_enums::Connector::Opennode => Self::Opennode,
dsl_enums::Connector::Payme => Self::Payme,
dsl_enums::Connector::Paypal => Self::Paypal,
dsl_enums::Connector::Payu => Self::Payu,
dsl_enums::Connector::Powertranz => Self::Powertranz,
dsl_enums::Connector::Prophetpay => Self::Prophetpay,
dsl_enums::Connector::Rapyd => Self::Rapyd,
dsl_enums::Connector::Shift4 => Self::Shift4,
dsl_enums::Connector::Square => Self::Square,
dsl_enums::Connector::Stax => Self::Stax,
dsl_enums::Connector::Stripe => Self::Stripe,
dsl_enums::Connector::Trustpay => Self::Trustpay,
dsl_enums::Connector::Tsys => Self::Tsys,
dsl_enums::Connector::Volt => Self::Volt,
dsl_enums::Connector::Wise => Self::Wise,
dsl_enums::Connector::Worldline => Self::Worldline,
dsl_enums::Connector::Worldpay => Self::Worldpay,
dsl_enums::Connector::Zen => Self::Zen,
}
}
}
impl ForeignFrom<storage_enums::MandateAmountData> for api_models::payments::MandateAmountData {
fn foreign_from(from: storage_enums::MandateAmountData) -> Self {
Self {