diff --git a/crates/hyperswitch_domain_models/src/relay.rs b/crates/hyperswitch_domain_models/src/relay.rs index 8af58265c39..969fda8d533 100644 --- a/crates/hyperswitch_domain_models/src/relay.rs +++ b/crates/hyperswitch_domain_models/src/relay.rs @@ -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, @@ -27,9 +27,7 @@ pub struct Relay { pub connector_reference_id: Option, pub error_code: Option, pub error_message: Option, - #[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, } @@ -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(), @@ -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()? @@ -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(), }, ) }) @@ -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()? diff --git a/migrations/2024-12-30-072943_remove_defaults_timestamp_in_relay/down.sql b/migrations/2024-12-30-072943_remove_defaults_timestamp_in_relay/down.sql new file mode 100644 index 00000000000..cf1cc5ea0d2 --- /dev/null +++ b/migrations/2024-12-30-072943_remove_defaults_timestamp_in_relay/down.sql @@ -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; \ No newline at end of file diff --git a/migrations/2024-12-30-072943_remove_defaults_timestamp_in_relay/up.sql b/migrations/2024-12-30-072943_remove_defaults_timestamp_in_relay/up.sql new file mode 100644 index 00000000000..e03355a37ec --- /dev/null +++ b/migrations/2024-12-30-072943_remove_defaults_timestamp_in_relay/up.sql @@ -0,0 +1,5 @@ +-- Your SQL goes here + +ALTER TABLE relay + ALTER COLUMN created_at DROP DEFAULT, + ALTER COLUMN modified_at DROP DEFAULT; \ No newline at end of file