Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions crates/hyperswitch_domain_models/src/relay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use time::PrimitiveDateTime;

use crate::{router_data::ErrorResponse, router_response_types};

#[derive(Debug, Clone, Deserialize, Serialize)]
#[derive(Debug, Clone)]
pub struct Relay {
pub id: id_type::RelayId,
pub connector_resource_id: String,
Expand All @@ -27,9 +27,7 @@ pub struct Relay {
pub connector_reference_id: Option<String>,
pub error_code: Option<String>,
pub error_message: Option<String>,
#[serde(with = "common_utils::custom_serde::iso8601")]
pub created_at: PrimitiveDateTime,
#[serde(with = "common_utils::custom_serde::iso8601")]
pub modified_at: PrimitiveDateTime,
pub response_data: Option<pii::SecretSerdeValue>,
}
Expand All @@ -42,7 +40,7 @@ impl Relay {
) -> Self {
let relay_id = id_type::RelayId::generate();
Self {
id: relay_id.clone(),
id: relay_id,
connector_resource_id: relay_request.connector_resource_id.clone(),
connector_id: relay_request.connector_id.clone(),
profile_id: profile_id.clone(),
Expand Down Expand Up @@ -198,7 +196,7 @@ impl super::behaviour::Conversion for Relay {
.request_data
.map(|data| {
serde_json::to_value(data).change_context(ValidationError::InvalidValue {
message: "Failed while decrypting business profile data".to_string(),
message: "Failed to serialize relay request data".to_string(),
})
})
.transpose()?
Expand All @@ -225,13 +223,13 @@ impl super::behaviour::Conversion for Relay {
connector_id: item.connector_id,
profile_id: item.profile_id,
merchant_id: item.merchant_id,
relay_type: enums::RelayType::Refund,
relay_type: item.relay_type,
request_data: item
.request_data
.map(|data| {
serde_json::from_value(data.expose()).change_context(
ValidationError::InvalidValue {
message: "Failed while decrypting business profile data".to_string(),
message: "Failed to deserialize relay request data".to_string(),
},
)
})
Expand All @@ -258,7 +256,7 @@ impl super::behaviour::Conversion for Relay {
.request_data
.map(|data| {
serde_json::to_value(data).change_context(ValidationError::InvalidValue {
message: "Failed while decrypting business profile data".to_string(),
message: "Failed to serialize relay request data".to_string(),
})
})
.transpose()?
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- This file should undo anything in `up.sql`

ALTER TABLE relay
ALTER COLUMN created_at SET DEFAULT now()::TIMESTAMP,
ALTER COLUMN modified_at SET DEFAULT now()::TIMESTAMP;
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- Your SQL goes here

ALTER TABLE relay
ALTER COLUMN created_at DROP DEFAULT,
ALTER COLUMN modified_at DROP DEFAULT;
Loading