Merge branch 'main' into feat/connector_bambora_use-connector-request…

…-reference-id

.github/CODEOWNERS

@@ -19,10 +19,13 @@ crates/router/src/services/ @juspay/hyperswitch-framework
 crates/router/src/db/ @juspay/hyperswitch-framework
 crates/router/src/routes/ @juspay/hyperswitch-framework
 migrations/ @juspay/hyperswitch-framework
+openapi/ @juspay/hyperswitch-framework
 
 connector-template/ @juspay/hyperswitch-connector
 crates/router/src/connector/ @juspay/hyperswitch-connector
-crates/router/tests/connectors @juspay/hyperswitch-connector
+crates/router/tests/connectors/ @juspay/hyperswitch-connector
+crates/test_utils/tests/connectors/ @juspay/hyperswitch-connector
+crates/test_utils/tests/sample_auth.toml @juspay/hyperswitch-connector
 
 crates/router/src/compatibility/ @juspay/hyperswitch-compatibility
 

config/config.example.toml

@@ -206,12 +206,13 @@ square.secondary_base_url = "https://pci-connect.squareupsandbox.com/"
 stax.base_url = "https://apiprod.fattlabs.com/"
 stripe.base_url = "https://api.stripe.com/"
 stripe.base_url_file_upload = "https://files.stripe.com/"
+trustpay.base_url = "https://test-tpgw.trustpay.eu/"
+trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
+tsys.base_url = "https://stagegw.transnox.com/"
+volt.base_url = "https://api.sandbox.volt.io/"
 wise.base_url = "https://api.sandbox.transferwise.tech/"
 worldline.base_url = "https://eu.sandbox.api-ingenico.com/"
 worldpay.base_url = "https://try.access.worldpay.com/"
-trustpay.base_url = "https://test-tpgw.trustpay.eu/"
-tsys.base_url = "https://stagegw.transnox.com/"
-trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
 zen.base_url = "https://api.zen-test.com/"
 zen.secondary_base_url = "https://secure.zen-test.com/"
 

config/development.toml

@@ -107,6 +107,7 @@ cards = [
     "stripe",
     "trustpay",
     "tsys",
+    "volt",
     "wise",
     "worldline",
     "worldpay",
@@ -182,6 +183,7 @@ worldline.base_url = "https://eu.sandbox.api-ingenico.com/"
 worldpay.base_url = "https://try.access.worldpay.com/"
 trustpay.base_url = "https://test-tpgw.trustpay.eu/"
 tsys.base_url = "https://stagegw.transnox.com/"
+volt.base_url = "https://api.sandbox.volt.io/"
 trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
 zen.base_url = "https://api.zen-test.com/"
 zen.secondary_base_url = "https://secure.zen-test.com/"

config/docker_compose.toml

@@ -121,12 +121,13 @@ square.secondary_base_url = "https://pci-connect.squareupsandbox.com/"
 stax.base_url = "https://apiprod.fattlabs.com/"
 stripe.base_url = "https://api.stripe.com/"
 stripe.base_url_file_upload = "https://files.stripe.com/"
+trustpay.base_url = "https://test-tpgw.trustpay.eu/"
+trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
+tsys.base_url = "https://stagegw.transnox.com/"
+volt.base_url = "https://api.sandbox.volt.io/"
 wise.base_url = "https://api.sandbox.transferwise.tech/"
 worldline.base_url = "https://eu.sandbox.api-ingenico.com/"
 worldpay.base_url = "https://try.access.worldpay.com/"
-trustpay.base_url = "https://test-tpgw.trustpay.eu/"
-tsys.base_url = "https://stagegw.transnox.com/"
-trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
 zen.base_url = "https://api.zen-test.com/"
 zen.secondary_base_url = "https://secure.zen-test.com/"
 
@@ -179,6 +180,7 @@ cards = [
     "stripe",
     "trustpay",
     "tsys",
+    "volt",
     "wise",
     "worldline",
     "worldpay",

crates/api_models/src/enums.rs

@@ -115,6 +115,7 @@ pub enum Connector {
     Trustpay,
     // Tsys,
     Tsys,
+    //Volt, added as template code for future usage,
     Wise,
     Worldline,
     Worldpay,
@@ -232,6 +233,7 @@ pub enum RoutableConnectors {
     Trustpay,
     // Tsys,
     Tsys,
+    // Volt, added as template code for future usage
     Wise,
     Worldline,
     Worldpay,

crates/router/src/configs/settings.rs

@@ -558,6 +558,7 @@ pub struct Connectors {
     pub stripe: ConnectorParamsWithFileUploadUrl,
     pub trustpay: ConnectorParamsWithMoreUrls,
     pub tsys: ConnectorParams,
+    pub volt: ConnectorParams,
     pub wise: ConnectorParams,
     pub worldline: ConnectorParams,
     pub worldpay: ConnectorParams,

crates/router/src/connector.rs

@@ -44,6 +44,7 @@ pub mod stripe;
 pub mod trustpay;
 pub mod tsys;
 pub mod utils;
+pub mod volt;
 pub mod wise;
 pub mod worldline;
 pub mod worldpay;
@@ -60,6 +61,6 @@ pub use self::{
     mollie::Mollie, multisafepay::Multisafepay, nexinets::Nexinets, nmi::Nmi, noon::Noon,
     nuvei::Nuvei, opayo::Opayo, opennode::Opennode, payeezy::Payeezy, payme::Payme, paypal::Paypal,
     payu::Payu, powertranz::Powertranz, rapyd::Rapyd, shift4::Shift4, square::Square, stax::Stax,
-    stripe::Stripe, trustpay::Trustpay, tsys::Tsys, wise::Wise, worldline::Worldline,
+    stripe::Stripe, trustpay::Trustpay, tsys::Tsys, volt::Volt, wise::Wise, worldline::Worldline,
     worldpay::Worldpay, zen::Zen,
 };

crates/router/src/connector/authorizedotnet/transformers.rs

@@ -540,7 +540,9 @@ impl<F, T>
                             mandate_reference: None,
                             connector_metadata: metadata,
                             network_txn_id: transaction_response.network_trans_id.clone(),
-                            connector_response_reference_id: None,
+                            connector_response_reference_id: Some(
+                                transaction_response.transaction_id.clone(),
+                            ),
                         }),
                     },
                     ..item.data
@@ -604,7 +606,9 @@ impl<F, T>
                             mandate_reference: None,
                             connector_metadata: metadata,
                             network_txn_id: transaction_response.network_trans_id.clone(),
-                            connector_response_reference_id: None,
+                            connector_response_reference_id: Some(
+                                transaction_response.transaction_id.clone(),
+                            ),
                         }),
                     },
                     ..item.data
@@ -887,13 +891,13 @@ impl<F, Req>
                 Ok(Self {
                     response: Ok(types::PaymentsResponseData::TransactionResponse {
                         resource_id: types::ResponseId::ConnectorTransactionId(
-                            transaction.transaction_id,
+                            transaction.transaction_id.clone(),
                         ),
                         redirection_data: None,
                         mandate_reference: None,
                         connector_metadata: None,
                         network_txn_id: None,
-                        connector_response_reference_id: None,
+                        connector_response_reference_id: Some(transaction.transaction_id.clone()),
                     }),
                     status: payment_status,
                     ..item.data

crates/router/src/connector/nexinets/transformers.rs

@@ -364,7 +364,7 @@ impl<F, T>
                 mandate_reference,
                 connector_metadata: Some(connector_metadata),
                 network_txn_id: None,
-                connector_response_reference_id: None,
+                connector_response_reference_id: Some(item.response.order_id),
             }),
             ..item.data
         })
@@ -425,7 +425,7 @@ impl<F, T>
         let transaction_id = Some(item.response.transaction_id.clone());
         let connector_metadata = serde_json::to_value(NexinetsPaymentsMetadata {
             transaction_id,
-            order_id: Some(item.response.order.order_id),
+            order_id: Some(item.response.order.order_id.clone()),
             psync_flow: item.response.transaction_type.clone(),
         })
         .into_report()
@@ -447,7 +447,7 @@ impl<F, T>
                 mandate_reference: None,
                 connector_metadata: Some(connector_metadata),
                 network_txn_id: None,
-                connector_response_reference_id: None,
+                connector_response_reference_id: Some(item.response.order.order_id),
             }),
             ..item.data
         })