Skip to content

Commit 47c7a22

Browse files
SanchithHegdeSanchithHegde
committed
fix(router): fix compilation errors in connector modules
1 parent 246bf5c commit 47c7a22

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+279
-334
lines changed

‎connector-template/mod.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pub mod transformers;
22

33
use std::fmt::Debug;
4-
use error_stack::ResultExt;
4+
use error_stack::{report, ResultExt};
55
use masking::ExposeInterface;
66

77
use crate::{
@@ -20,7 +20,6 @@ use crate::{
2020
}
2121
};
2222

23-
2423
use transformers as {{project-name | downcase}};
2524

2625
#[derive(Debug, Clone)]
@@ -74,8 +73,8 @@ impl ConnectorCommon for {{project-name | downcase | pascal_case}} {
7473

7574
fn get_currency_unit(&self) -> api::CurrencyUnit {
7675
todo!()
77-
// TODO! Check connector documentation, on which unit they are processing the currency.
78-
// If the connector accepts amount in lower unit ( i.e cents for USD) then return api::CurrencyUnit::Minor,
76+
// TODO! Check connector documentation, on which unit they are processing the currency.
77+
// If the connector accepts amount in lower unit ( i.e cents for USD) then return api::CurrencyUnit::Minor,
7978
// if connector accepts amount in base unit (i.e dollars for USD) then return api::CurrencyUnit::Base
8079
}
8180

@@ -117,7 +116,7 @@ impl ConnectorCommon for {{project-name | downcase | pascal_case}} {
117116
}
118117
}
119118

120-
impl ConnectorValidation for {{project-name | downcase | pascal_case}}
119+
impl ConnectorValidation for {{project-name | downcase | pascal_case}}
121120
{
122121
//TODO: implement functions when support enabled
123122
}
@@ -274,7 +273,7 @@ impl
274273
http_code: res.status_code,
275274
})
276275
}
277-
276+
278277
fn get_error_response(
279278
&self,
280279
res: Response,
@@ -492,20 +491,20 @@ impl api::IncomingWebhook for {{project-name | downcase | pascal_case}} {
492491
&self,
493492
_request: &api::IncomingWebhookRequestDetails<'_>,
494493
) -> CustomResult<api::webhooks::ObjectReferenceId, errors::ConnectorError> {
495-
Err(errors::ConnectorError::WebhooksNotImplemented)
494+
Err(report!(errors::ConnectorError::WebhooksNotImplemented))
496495
}
497496

498497
fn get_webhook_event_type(
499498
&self,
500499
_request: &api::IncomingWebhookRequestDetails<'_>,
501500
) -> CustomResult<api::IncomingWebhookEvent, errors::ConnectorError> {
502-
Err(errors::ConnectorError::WebhooksNotImplemented)
501+
Err(report!(errors::ConnectorError::WebhooksNotImplemented))
503502
}
504503

505504
fn get_webhook_resource_object(
506505
&self,
507506
_request: &api::IncomingWebhookRequestDetails<'_>,
508507
) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {
509-
Err(errors::ConnectorError::WebhooksNotImplemented)
508+
Err(report!(errors::ConnectorError::WebhooksNotImplemented))
510509
}
511510
}

‎crates/router/src/connector/aci.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pub mod transformers;
33
use std::fmt::Debug;
44

55
use common_utils::request::RequestContent;
6-
use error_stack::ResultExt;
6+
use error_stack::{report, ResultExt};
77
use masking::PeekInterface;
88
use transformers as aci;
99

@@ -47,8 +47,7 @@ impl ConnectorCommon for Aci {
4747
&self,
4848
auth_type: &types::ConnectorAuthType,
4949
) -> CustomResult<Vec<(String, request::Maskable<String>)>, errors::ConnectorError> {
50-
let auth: aci::AciAuthType = auth_type
51-
.try_into()
50+
let auth = aci::AciAuthType::try_from(auth_type)
5251
.change_context(errors::ConnectorError::FailedToObtainAuthType)?;
5352
Ok(vec![(
5453
headers::AUTHORIZATION.to_string(),
@@ -575,7 +574,7 @@ impl api::IncomingWebhook for Aci {
575574
&self,
576575
_request: &api::IncomingWebhookRequestDetails<'_>,
577576
) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {
578-
Err(errors::ConnectorError::WebhooksNotImplemented)
577+
Err(report!(errors::ConnectorError::WebhooksNotImplemented))
579578
}
580579

581580
fn get_webhook_event_type(
@@ -589,6 +588,6 @@ impl api::IncomingWebhook for Aci {
589588
&self,
590589
_request: &api::IncomingWebhookRequestDetails<'_>,
591590
) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {
592-
Err(errors::ConnectorError::WebhooksNotImplemented)
591+
Err(report!(errors::ConnectorError::WebhooksNotImplemented))
593592
}
594593
}

‎crates/router/src/connector/adyen.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use api_models::{enums::PaymentMethodType, webhooks::IncomingWebhookEvent};
66
use base64::Engine;
77
use common_utils::request::RequestContent;
88
use diesel_models::{enums as storage_enums, enums};
9-
use error_stack::ResultExt;
9+
use error_stack::{report, ResultExt};
1010
use masking::ExposeInterface;
1111
use ring::hmac;
1212
use router_env::{instrument, tracing};
@@ -1770,7 +1770,7 @@ impl api::IncomingWebhook for Adyen {
17701770
),
17711771
));
17721772
}
1773-
Err(errors::ConnectorError::WebhookReferenceIdNotFound)
1773+
Err(report!(errors::ConnectorError::WebhookReferenceIdNotFound))
17741774
}
17751775

17761776
fn get_webhook_event_type(

‎crates/router/src/connector/adyen/transformers.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use api_models::payouts::PayoutMethodData;
33
use api_models::{enums, payments, webhooks};
44
use cards::CardNumber;
55
use common_utils::{ext_traits::Encode, pii};
6-
use error_stack::ResultExt;
6+
use error_stack::{report, ResultExt};
77
use masking::{ExposeInterface, PeekInterface};
88
use reqwest::Url;
99
use serde::{Deserialize, Serialize};
@@ -294,7 +294,7 @@ impl ForeignTryFrom<(bool, AdyenWebhookStatus)> for storage_enums::AttemptStatus
294294
//If Unexpected Event is received, need to understand how it reached this point
295295
//Webhooks with Payment Events only should try to conume this resource object.
296296
AdyenWebhookStatus::UnexpectedEvent => {
297-
Err(errors::ConnectorError::WebhookBodyDecodingFailed)
297+
Err(report!(errors::ConnectorError::WebhookBodyDecodingFailed))
298298
}
299299
}
300300
}

‎crates/router/src/connector/airwallex.rs

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use common_utils::{
77
request::RequestContent,
88
};
99
use diesel_models::enums;
10-
use error_stack::ResultExt;
10+
use error_stack::{report, ResultExt};
1111
use masking::PeekInterface;
1212
use transformers as airwallex;
1313

@@ -223,12 +223,11 @@ impl ConnectorIntegration<api::AccessTokenAuth, types::AccessTokenRequestData, t
223223
event_builder.map(|i| i.set_response_body(&response));
224224
router_env::logger::info!(connector_response=?response);
225225

226-
types::ResponseRouterData {
226+
types::RouterData::try_from(types::ResponseRouterData {
227227
response,
228228
data: data.clone(),
229229
http_code: res.status_code,
230-
}
231-
.try_into()
230+
})
232231
.change_context(errors::ConnectorError::ResponseHandlingFailed)
233232
}
234233

@@ -313,12 +312,11 @@ impl
313312
event_builder.map(|i| i.set_response_body(&response));
314313
router_env::logger::info!(connector_response=?response);
315314

316-
types::ResponseRouterData {
315+
types::RouterData::try_from(types::ResponseRouterData {
317316
response,
318317
data: data.clone(),
319318
http_code: res.status_code,
320-
}
321-
.try_into()
319+
})
322320
.change_context(errors::ConnectorError::ResponseHandlingFailed)
323321
}
324322

@@ -444,12 +442,11 @@ impl ConnectorIntegration<api::Authorize, types::PaymentsAuthorizeData, types::P
444442
.change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
445443
event_builder.map(|i| i.set_response_body(&response));
446444
router_env::logger::info!(connector_response=?response);
447-
types::ResponseRouterData {
445+
types::RouterData::try_from(types::ResponseRouterData {
448446
response,
449447
data: data.clone(),
450448
http_code: res.status_code,
451-
}
452-
.try_into()
449+
})
453450
.change_context(errors::ConnectorError::ResponseHandlingFailed)
454451
}
455452

@@ -526,7 +523,7 @@ impl ConnectorIntegration<api::PSync, types::PaymentsSyncData, types::PaymentsRe
526523
event_builder.map(|i| i.set_response_body(&response));
527524
router_env::logger::info!(connector_response=?response);
528525

529-
types::PaymentsSyncRouterData::try_from(types::ResponseRouterData {
526+
types::RouterData::try_from(types::ResponseRouterData {
530527
response,
531528
data: data.clone(),
532529
http_code: res.status_code,
@@ -706,12 +703,11 @@ impl ConnectorIntegration<api::Capture, types::PaymentsCaptureData, types::Payme
706703
.change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
707704
event_builder.map(|i| i.set_response_body(&response));
708705
router_env::logger::info!(connector_response=?response);
709-
types::ResponseRouterData {
706+
types::RouterData::try_from(types::ResponseRouterData {
710707
response,
711708
data: data.clone(),
712709
http_code: res.status_code,
713-
}
714-
.try_into()
710+
})
715711
.change_context(errors::ConnectorError::ResponseHandlingFailed)
716712
}
717713

@@ -783,12 +779,11 @@ impl ConnectorIntegration<api::Void, types::PaymentsCancelData, types::PaymentsR
783779
.change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
784780
event_builder.map(|i| i.set_response_body(&response));
785781
router_env::logger::info!(connector_response=?response);
786-
types::ResponseRouterData {
782+
types::RouterData::try_from(types::ResponseRouterData {
787783
response,
788784
data: data.clone(),
789785
http_code: res.status_code,
790-
}
791-
.try_into()
786+
})
792787
.change_context(errors::ConnectorError::ResponseHandlingFailed)
793788
}
794789

@@ -897,12 +892,11 @@ impl ConnectorIntegration<api::Execute, types::RefundsData, types::RefundsRespon
897892
.change_context(errors::ConnectorError::RequestEncodingFailed)?;
898893
event_builder.map(|i| i.set_response_body(&response));
899894
router_env::logger::info!(connector_response=?response);
900-
types::ResponseRouterData {
895+
types::RouterData::try_from(types::ResponseRouterData {
901896
response,
902897
data: data.clone(),
903898
http_code: res.status_code,
904-
}
905-
.try_into()
899+
})
906900
.change_context(errors::ConnectorError::ResponseHandlingFailed)
907901
}
908902

@@ -971,12 +965,11 @@ impl ConnectorIntegration<api::RSync, types::RefundsData, types::RefundsResponse
971965
.change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
972966
event_builder.map(|i| i.set_response_body(&response));
973967
router_env::logger::info!(connector_response=?response);
974-
types::ResponseRouterData {
968+
types::RouterData::try_from(types::ResponseRouterData {
975969
response,
976970
data: data.clone(),
977971
http_code: res.status_code,
978-
}
979-
.try_into()
972+
})
980973
.change_context(errors::ConnectorError::ResponseHandlingFailed)
981974
}
982975

@@ -1076,7 +1069,7 @@ impl api::IncomingWebhook for Airwallex {
10761069
),
10771070
))
10781071
} else {
1079-
Err(errors::ConnectorError::WebhookEventTypeNotFound)
1072+
Err(report!(errors::ConnectorError::WebhookEventTypeNotFound))
10801073
}
10811074
}
10821075

‎crates/router/src/connector/bambora.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::fmt::Debug;
44

55
use common_utils::request::RequestContent;
66
use diesel_models::enums;
7-
use error_stack::ResultExt;
7+
use error_stack::{report, ResultExt};
88
use transformers as bambora;
99

1010
use super::utils::RefundsRequestData;
@@ -74,8 +74,7 @@ impl ConnectorCommon for Bambora {
7474
&self,
7575
auth_type: &types::ConnectorAuthType,
7676
) -> CustomResult<Vec<(String, request::Maskable<String>)>, errors::ConnectorError> {
77-
let auth: bambora::BamboraAuthType = auth_type
78-
.try_into()
77+
let auth = bambora::BamboraAuthType::try_from(auth_type)
7978
.change_context(errors::ConnectorError::FailedToObtainAuthType)?;
8079
Ok(vec![(
8180
headers::AUTHORIZATION.to_string(),
@@ -607,7 +606,7 @@ impl ConnectorIntegration<api::Execute, types::RefundsData, types::RefundsRespon
607606
event_builder.map(|i| i.set_response_body(&response));
608607
router_env::logger::info!(connector_response=?response);
609608

610-
types::RefundsRouterData::try_from(types::ResponseRouterData {
609+
types::RouterData::try_from(types::ResponseRouterData {
611610
response,
612611
data: data.clone(),
613612
http_code: res.status_code,
@@ -704,7 +703,7 @@ impl api::IncomingWebhook for Bambora {
704703
&self,
705704
_request: &api::IncomingWebhookRequestDetails<'_>,
706705
) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {
707-
Err(errors::ConnectorError::WebhooksNotImplemented)
706+
Err(report!(errors::ConnectorError::WebhooksNotImplemented))
708707
}
709708

710709
fn get_webhook_event_type(
@@ -718,7 +717,7 @@ impl api::IncomingWebhook for Bambora {
718717
&self,
719718
_request: &api::IncomingWebhookRequestDetails<'_>,
720719
) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {
721-
Err(errors::ConnectorError::WebhooksNotImplemented)
720+
Err(report!(errors::ConnectorError::WebhooksNotImplemented))
722721
}
723722
}
724723

‎crates/router/src/connector/bankofamerica.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::fmt::Debug;
55
use base64::Engine;
66
use common_utils::request::RequestContent;
77
use diesel_models::enums;
8-
use error_stack::ResultExt;
8+
use error_stack::{report, ResultExt};
99
use masking::{ExposeInterface, PeekInterface};
1010
use ring::{digest, hmac};
1111
use time::OffsetDateTime;
@@ -1173,20 +1173,20 @@ impl api::IncomingWebhook for Bankofamerica {
11731173
&self,
11741174
_request: &api::IncomingWebhookRequestDetails<'_>,
11751175
) -> CustomResult<api::webhooks::ObjectReferenceId, errors::ConnectorError> {
1176-
Err(errors::ConnectorError::WebhooksNotImplemented)
1176+
Err(report!(errors::ConnectorError::WebhooksNotImplemented))
11771177
}
11781178

11791179
fn get_webhook_event_type(
11801180
&self,
11811181
_request: &api::IncomingWebhookRequestDetails<'_>,
11821182
) -> CustomResult<api::IncomingWebhookEvent, errors::ConnectorError> {
1183-
Err(errors::ConnectorError::WebhooksNotImplemented)
1183+
Err(report!(errors::ConnectorError::WebhooksNotImplemented))
11841184
}
11851185

11861186
fn get_webhook_resource_object(
11871187
&self,
11881188
_request: &api::IncomingWebhookRequestDetails<'_>,
11891189
) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {
1190-
Err(errors::ConnectorError::WebhooksNotImplemented)
1190+
Err(report!(errors::ConnectorError::WebhooksNotImplemented))
11911191
}
11921192
}

‎crates/router/src/connector/bluesnap.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use common_utils::{
99
request::RequestContent,
1010
};
1111
use diesel_models::enums;
12-
use error_stack::ResultExt;
12+
use error_stack::{report, ResultExt};
1313
use masking::PeekInterface;
1414
use transformers as bluesnap;
1515

@@ -83,8 +83,7 @@ impl ConnectorCommon for Bluesnap {
8383
&self,
8484
auth_type: &types::ConnectorAuthType,
8585
) -> CustomResult<Vec<(String, request::Maskable<String>)>, errors::ConnectorError> {
86-
let auth: bluesnap::BluesnapAuthType = auth_type
87-
.try_into()
86+
let auth = bluesnap::BluesnapAuthType::try_from(auth_type)
8887
.change_context(errors::ConnectorError::FailedToObtainAuthType)?;
8988
let encoded_api_key =
9089
consts::BASE64_ENGINE.encode(format!("{}:{}", auth.key1.peek(), auth.api_key.peek()));
@@ -195,7 +194,8 @@ impl ConnectorValidation for Bluesnap {
195194
return Err(
196195
errors::ConnectorError::MissingConnectorRelatedTransactionID {
197196
id: "connector_transaction_id".to_string(),
198-
},
197+
}
198+
.into(),
199199
);
200200
}
201201
// if connector_transaction_id is present, psync can be made
@@ -1100,7 +1100,7 @@ impl api::IncomingWebhook for Bluesnap {
11001100
))
11011101
}
11021102
bluesnap::BluesnapWebhookEvents::Unknown => {
1103-
Err(errors::ConnectorError::WebhookReferenceIdNotFound)
1103+
Err(report!(errors::ConnectorError::WebhookReferenceIdNotFound))
11041104
}
11051105
}
11061106
}

0 commit comments

Comments
 (0)