Skip to content

Commit 567088e

Browse files
SakilmostakSakilmostak
committed
refactor: resolve comments
1 parent 758d5d0 commit 567088e

File tree

13 files changed

+29
-29
lines changed

13 files changed

+29
-29
lines changed

‎crates/api_models/src/admin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2239,7 +2239,7 @@ pub struct ProfileResponse {
22392239
pub is_clear_pan_retries_enabled: bool,
22402240

22412241
/// Indicates if 3ds challenge is forced
2242-
pub force_3ds_challenge: Option<bool>,
2242+
pub force_3ds_challenge: bool,
22432243
}
22442244

22452245
#[cfg(feature = "v2")]

‎crates/common_utils/src/types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ impl SemanticVersion {
208208
self.0.major
209209
}
210210

211-
/// returns major version number
211+
/// returns minor version number
212212
pub fn get_minor(&self) -> u64 {
213213
self.0.minor
214214
}

‎crates/diesel_models/src/business_profile.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub struct Profile {
6464
pub card_testing_guard_config: Option<CardTestingGuardConfig>,
6565
pub card_testing_secret_key: Option<Encryption>,
6666
pub is_clear_pan_retries_enabled: bool,
67-
pub force_3ds_challenge: Option<bool>,
67+
pub force_3ds_challenge: bool,
6868
}
6969

7070
#[cfg(feature = "v1")]
@@ -114,7 +114,7 @@ pub struct ProfileNew {
114114
pub card_testing_guard_config: Option<CardTestingGuardConfig>,
115115
pub card_testing_secret_key: Option<Encryption>,
116116
pub is_clear_pan_retries_enabled: bool,
117-
pub force_3ds_challenge: Option<bool>,
117+
pub force_3ds_challenge: bool,
118118
}
119119

120120
#[cfg(feature = "v1")]
@@ -162,7 +162,7 @@ pub struct ProfileUpdateInternal {
162162
pub card_testing_guard_config: Option<CardTestingGuardConfig>,
163163
pub card_testing_secret_key: Option<Encryption>,
164164
pub is_clear_pan_retries_enabled: Option<bool>,
165-
pub force_3ds_challenge: Option<bool>,
165+
pub force_3ds_challenge: bool,
166166
}
167167

168168
#[cfg(feature = "v1")]
@@ -279,7 +279,7 @@ impl ProfileUpdateInternal {
279279
card_testing_secret_key,
280280
is_clear_pan_retries_enabled: is_clear_pan_retries_enabled
281281
.unwrap_or(source.is_clear_pan_retries_enabled),
282-
force_3ds_challenge: force_3ds_challenge.or(source.force_3ds_challenge),
282+
force_3ds_challenge,
283283
}
284284
}
285285
}
@@ -333,7 +333,7 @@ pub struct Profile {
333333
pub card_testing_guard_config: Option<CardTestingGuardConfig>,
334334
pub card_testing_secret_key: Option<Encryption>,
335335
pub is_clear_pan_retries_enabled: bool,
336-
pub force_3ds_challenge: Option<bool>,
336+
pub force_3ds_challenge: bool,
337337
pub routing_algorithm_id: Option<common_utils::id_type::RoutingId>,
338338
pub order_fulfillment_time: Option<i64>,
339339
pub order_fulfillment_time_origin: Option<common_enums::OrderFulfillmentTimeOrigin>,
@@ -580,7 +580,7 @@ impl ProfileUpdateInternal {
580580
card_testing_secret_key: card_testing_secret_key.or(source.card_testing_secret_key),
581581
is_clear_pan_retries_enabled: is_clear_pan_retries_enabled
582582
.unwrap_or(source.is_clear_pan_retries_enabled),
583-
force_3ds_challenge: None,
583+
force_3ds_challenge: false,
584584
}
585585
}
586586
}

‎crates/diesel_models/src/schema.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ diesel::table! {
220220
card_testing_guard_config -> Nullable<Jsonb>,
221221
card_testing_secret_key -> Nullable<Bytea>,
222222
is_clear_pan_retries_enabled -> Bool,
223-
force_3ds_challenge -> Nullable<Bool>,
223+
force_3ds_challenge -> Bool,
224224
}
225225
}
226226

‎crates/diesel_models/src/schema_v2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ diesel::table! {
216216
card_testing_guard_config -> Nullable<Jsonb>,
217217
card_testing_secret_key -> Nullable<Bytea>,
218218
is_clear_pan_retries_enabled -> Bool,
219-
force_3ds_challenge -> Nullable<Bool>,
219+
force_3ds_challenge -> Bool,
220220
#[max_length = 64]
221221
routing_algorithm_id -> Nullable<Varchar>,
222222
order_fulfillment_time -> Nullable<Int8>,

‎crates/hyperswitch_domain_models/src/business_profile.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub struct Profile {
6565
pub card_testing_guard_config: Option<CardTestingGuardConfig>,
6666
pub card_testing_secret_key: OptionalEncryptableName,
6767
pub is_clear_pan_retries_enabled: bool,
68-
pub force_3ds_challenge: Option<bool>,
68+
pub force_3ds_challenge: bool,
6969
}
7070

7171
#[cfg(feature = "v1")]
@@ -113,7 +113,7 @@ pub struct ProfileSetter {
113113
pub card_testing_guard_config: Option<CardTestingGuardConfig>,
114114
pub card_testing_secret_key: OptionalEncryptableName,
115115
pub is_clear_pan_retries_enabled: bool,
116-
pub force_3ds_challenge: Option<bool>,
116+
pub force_3ds_challenge: bool,
117117
}
118118

119119
#[cfg(feature = "v1")]
@@ -223,7 +223,7 @@ pub struct ProfileGeneralUpdate {
223223
pub card_testing_guard_config: Option<CardTestingGuardConfig>,
224224
pub card_testing_secret_key: OptionalEncryptableName,
225225
pub is_clear_pan_retries_enabled: Option<bool>,
226-
pub force_3ds_challenge: Option<bool>,
226+
pub force_3ds_challenge: bool,
227227
}
228228

229229
#[cfg(feature = "v1")]
@@ -384,7 +384,7 @@ impl From<ProfileUpdate> for ProfileUpdateInternal {
384384
card_testing_guard_config: None,
385385
card_testing_secret_key: None,
386386
is_clear_pan_retries_enabled: None,
387-
force_3ds_challenge: None,
387+
force_3ds_challenge: false,
388388
},
389389
ProfileUpdate::DynamicRoutingAlgorithmUpdate {
390390
dynamic_routing_algorithm,
@@ -428,7 +428,7 @@ impl From<ProfileUpdate> for ProfileUpdateInternal {
428428
card_testing_guard_config: None,
429429
card_testing_secret_key: None,
430430
is_clear_pan_retries_enabled: None,
431-
force_3ds_challenge: None,
431+
force_3ds_challenge: false,
432432
},
433433
ProfileUpdate::ExtendedCardInfoUpdate {
434434
is_extended_card_info_enabled,
@@ -472,7 +472,7 @@ impl From<ProfileUpdate> for ProfileUpdateInternal {
472472
card_testing_guard_config: None,
473473
card_testing_secret_key: None,
474474
is_clear_pan_retries_enabled: None,
475-
force_3ds_challenge: None,
475+
force_3ds_challenge: false,
476476
},
477477
ProfileUpdate::ConnectorAgnosticMitUpdate {
478478
is_connector_agnostic_mit_enabled,
@@ -516,7 +516,7 @@ impl From<ProfileUpdate> for ProfileUpdateInternal {
516516
card_testing_guard_config: None,
517517
card_testing_secret_key: None,
518518
is_clear_pan_retries_enabled: None,
519-
force_3ds_challenge: None,
519+
force_3ds_challenge: false,
520520
},
521521
ProfileUpdate::NetworkTokenizationUpdate {
522522
is_network_tokenization_enabled,
@@ -560,7 +560,7 @@ impl From<ProfileUpdate> for ProfileUpdateInternal {
560560
card_testing_guard_config: None,
561561
card_testing_secret_key: None,
562562
is_clear_pan_retries_enabled: None,
563-
force_3ds_challenge: None,
563+
force_3ds_challenge: false,
564564
},
565565
ProfileUpdate::CardTestingSecretKeyUpdate {
566566
card_testing_secret_key,
@@ -604,7 +604,7 @@ impl From<ProfileUpdate> for ProfileUpdateInternal {
604604
card_testing_guard_config: None,
605605
card_testing_secret_key: card_testing_secret_key.map(Encryption::from),
606606
is_clear_pan_retries_enabled: None,
607-
force_3ds_challenge: None,
607+
force_3ds_challenge: false,
608608
},
609609
}
610610
}
@@ -1562,7 +1562,7 @@ impl super::behaviour::Conversion for Profile {
15621562
card_testing_guard_config: self.card_testing_guard_config,
15631563
card_testing_secret_key: self.card_testing_secret_key.map(|name| name.into()),
15641564
is_clear_pan_retries_enabled: self.is_clear_pan_retries_enabled,
1565-
force_3ds_challenge: None,
1565+
force_3ds_challenge: false,
15661566
})
15671567
}
15681568

‎crates/hyperswitch_domain_models/src/router_request_types/authentication.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub struct ConnectorAuthenticationRequestData {
9292
pub threeds_method_comp_ind: api_models::payments::ThreeDsCompletionIndicator,
9393
pub three_ds_requestor_url: String,
9494
pub webhook_url: String,
95-
pub force_3ds_challenge: Option<bool>,
95+
pub force_3ds_challenge: bool,
9696
}
9797

9898
#[derive(Clone, serde::Deserialize, Debug, serde::Serialize, PartialEq, Eq)]

‎crates/router/src/connector/netcetera/netcetera_types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,11 @@ impl ThreeDSRequestor {
183183
pub fn new(
184184
app_ip: Option<std::net::IpAddr>,
185185
psd2_sca_exemption_type: Option<common_enums::ScaExemptionType>,
186-
force_3ds_challenge: Option<bool>,
186+
force_3ds_challenge: bool,
187187
message_version: SemanticVersion,
188188
) -> Self {
189189
// if sca exemption is provided, we need to set the challenge indicator to NoChallengeRequestedTransactionalRiskAnalysis
190-
let three_ds_requestor_challenge_ind = if force_3ds_challenge == Some(true) {
190+
let three_ds_requestor_challenge_ind = if force_3ds_challenge {
191191
Some(SingleOrListElement::get_version_checked(
192192
message_version,
193193
ThreeDSRequestorChallengeIndicator::ChallengeRequestedMandate,

‎crates/router/src/core/admin.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3787,7 +3787,7 @@ impl ProfileCreateBridge for api::ProfileCreate {
37873787
.change_context(errors::ApiErrorResponse::InternalServerError)
37883788
.attach_printable("error while generating card testing secret key")?,
37893789
is_clear_pan_retries_enabled: self.is_clear_pan_retries_enabled.unwrap_or_default(),
3790-
force_3ds_challenge: self.force_3ds_challenge,
3790+
force_3ds_challenge: self.force_3ds_challenge.unwrap_or_default(),
37913791
}))
37923792
}
37933793

@@ -4231,7 +4231,7 @@ impl ProfileUpdateBridge for api::ProfileUpdate {
42314231
.map(ForeignInto::foreign_into),
42324232
card_testing_secret_key,
42334233
is_clear_pan_retries_enabled: self.is_clear_pan_retries_enabled,
4234-
force_3ds_challenge: self.force_3ds_challenge,
4234+
force_3ds_challenge: self.force_3ds_challenge.unwrap_or_default(),
42354235
},
42364236
)))
42374237
}

‎crates/router/src/core/authentication.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub async fn perform_authentication(
4040
webhook_url: String,
4141
three_ds_requestor_url: String,
4242
psd2_sca_exemption_type: Option<common_enums::ScaExemptionType>,
43-
force_3ds_challenge: Option<bool>,
43+
force_3ds_challenge: bool,
4444
) -> CustomResult<api::authentication::AuthenticationResponse, ApiErrorResponse> {
4545
let router_data = transformers::construct_authentication_router_data(
4646
state,

0 commit comments

Comments
 (0)