Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(relay): add trait based implementation for relay #7264

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
4 changes: 2 additions & 2 deletions api-reference/openapi_spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -23737,7 +23737,7 @@
],
"properties": {
"refund": {
"$ref": "#/components/schemas/RelayRefundRequest"
"$ref": "#/components/schemas/RelayRefundRequestData"
}
}
}
Expand All @@ -23760,7 +23760,7 @@
}
}
},
"RelayRefundRequest": {
"RelayRefundRequestData": {
"type": "object",
"required": [
"amount",
Expand Down
4 changes: 2 additions & 2 deletions crates/api_models/src/relay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ pub struct RelayRequest {
#[serde(rename_all = "snake_case")]
pub enum RelayData {
/// The data that is associated with a refund relay request
Refund(RelayRefundRequest),
Refund(RelayRefundRequestData),
}

#[derive(Debug, ToSchema, Clone, Deserialize, Serialize)]
pub struct RelayRefundRequest {
pub struct RelayRefundRequestData {
/// The amount that is being refunded
#[schema(value_type = i64 , example = 6540)]
pub amount: MinorUnit,
Expand Down
12 changes: 11 additions & 1 deletion crates/hyperswitch_domain_models/src/relay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ impl From<api_models::relay::RelayData> for RelayData {
}
}

impl From<api_models::relay::RelayRefundRequestData> for RelayRefundData {
fn from(relay: api_models::relay::RelayRefundRequestData) -> Self {
Self {
amount: relay.amount,
currency: relay.currency,
reason: relay.reason,
}
}
}

impl RelayUpdate {
pub fn from(
response: Result<router_response_types::RefundsResponseData, ErrorResponse>,
Expand Down Expand Up @@ -106,7 +116,7 @@ impl From<Relay> for api_models::relay::RelayResponse {

let data = value.request_data.map(|relay_data| match relay_data {
RelayData::Refund(relay_refund_request) => {
api_models::relay::RelayData::Refund(api_models::relay::RelayRefundRequest {
api_models::relay::RelayData::Refund(api_models::relay::RelayRefundRequestData {
amount: relay_refund_request.amount,
currency: relay_refund_request.currency,
reason: relay_refund_request.reason,
Expand Down
2 changes: 1 addition & 1 deletion crates/openapi/src/openapi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ Never share your secret api keys. Keep them guarded and secure.
api_models::relay::RelayResponse,
api_models::enums::RelayType,
api_models::relay::RelayData,
api_models::relay::RelayRefundRequest,
api_models::relay::RelayRefundRequestData,
api_models::enums::RelayStatus,
api_models::relay::RelayError,
api_models::payments::AmountFilter,
Expand Down
Loading
Loading