Skip to content

Commit ea2fd1d

Browse files
jagan-jayahyperswitch-bot[bot]
jagan-jaya
and
hyperswitch-bot[bot]
authored
refactor(connector): rename RevenueRecoveryRecordBack as InvoiceRecordBack (#9321)
Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
1 parent 3f8943b commit ea2fd1d

File tree

21 files changed

+165
-196
lines changed

21 files changed

+165
-196
lines changed

‎crates/hyperswitch_connectors/src/connectors/chargebee.rs

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,28 @@ use common_utils::{
1313
use error_stack::report;
1414
use error_stack::ResultExt;
1515
#[cfg(all(feature = "v2", feature = "revenue_recovery"))]
16-
use hyperswitch_domain_models::{
17-
revenue_recovery, router_flow_types::revenue_recovery::RecoveryRecordBack,
18-
router_request_types::revenue_recovery::RevenueRecoveryRecordBackRequest,
19-
router_response_types::revenue_recovery::RevenueRecoveryRecordBackResponse,
20-
types::RevenueRecoveryRecordBackRouterData,
21-
};
16+
use hyperswitch_domain_models::revenue_recovery;
2217
use hyperswitch_domain_models::{
2318
router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},
2419
router_flow_types::{
2520
access_token_auth::AccessTokenAuth,
2621
payments::{Authorize, Capture, PSync, PaymentMethodToken, Session, SetupMandate, Void},
2722
refunds::{Execute, RSync},
23+
revenue_recovery::InvoiceRecordBack,
2824
},
2925
router_request_types::{
30-
AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,
31-
PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,
32-
RefundsData, SetupMandateRequestData,
26+
revenue_recovery::InvoiceRecordBackRequest, AccessTokenRequestData,
27+
PaymentMethodTokenizationData, PaymentsAuthorizeData, PaymentsCancelData,
28+
PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData, RefundsData,
29+
SetupMandateRequestData,
30+
},
31+
router_response_types::{
32+
revenue_recovery::InvoiceRecordBackResponse, ConnectorInfo, PaymentsResponseData,
33+
RefundsResponseData,
3334
},
34-
router_response_types::{ConnectorInfo, PaymentsResponseData, RefundsResponseData},
3535
types::{
36-
PaymentsAuthorizeRouterData, PaymentsCaptureRouterData, PaymentsSyncRouterData,
37-
RefundSyncRouterData, RefundsRouterData,
36+
InvoiceRecordBackRouterData, PaymentsAuthorizeRouterData, PaymentsCaptureRouterData,
37+
PaymentsSyncRouterData, RefundSyncRouterData, RefundsRouterData,
3838
},
3939
};
4040
use hyperswitch_interfaces::{
@@ -560,24 +560,19 @@ impl ConnectorIntegration<RSync, RefundsData, RefundsResponseData> for Chargebee
560560
}
561561
}
562562

563-
#[cfg(all(feature = "v2", feature = "revenue_recovery"))]
564-
impl
565-
ConnectorIntegration<
566-
RecoveryRecordBack,
567-
RevenueRecoveryRecordBackRequest,
568-
RevenueRecoveryRecordBackResponse,
569-
> for Chargebee
563+
impl ConnectorIntegration<InvoiceRecordBack, InvoiceRecordBackRequest, InvoiceRecordBackResponse>
564+
for Chargebee
570565
{
571566
fn get_headers(
572567
&self,
573-
req: &RevenueRecoveryRecordBackRouterData,
568+
req: &InvoiceRecordBackRouterData,
574569
connectors: &Connectors,
575570
) -> CustomResult<Vec<(String, masking::Maskable<String>)>, errors::ConnectorError> {
576571
self.build_headers(req, connectors)
577572
}
578573
fn get_url(
579574
&self,
580-
req: &RevenueRecoveryRecordBackRouterData,
575+
req: &InvoiceRecordBackRouterData,
581576
connectors: &Connectors,
582577
) -> CustomResult<String, errors::ConnectorError> {
583578
let metadata: chargebee::ChargebeeMetadata =
@@ -600,7 +595,7 @@ impl
600595

601596
fn get_request_body(
602597
&self,
603-
req: &RevenueRecoveryRecordBackRouterData,
598+
req: &InvoiceRecordBackRouterData,
604599
_connectors: &Connectors,
605600
) -> CustomResult<RequestContent, errors::ConnectorError> {
606601
let amount = utils::convert_amount(
@@ -616,20 +611,20 @@ impl
616611

617612
fn build_request(
618613
&self,
619-
req: &RevenueRecoveryRecordBackRouterData,
614+
req: &InvoiceRecordBackRouterData,
620615
connectors: &Connectors,
621616
) -> CustomResult<Option<Request>, errors::ConnectorError> {
622617
Ok(Some(
623618
RequestBuilder::new()
624619
.method(Method::Post)
625-
.url(&types::RevenueRecoveryRecordBackType::get_url(
620+
.url(&types::InvoiceRecordBackType::get_url(
626621
self, req, connectors,
627622
)?)
628623
.attach_default_headers()
629-
.headers(types::RevenueRecoveryRecordBackType::get_headers(
624+
.headers(types::InvoiceRecordBackType::get_headers(
630625
self, req, connectors,
631626
)?)
632-
.set_body(types::RevenueRecoveryRecordBackType::get_request_body(
627+
.set_body(types::InvoiceRecordBackType::get_request_body(
633628
self, req, connectors,
634629
)?)
635630
.build(),
@@ -638,10 +633,10 @@ impl
638633

639634
fn handle_response(
640635
&self,
641-
data: &RevenueRecoveryRecordBackRouterData,
636+
data: &InvoiceRecordBackRouterData,
642637
event_builder: Option<&mut ConnectorEvent>,
643638
res: Response,
644-
) -> CustomResult<RevenueRecoveryRecordBackRouterData, errors::ConnectorError> {
639+
) -> CustomResult<InvoiceRecordBackRouterData, errors::ConnectorError> {
645640
let response: chargebee::ChargebeeRecordbackResponse = res
646641
.response
647642
.parse_struct("chargebee ChargebeeRecordbackResponse")

‎crates/hyperswitch_connectors/src/connectors/chargebee/transformers.rs

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ use hyperswitch_domain_models::{
1111
router_data::{ConnectorAuthType, RouterData},
1212
router_flow_types::{
1313
refunds::{Execute, RSync},
14-
RecoveryRecordBack,
14+
InvoiceRecordBack,
1515
},
16-
router_request_types::{revenue_recovery::RevenueRecoveryRecordBackRequest, ResponseId},
16+
router_request_types::{revenue_recovery::InvoiceRecordBackRequest, ResponseId},
1717
router_response_types::{
18-
revenue_recovery::RevenueRecoveryRecordBackResponse, PaymentsResponseData,
19-
RefundsResponseData,
18+
revenue_recovery::InvoiceRecordBackResponse, PaymentsResponseData, RefundsResponseData,
2019
},
21-
types::{PaymentsAuthorizeRouterData, RefundsRouterData, RevenueRecoveryRecordBackRouterData},
20+
types::{InvoiceRecordBackRouterData, PaymentsAuthorizeRouterData, RefundsRouterData},
2221
};
2322
use hyperswitch_interfaces::errors;
2423
use masking::Secret;
@@ -673,13 +672,10 @@ pub enum ChargebeeRecordStatus {
673672
Failure,
674673
}
675674

676-
#[cfg(all(feature = "v2", feature = "revenue_recovery"))]
677-
impl TryFrom<&ChargebeeRouterData<&RevenueRecoveryRecordBackRouterData>>
678-
for ChargebeeRecordPaymentRequest
679-
{
675+
impl TryFrom<&ChargebeeRouterData<&InvoiceRecordBackRouterData>> for ChargebeeRecordPaymentRequest {
680676
type Error = error_stack::Report<errors::ConnectorError>;
681677
fn try_from(
682-
item: &ChargebeeRouterData<&RevenueRecoveryRecordBackRouterData>,
678+
item: &ChargebeeRouterData<&InvoiceRecordBackRouterData>,
683679
) -> Result<Self, Self::Error> {
684680
let req = &item.router_data.request;
685681
Ok(Self {
@@ -694,7 +690,6 @@ impl TryFrom<&ChargebeeRouterData<&RevenueRecoveryRecordBackRouterData>>
694690
}
695691
}
696692

697-
#[cfg(all(feature = "v2", feature = "revenue_recovery"))]
698693
impl TryFrom<enums::AttemptStatus> for ChargebeeRecordStatus {
699694
type Error = error_stack::Report<errors::ConnectorError>;
700695
fn try_from(status: enums::AttemptStatus) -> Result<Self, Self::Error> {
@@ -748,25 +743,25 @@ pub struct ChargebeeRecordbackInvoice {
748743
impl
749744
TryFrom<
750745
ResponseRouterData<
751-
RecoveryRecordBack,
746+
InvoiceRecordBack,
752747
ChargebeeRecordbackResponse,
753-
RevenueRecoveryRecordBackRequest,
754-
RevenueRecoveryRecordBackResponse,
748+
InvoiceRecordBackRequest,
749+
InvoiceRecordBackResponse,
755750
>,
756-
> for RevenueRecoveryRecordBackRouterData
751+
> for InvoiceRecordBackRouterData
757752
{
758753
type Error = error_stack::Report<errors::ConnectorError>;
759754
fn try_from(
760755
item: ResponseRouterData<
761-
RecoveryRecordBack,
756+
InvoiceRecordBack,
762757
ChargebeeRecordbackResponse,
763-
RevenueRecoveryRecordBackRequest,
764-
RevenueRecoveryRecordBackResponse,
758+
InvoiceRecordBackRequest,
759+
InvoiceRecordBackResponse,
765760
>,
766761
) -> Result<Self, Self::Error> {
767762
let merchant_reference_id = item.response.invoice.id;
768763
Ok(Self {
769-
response: Ok(RevenueRecoveryRecordBackResponse {
764+
response: Ok(InvoiceRecordBackResponse {
770765
merchant_reference_id,
771766
}),
772767
..item.data

‎crates/hyperswitch_connectors/src/connectors/recurly.rs

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -300,15 +300,15 @@ impl
300300
#[cfg(all(feature = "v2", feature = "revenue_recovery"))]
301301
impl
302302
ConnectorIntegrationV2<
303-
recovery_router_flows::RecoveryRecordBack,
304-
recovery_flow_common_types::RevenueRecoveryRecordBackData,
305-
recovery_request_types::RevenueRecoveryRecordBackRequest,
306-
recovery_response_types::RevenueRecoveryRecordBackResponse,
303+
recovery_router_flows::InvoiceRecordBack,
304+
recovery_flow_common_types::InvoiceRecordBackData,
305+
recovery_request_types::InvoiceRecordBackRequest,
306+
recovery_response_types::InvoiceRecordBackResponse,
307307
> for Recurly
308308
{
309309
fn get_headers(
310310
&self,
311-
req: &recovery_router_data_types::RevenueRecoveryRecordBackRouterDataV2,
311+
req: &recovery_router_data_types::InvoiceRecordBackRouterDataV2,
312312
) -> CustomResult<Vec<(String, masking::Maskable<String>)>, errors::ConnectorError> {
313313
let mut header = vec![(
314314
headers::CONTENT_TYPE.to_string(),
@@ -321,7 +321,7 @@ impl
321321

322322
fn get_url(
323323
&self,
324-
req: &recovery_router_data_types::RevenueRecoveryRecordBackRouterDataV2,
324+
req: &recovery_router_data_types::InvoiceRecordBackRouterDataV2,
325325
) -> CustomResult<String, errors::ConnectorError> {
326326
let invoice_id = req
327327
.request
@@ -344,28 +344,26 @@ impl
344344

345345
fn build_request_v2(
346346
&self,
347-
req: &recovery_router_data_types::RevenueRecoveryRecordBackRouterDataV2,
347+
req: &recovery_router_data_types::InvoiceRecordBackRouterDataV2,
348348
) -> CustomResult<Option<Request>, errors::ConnectorError> {
349349
Ok(Some(
350350
RequestBuilder::new()
351351
.method(Method::Put)
352-
.url(&types::RevenueRecoveryRecordBackTypeV2::get_url(self, req)?)
352+
.url(&types::InvoiceRecordBackTypeV2::get_url(self, req)?)
353353
.attach_default_headers()
354-
.headers(types::RevenueRecoveryRecordBackTypeV2::get_headers(
355-
self, req,
356-
)?)
354+
.headers(types::InvoiceRecordBackTypeV2::get_headers(self, req)?)
357355
.header("Content-Length", "0")
358356
.build(),
359357
))
360358
}
361359

362360
fn handle_response_v2(
363361
&self,
364-
data: &recovery_router_data_types::RevenueRecoveryRecordBackRouterDataV2,
362+
data: &recovery_router_data_types::InvoiceRecordBackRouterDataV2,
365363
event_builder: Option<&mut ConnectorEvent>,
366364
res: Response,
367365
) -> CustomResult<
368-
recovery_router_data_types::RevenueRecoveryRecordBackRouterDataV2,
366+
recovery_router_data_types::InvoiceRecordBackRouterDataV2,
369367
errors::ConnectorError,
370368
> {
371369
let response: recurly::RecurlyRecordBackResponse = res
@@ -374,13 +372,11 @@ impl
374372
.change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
375373
event_builder.map(|i| i.set_response_body(&response));
376374
router_env::logger::info!(connector_response=?response);
377-
recovery_router_data_types::RevenueRecoveryRecordBackRouterDataV2::try_from(
378-
ResponseRouterDataV2 {
379-
response,
380-
data: data.clone(),
381-
http_code: res.status_code,
382-
},
383-
)
375+
recovery_router_data_types::InvoiceRecordBackRouterDataV2::try_from(ResponseRouterDataV2 {
376+
response,
377+
data: data.clone(),
378+
http_code: res.status_code,
379+
})
384380
}
385381

386382
fn get_error_response_v2(

‎crates/hyperswitch_connectors/src/connectors/recurly/transformers.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -316,27 +316,27 @@ pub struct RecurlyRecordBackResponse {
316316
impl
317317
TryFrom<
318318
ResponseRouterDataV2<
319-
recovery_router_flows::RecoveryRecordBack,
319+
recovery_router_flows::InvoiceRecordBack,
320320
RecurlyRecordBackResponse,
321-
recovery_flow_common_types::RevenueRecoveryRecordBackData,
322-
recovery_request_types::RevenueRecoveryRecordBackRequest,
323-
recovery_response_types::RevenueRecoveryRecordBackResponse,
321+
recovery_flow_common_types::InvoiceRecordBackData,
322+
recovery_request_types::InvoiceRecordBackRequest,
323+
recovery_response_types::InvoiceRecordBackResponse,
324324
>,
325-
> for recovery_router_data_types::RevenueRecoveryRecordBackRouterDataV2
325+
> for recovery_router_data_types::InvoiceRecordBackRouterDataV2
326326
{
327327
type Error = error_stack::Report<errors::ConnectorError>;
328328
fn try_from(
329329
item: ResponseRouterDataV2<
330-
recovery_router_flows::RecoveryRecordBack,
330+
recovery_router_flows::InvoiceRecordBack,
331331
RecurlyRecordBackResponse,
332-
recovery_flow_common_types::RevenueRecoveryRecordBackData,
333-
recovery_request_types::RevenueRecoveryRecordBackRequest,
334-
recovery_response_types::RevenueRecoveryRecordBackResponse,
332+
recovery_flow_common_types::InvoiceRecordBackData,
333+
recovery_request_types::InvoiceRecordBackRequest,
334+
recovery_response_types::InvoiceRecordBackResponse,
335335
>,
336336
) -> Result<Self, Self::Error> {
337337
let merchant_reference_id = item.response.id;
338338
Ok(Self {
339-
response: Ok(recovery_response_types::RevenueRecoveryRecordBackResponse {
339+
response: Ok(recovery_response_types::InvoiceRecordBackResponse {
340340
merchant_reference_id,
341341
}),
342342
..item.data

‎crates/hyperswitch_connectors/src/connectors/stripebilling.rs

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -663,14 +663,14 @@ impl
663663
#[cfg(all(feature = "v2", feature = "revenue_recovery"))]
664664
impl
665665
ConnectorIntegration<
666-
recovery_router_flows::RecoveryRecordBack,
667-
recovery_request_types::RevenueRecoveryRecordBackRequest,
668-
recovery_response_types::RevenueRecoveryRecordBackResponse,
666+
recovery_router_flows::InvoiceRecordBack,
667+
recovery_request_types::InvoiceRecordBackRequest,
668+
recovery_response_types::InvoiceRecordBackResponse,
669669
> for Stripebilling
670670
{
671671
fn get_headers(
672672
&self,
673-
req: &recovery_router_data_types::RevenueRecoveryRecordBackRouterData,
673+
req: &recovery_router_data_types::InvoiceRecordBackRouterData,
674674
connectors: &Connectors,
675675
) -> CustomResult<Vec<(String, masking::Maskable<String>)>, errors::ConnectorError> {
676676
self.build_headers(req, connectors)
@@ -682,7 +682,7 @@ impl
682682

683683
fn get_url(
684684
&self,
685-
req: &recovery_router_data_types::RevenueRecoveryRecordBackRouterData,
685+
req: &recovery_router_data_types::InvoiceRecordBackRouterData,
686686
connectors: &Connectors,
687687
) -> CustomResult<String, errors::ConnectorError> {
688688
let invoice_id = req
@@ -705,17 +705,17 @@ impl
705705

706706
fn build_request(
707707
&self,
708-
req: &recovery_router_data_types::RevenueRecoveryRecordBackRouterData,
708+
req: &recovery_router_data_types::InvoiceRecordBackRouterData,
709709
connectors: &Connectors,
710710
) -> CustomResult<Option<Request>, errors::ConnectorError> {
711711
Ok(Some(
712712
RequestBuilder::new()
713713
.method(Method::Post)
714-
.url(&types::RevenueRecoveryRecordBackType::get_url(
714+
.url(&types::InvoiceRecordBackType::get_url(
715715
self, req, connectors,
716716
)?)
717717
.attach_default_headers()
718-
.headers(types::RevenueRecoveryRecordBackType::get_headers(
718+
.headers(types::InvoiceRecordBackType::get_headers(
719719
self, req, connectors,
720720
)?)
721721
.build(),
@@ -724,13 +724,11 @@ impl
724724

725725
fn handle_response(
726726
&self,
727-
data: &recovery_router_data_types::RevenueRecoveryRecordBackRouterData,
727+
data: &recovery_router_data_types::InvoiceRecordBackRouterData,
728728
event_builder: Option<&mut ConnectorEvent>,
729729
res: Response,
730-
) -> CustomResult<
731-
recovery_router_data_types::RevenueRecoveryRecordBackRouterData,
732-
errors::ConnectorError,
733-
> {
730+
) -> CustomResult<recovery_router_data_types::InvoiceRecordBackRouterData, errors::ConnectorError>
731+
{
734732
let response = res
735733
.response
736734
.parse_struct::<stripebilling::StripebillingRecordBackResponse>(
@@ -739,13 +737,11 @@ impl
739737
.change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
740738
event_builder.map(|i| i.set_response_body(&response));
741739
router_env::logger::info!(connector_response=?response);
742-
recovery_router_data_types::RevenueRecoveryRecordBackRouterData::try_from(
743-
ResponseRouterData {
744-
response,
745-
data: data.clone(),
746-
http_code: res.status_code,
747-
},
748-
)
740+
recovery_router_data_types::InvoiceRecordBackRouterData::try_from(ResponseRouterData {
741+
response,
742+
data: data.clone(),
743+
http_code: res.status_code,
744+
})
749745
}
750746

751747
fn get_error_response(

0 commit comments

Comments
 (0)