Add files using upload-large-folder tool
Browse filesThis view is limited to 50 files because it contains too many changes. See raw diff
- diffs/pr_10002/1871e0a/diff.json +55 -0
- diffs/pr_10002/8adc253/diff.json +6 -0
- diffs/pr_10002/901eca8/diff.json +6 -0
- diffs/pr_10002/c274258/diff.json +147 -0
- diffs/pr_10071/1bb2d15/diff.json +6 -0
- diffs/pr_10071/d540635/diff.json +6 -0
- diffs/pr_10071/df6d9cd/diff.json +6 -0
- diffs/pr_10138/544521b/diff.json +115 -0
- diffs/pr_10162/0b3886d/diff.json +159 -0
- diffs/pr_10162/38e59dd/diff.json +86 -0
- diffs/pr_10162/c3f9846/diff.json +24 -0
- diffs/pr_10162/c98bc4c/diff.json +40 -0
- diffs/pr_10162/cbbf0ca/diff.json +0 -0
- diffs/pr_10163/cb4e03f/diff.json +49 -0
- diffs/pr_10197/1022c03/diff.json +39 -0
- diffs/pr_10197/234898a/diff.json +251 -0
- diffs/pr_10197/9ec1575/diff.json +200 -0
- diffs/pr_10197/d1426a6/diff.json +6 -0
- diffs/pr_10197/da4cfe5/diff.json +173 -0
- diffs/pr_10197/e93005a/diff.json +207 -0
- diffs/pr_10246/2aaf16f/diff.json +0 -0
- diffs/pr_10277/fa6a2d2/diff.json +137 -0
- diffs/pr_10324/590c7c8/diff.json +0 -0
- diffs/pr_10324/e080ba2/diff.json +0 -0
- diffs/pr_10436/2e7d22a/diff.json +205 -0
- diffs/pr_10631/7632690/diff.json +6 -0
- diffs/pr_6706/0013bf4/diff.json +8 -0
- diffs/pr_6706/1036cfc/diff.json +6 -0
- diffs/pr_6706/107dd80/diff.json +0 -0
- diffs/pr_6706/129fdf1/diff.json +10 -0
- diffs/pr_6706/13ea66f/diff.json +0 -0
- diffs/pr_6706/2568e97/diff.json +0 -0
- diffs/pr_6706/25e2145/diff.json +0 -0
- diffs/pr_6706/2b26ce6/diff.json +0 -0
- diffs/pr_6706/483c6d2/diff.json +0 -0
- diffs/pr_6706/4e70d21/diff.json +184 -0
- diffs/pr_6706/570c056/diff.json +9 -0
- diffs/pr_6706/88d8e6f/diff.json +0 -0
- diffs/pr_6706/9a34e69/diff.json +9 -0
- diffs/pr_6706/a8db548/diff.json +0 -0
- diffs/pr_6706/bb8ae08/diff.json +26 -0
- diffs/pr_6706/c46282c/diff.json +6 -0
- diffs/pr_6706/cc12206/diff.json +0 -0
- diffs/pr_6706/cc56676/diff.json +8 -0
- diffs/pr_6706/d1ee42b/diff.json +24 -0
- diffs/pr_6706/d1f446c/diff.json +6 -0
- diffs/pr_6706/df3ec15/diff.json +0 -0
- diffs/pr_6706/f363b77/diff.json +10 -0
- diffs/pr_6706/f5930fe/diff.json +0 -0
- diffs/pr_6757/12df43a/diff.json +26 -0
diffs/pr_10002/1871e0a/diff.json
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "1871e0a201f5e2997b11e17eac242752082a55e7",
|
| 3 |
+
"pr_number": 10002,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/routes/admin.rs",
|
| 6 |
+
"crates/router/src/routes/profiles.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/router/src/routes/admin.rs::function::connector_update",
|
| 11 |
+
"file": "crates/router/src/routes/admin.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "pub async fn connector_update(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantConnectorAccountId>,\n json_payload: web::Json<api_models::admin::MerchantConnectorUpdate>,\n) -> HttpResponse {\n let flow = Flow::MerchantConnectorsUpdate;\n let id = path.into_inner();\n let payload = json_payload.into_inner();\n let merchant_id = payload.merchant_id.clone();\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, _, req, _| update_connector(state, merchant_id, None, &id, req),\n auth::auth_type(\n &auth::V2AdminApiAuth,\n &auth::JWTAuthMerchantFromRoute {\n merchant_id: merchant_id.clone(),\n required_permission: Permission::MerchantConnectorWrite,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 17 |
+
"after_code": "pub async fn connector_update(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantConnectorAccountId>,\n json_payload: web::Json<api_models::admin::MerchantConnectorUpdate>,\n) -> HttpResponse {\n let flow = Flow::MerchantConnectorsUpdate;\n let id = path.into_inner();\n let payload = json_payload.into_inner();\n let merchant_id = payload.merchant_id.clone();\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, _, req, _| update_connector(state, merchant_id.clone(), None, &id, req),\n auth::auth_type(\n &auth::V2AdminApiAuth,\n &auth::JWTAuthMerchantFromRoute {\n merchant_id: merchant_id.clone(),\n required_permission: Permission::MerchantConnectorWrite,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " &req,\n payload,\n |state, _, req, _| update_connector(state, merchant_id, None, &id, req),\n auth::auth_type(\n &auth::V2AdminApiAuth,",
|
| 20 |
+
"after": " &req,\n payload,\n |state, _, req, _| update_connector(state, merchant_id.clone(), None, &id, req),\n auth::auth_type(\n &auth::V2AdminApiAuth,"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "1871e0a201f5e2997b11e17eac242752082a55e7"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/router/src/routes/profiles.rs::function::profile_update",
|
| 26 |
+
"file": "crates/router/src/routes/profiles.rs",
|
| 27 |
+
"kind": "function_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "pub async fn profile_update(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::ProfileId>,\n json_payload: web::Json<api_models::admin::ProfileUpdate>,\n) -> HttpResponse {\n let flow = Flow::ProfileUpdate;\n let profile_id = path.into_inner();\n let payload = json_payload.into_inner();\n if let Err(api_error) = payload\n .webhook_details\n .as_ref()\n .map(|details| {\n details\n .validate()\n .map_err(|message| errors::ApiErrorResponse::InvalidRequestData { message })\n })\n .transpose()\n {\n return api::log_and_return_error_response(api_error.into());\n }\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth::AuthenticationDataWithoutProfile { key_store, .. }, req, _| {\n update_profile(state, &profile_id, key_store, req)\n },\n auth::auth_type(\n &auth::AdminApiAuthWithMerchantIdFromHeader,\n &auth::JWTAuthMerchantFromHeader {\n required_permission: permissions::Permission::MerchantAccountWrite,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 32 |
+
"after_code": "pub async fn profile_update(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::ProfileId>,\n json_payload: web::Json<api_models::admin::ProfileUpdate>,\n) -> HttpResponse {\n let flow = Flow::ProfileUpdate;\n let profile_id = path.into_inner();\n let payload = json_payload.into_inner();\n if let Err(api_error) = payload\n .webhook_details\n .as_ref()\n .map(|details| {\n details\n .validate()\n .map_err(|message| errors::ApiErrorResponse::InvalidRequestData { message })\n })\n .transpose()\n {\n return api::log_and_return_error_response(api_error.into());\n }\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state,\n auth::AuthenticationDataWithoutProfile {\n merchant_account,\n key_store,\n },\n req,\n _| {\n update_profile(\n state,\n &profile_id,\n merchant_account.get_id().clone(),\n key_store,\n req,\n )\n },\n auth::auth_type(\n &auth::AdminApiAuthWithMerchantIdFromHeader,\n &auth::JWTAuthMerchantFromHeader {\n required_permission: permissions::Permission::MerchantAccountWrite,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " &req,\n payload,\n |state, auth::AuthenticationDataWithoutProfile { key_store, .. }, req, _| {\n update_profile(state, &profile_id, key_store, req)\n },\n auth::auth_type(",
|
| 35 |
+
"after": " &req,\n payload,\n |state,\n auth::AuthenticationDataWithoutProfile {\n merchant_account,\n key_store,\n },\n req,\n _| {\n update_profile(\n state,\n &profile_id,\n merchant_account.get_id().clone(),\n key_store,\n req,\n )\n },\n auth::auth_type("
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "1871e0a201f5e2997b11e17eac242752082a55e7"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/router/src/routes/profiles.rs::function::profile_retrieve",
|
| 41 |
+
"file": "crates/router/src/routes/profiles.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "pub async fn profile_retrieve(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::ProfileId>,\n) -> HttpResponse {\n let flow = Flow::ProfileRetrieve;\n let profile_id = path.into_inner();\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n profile_id,\n |state, auth::AuthenticationDataWithoutProfile { key_store, .. }, profile_id, _| {\n retrieve_profile(state, profile_id, key_store)\n },\n auth::auth_type(\n &auth::AdminApiAuthWithMerchantIdFromHeader,\n &auth::JWTAuthMerchantFromHeader {\n required_permission: permissions::Permission::MerchantAccountRead,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 47 |
+
"after_code": "pub async fn profile_retrieve(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::ProfileId>,\n) -> HttpResponse {\n let flow = Flow::ProfileRetrieve;\n let profile_id = path.into_inner();\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n profile_id,\n |state,\n auth::AuthenticationDataWithoutProfile {\n merchant_account,\n key_store,\n },\n profile_id,\n _| {\n retrieve_profile(\n state,\n profile_id,\n merchant_account.get_id().clone(),\n key_store,\n )\n },\n auth::auth_type(\n &auth::AdminApiAuthWithMerchantIdFromHeader,\n &auth::JWTAuthMerchantFromHeader {\n required_permission: permissions::Permission::MerchantAccountRead,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " &req,\n profile_id,\n |state, auth::AuthenticationDataWithoutProfile { key_store, .. }, profile_id, _| {\n retrieve_profile(state, profile_id, key_store)\n },\n auth::auth_type(",
|
| 50 |
+
"after": " &req,\n profile_id,\n |state,\n auth::AuthenticationDataWithoutProfile {\n merchant_account,\n key_store,\n },\n profile_id,\n _| {\n retrieve_profile(\n state,\n profile_id,\n merchant_account.get_id().clone(),\n key_store,\n )\n },\n auth::auth_type("
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "1871e0a201f5e2997b11e17eac242752082a55e7"
|
| 53 |
+
}
|
| 54 |
+
]
|
| 55 |
+
}
|
diffs/pr_10002/8adc253/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "8adc253b894686df983ce7d7a160a56c38b91f18",
|
| 3 |
+
"pr_number": 10002,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10002/901eca8/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "901eca86020ef8d0a27afd778578ce770a0429bc",
|
| 3 |
+
"pr_number": 10002,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10002/c274258/diff.json
ADDED
|
@@ -0,0 +1,147 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "c27425869cb155e3f2502baaa3da34cbfa859bce",
|
| 3 |
+
"pr_number": 10002,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/admin.rs",
|
| 6 |
+
"crates/router/src/core/connector_onboarding/paypal.rs",
|
| 7 |
+
"crates/router/src/routes/admin.rs",
|
| 8 |
+
"crates/router/src/routes/profiles.rs"
|
| 9 |
+
],
|
| 10 |
+
"diffs": [
|
| 11 |
+
{
|
| 12 |
+
"id": "crates/router/src/core/admin.rs::function::update_profile",
|
| 13 |
+
"file": "crates/router/src/core/admin.rs",
|
| 14 |
+
"kind": "function_item",
|
| 15 |
+
"status": "modified",
|
| 16 |
+
"code_changed": true,
|
| 17 |
+
"imports_changed": false,
|
| 18 |
+
"before_code": "pub async fn update_profile(\n state: SessionState,\n profile_id: &id_type::ProfileId,\n key_store: domain::MerchantKeyStore,\n request: api::ProfileUpdate,\n) -> RouterResponse<api::ProfileResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n\n let business_profile = db\n .find_business_profile_by_profile_id(key_manager_state, &key_store, profile_id)\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n let profile_update = request\n .get_update_profile_object(&state, &key_store, &business_profile)\n .await?;\n\n let updated_business_profile = db\n .update_profile_by_profile_id(\n key_manager_state,\n &key_store,\n business_profile,\n profile_update,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n Ok(service_api::ApplicationResponse::Json(\n api_models::admin::ProfileResponse::foreign_try_from(updated_business_profile)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse business profile details\")?,\n ))\n}",
|
| 19 |
+
"after_code": "pub async fn update_profile(\n state: SessionState,\n profile_id: &id_type::ProfileId,\n merchant_id: id_type::MerchantId,\n key_store: domain::MerchantKeyStore,\n request: api::ProfileUpdate,\n) -> RouterResponse<api::ProfileResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n\n let business_profile = db\n .find_business_profile_by_merchant_id_profile_id(\n key_manager_state,\n &key_store,\n &merchant_id,\n profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n let profile_update = request\n .get_update_profile_object(&state, &key_store, &business_profile)\n .await?;\n\n let updated_business_profile = db\n .update_profile_by_profile_id(\n key_manager_state,\n &key_store,\n business_profile,\n profile_update,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n Ok(service_api::ApplicationResponse::Json(\n api_models::admin::ProfileResponse::foreign_try_from(updated_business_profile)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse business profile details\")?,\n ))\n}",
|
| 20 |
+
"diff_span": {
|
| 21 |
+
"before": "\n let business_profile = db\n .find_business_profile_by_profile_id(key_manager_state, &key_store, profile_id)\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {",
|
| 22 |
+
"after": " state: SessionState,\n profile_id: &id_type::ProfileId,\n merchant_id: id_type::MerchantId,\n key_store: domain::MerchantKeyStore,\n request: api::ProfileUpdate,\n) -> RouterResponse<api::ProfileResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n\n let business_profile = db\n .find_business_profile_by_merchant_id_profile_id(\n key_manager_state,\n &key_store,\n &merchant_id,\n profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {"
|
| 23 |
+
},
|
| 24 |
+
"commit_sha": "c27425869cb155e3f2502baaa3da34cbfa859bce"
|
| 25 |
+
},
|
| 26 |
+
{
|
| 27 |
+
"id": "crates/router/src/routes/admin.rs::function::connector_update",
|
| 28 |
+
"file": "crates/router/src/routes/admin.rs",
|
| 29 |
+
"kind": "function_item",
|
| 30 |
+
"status": "modified",
|
| 31 |
+
"code_changed": true,
|
| 32 |
+
"imports_changed": false,
|
| 33 |
+
"before_code": "pub async fn connector_update(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantConnectorAccountId>,\n json_payload: web::Json<api_models::admin::MerchantConnectorUpdate>,\n) -> HttpResponse {\n let flow = Flow::MerchantConnectorsUpdate;\n let id = path.into_inner();\n let payload = json_payload.into_inner();\n let merchant_id = payload.merchant_id.clone();\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, _, req, _| update_connector(state, &merchant_id, None, &id, req),\n auth::auth_type(\n &auth::V2AdminApiAuth,\n &auth::JWTAuthMerchantFromRoute {\n merchant_id: merchant_id.clone(),\n required_permission: Permission::MerchantConnectorWrite,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 34 |
+
"after_code": "pub async fn connector_update(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantConnectorAccountId>,\n json_payload: web::Json<api_models::admin::MerchantConnectorUpdate>,\n) -> HttpResponse {\n let flow = Flow::MerchantConnectorsUpdate;\n let id = path.into_inner();\n let payload = json_payload.into_inner();\n let merchant_id = payload.merchant_id.clone();\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, _, req, _| update_connector(state, merchant_id, None, &id, req),\n auth::auth_type(\n &auth::V2AdminApiAuth,\n &auth::JWTAuthMerchantFromRoute {\n merchant_id: merchant_id.clone(),\n required_permission: Permission::MerchantConnectorWrite,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 35 |
+
"diff_span": {
|
| 36 |
+
"before": " &req,\n payload,\n |state, _, req, _| update_connector(state, &merchant_id, None, &id, req),\n auth::auth_type(\n &auth::V2AdminApiAuth,",
|
| 37 |
+
"after": " &req,\n payload,\n |state, _, req, _| update_connector(state, merchant_id, None, &id, req),\n auth::auth_type(\n &auth::V2AdminApiAuth,"
|
| 38 |
+
},
|
| 39 |
+
"commit_sha": "c27425869cb155e3f2502baaa3da34cbfa859bce"
|
| 40 |
+
},
|
| 41 |
+
{
|
| 42 |
+
"id": "crates/router/src/routes/profiles.rs::function::profiles_list_at_profile_level",
|
| 43 |
+
"file": "crates/router/src/routes/profiles.rs",
|
| 44 |
+
"kind": "function_item",
|
| 45 |
+
"status": "modified",
|
| 46 |
+
"code_changed": true,
|
| 47 |
+
"imports_changed": false,
|
| 48 |
+
"before_code": "pub async fn profiles_list_at_profile_level(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantId>,\n) -> HttpResponse {\n let flow = Flow::ProfileList;\n let merchant_id = path.into_inner();\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n merchant_id.clone(),\n |state, auth, merchant_id, _| {\n list_profile(\n state,\n merchant_id,\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::HeaderAuth(auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone())),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,\n required_permission: permissions::Permission::ProfileAccountRead,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 49 |
+
"after_code": "pub async fn profiles_list_at_profile_level(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantId>,\n) -> HttpResponse {\n let flow = Flow::ProfileList;\n let merchant_id = path.into_inner();\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n merchant_id.clone(),\n |state, auth, _, _| {\n list_profile(\n state,\n auth.merchant_account.get_id().clone(),\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone()),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,\n required_permission: permissions::Permission::ProfileAccountRead,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 50 |
+
"diff_span": {
|
| 51 |
+
"before": " &req,\n merchant_id.clone(),\n |state, auth, merchant_id, _| {\n list_profile(\n state,\n merchant_id,\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::HeaderAuth(auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone())),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,",
|
| 52 |
+
"after": " &req,\n merchant_id.clone(),\n |state, auth, _, _| {\n list_profile(\n state,\n auth.merchant_account.get_id().clone(),\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone()),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,"
|
| 53 |
+
},
|
| 54 |
+
"commit_sha": "c27425869cb155e3f2502baaa3da34cbfa859bce"
|
| 55 |
+
},
|
| 56 |
+
{
|
| 57 |
+
"id": "crates/router/src/core/admin.rs::function::retrieve_profile",
|
| 58 |
+
"file": "crates/router/src/core/admin.rs",
|
| 59 |
+
"kind": "function_item",
|
| 60 |
+
"status": "modified",
|
| 61 |
+
"code_changed": true,
|
| 62 |
+
"imports_changed": false,
|
| 63 |
+
"before_code": "pub async fn retrieve_profile(\n state: SessionState,\n profile_id: id_type::ProfileId,\n key_store: domain::MerchantKeyStore,\n) -> RouterResponse<api_models::admin::ProfileResponse> {\n let db = state.store.as_ref();\n\n let business_profile = db\n .find_business_profile_by_profile_id(&(&state).into(), &key_store, &profile_id)\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n Ok(service_api::ApplicationResponse::Json(\n api_models::admin::ProfileResponse::foreign_try_from(business_profile)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse business profile details\")?,\n ))\n}",
|
| 64 |
+
"after_code": "pub async fn retrieve_profile(\n state: SessionState,\n profile_id: id_type::ProfileId,\n merchant_id: id_type::MerchantId,\n key_store: domain::MerchantKeyStore,\n) -> RouterResponse<api_models::admin::ProfileResponse> {\n let db = state.store.as_ref();\n\n let business_profile = db\n .find_business_profile_by_merchant_id_profile_id(\n &(&state).into(),\n &key_store,\n &merchant_id,\n &profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n Ok(service_api::ApplicationResponse::Json(\n api_models::admin::ProfileResponse::foreign_try_from(business_profile)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse business profile details\")?,\n ))\n}",
|
| 65 |
+
"diff_span": {
|
| 66 |
+
"before": "\n let business_profile = db\n .find_business_profile_by_profile_id(&(&state).into(), &key_store, &profile_id)\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {",
|
| 67 |
+
"after": " state: SessionState,\n profile_id: id_type::ProfileId,\n merchant_id: id_type::MerchantId,\n key_store: domain::MerchantKeyStore,\n) -> RouterResponse<api_models::admin::ProfileResponse> {\n let db = state.store.as_ref();\n\n let business_profile = db\n .find_business_profile_by_merchant_id_profile_id(\n &(&state).into(),\n &key_store,\n &merchant_id,\n &profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {"
|
| 68 |
+
},
|
| 69 |
+
"commit_sha": "c27425869cb155e3f2502baaa3da34cbfa859bce"
|
| 70 |
+
},
|
| 71 |
+
{
|
| 72 |
+
"id": "crates/router/src/routes/admin.rs::function::connector_list",
|
| 73 |
+
"file": "crates/router/src/routes/admin.rs",
|
| 74 |
+
"kind": "function_item",
|
| 75 |
+
"status": "modified",
|
| 76 |
+
"code_changed": true,
|
| 77 |
+
"imports_changed": false,
|
| 78 |
+
"before_code": "pub async fn connector_list(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantId>,\n) -> HttpResponse {\n let flow = Flow::MerchantConnectorsList;\n let merchant_id = path.into_inner();\n\n api::server_wrap(\n flow,\n state,\n &req,\n merchant_id.to_owned(),\n |state, _auth, merchant_id, _| list_payment_connectors(state, merchant_id, None),\n auth::auth_type(\n &auth::HeaderAuth(auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone())),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,\n required_permission: Permission::MerchantConnectorRead,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n )\n .await\n}",
|
| 79 |
+
"after_code": "pub async fn connector_list(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantId>,\n) -> HttpResponse {\n let flow = Flow::MerchantConnectorsList;\n let merchant_id = path.into_inner();\n\n api::server_wrap(\n flow,\n state,\n &req,\n merchant_id.to_owned(),\n |state, auth, _, _| {\n list_payment_connectors(state, auth.merchant_account.get_id().clone(), None)\n },\n auth::auth_type(\n &auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone()),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,\n required_permission: Permission::MerchantConnectorRead,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n )\n .await\n}",
|
| 80 |
+
"diff_span": {
|
| 81 |
+
"before": " &req,\n merchant_id.to_owned(),\n |state, _auth, merchant_id, _| list_payment_connectors(state, merchant_id, None),\n auth::auth_type(\n &auth::HeaderAuth(auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone())),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,",
|
| 82 |
+
"after": " &req,\n merchant_id.to_owned(),\n |state, auth, _, _| {\n list_payment_connectors(state, auth.merchant_account.get_id().clone(), None)\n },\n auth::auth_type(\n &auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone()),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,"
|
| 83 |
+
},
|
| 84 |
+
"commit_sha": "c27425869cb155e3f2502baaa3da34cbfa859bce"
|
| 85 |
+
},
|
| 86 |
+
{
|
| 87 |
+
"id": "crates/router/src/routes/profiles.rs::function::payment_connector_list_profile",
|
| 88 |
+
"file": "crates/router/src/routes/profiles.rs",
|
| 89 |
+
"kind": "function_item",
|
| 90 |
+
"status": "modified",
|
| 91 |
+
"code_changed": true,
|
| 92 |
+
"imports_changed": false,
|
| 93 |
+
"before_code": "pub async fn payment_connector_list_profile(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantId>,\n) -> HttpResponse {\n let flow = Flow::MerchantConnectorsList;\n let merchant_id = path.into_inner();\n\n api::server_wrap(\n flow,\n state,\n &req,\n merchant_id.to_owned(),\n |state, auth, merchant_id, _| {\n list_payment_connectors(\n state,\n merchant_id,\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::HeaderAuth(auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone())),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,\n required_permission: permissions::Permission::ProfileConnectorRead,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n )\n .await\n}",
|
| 94 |
+
"after_code": "pub async fn payment_connector_list_profile(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantId>,\n) -> HttpResponse {\n let flow = Flow::MerchantConnectorsList;\n let merchant_id = path.into_inner();\n\n api::server_wrap(\n flow,\n state,\n &req,\n merchant_id.to_owned(),\n |state, auth, _, _| {\n list_payment_connectors(\n state,\n auth.merchant_account.get_id().clone(),\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone()),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,\n required_permission: permissions::Permission::ProfileConnectorRead,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n )\n .await\n}",
|
| 95 |
+
"diff_span": {
|
| 96 |
+
"before": " &req,\n merchant_id.to_owned(),\n |state, auth, merchant_id, _| {\n list_payment_connectors(\n state,\n merchant_id,\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::HeaderAuth(auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone())),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,",
|
| 97 |
+
"after": " &req,\n merchant_id.to_owned(),\n |state, auth, _, _| {\n list_payment_connectors(\n state,\n auth.merchant_account.get_id().clone(),\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone()),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,"
|
| 98 |
+
},
|
| 99 |
+
"commit_sha": "c27425869cb155e3f2502baaa3da34cbfa859bce"
|
| 100 |
+
},
|
| 101 |
+
{
|
| 102 |
+
"id": "crates/router/src/routes/admin.rs::function::connector_list_profile",
|
| 103 |
+
"file": "crates/router/src/routes/admin.rs",
|
| 104 |
+
"kind": "function_item",
|
| 105 |
+
"status": "modified",
|
| 106 |
+
"code_changed": true,
|
| 107 |
+
"imports_changed": false,
|
| 108 |
+
"before_code": "pub async fn connector_list_profile(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantId>,\n) -> HttpResponse {\n let flow = Flow::MerchantConnectorsList;\n let merchant_id = path.into_inner();\n\n api::server_wrap(\n flow,\n state,\n &req,\n merchant_id.to_owned(),\n |state, auth, merchant_id, _| {\n list_payment_connectors(\n state,\n merchant_id,\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::HeaderAuth(auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone())),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,\n required_permission: Permission::ProfileConnectorRead,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n )\n .await\n}",
|
| 109 |
+
"after_code": "pub async fn connector_list_profile(\n state: web::Data<AppState>,\n req: HttpRequest,\n path: web::Path<common_utils::id_type::MerchantId>,\n) -> HttpResponse {\n let flow = Flow::MerchantConnectorsList;\n let merchant_id = path.into_inner();\n\n api::server_wrap(\n flow,\n state,\n &req,\n merchant_id.to_owned(),\n |state, auth, _, _| {\n list_payment_connectors(\n state,\n auth.merchant_account.get_id().clone(),\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone()),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,\n required_permission: Permission::ProfileConnectorRead,\n },\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n )\n .await\n}",
|
| 110 |
+
"diff_span": {
|
| 111 |
+
"before": " &req,\n merchant_id.to_owned(),\n |state, auth, merchant_id, _| {\n list_payment_connectors(\n state,\n merchant_id,\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::HeaderAuth(auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone())),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,",
|
| 112 |
+
"after": " &req,\n merchant_id.to_owned(),\n |state, auth, _, _| {\n list_payment_connectors(\n state,\n auth.merchant_account.get_id().clone(),\n auth.profile_id.map(|profile_id| vec![profile_id]),\n )\n },\n auth::auth_type(\n &auth::ApiKeyAuthWithMerchantIdFromRoute(merchant_id.clone()),\n &auth::JWTAuthMerchantFromRoute {\n merchant_id,"
|
| 113 |
+
},
|
| 114 |
+
"commit_sha": "c27425869cb155e3f2502baaa3da34cbfa859bce"
|
| 115 |
+
},
|
| 116 |
+
{
|
| 117 |
+
"id": "crates/router/src/core/admin.rs::function::update_connector",
|
| 118 |
+
"file": "crates/router/src/core/admin.rs",
|
| 119 |
+
"kind": "function_item",
|
| 120 |
+
"status": "modified",
|
| 121 |
+
"code_changed": true,
|
| 122 |
+
"imports_changed": false,
|
| 123 |
+
"before_code": "pub async fn update_connector(\n state: SessionState,\n merchant_id: &id_type::MerchantId,\n profile_id: Option<id_type::ProfileId>,\n merchant_connector_id: &id_type::MerchantConnectorAccountId,\n req: api_models::admin::MerchantConnectorUpdate,\n) -> RouterResponse<api_models::admin::MerchantConnectorResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let key_store = db\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n merchant_id,\n &db.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let merchant_account = db\n .find_merchant_account_by_merchant_id(key_manager_state, merchant_id, &key_store)\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let mca = req\n .clone()\n .get_merchant_connector_account_from_id(\n db,\n merchant_id,\n merchant_connector_id,\n &key_store,\n key_manager_state,\n )\n .await?;\n core_utils::validate_profile_id_from_auth_layer(profile_id, &mca)?;\n\n let merchant_context = domain::MerchantContext::NormalMerchant(Box::new(domain::Context(\n merchant_account.clone(),\n key_store.clone(),\n )));\n let payment_connector = req\n .clone()\n .create_domain_model_from_request(&state, &mca, key_manager_state, &merchant_context)\n .await?;\n\n // Profile id should always be present\n let profile_id = mca.profile_id.clone();\n\n let request_connector_label = req.connector_label;\n\n let updated_mca = db\n .update_merchant_connector_account(\n key_manager_state,\n mca.clone(),\n payment_connector.into(),\n &key_store,\n )\n .await\n .change_context(\n errors::ApiErrorResponse::DuplicateMerchantConnectorAccount {\n profile_id: profile_id.get_string_repr().to_owned(),\n connector_label: request_connector_label.unwrap_or_default(),\n },\n )\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating MerchantConnectorAccount: id: {merchant_connector_id:?}\",\n\n )\n })?;\n\n // redact cgraph cache on connector updation\n redact_cgraph_cache(&state, merchant_id, &profile_id).await?;\n\n // redact routing cache on connector updation\n #[cfg(feature = \"v1\")]\n let merchant_config = MerchantDefaultConfigUpdate {\n routable_connector: &Some(\n common_enums::RoutableConnectors::from_str(&mca.connector_name).map_err(|_| {\n errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector_name\",\n }\n })?,\n ),\n merchant_connector_id: &mca.get_id(),\n store: db,\n merchant_id,\n profile_id: &mca.profile_id,\n transaction_type: &mca.connector_type.into(),\n };\n\n #[cfg(feature = \"v1\")]\n if req.disabled.unwrap_or(false) {\n merchant_config\n .retrieve_and_delete_from_default_fallback_routing_algorithm_if_routable_connector_exists()\n .await?;\n } else {\n merchant_config\n .retrieve_and_update_default_fallback_routing_algorithm_if_routable_connector_exists()\n .await?;\n }\n\n let response = updated_mca.foreign_try_into()?;\n\n Ok(service_api::ApplicationResponse::Json(response))\n}",
|
| 124 |
+
"after_code": "pub async fn update_connector(\n state: SessionState,\n merchant_id: id_type::MerchantId,\n profile_id: Option<id_type::ProfileId>,\n merchant_connector_id: &id_type::MerchantConnectorAccountId,\n req: api_models::admin::MerchantConnectorUpdate,\n) -> RouterResponse<api_models::admin::MerchantConnectorResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let key_store = db\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &merchant_id,\n &db.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let merchant_account = db\n .find_merchant_account_by_merchant_id(key_manager_state, &merchant_id, &key_store)\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let mca = req\n .clone()\n .get_merchant_connector_account_from_id(\n db,\n &merchant_id,\n merchant_connector_id,\n &key_store,\n key_manager_state,\n )\n .await?;\n core_utils::validate_profile_id_from_auth_layer(profile_id, &mca)?;\n\n let merchant_context = domain::MerchantContext::NormalMerchant(Box::new(domain::Context(\n merchant_account.clone(),\n key_store.clone(),\n )));\n let payment_connector = req\n .clone()\n .create_domain_model_from_request(&state, &mca, key_manager_state, &merchant_context)\n .await?;\n\n // Profile id should always be present\n let profile_id = mca.profile_id.clone();\n\n let request_connector_label = req.connector_label;\n\n let updated_mca = db\n .update_merchant_connector_account(\n key_manager_state,\n mca.clone(),\n payment_connector.into(),\n &key_store,\n )\n .await\n .change_context(\n errors::ApiErrorResponse::DuplicateMerchantConnectorAccount {\n profile_id: profile_id.get_string_repr().to_owned(),\n connector_label: request_connector_label.unwrap_or_default(),\n },\n )\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating MerchantConnectorAccount: id: {merchant_connector_id:?}\",\n\n )\n })?;\n\n // redact cgraph cache on connector updation\n redact_cgraph_cache(&state, &merchant_id, &profile_id).await?;\n\n // redact routing cache on connector updation\n #[cfg(feature = \"v1\")]\n let merchant_config = MerchantDefaultConfigUpdate {\n routable_connector: &Some(\n common_enums::RoutableConnectors::from_str(&mca.connector_name).map_err(|_| {\n errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector_name\",\n }\n })?,\n ),\n merchant_connector_id: &mca.get_id(),\n store: db,\n merchant_id: &merchant_id,\n profile_id: &mca.profile_id,\n transaction_type: &mca.connector_type.into(),\n };\n\n #[cfg(feature = \"v1\")]\n if req.disabled.unwrap_or(false) {\n merchant_config\n .retrieve_and_delete_from_default_fallback_routing_algorithm_if_routable_connector_exists()\n .await?;\n } else {\n merchant_config\n .retrieve_and_update_default_fallback_routing_algorithm_if_routable_connector_exists()\n .await?;\n }\n\n let response = updated_mca.foreign_try_into()?;\n\n Ok(service_api::ApplicationResponse::Json(response))\n}",
|
| 125 |
+
"diff_span": {
|
| 126 |
+
"before": "pub async fn update_connector(\n state: SessionState,\n merchant_id: &id_type::MerchantId,\n profile_id: Option<id_type::ProfileId>,\n merchant_connector_id: &id_type::MerchantConnectorAccountId,\n req: api_models::admin::MerchantConnectorUpdate,\n) -> RouterResponse<api_models::admin::MerchantConnectorResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let key_store = db\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n merchant_id,\n &db.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let merchant_account = db\n .find_merchant_account_by_merchant_id(key_manager_state, merchant_id, &key_store)\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let mca = req\n .clone()\n .get_merchant_connector_account_from_id(\n db,\n merchant_id,\n merchant_connector_id,\n &key_store,\n key_manager_state,\n )\n .await?;\n core_utils::validate_profile_id_from_auth_layer(profile_id, &mca)?;\n\n let merchant_context = domain::MerchantContext::NormalMerchant(Box::new(domain::Context(\n merchant_account.clone(),\n key_store.clone(),\n )));\n let payment_connector = req\n .clone()\n .create_domain_model_from_request(&state, &mca, key_manager_state, &merchant_context)\n .await?;\n\n // Profile id should always be present\n let profile_id = mca.profile_id.clone();\n\n let request_connector_label = req.connector_label;\n\n let updated_mca = db\n .update_merchant_connector_account(\n key_manager_state,\n mca.clone(),\n payment_connector.into(),\n &key_store,\n )\n .await\n .change_context(\n errors::ApiErrorResponse::DuplicateMerchantConnectorAccount {\n profile_id: profile_id.get_string_repr().to_owned(),\n connector_label: request_connector_label.unwrap_or_default(),\n },\n )\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating MerchantConnectorAccount: id: {merchant_connector_id:?}\",\n\n )\n })?;\n\n // redact cgraph cache on connector updation\n redact_cgraph_cache(&state, merchant_id, &profile_id).await?;\n\n // redact routing cache on connector updation\n #[cfg(feature = \"v1\")]\n let merchant_config = MerchantDefaultConfigUpdate {\n routable_connector: &Some(\n common_enums::RoutableConnectors::from_str(&mca.connector_name).map_err(|_| {\n errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector_name\",\n }\n })?,\n ),\n merchant_connector_id: &mca.get_id(),\n store: db,\n merchant_id,\n profile_id: &mca.profile_id,\n transaction_type: &mca.connector_type.into(),",
|
| 127 |
+
"after": "pub async fn update_connector(\n state: SessionState,\n merchant_id: id_type::MerchantId,\n profile_id: Option<id_type::ProfileId>,\n merchant_connector_id: &id_type::MerchantConnectorAccountId,\n req: api_models::admin::MerchantConnectorUpdate,\n) -> RouterResponse<api_models::admin::MerchantConnectorResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let key_store = db\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &merchant_id,\n &db.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let merchant_account = db\n .find_merchant_account_by_merchant_id(key_manager_state, &merchant_id, &key_store)\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let mca = req\n .clone()\n .get_merchant_connector_account_from_id(\n db,\n &merchant_id,\n merchant_connector_id,\n &key_store,\n key_manager_state,\n )\n .await?;\n core_utils::validate_profile_id_from_auth_layer(profile_id, &mca)?;\n\n let merchant_context = domain::MerchantContext::NormalMerchant(Box::new(domain::Context(\n merchant_account.clone(),\n key_store.clone(),\n )));\n let payment_connector = req\n .clone()\n .create_domain_model_from_request(&state, &mca, key_manager_state, &merchant_context)\n .await?;\n\n // Profile id should always be present\n let profile_id = mca.profile_id.clone();\n\n let request_connector_label = req.connector_label;\n\n let updated_mca = db\n .update_merchant_connector_account(\n key_manager_state,\n mca.clone(),\n payment_connector.into(),\n &key_store,\n )\n .await\n .change_context(\n errors::ApiErrorResponse::DuplicateMerchantConnectorAccount {\n profile_id: profile_id.get_string_repr().to_owned(),\n connector_label: request_connector_label.unwrap_or_default(),\n },\n )\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating MerchantConnectorAccount: id: {merchant_connector_id:?}\",\n\n )\n })?;\n\n // redact cgraph cache on connector updation\n redact_cgraph_cache(&state, &merchant_id, &profile_id).await?;\n\n // redact routing cache on connector updation\n #[cfg(feature = \"v1\")]\n let merchant_config = MerchantDefaultConfigUpdate {\n routable_connector: &Some(\n common_enums::RoutableConnectors::from_str(&mca.connector_name).map_err(|_| {\n errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector_name\",\n }\n })?,\n ),\n merchant_connector_id: &mca.get_id(),\n store: db,\n merchant_id: &merchant_id,\n profile_id: &mca.profile_id,\n transaction_type: &mca.connector_type.into(),"
|
| 128 |
+
},
|
| 129 |
+
"commit_sha": "c27425869cb155e3f2502baaa3da34cbfa859bce"
|
| 130 |
+
},
|
| 131 |
+
{
|
| 132 |
+
"id": "crates/router/src/core/connector_onboarding/paypal.rs::function::update_mca",
|
| 133 |
+
"file": "crates/router/src/core/connector_onboarding/paypal.rs",
|
| 134 |
+
"kind": "function_item",
|
| 135 |
+
"status": "modified",
|
| 136 |
+
"code_changed": true,
|
| 137 |
+
"imports_changed": false,
|
| 138 |
+
"before_code": "pub async fn update_mca(\n state: &SessionState,\n merchant_id: common_utils::id_type::MerchantId,\n connector_id: common_utils::id_type::MerchantConnectorAccountId,\n auth_details: oss_types::ConnectorAuthType,\n) -> RouterResult<oss_api_types::MerchantConnectorResponse> {\n let connector_auth_json = auth_details\n .encode_to_value()\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error while deserializing connector_account_details\")?;\n #[cfg(feature = \"v1\")]\n let request = MerchantConnectorUpdate {\n connector_type: common_enums::ConnectorType::PaymentProcessor,\n connector_account_details: Some(Secret::new(connector_auth_json)),\n disabled: Some(false),\n status: Some(common_enums::ConnectorStatus::Active),\n connector_label: None,\n payment_methods_enabled: None,\n metadata: None,\n frm_configs: None,\n connector_webhook_details: None,\n pm_auth_config: None,\n test_mode: None,\n additional_merchant_data: None,\n connector_wallets_details: None,\n };\n #[cfg(feature = \"v2\")]\n let request = MerchantConnectorUpdate {\n connector_type: common_enums::ConnectorType::PaymentProcessor,\n connector_account_details: Some(Secret::new(connector_auth_json)),\n disabled: Some(false),\n status: Some(common_enums::ConnectorStatus::Active),\n connector_label: None,\n payment_methods_enabled: None,\n metadata: None,\n frm_configs: None,\n connector_webhook_details: None,\n pm_auth_config: None,\n merchant_id: merchant_id.clone(),\n additional_merchant_data: None,\n connector_wallets_details: None,\n feature_metadata: None,\n };\n let mca_response =\n admin::update_connector(state.clone(), &merchant_id, None, &connector_id, request).await?;\n\n match mca_response {\n ApplicationResponse::Json(mca_data) => Ok(mca_data),\n _ => Err(ApiErrorResponse::InternalServerError.into()),\n }\n}",
|
| 139 |
+
"after_code": "pub async fn update_mca(\n state: &SessionState,\n merchant_id: common_utils::id_type::MerchantId,\n connector_id: common_utils::id_type::MerchantConnectorAccountId,\n auth_details: oss_types::ConnectorAuthType,\n) -> RouterResult<oss_api_types::MerchantConnectorResponse> {\n let connector_auth_json = auth_details\n .encode_to_value()\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error while deserializing connector_account_details\")?;\n #[cfg(feature = \"v1\")]\n let request = MerchantConnectorUpdate {\n connector_type: common_enums::ConnectorType::PaymentProcessor,\n connector_account_details: Some(Secret::new(connector_auth_json)),\n disabled: Some(false),\n status: Some(common_enums::ConnectorStatus::Active),\n connector_label: None,\n payment_methods_enabled: None,\n metadata: None,\n frm_configs: None,\n connector_webhook_details: None,\n pm_auth_config: None,\n test_mode: None,\n additional_merchant_data: None,\n connector_wallets_details: None,\n };\n #[cfg(feature = \"v2\")]\n let request = MerchantConnectorUpdate {\n connector_type: common_enums::ConnectorType::PaymentProcessor,\n connector_account_details: Some(Secret::new(connector_auth_json)),\n disabled: Some(false),\n status: Some(common_enums::ConnectorStatus::Active),\n connector_label: None,\n payment_methods_enabled: None,\n metadata: None,\n frm_configs: None,\n connector_webhook_details: None,\n pm_auth_config: None,\n merchant_id: merchant_id.clone(),\n additional_merchant_data: None,\n connector_wallets_details: None,\n feature_metadata: None,\n };\n let mca_response =\n admin::update_connector(state.clone(), merchant_id, None, &connector_id, request).await?;\n\n match mca_response {\n ApplicationResponse::Json(mca_data) => Ok(mca_data),\n _ => Err(ApiErrorResponse::InternalServerError.into()),\n }\n}",
|
| 140 |
+
"diff_span": {
|
| 141 |
+
"before": " };\n let mca_response =\n admin::update_connector(state.clone(), &merchant_id, None, &connector_id, request).await?;\n\n match mca_response {",
|
| 142 |
+
"after": " };\n let mca_response =\n admin::update_connector(state.clone(), merchant_id, None, &connector_id, request).await?;\n\n match mca_response {"
|
| 143 |
+
},
|
| 144 |
+
"commit_sha": "c27425869cb155e3f2502baaa3da34cbfa859bce"
|
| 145 |
+
}
|
| 146 |
+
]
|
| 147 |
+
}
|
diffs/pr_10071/1bb2d15/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "1bb2d1528059264764506594f495079900dfe29c",
|
| 3 |
+
"pr_number": 10071,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10071/d540635/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "d540635be3083b098163ff789a436d6901939121",
|
| 3 |
+
"pr_number": 10071,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10071/df6d9cd/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "df6d9cdaf7f74757725a6862c7528d6bb942d8d7",
|
| 3 |
+
"pr_number": 10071,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10138/544521b/diff.json
ADDED
|
@@ -0,0 +1,115 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "544521b80b1a37e6a07db68212c60d814daffa4b",
|
| 3 |
+
"pr_number": 10138,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/payjustnow.rs",
|
| 6 |
+
"crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::impl::PayjustnowRefundRequest",
|
| 11 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
|
| 12 |
+
"kind": "impl_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "impl<F> TryFrom<&RefundsRouterData<F>> for PayjustnowRefundRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.request.refund_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),\n refund_amount_cents: item.request.minor_refund_amount,\n refund_description: item\n .request\n .reason\n .clone()\n .unwrap_or(NO_REFUND_REASON.to_string()),\n })\n }\n}",
|
| 17 |
+
"after_code": "impl<F> TryFrom<&RefundsRouterData<F>> for PayjustnowRefundRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.connector_request_reference_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),\n refund_amount_cents: item.request.minor_refund_amount,\n refund_description: item\n .request\n .reason\n .clone()\n .unwrap_or(NO_REFUND_REASON.to_string()),\n })\n }\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.request.refund_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),",
|
| 20 |
+
"after": " fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.connector_request_reference_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "544521b80b1a37e6a07db68212c60d814daffa4b"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::PayjustnowRefundRequest::function::try_from",
|
| 26 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
|
| 27 |
+
"kind": "function_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.request.refund_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),\n refund_amount_cents: item.request.minor_refund_amount,\n refund_description: item\n .request\n .reason\n .clone()\n .unwrap_or(NO_REFUND_REASON.to_string()),\n })\n }",
|
| 32 |
+
"after_code": "fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.connector_request_reference_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),\n refund_amount_cents: item.request.minor_refund_amount,\n refund_description: item\n .request\n .reason\n .clone()\n .unwrap_or(NO_REFUND_REASON.to_string()),\n })\n }",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": "fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.request.refund_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),",
|
| 35 |
+
"after": "fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.connector_request_reference_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "544521b80b1a37e6a07db68212c60d814daffa4b"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payjustnow.rs::Payjustnow::function::build_error_response",
|
| 41 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payjustnow.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "fn build_error_response(\n &self,\n res: Response,\n event_builder: Option<&mut ConnectorEvent>,\n ) -> CustomResult<ErrorResponse, errors::ConnectorError> {\n let response: payjustnow::PayjustnowErrorResponse = res\n .response\n .parse_struct(\"PayjustnowErrorResponse\")\n .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;\n\n event_builder.map(|i| i.set_response_body(&response));\n router_env::logger::info!(connector_response=?response);\n\n Ok(ErrorResponse {\n status_code: res.status_code,\n code: hyperswitch_interfaces::consts::NO_ERROR_CODE.to_string(),\n message: response.message,\n reason: None,\n attempt_status: None,\n connector_transaction_id: None,\n network_advice_code: None,\n network_decline_code: None,\n network_error_message: None,\n connector_metadata: None,\n })\n }",
|
| 47 |
+
"after_code": "fn build_error_response(\n &self,\n res: Response,\n event_builder: Option<&mut ConnectorEvent>,\n ) -> CustomResult<ErrorResponse, errors::ConnectorError> {\n let response: payjustnow::PayjustnowErrorResponse = res\n .response\n .parse_struct(\"PayjustnowErrorResponse\")\n .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;\n\n event_builder.map(|i| i.set_response_body(&response));\n router_env::logger::info!(connector_response=?response);\n\n let message = match response {\n payjustnow::PayjustnowErrorResponse::Structured(error) => error.message,\n payjustnow::PayjustnowErrorResponse::Message(message) => message,\n };\n\n Ok(ErrorResponse {\n status_code: res.status_code,\n code: hyperswitch_interfaces::consts::NO_ERROR_CODE.to_string(),\n message,\n reason: None,\n attempt_status: None,\n connector_transaction_id: None,\n network_advice_code: None,\n network_decline_code: None,\n network_error_message: None,\n connector_metadata: None,\n })\n }",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " status_code: res.status_code,\n code: hyperswitch_interfaces::consts::NO_ERROR_CODE.to_string(),\n message: response.message,\n reason: None,\n attempt_status: None,",
|
| 50 |
+
"after": " router_env::logger::info!(connector_response=?response);\n\n let message = match response {\n payjustnow::PayjustnowErrorResponse::Structured(error) => error.message,\n payjustnow::PayjustnowErrorResponse::Message(message) => message,\n };\n\n Ok(ErrorResponse {\n status_code: res.status_code,\n code: hyperswitch_interfaces::consts::NO_ERROR_CODE.to_string(),\n message,\n reason: None,\n attempt_status: None,"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "544521b80b1a37e6a07db68212c60d814daffa4b"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::impl::PayjustnowPaymentsRequest",
|
| 56 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
|
| 57 |
+
"kind": "impl_item",
|
| 58 |
+
"status": "modified",
|
| 59 |
+
"code_changed": true,
|
| 60 |
+
"imports_changed": false,
|
| 61 |
+
"before_code": "impl TryFrom<&PayjustnowRouterData<&PaymentsAuthorizeRouterData>> for PayjustnowPaymentsRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: &PayjustnowRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n let router_data = item.router_data;\n let order_items = router_data\n .request\n .order_details\n .as_ref()\n .map(|order_details| {\n order_details\n .iter()\n .map(|order| {\n Ok(OrderItem {\n name: order.product_name.clone(),\n sku: order.product_id.clone().unwrap_or_default(),\n quantity: u32::from(order.quantity),\n price_cents: order.amount,\n })\n })\n .collect::<Result<Vec<OrderItem>, errors::ConnectorError>>()\n })\n .transpose()?;\n\n let customer = router_data\n .get_optional_billing_email()\n .or_else(|| item.router_data.request.email.clone())\n .map(|email| Customer {\n first_name: router_data.get_optional_billing_first_name(),\n last_name: router_data.get_optional_billing_last_name(),\n email,\n phone_number: router_data.get_optional_billing_phone_number(),\n });\n\n let billing_address = Some(Address {\n address_line1: router_data.get_optional_billing_line1(),\n address_line2: router_data.get_optional_billing_line2(),\n city: router_data.get_optional_billing_city(),\n province: router_data.get_optional_billing_state(),\n postal_code: item.router_data.get_optional_billing_zip(),\n });\n\n let shipping_address = Some(Address {\n address_line1: item.router_data.get_optional_shipping_line1(),\n address_line2: item.router_data.get_optional_shipping_line2(),\n city: item.router_data.get_optional_shipping_city(),\n province: item.router_data.get_optional_shipping_state(),\n postal_code: item.router_data.get_optional_shipping_zip(),\n });\n\n let router_return_url = item.router_data.request.get_router_return_url()?;\n\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.payment_id.clone()),\n merchant_order_reference: router_data.connector_request_reference_id.clone(),\n order_amount_cents: item.amount,\n order_items,\n customer,\n billing_address,\n shipping_address,\n confirm_redirect_url: router_return_url.clone(),\n cancel_redirect_url: router_return_url,\n };\n\n Ok(Self {\n payjustnow: payjustnow_request,\n checkout_total_cents: item.amount,\n })\n }\n}",
|
| 62 |
+
"after_code": "impl TryFrom<&PayjustnowRouterData<&PaymentsAuthorizeRouterData>> for PayjustnowPaymentsRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: &PayjustnowRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n let router_data = item.router_data;\n let order_items = router_data\n .request\n .order_details\n .as_ref()\n .map(|order_details| {\n order_details\n .iter()\n .map(|order| {\n Ok(OrderItem {\n name: order.product_name.clone(),\n sku: order.product_id.clone().unwrap_or_default(),\n quantity: u32::from(order.quantity),\n price_cents: order.amount,\n })\n })\n .collect::<Result<Vec<OrderItem>, errors::ConnectorError>>()\n })\n .transpose()?;\n\n let customer = router_data\n .get_optional_billing_email()\n .or_else(|| item.router_data.request.email.clone())\n .map(|email| Customer {\n first_name: router_data.get_optional_billing_first_name(),\n last_name: router_data.get_optional_billing_last_name(),\n email,\n phone_number: router_data.get_optional_billing_phone_number(),\n });\n\n let billing_address = Some(Address {\n address_line1: router_data.get_optional_billing_line1(),\n address_line2: router_data.get_optional_billing_line2(),\n city: router_data.get_optional_billing_city(),\n province: router_data.get_optional_billing_state(),\n postal_code: item.router_data.get_optional_billing_zip(),\n });\n\n let shipping_address = Some(Address {\n address_line1: item.router_data.get_optional_shipping_line1(),\n address_line2: item.router_data.get_optional_shipping_line2(),\n city: item.router_data.get_optional_shipping_city(),\n province: item.router_data.get_optional_shipping_state(),\n postal_code: item.router_data.get_optional_shipping_zip(),\n });\n\n let router_return_url = item.router_data.request.get_router_return_url()?;\n\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.connector_request_reference_id.clone()),\n merchant_order_reference: item\n .router_data\n .request\n .merchant_order_reference_id\n .clone()\n .unwrap_or(item.router_data.payment_id.clone()),\n order_amount_cents: item.amount,\n order_items,\n customer,\n billing_address,\n shipping_address,\n confirm_redirect_url: router_return_url.clone(),\n cancel_redirect_url: router_return_url,\n };\n\n Ok(Self {\n payjustnow: payjustnow_request,\n checkout_total_cents: item.amount,\n })\n }\n}",
|
| 63 |
+
"diff_span": {
|
| 64 |
+
"before": "\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.payment_id.clone()),\n merchant_order_reference: router_data.connector_request_reference_id.clone(),\n order_amount_cents: item.amount,\n order_items,",
|
| 65 |
+
"after": "\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.connector_request_reference_id.clone()),\n merchant_order_reference: item\n .router_data\n .request\n .merchant_order_reference_id\n .clone()\n .unwrap_or(item.router_data.payment_id.clone()),\n order_amount_cents: item.amount,\n order_items,"
|
| 66 |
+
},
|
| 67 |
+
"commit_sha": "544521b80b1a37e6a07db68212c60d814daffa4b"
|
| 68 |
+
},
|
| 69 |
+
{
|
| 70 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::PayjustnowPaymentsRequest::function::try_from",
|
| 71 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
|
| 72 |
+
"kind": "function_item",
|
| 73 |
+
"status": "modified",
|
| 74 |
+
"code_changed": true,
|
| 75 |
+
"imports_changed": false,
|
| 76 |
+
"before_code": "fn try_from(\n item: &PayjustnowRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n let router_data = item.router_data;\n let order_items = router_data\n .request\n .order_details\n .as_ref()\n .map(|order_details| {\n order_details\n .iter()\n .map(|order| {\n Ok(OrderItem {\n name: order.product_name.clone(),\n sku: order.product_id.clone().unwrap_or_default(),\n quantity: u32::from(order.quantity),\n price_cents: order.amount,\n })\n })\n .collect::<Result<Vec<OrderItem>, errors::ConnectorError>>()\n })\n .transpose()?;\n\n let customer = router_data\n .get_optional_billing_email()\n .or_else(|| item.router_data.request.email.clone())\n .map(|email| Customer {\n first_name: router_data.get_optional_billing_first_name(),\n last_name: router_data.get_optional_billing_last_name(),\n email,\n phone_number: router_data.get_optional_billing_phone_number(),\n });\n\n let billing_address = Some(Address {\n address_line1: router_data.get_optional_billing_line1(),\n address_line2: router_data.get_optional_billing_line2(),\n city: router_data.get_optional_billing_city(),\n province: router_data.get_optional_billing_state(),\n postal_code: item.router_data.get_optional_billing_zip(),\n });\n\n let shipping_address = Some(Address {\n address_line1: item.router_data.get_optional_shipping_line1(),\n address_line2: item.router_data.get_optional_shipping_line2(),\n city: item.router_data.get_optional_shipping_city(),\n province: item.router_data.get_optional_shipping_state(),\n postal_code: item.router_data.get_optional_shipping_zip(),\n });\n\n let router_return_url = item.router_data.request.get_router_return_url()?;\n\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.payment_id.clone()),\n merchant_order_reference: router_data.connector_request_reference_id.clone(),\n order_amount_cents: item.amount,\n order_items,\n customer,\n billing_address,\n shipping_address,\n confirm_redirect_url: router_return_url.clone(),\n cancel_redirect_url: router_return_url,\n };\n\n Ok(Self {\n payjustnow: payjustnow_request,\n checkout_total_cents: item.amount,\n })\n }",
|
| 77 |
+
"after_code": "fn try_from(\n item: &PayjustnowRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n let router_data = item.router_data;\n let order_items = router_data\n .request\n .order_details\n .as_ref()\n .map(|order_details| {\n order_details\n .iter()\n .map(|order| {\n Ok(OrderItem {\n name: order.product_name.clone(),\n sku: order.product_id.clone().unwrap_or_default(),\n quantity: u32::from(order.quantity),\n price_cents: order.amount,\n })\n })\n .collect::<Result<Vec<OrderItem>, errors::ConnectorError>>()\n })\n .transpose()?;\n\n let customer = router_data\n .get_optional_billing_email()\n .or_else(|| item.router_data.request.email.clone())\n .map(|email| Customer {\n first_name: router_data.get_optional_billing_first_name(),\n last_name: router_data.get_optional_billing_last_name(),\n email,\n phone_number: router_data.get_optional_billing_phone_number(),\n });\n\n let billing_address = Some(Address {\n address_line1: router_data.get_optional_billing_line1(),\n address_line2: router_data.get_optional_billing_line2(),\n city: router_data.get_optional_billing_city(),\n province: router_data.get_optional_billing_state(),\n postal_code: item.router_data.get_optional_billing_zip(),\n });\n\n let shipping_address = Some(Address {\n address_line1: item.router_data.get_optional_shipping_line1(),\n address_line2: item.router_data.get_optional_shipping_line2(),\n city: item.router_data.get_optional_shipping_city(),\n province: item.router_data.get_optional_shipping_state(),\n postal_code: item.router_data.get_optional_shipping_zip(),\n });\n\n let router_return_url = item.router_data.request.get_router_return_url()?;\n\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.connector_request_reference_id.clone()),\n merchant_order_reference: item\n .router_data\n .request\n .merchant_order_reference_id\n .clone()\n .unwrap_or(item.router_data.payment_id.clone()),\n order_amount_cents: item.amount,\n order_items,\n customer,\n billing_address,\n shipping_address,\n confirm_redirect_url: router_return_url.clone(),\n cancel_redirect_url: router_return_url,\n };\n\n Ok(Self {\n payjustnow: payjustnow_request,\n checkout_total_cents: item.amount,\n })\n }",
|
| 78 |
+
"diff_span": {
|
| 79 |
+
"before": "\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.payment_id.clone()),\n merchant_order_reference: router_data.connector_request_reference_id.clone(),\n order_amount_cents: item.amount,\n order_items,",
|
| 80 |
+
"after": "\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.connector_request_reference_id.clone()),\n merchant_order_reference: item\n .router_data\n .request\n .merchant_order_reference_id\n .clone()\n .unwrap_or(item.router_data.payment_id.clone()),\n order_amount_cents: item.amount,\n order_items,"
|
| 81 |
+
},
|
| 82 |
+
"commit_sha": "544521b80b1a37e6a07db68212c60d814daffa4b"
|
| 83 |
+
},
|
| 84 |
+
{
|
| 85 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::struct::PayjustnowError",
|
| 86 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
|
| 87 |
+
"kind": "struct_item",
|
| 88 |
+
"status": "added",
|
| 89 |
+
"before_code": null,
|
| 90 |
+
"after_code": "pub struct PayjustnowError {\n pub message: String,\n}",
|
| 91 |
+
"diff_span": null,
|
| 92 |
+
"commit_sha": "544521b80b1a37e6a07db68212c60d814daffa4b"
|
| 93 |
+
},
|
| 94 |
+
{
|
| 95 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::enum::PayjustnowErrorResponse",
|
| 96 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
|
| 97 |
+
"kind": "enum_item",
|
| 98 |
+
"status": "added",
|
| 99 |
+
"before_code": null,
|
| 100 |
+
"after_code": "pub enum PayjustnowErrorResponse {\n Structured(PayjustnowError),\n Message(String),\n}",
|
| 101 |
+
"diff_span": null,
|
| 102 |
+
"commit_sha": "544521b80b1a37e6a07db68212c60d814daffa4b"
|
| 103 |
+
},
|
| 104 |
+
{
|
| 105 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::struct::PayjustnowErrorResponse",
|
| 106 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
|
| 107 |
+
"kind": "struct_item",
|
| 108 |
+
"status": "removed",
|
| 109 |
+
"before_code": "pub struct PayjustnowErrorResponse {\n pub code: String,\n pub message: String,\n pub reason: Option<String>,\n}",
|
| 110 |
+
"after_code": null,
|
| 111 |
+
"diff_span": null,
|
| 112 |
+
"commit_sha": "544521b80b1a37e6a07db68212c60d814daffa4b"
|
| 113 |
+
}
|
| 114 |
+
]
|
| 115 |
+
}
|
diffs/pr_10162/0b3886d/diff.json
ADDED
|
@@ -0,0 +1,159 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "0b3886d8f2a6c57d5a67dc59f4e05d9c7e180801",
|
| 3 |
+
"pr_number": 10162,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/ephemeral_key.rs",
|
| 6 |
+
"crates/api_models/src/tokenization.rs",
|
| 7 |
+
"crates/common_enums/src/enums/accounts.rs",
|
| 8 |
+
"crates/common_enums/src/enums/payments.rs",
|
| 9 |
+
"crates/common_utils/src/crypto.rs",
|
| 10 |
+
"crates/common_utils/src/payout_method_utils.rs",
|
| 11 |
+
"crates/connector_configs/src/connector.rs",
|
| 12 |
+
"crates/diesel_models/src/authentication.rs",
|
| 13 |
+
"crates/diesel_models/src/query/utils.rs",
|
| 14 |
+
"crates/diesel_models/src/tokenization.rs",
|
| 15 |
+
"crates/external_services/src/crm.rs",
|
| 16 |
+
"crates/external_services/src/grpc_client.rs",
|
| 17 |
+
"crates/external_services/src/grpc_client/dynamic_routing.rs",
|
| 18 |
+
"crates/hyperswitch_connectors/src/connectors/amazonpay.rs",
|
| 19 |
+
"crates/hyperswitch_connectors/src/connectors/authipay/transformers.rs",
|
| 20 |
+
"crates/hyperswitch_connectors/src/connectors/nmi.rs",
|
| 21 |
+
"crates/hyperswitch_connectors/src/connectors/payjustnow.rs",
|
| 22 |
+
"crates/hyperswitch_connectors/src/connectors/riskified/transformers/auth.rs",
|
| 23 |
+
"crates/hyperswitch_connectors/src/connectors/signifyd/transformers/auth.rs",
|
| 24 |
+
"crates/hyperswitch_connectors/src/connectors/stripe/transformers/connect.rs",
|
| 25 |
+
"crates/hyperswitch_connectors/src/connectors/trustpayments/transformers.rs",
|
| 26 |
+
"crates/hyperswitch_domain_models/src/connector_endpoints.rs",
|
| 27 |
+
"crates/hyperswitch_domain_models/src/router_request_types/fraud_check.rs",
|
| 28 |
+
"crates/hyperswitch_domain_models/src/routing.rs",
|
| 29 |
+
"crates/hyperswitch_domain_models/src/tokenization.rs",
|
| 30 |
+
"crates/hyperswitch_domain_models/src/vault.rs",
|
| 31 |
+
"crates/openapi/src/routes/subscriptions.rs",
|
| 32 |
+
"crates/router/src/consts/user.rs",
|
| 33 |
+
"crates/router/src/core/payments.rs",
|
| 34 |
+
"crates/router/src/core/payments/access_token.rs",
|
| 35 |
+
"crates/router/src/core/payments/operations/payment_cancel.rs",
|
| 36 |
+
"crates/router/src/core/payments/operations/payment_cancel_post_capture.rs",
|
| 37 |
+
"crates/router/src/core/payments/operations/payment_cancel_v2.rs",
|
| 38 |
+
"crates/router/src/core/payments/operations/payment_reject.rs",
|
| 39 |
+
"crates/router/src/core/payments/operations/payment_response.rs",
|
| 40 |
+
"crates/router/src/core/payments/operations/payments_extend_authorization.rs",
|
| 41 |
+
"crates/router/src/core/payouts.rs",
|
| 42 |
+
"crates/router/src/core/pm_auth.rs",
|
| 43 |
+
"crates/router/src/core/tokenization.rs",
|
| 44 |
+
"crates/router/src/core/webhooks/outgoing_v2.rs",
|
| 45 |
+
"crates/router/src/db/relay.rs",
|
| 46 |
+
"crates/router/src/routes/refunds.rs",
|
| 47 |
+
"crates/router/src/routes/tokenization.rs",
|
| 48 |
+
"crates/router/src/services/kafka/payment_intent.rs",
|
| 49 |
+
"crates/router/src/types/api/poll.rs",
|
| 50 |
+
"crates/router/tests/connectors/authipay.rs"
|
| 51 |
+
],
|
| 52 |
+
"diffs": [
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/router/tests/connectors/authipay.rs::function::should_make_payment",
|
| 55 |
+
"file": "crates/router/tests/connectors/authipay.rs",
|
| 56 |
+
"kind": "function_item",
|
| 57 |
+
"status": "modified",
|
| 58 |
+
"code_changed": true,
|
| 59 |
+
"imports_changed": false,
|
| 60 |
+
"before_code": "async fn should_make_payment() {\n let authorize_response = CONNECTOR.make_payment(payment_method_details(), get_default_payment_info()).await.unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n}",
|
| 61 |
+
"after_code": "async fn should_make_payment() {\n let authorize_response = CONNECTOR\n .make_payment(payment_method_details(), get_default_payment_info())\n .await\n .unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n}",
|
| 62 |
+
"diff_span": {
|
| 63 |
+
"before": "async fn should_make_payment() {\n let authorize_response = CONNECTOR.make_payment(payment_method_details(), get_default_payment_info()).await.unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n}",
|
| 64 |
+
"after": "async fn should_make_payment() {\n let authorize_response = CONNECTOR\n .make_payment(payment_method_details(), get_default_payment_info())\n .await\n .unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n}"
|
| 65 |
+
},
|
| 66 |
+
"commit_sha": "0b3886d8f2a6c57d5a67dc59f4e05d9c7e180801"
|
| 67 |
+
},
|
| 68 |
+
{
|
| 69 |
+
"id": "crates/router/tests/connectors/authipay.rs::function::should_refund_manually_captured_payment",
|
| 70 |
+
"file": "crates/router/tests/connectors/authipay.rs",
|
| 71 |
+
"kind": "function_item",
|
| 72 |
+
"status": "modified",
|
| 73 |
+
"code_changed": true,
|
| 74 |
+
"imports_changed": false,
|
| 75 |
+
"before_code": "async fn should_refund_manually_captured_payment() {\n let response = CONNECTOR\n .capture_payment_and_refund(payment_method_details(), None, None, get_default_payment_info())\n .await\n .unwrap();\n assert_eq!(\n response.response.unwrap().refund_status,\n enums::RefundStatus::Success,\n );\n}",
|
| 76 |
+
"after_code": "async fn should_refund_manually_captured_payment() {\n let response = CONNECTOR\n .capture_payment_and_refund(\n payment_method_details(),\n None,\n None,\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(\n response.response.unwrap().refund_status,\n enums::RefundStatus::Success,\n );\n}",
|
| 77 |
+
"diff_span": {
|
| 78 |
+
"before": "async fn should_refund_manually_captured_payment() {\n let response = CONNECTOR\n .capture_payment_and_refund(payment_method_details(), None, None, get_default_payment_info())\n .await\n .unwrap();",
|
| 79 |
+
"after": "async fn should_refund_manually_captured_payment() {\n let response = CONNECTOR\n .capture_payment_and_refund(\n payment_method_details(),\n None,\n None,\n get_default_payment_info(),\n )\n .await\n .unwrap();"
|
| 80 |
+
},
|
| 81 |
+
"commit_sha": "0b3886d8f2a6c57d5a67dc59f4e05d9c7e180801"
|
| 82 |
+
},
|
| 83 |
+
{
|
| 84 |
+
"id": "crates/router/tests/connectors/authipay.rs::function::should_fail_void_payment_for_auto_capture",
|
| 85 |
+
"file": "crates/router/tests/connectors/authipay.rs",
|
| 86 |
+
"kind": "function_item",
|
| 87 |
+
"status": "modified",
|
| 88 |
+
"code_changed": true,
|
| 89 |
+
"imports_changed": false,
|
| 90 |
+
"before_code": "async fn should_fail_void_payment_for_auto_capture() {\n let authorize_response = CONNECTOR.make_payment(payment_method_details(), get_default_payment_info()).await.unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n let txn_id = utils::get_connector_transaction_id(authorize_response.response);\n assert_ne!(txn_id, None, \"Empty connector transaction id\");\n let void_response = CONNECTOR\n .void_payment(txn_id.unwrap(), None, get_default_payment_info())\n .await\n .unwrap();\n assert_eq!(\n void_response.response.unwrap_err().message,\n \"You cannot cancel this PaymentIntent because it has a status of succeeded.\"\n );\n}",
|
| 91 |
+
"after_code": "async fn should_fail_void_payment_for_auto_capture() {\n let authorize_response = CONNECTOR\n .make_payment(payment_method_details(), get_default_payment_info())\n .await\n .unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n let txn_id = utils::get_connector_transaction_id(authorize_response.response);\n assert_ne!(txn_id, None, \"Empty connector transaction id\");\n let void_response = CONNECTOR\n .void_payment(txn_id.unwrap(), None, get_default_payment_info())\n .await\n .unwrap();\n assert_eq!(\n void_response.response.unwrap_err().message,\n \"You cannot cancel this PaymentIntent because it has a status of succeeded.\"\n );\n}",
|
| 92 |
+
"diff_span": {
|
| 93 |
+
"before": "async fn should_fail_void_payment_for_auto_capture() {\n let authorize_response = CONNECTOR.make_payment(payment_method_details(), get_default_payment_info()).await.unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n let txn_id = utils::get_connector_transaction_id(authorize_response.response);",
|
| 94 |
+
"after": "async fn should_fail_void_payment_for_auto_capture() {\n let authorize_response = CONNECTOR\n .make_payment(payment_method_details(), get_default_payment_info())\n .await\n .unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n let txn_id = utils::get_connector_transaction_id(authorize_response.response);"
|
| 95 |
+
},
|
| 96 |
+
"commit_sha": "0b3886d8f2a6c57d5a67dc59f4e05d9c7e180801"
|
| 97 |
+
},
|
| 98 |
+
{
|
| 99 |
+
"id": "crates/router/tests/connectors/authipay.rs::impl::AuthipayTest",
|
| 100 |
+
"file": "crates/router/tests/connectors/authipay.rs",
|
| 101 |
+
"kind": "impl_item",
|
| 102 |
+
"status": "modified",
|
| 103 |
+
"code_changed": true,
|
| 104 |
+
"imports_changed": false,
|
| 105 |
+
"before_code": "impl utils::Connector for AuthipayTest {\n fn get_data(&self) -> api::ConnectorData {\n use router::connector::Authipay;\n api::ConnectorData {\n connector: Box::new(Authipay::new()),\n connector_name: types::Connector::Authipay,\n get_token: types::api::GetToken::Connector,\n merchant_connector_id: None,\n }\n }\n\n fn get_auth_token(&self) -> types::ConnectorAuthType {\n utils::to_connector_auth_type(\n connector_auth::ConnectorAuthentication::new()\n .authipay\n .expect(\"Missing connector authentication configuration\").into(),\n )\n }\n\n fn get_name(&self) -> String {\n \"authipay\".to_string()\n }\n}",
|
| 106 |
+
"after_code": "impl utils::Connector for AuthipayTest {\n fn get_data(&self) -> api::ConnectorData {\n use router::connector::Authipay;\n api::ConnectorData {\n connector: Box::new(Authipay::new()),\n connector_name: types::Connector::Authipay,\n get_token: types::api::GetToken::Connector,\n merchant_connector_id: None,\n }\n }\n\n fn get_auth_token(&self) -> types::ConnectorAuthType {\n utils::to_connector_auth_type(\n connector_auth::ConnectorAuthentication::new()\n .authipay\n .expect(\"Missing connector authentication configuration\")\n .into(),\n )\n }\n\n fn get_name(&self) -> String {\n \"authipay\".to_string()\n }\n}",
|
| 107 |
+
"diff_span": {
|
| 108 |
+
"before": " connector_auth::ConnectorAuthentication::new()\n .authipay\n .expect(\"Missing connector authentication configuration\").into(),\n )\n }",
|
| 109 |
+
"after": " connector_auth::ConnectorAuthentication::new()\n .authipay\n .expect(\"Missing connector authentication configuration\")\n .into(),\n )\n }"
|
| 110 |
+
},
|
| 111 |
+
"commit_sha": "0b3886d8f2a6c57d5a67dc59f4e05d9c7e180801"
|
| 112 |
+
},
|
| 113 |
+
{
|
| 114 |
+
"id": "crates/router/tests/connectors/authipay.rs::function::should_sync_manually_captured_refund",
|
| 115 |
+
"file": "crates/router/tests/connectors/authipay.rs",
|
| 116 |
+
"kind": "function_item",
|
| 117 |
+
"status": "modified",
|
| 118 |
+
"code_changed": true,
|
| 119 |
+
"imports_changed": false,
|
| 120 |
+
"before_code": "async fn should_sync_manually_captured_refund() {\n let refund_response = CONNECTOR\n .capture_payment_and_refund(payment_method_details(), None, None, get_default_payment_info())\n .await\n .unwrap();\n let response = CONNECTOR\n .rsync_retry_till_status_matches(\n enums::RefundStatus::Success,\n refund_response.response.unwrap().connector_refund_id,\n None,\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(\n response.response.unwrap().refund_status,\n enums::RefundStatus::Success,\n );\n}",
|
| 121 |
+
"after_code": "async fn should_sync_manually_captured_refund() {\n let refund_response = CONNECTOR\n .capture_payment_and_refund(\n payment_method_details(),\n None,\n None,\n get_default_payment_info(),\n )\n .await\n .unwrap();\n let response = CONNECTOR\n .rsync_retry_till_status_matches(\n enums::RefundStatus::Success,\n refund_response.response.unwrap().connector_refund_id,\n None,\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(\n response.response.unwrap().refund_status,\n enums::RefundStatus::Success,\n );\n}",
|
| 122 |
+
"diff_span": {
|
| 123 |
+
"before": "async fn should_sync_manually_captured_refund() {\n let refund_response = CONNECTOR\n .capture_payment_and_refund(payment_method_details(), None, None, get_default_payment_info())\n .await\n .unwrap();",
|
| 124 |
+
"after": "async fn should_sync_manually_captured_refund() {\n let refund_response = CONNECTOR\n .capture_payment_and_refund(\n payment_method_details(),\n None,\n None,\n get_default_payment_info(),\n )\n .await\n .unwrap();"
|
| 125 |
+
},
|
| 126 |
+
"commit_sha": "0b3886d8f2a6c57d5a67dc59f4e05d9c7e180801"
|
| 127 |
+
},
|
| 128 |
+
{
|
| 129 |
+
"id": "crates/router/tests/connectors/authipay.rs::AuthipayTest::function::get_auth_token",
|
| 130 |
+
"file": "crates/router/tests/connectors/authipay.rs",
|
| 131 |
+
"kind": "function_item",
|
| 132 |
+
"status": "modified",
|
| 133 |
+
"code_changed": true,
|
| 134 |
+
"imports_changed": false,
|
| 135 |
+
"before_code": "fn get_auth_token(&self) -> types::ConnectorAuthType {\n utils::to_connector_auth_type(\n connector_auth::ConnectorAuthentication::new()\n .authipay\n .expect(\"Missing connector authentication configuration\").into(),\n )\n }",
|
| 136 |
+
"after_code": "fn get_auth_token(&self) -> types::ConnectorAuthType {\n utils::to_connector_auth_type(\n connector_auth::ConnectorAuthentication::new()\n .authipay\n .expect(\"Missing connector authentication configuration\")\n .into(),\n )\n }",
|
| 137 |
+
"diff_span": {
|
| 138 |
+
"before": " connector_auth::ConnectorAuthentication::new()\n .authipay\n .expect(\"Missing connector authentication configuration\").into(),\n )\n }",
|
| 139 |
+
"after": " connector_auth::ConnectorAuthentication::new()\n .authipay\n .expect(\"Missing connector authentication configuration\")\n .into(),\n )\n }"
|
| 140 |
+
},
|
| 141 |
+
"commit_sha": "0b3886d8f2a6c57d5a67dc59f4e05d9c7e180801"
|
| 142 |
+
},
|
| 143 |
+
{
|
| 144 |
+
"id": "crates/router/tests/connectors/authipay.rs::function::should_sync_auto_captured_payment",
|
| 145 |
+
"file": "crates/router/tests/connectors/authipay.rs",
|
| 146 |
+
"kind": "function_item",
|
| 147 |
+
"status": "modified",
|
| 148 |
+
"code_changed": true,
|
| 149 |
+
"imports_changed": false,
|
| 150 |
+
"before_code": "async fn should_sync_auto_captured_payment() {\n let authorize_response = CONNECTOR.make_payment(payment_method_details(), get_default_payment_info()).await.unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n let txn_id = utils::get_connector_transaction_id(authorize_response.response);\n assert_ne!(txn_id, None, \"Empty connector transaction id\");\n let response = CONNECTOR\n .psync_retry_till_status_matches(\n enums::AttemptStatus::Charged,\n Some(types::PaymentsSyncData {\n connector_transaction_id: types::ResponseId::ConnectorTransactionId(\n txn_id.unwrap(),\n ),\n capture_method: Some(enums::CaptureMethod::Automatic),\n ..Default::default()\n }),\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(response.status, enums::AttemptStatus::Charged,);\n}",
|
| 151 |
+
"after_code": "async fn should_sync_auto_captured_payment() {\n let authorize_response = CONNECTOR\n .make_payment(payment_method_details(), get_default_payment_info())\n .await\n .unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n let txn_id = utils::get_connector_transaction_id(authorize_response.response);\n assert_ne!(txn_id, None, \"Empty connector transaction id\");\n let response = CONNECTOR\n .psync_retry_till_status_matches(\n enums::AttemptStatus::Charged,\n Some(types::PaymentsSyncData {\n connector_transaction_id: types::ResponseId::ConnectorTransactionId(\n txn_id.unwrap(),\n ),\n capture_method: Some(enums::CaptureMethod::Automatic),\n ..Default::default()\n }),\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(response.status, enums::AttemptStatus::Charged,);\n}",
|
| 152 |
+
"diff_span": {
|
| 153 |
+
"before": "async fn should_sync_auto_captured_payment() {\n let authorize_response = CONNECTOR.make_payment(payment_method_details(), get_default_payment_info()).await.unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n let txn_id = utils::get_connector_transaction_id(authorize_response.response);",
|
| 154 |
+
"after": "async fn should_sync_auto_captured_payment() {\n let authorize_response = CONNECTOR\n .make_payment(payment_method_details(), get_default_payment_info())\n .await\n .unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Charged);\n let txn_id = utils::get_connector_transaction_id(authorize_response.response);"
|
| 155 |
+
},
|
| 156 |
+
"commit_sha": "0b3886d8f2a6c57d5a67dc59f4e05d9c7e180801"
|
| 157 |
+
}
|
| 158 |
+
]
|
| 159 |
+
}
|
diffs/pr_10162/38e59dd/diff.json
ADDED
|
@@ -0,0 +1,86 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "38e59dd13fd37cbd08dc67894e5d24709ea0e082",
|
| 3 |
+
"pr_number": 10162,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/external_services/build.rs",
|
| 6 |
+
"crates/masking/tests/basic.rs",
|
| 7 |
+
"crates/router_env/tests/logger.rs"
|
| 8 |
+
],
|
| 9 |
+
"diffs": [
|
| 10 |
+
{
|
| 11 |
+
"id": "crates/external_services/build.rs::function::main",
|
| 12 |
+
"file": "crates/external_services/build.rs",
|
| 13 |
+
"kind": "function_item",
|
| 14 |
+
"status": "modified",
|
| 15 |
+
"code_changed": true,
|
| 16 |
+
"imports_changed": false,
|
| 17 |
+
"before_code": "fn main() -> Result<(), Box<dyn std::error::Error>> {\n // Compilation for revenue recovery protos\n #[cfg(feature = \"revenue_recovery\")]\n {\n let proto_base_path = router_env::workspace_path().join(\"proto\");\n let out_dir = std::path::PathBuf::from(std::env::var(\"OUT_DIR\")?);\n let recovery_proto_files = [proto_base_path.join(\"recovery_decider.proto\")];\n tonic_build::configure()\n .out_dir(&out_dir)\n .compile_well_known_types(true)\n .extern_path(\".google.protobuf.Timestamp\", \"::prost_types::Timestamp\")\n .compile_protos(&recovery_proto_files, &[&proto_base_path])\n .expect(\"Failed to compile revenue-recovery proto files\");\n }\n\n // Compilation for dynamic_routing protos\n #[cfg(feature = \"dynamic_routing\")]\n {\n // Get the directory of the current crate\n let proto_path = router_env::workspace_path().join(\"proto\");\n let success_rate_proto_file = proto_path.join(\"success_rate.proto\");\n let contract_routing_proto_file = proto_path.join(\"contract_routing.proto\");\n let elimination_proto_file = proto_path.join(\"elimination_rate.proto\");\n let health_check_proto_file = proto_path.join(\"health_check.proto\");\n let out_dir = std::path::PathBuf::from(std::env::var(\"OUT_DIR\")?);\n\n // Compile the .proto file\n tonic_build::configure()\n .out_dir(out_dir)\n .compile_protos(\n &[\n success_rate_proto_file,\n health_check_proto_file,\n elimination_proto_file,\n contract_routing_proto_file,\n ],\n &[proto_path],\n )\n .expect(\"Failed to compile proto files\");\n }\n Ok(())\n}",
|
| 18 |
+
"after_code": "fn main() -> Result<(), Box<dyn std::error::Error>> {\n // Compilation for revenue recovery protos\n #[cfg(feature = \"revenue_recovery\")]\n {\n let proto_base_path = router_env::workspace_path().join(\"proto\");\n let out_dir = std::path::PathBuf::from(std::env::var(\"OUT_DIR\")?);\n let recovery_proto_files = [proto_base_path.join(\"recovery_decider.proto\")];\n\n #[allow(clippy::expect_used, clippy::unwrap_in_result)]\n tonic_build::configure()\n .out_dir(&out_dir)\n .compile_well_known_types(true)\n .extern_path(\".google.protobuf.Timestamp\", \"::prost_types::Timestamp\")\n .compile_protos(&recovery_proto_files, &[&proto_base_path])\n .expect(\"Failed to compile revenue-recovery proto files\");\n }\n\n // Compilation for dynamic_routing protos\n #[cfg(feature = \"dynamic_routing\")]\n {\n // Get the directory of the current crate\n let proto_path = router_env::workspace_path().join(\"proto\");\n let success_rate_proto_file = proto_path.join(\"success_rate.proto\");\n let contract_routing_proto_file = proto_path.join(\"contract_routing.proto\");\n let elimination_proto_file = proto_path.join(\"elimination_rate.proto\");\n let health_check_proto_file = proto_path.join(\"health_check.proto\");\n let out_dir = std::path::PathBuf::from(std::env::var(\"OUT_DIR\")?);\n\n // Compile the .proto file\n #[allow(clippy::expect_used, clippy::unwrap_in_result)]\n tonic_build::configure()\n .out_dir(out_dir)\n .compile_protos(\n &[\n success_rate_proto_file,\n health_check_proto_file,\n elimination_proto_file,\n contract_routing_proto_file,\n ],\n &[proto_path],\n )\n .expect(\"Failed to compile proto files\");\n }\n Ok(())\n}",
|
| 19 |
+
"diff_span": {
|
| 20 |
+
"before": "",
|
| 21 |
+
"after": " let out_dir = std::path::PathBuf::from(std::env::var(\"OUT_DIR\")?);\n let recovery_proto_files = [proto_base_path.join(\"recovery_decider.proto\")];\n\n #[allow(clippy::expect_used, clippy::unwrap_in_result)]\n tonic_build::configure()\n .out_dir(&out_dir)\n .compile_well_known_types(true)\n .extern_path(\".google.protobuf.Timestamp\", \"::prost_types::Timestamp\")\n .compile_protos(&recovery_proto_files, &[&proto_base_path])\n .expect(\"Failed to compile revenue-recovery proto files\");\n }\n\n // Compilation for dynamic_routing protos\n #[cfg(feature = \"dynamic_routing\")]\n {\n // Get the directory of the current crate\n let proto_path = router_env::workspace_path().join(\"proto\");\n let success_rate_proto_file = proto_path.join(\"success_rate.proto\");\n let contract_routing_proto_file = proto_path.join(\"contract_routing.proto\");\n let elimination_proto_file = proto_path.join(\"elimination_rate.proto\");\n let health_check_proto_file = proto_path.join(\"health_check.proto\");\n let out_dir = std::path::PathBuf::from(std::env::var(\"OUT_DIR\")?);\n\n // Compile the .proto file\n #[allow(clippy::expect_used, clippy::unwrap_in_result)]\n tonic_build::configure()\n .out_dir(out_dir)"
|
| 22 |
+
},
|
| 23 |
+
"commit_sha": "38e59dd13fd37cbd08dc67894e5d24709ea0e082"
|
| 24 |
+
},
|
| 25 |
+
{
|
| 26 |
+
"id": "crates/masking/tests/basic.rs::function::without_serialize",
|
| 27 |
+
"file": "crates/masking/tests/basic.rs",
|
| 28 |
+
"kind": "function_item",
|
| 29 |
+
"status": "modified",
|
| 30 |
+
"code_changed": true,
|
| 31 |
+
"imports_changed": false,
|
| 32 |
+
"before_code": "fn without_serialize() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct AccountNumber(String);\n\n #[cfg(feature = \"alloc\")]\n impl ZeroizableSecret for AccountNumber {\n fn zeroize(&mut self) {\n self.0.zeroize();\n }\n }\n\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct Composite {\n #[cfg_attr(feature = \"serde\", serde(skip))]\n secret_number: Secret<AccountNumber>,\n not_secret: String,\n }\n\n // construct\n\n let secret_number = Secret::<AccountNumber>::new(AccountNumber(\"abc\".to_string()));\n let not_secret = \"not secret\".to_string();\n let composite = Composite {\n secret_number,\n not_secret,\n };\n\n // format\n\n let got = format!(\"{composite:?}\");\n let exp = r#\"Composite { secret_number: *** basic::without_serialize::AccountNumber ***, not_secret: \"not secret\" }\"#;\n assert_eq!(got, exp);\n\n // serialize\n\n #[cfg(feature = \"serde\")]\n {\n let got = serde_json::to_string(&composite).unwrap();\n let exp = r#\"{\"not_secret\":\"not secret\"}\"#;\n assert_eq!(got, exp);\n }\n\n // end\n\n Ok(())\n}",
|
| 33 |
+
"after_code": "fn without_serialize() {\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct AccountNumber(String);\n\n #[cfg(feature = \"alloc\")]\n impl ZeroizableSecret for AccountNumber {\n fn zeroize(&mut self) {\n self.0.zeroize();\n }\n }\n\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct Composite {\n #[cfg_attr(feature = \"serde\", serde(skip))]\n secret_number: Secret<AccountNumber>,\n not_secret: String,\n }\n\n // construct\n\n let secret_number = Secret::<AccountNumber>::new(AccountNumber(\"abc\".to_string()));\n let not_secret = \"not secret\".to_string();\n let composite = Composite {\n secret_number,\n not_secret,\n };\n\n // format\n\n let got = format!(\"{composite:?}\");\n let exp = r#\"Composite { secret_number: *** basic::without_serialize::AccountNumber ***, not_secret: \"not secret\" }\"#;\n assert_eq!(got, exp);\n\n // serialize\n\n #[cfg(feature = \"serde\")]\n {\n let got = serde_json::to_string(&composite).unwrap();\n let exp = r#\"{\"not_secret\":\"not secret\"}\"#;\n assert_eq!(got, exp);\n }\n\n // end\n}",
|
| 34 |
+
"diff_span": {
|
| 35 |
+
"before": "fn without_serialize() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct AccountNumber(String);\n\n #[cfg(feature = \"alloc\")]\n impl ZeroizableSecret for AccountNumber {\n fn zeroize(&mut self) {\n self.0.zeroize();\n }\n }\n\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct Composite {\n #[cfg_attr(feature = \"serde\", serde(skip))]\n secret_number: Secret<AccountNumber>,\n not_secret: String,\n }\n\n // construct\n\n let secret_number = Secret::<AccountNumber>::new(AccountNumber(\"abc\".to_string()));\n let not_secret = \"not secret\".to_string();\n let composite = Composite {\n secret_number,\n not_secret,\n };\n\n // format\n\n let got = format!(\"{composite:?}\");\n let exp = r#\"Composite { secret_number: *** basic::without_serialize::AccountNumber ***, not_secret: \"not secret\" }\"#;\n assert_eq!(got, exp);\n\n // serialize\n\n #[cfg(feature = \"serde\")]\n {\n let got = serde_json::to_string(&composite).unwrap();\n let exp = r#\"{\"not_secret\":\"not secret\"}\"#;\n assert_eq!(got, exp);\n }\n\n // end\n\n Ok(())\n}",
|
| 36 |
+
"after": "fn without_serialize() {\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]"
|
| 37 |
+
},
|
| 38 |
+
"commit_sha": "38e59dd13fd37cbd08dc67894e5d24709ea0e082"
|
| 39 |
+
},
|
| 40 |
+
{
|
| 41 |
+
"id": "crates/masking/tests/basic.rs::function::basic",
|
| 42 |
+
"file": "crates/masking/tests/basic.rs",
|
| 43 |
+
"kind": "function_item",
|
| 44 |
+
"status": "modified",
|
| 45 |
+
"code_changed": true,
|
| 46 |
+
"imports_changed": false,
|
| 47 |
+
"before_code": "fn basic() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct AccountNumber(String);\n\n #[cfg(feature = \"alloc\")]\n impl ZeroizableSecret for AccountNumber {\n fn zeroize(&mut self) {\n self.0.zeroize();\n }\n }\n\n #[cfg(feature = \"serde\")]\n impl SerializableSecret for AccountNumber {}\n\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct Composite {\n secret_number: Secret<AccountNumber>,\n not_secret: String,\n }\n\n // construct\n\n let secret_number = Secret::<AccountNumber>::new(AccountNumber(\"abc\".to_string()));\n let not_secret = \"not secret\".to_string();\n let composite = Composite {\n secret_number,\n not_secret,\n };\n\n // clone\n #[allow(clippy::redundant_clone)] // We are asserting that the cloned value is equal\n let composite2 = composite.clone();\n assert_eq!(composite, composite2);\n\n // format\n\n let got = format!(\"{composite:?}\");\n let exp = r#\"Composite { secret_number: *** basic::basic::AccountNumber ***, not_secret: \"not secret\" }\"#;\n assert_eq!(got, exp);\n\n // serialize\n\n #[cfg(feature = \"serde\")]\n {\n let got = serde_json::to_string(&composite).unwrap();\n let exp = r#\"{\"secret_number\":\"abc\",\"not_secret\":\"not secret\"}\"#;\n assert_eq!(got, exp);\n }\n\n // end\n\n Ok(())\n}",
|
| 48 |
+
"after_code": "fn basic() {\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct AccountNumber(String);\n\n #[cfg(feature = \"alloc\")]\n impl ZeroizableSecret for AccountNumber {\n fn zeroize(&mut self) {\n self.0.zeroize();\n }\n }\n\n #[cfg(feature = \"serde\")]\n impl SerializableSecret for AccountNumber {}\n\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct Composite {\n secret_number: Secret<AccountNumber>,\n not_secret: String,\n }\n\n // construct\n\n let secret_number = Secret::<AccountNumber>::new(AccountNumber(\"abc\".to_string()));\n let not_secret = \"not secret\".to_string();\n let composite = Composite {\n secret_number,\n not_secret,\n };\n\n // clone\n #[allow(clippy::redundant_clone)] // We are asserting that the cloned value is equal\n let composite2 = composite.clone();\n assert_eq!(composite, composite2);\n\n // format\n\n let got = format!(\"{composite:?}\");\n let exp = r#\"Composite { secret_number: *** basic::basic::AccountNumber ***, not_secret: \"not secret\" }\"#;\n assert_eq!(got, exp);\n\n // serialize\n\n #[cfg(feature = \"serde\")]\n {\n let got = serde_json::to_string(&composite).unwrap();\n let exp = r#\"{\"secret_number\":\"abc\",\"not_secret\":\"not secret\"}\"#;\n assert_eq!(got, exp);\n }\n\n // end\n}",
|
| 49 |
+
"diff_span": {
|
| 50 |
+
"before": "fn basic() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct AccountNumber(String);\n\n #[cfg(feature = \"alloc\")]\n impl ZeroizableSecret for AccountNumber {\n fn zeroize(&mut self) {\n self.0.zeroize();\n }\n }\n\n #[cfg(feature = \"serde\")]\n impl SerializableSecret for AccountNumber {}\n\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct Composite {\n secret_number: Secret<AccountNumber>,\n not_secret: String,\n }\n\n // construct\n\n let secret_number = Secret::<AccountNumber>::new(AccountNumber(\"abc\".to_string()));\n let not_secret = \"not secret\".to_string();\n let composite = Composite {\n secret_number,\n not_secret,\n };\n\n // clone\n #[allow(clippy::redundant_clone)] // We are asserting that the cloned value is equal\n let composite2 = composite.clone();\n assert_eq!(composite, composite2);\n\n // format\n\n let got = format!(\"{composite:?}\");\n let exp = r#\"Composite { secret_number: *** basic::basic::AccountNumber ***, not_secret: \"not secret\" }\"#;\n assert_eq!(got, exp);\n\n // serialize\n\n #[cfg(feature = \"serde\")]\n {\n let got = serde_json::to_string(&composite).unwrap();\n let exp = r#\"{\"secret_number\":\"abc\",\"not_secret\":\"not secret\"}\"#;\n assert_eq!(got, exp);\n }\n\n // end\n\n Ok(())\n}",
|
| 51 |
+
"after": "fn basic() {\n #[cfg_attr(feature = \"serde\", derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]"
|
| 52 |
+
},
|
| 53 |
+
"commit_sha": "38e59dd13fd37cbd08dc67894e5d24709ea0e082"
|
| 54 |
+
},
|
| 55 |
+
{
|
| 56 |
+
"id": "crates/router_env/tests/logger.rs::function::logger",
|
| 57 |
+
"file": "crates/router_env/tests/logger.rs",
|
| 58 |
+
"kind": "function_item",
|
| 59 |
+
"status": "modified",
|
| 60 |
+
"code_changed": true,
|
| 61 |
+
"imports_changed": false,
|
| 62 |
+
"before_code": "fn logger() -> error_stack::Result<&'static TelemetryGuard, ConfigError> {\n use std::sync::OnceLock;\n\n static INSTANCE: OnceLock<TelemetryGuard> = OnceLock::new();\n Ok(INSTANCE.get_or_init(|| {\n let config = router_env::Config::new().unwrap();\n\n router_env::setup(&config.log, \"router_env_test\", []).unwrap()\n }))\n}",
|
| 63 |
+
"after_code": "fn logger() -> error_stack::Result<&'static TelemetryGuard, ConfigError> {\n use std::sync::OnceLock;\n\n static INSTANCE: OnceLock<TelemetryGuard> = OnceLock::new();\n\n #[allow(clippy::unwrap_used)]\n Ok(INSTANCE.get_or_init(|| {\n let config = router_env::Config::new().unwrap();\n\n router_env::setup(&config.log, \"router_env_test\", []).unwrap()\n }))\n}",
|
| 64 |
+
"diff_span": {
|
| 65 |
+
"before": "",
|
| 66 |
+
"after": "\n static INSTANCE: OnceLock<TelemetryGuard> = OnceLock::new();\n\n #[allow(clippy::unwrap_used)]\n Ok(INSTANCE.get_or_init(|| {\n let config = router_env::Config::new().unwrap();"
|
| 67 |
+
},
|
| 68 |
+
"commit_sha": "38e59dd13fd37cbd08dc67894e5d24709ea0e082"
|
| 69 |
+
},
|
| 70 |
+
{
|
| 71 |
+
"id": "crates/masking/tests/basic.rs::function::for_string",
|
| 72 |
+
"file": "crates/masking/tests/basic.rs",
|
| 73 |
+
"kind": "function_item",
|
| 74 |
+
"status": "modified",
|
| 75 |
+
"code_changed": true,
|
| 76 |
+
"imports_changed": false,
|
| 77 |
+
"before_code": "fn for_string() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {\n #[cfg_attr(all(feature = \"alloc\", feature = \"serde\"), derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct Composite {\n secret_number: Secret<String>,\n not_secret: String,\n }\n\n // construct\n\n let secret_number = Secret::<String>::new(\"abc\".to_string());\n let not_secret = \"not secret\".to_string();\n let composite = Composite {\n secret_number,\n not_secret,\n };\n\n // clone\n #[allow(clippy::redundant_clone)] // We are asserting that the cloned value is equal\n let composite2 = composite.clone();\n assert_eq!(composite, composite2);\n\n // format\n\n let got = format!(\"{composite:?}\");\n let exp =\n r#\"Composite { secret_number: *** alloc::string::String ***, not_secret: \"not secret\" }\"#;\n assert_eq!(got, exp);\n\n // serialize\n\n #[cfg(all(feature = \"alloc\", feature = \"serde\"))]\n {\n let got = serde_json::to_string(&composite).unwrap();\n let exp = r#\"{\"secret_number\":\"abc\",\"not_secret\":\"not secret\"}\"#;\n assert_eq!(got, exp);\n }\n\n // end\n\n Ok(())\n}",
|
| 78 |
+
"after_code": "fn for_string() {\n #[cfg_attr(all(feature = \"alloc\", feature = \"serde\"), derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct Composite {\n secret_number: Secret<String>,\n not_secret: String,\n }\n\n // construct\n\n let secret_number = Secret::<String>::new(\"abc\".to_string());\n let not_secret = \"not secret\".to_string();\n let composite = Composite {\n secret_number,\n not_secret,\n };\n\n // clone\n #[allow(clippy::redundant_clone)] // We are asserting that the cloned value is equal\n let composite2 = composite.clone();\n assert_eq!(composite, composite2);\n\n // format\n\n let got = format!(\"{composite:?}\");\n let exp =\n r#\"Composite { secret_number: *** alloc::string::String ***, not_secret: \"not secret\" }\"#;\n assert_eq!(got, exp);\n\n // serialize\n\n #[cfg(all(feature = \"alloc\", feature = \"serde\"))]\n {\n let got = serde_json::to_string(&composite).unwrap();\n let exp = r#\"{\"secret_number\":\"abc\",\"not_secret\":\"not secret\"}\"#;\n assert_eq!(got, exp);\n }\n\n // end\n}",
|
| 79 |
+
"diff_span": {
|
| 80 |
+
"before": "fn for_string() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {\n #[cfg_attr(all(feature = \"alloc\", feature = \"serde\"), derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]\n pub struct Composite {\n secret_number: Secret<String>,\n not_secret: String,\n }\n\n // construct\n\n let secret_number = Secret::<String>::new(\"abc\".to_string());\n let not_secret = \"not secret\".to_string();\n let composite = Composite {\n secret_number,\n not_secret,\n };\n\n // clone\n #[allow(clippy::redundant_clone)] // We are asserting that the cloned value is equal\n let composite2 = composite.clone();\n assert_eq!(composite, composite2);\n\n // format\n\n let got = format!(\"{composite:?}\");\n let exp =\n r#\"Composite { secret_number: *** alloc::string::String ***, not_secret: \"not secret\" }\"#;\n assert_eq!(got, exp);\n\n // serialize\n\n #[cfg(all(feature = \"alloc\", feature = \"serde\"))]\n {\n let got = serde_json::to_string(&composite).unwrap();\n let exp = r#\"{\"secret_number\":\"abc\",\"not_secret\":\"not secret\"}\"#;\n assert_eq!(got, exp);\n }\n\n // end\n\n Ok(())\n}",
|
| 81 |
+
"after": "fn for_string() {\n #[cfg_attr(all(feature = \"alloc\", feature = \"serde\"), derive(Serialize))]\n #[derive(Clone, Debug, PartialEq, Eq)]"
|
| 82 |
+
},
|
| 83 |
+
"commit_sha": "38e59dd13fd37cbd08dc67894e5d24709ea0e082"
|
| 84 |
+
}
|
| 85 |
+
]
|
| 86 |
+
}
|
diffs/pr_10162/c3f9846/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "c3f9846134dc4a1d335984942a31ce3aeeec661d",
|
| 3 |
+
"pr_number": 10162,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/cards/src/validate.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/cards/src/validate.rs::function::validate_card_number_chars",
|
| 10 |
+
"file": "crates/cards/src/validate.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub fn validate_card_number_chars(number: &str) -> Result<Vec<u8>, CardNumberValidationErr> {\n let data = number.chars().try_fold(\n Vec::with_capacity(MAX_CARD_NUMBER_LENGTH),\n |mut data, character| {\n data.push(\n #[allow(clippy::expect_used)]\n character\n .to_digit(10)\n .ok_or(CardNumberValidationErr(\n \"invalid character found in card number\",\n ))?\n .try_into()\n .expect(\"error while converting a single character to u8\"), // safety, a single character will never be greater `u8`\n );\n Ok::<Vec<u8>, CardNumberValidationErr>(data)\n },\n )?;\n\n Ok(data)\n}",
|
| 16 |
+
"after_code": "pub fn validate_card_number_chars(number: &str) -> Result<Vec<u8>, CardNumberValidationErr> {\n let data = number.chars().try_fold(\n Vec::with_capacity(MAX_CARD_NUMBER_LENGTH),\n |mut data, character| {\n data.push(\n #[allow(clippy::expect_used)]\n character\n .to_digit(10)\n .ok_or(CardNumberValidationErr(\n \"invalid character found in card number\",\n ))?\n .try_into()\n .expect(\"error while converting a single decimal digit to u8\"), // safety, a single decimal digit will never be greater `u8`\n );\n Ok::<Vec<u8>, CardNumberValidationErr>(data)\n },\n )?;\n\n Ok(data)\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " ))?\n .try_into()\n .expect(\"error while converting a single character to u8\"), // safety, a single character will never be greater `u8`\n );\n Ok::<Vec<u8>, CardNumberValidationErr>(data)",
|
| 19 |
+
"after": " ))?\n .try_into()\n .expect(\"error while converting a single decimal digit to u8\"), // safety, a single decimal digit will never be greater `u8`\n );\n Ok::<Vec<u8>, CardNumberValidationErr>(data)"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "c3f9846134dc4a1d335984942a31ce3aeeec661d"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10162/c98bc4c/diff.json
ADDED
|
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "c98bc4c64a085ac152b8aaa7d83f70d93819af83",
|
| 3 |
+
"pr_number": 10162,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/scheduler/src/consumer.rs",
|
| 6 |
+
"crates/scheduler/src/producer.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/scheduler/src/producer.rs::function::start_producer",
|
| 11 |
+
"file": "crates/scheduler/src/producer.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "pub async fn start_producer<T, U, F>(\n state: &T,\n scheduler_settings: Arc<SchedulerSettings>,\n (tx, mut rx): (mpsc::Sender<()>, mpsc::Receiver<()>),\n app_state_to_session_state: F,\n) -> CustomResult<(), errors::ProcessTrackerError>\nwhere\n F: Fn(&T, &id_type::TenantId) -> CustomResult<U, errors::ProcessTrackerError>,\n T: SchedulerAppState,\n U: SchedulerSessionState,\n{\n use std::time::Duration;\n\n use rand::distributions::{Distribution, Uniform};\n\n let mut rng = rand::thread_rng();\n\n // TODO: this can be removed once rand-0.9 is released\n // reference - https://github.com/rust-random/rand/issues/1326#issuecomment-1635331942\n #[allow(unknown_lints)]\n #[allow(clippy::unnecessary_fallible_conversions)]\n let timeout = Uniform::try_from(0..=scheduler_settings.loop_interval)\n .change_context(errors::ProcessTrackerError::ConfigurationError)?;\n\n tokio::time::sleep(Duration::from_millis(timeout.sample(&mut rng))).await;\n\n let mut interval =\n tokio::time::interval(Duration::from_millis(scheduler_settings.loop_interval));\n\n let mut shutdown_interval = tokio::time::interval(Duration::from_millis(\n scheduler_settings.graceful_shutdown_interval,\n ));\n\n let signal = common_utils::signals::get_allowed_signals()\n .map_err(|error| {\n logger::error!(\"Signal Handler Error: {:?}\", error);\n errors::ProcessTrackerError::ConfigurationError\n })\n .attach_printable(\"Failed while creating a signals handler\")?;\n let handle = signal.handle();\n let task_handle =\n tokio::spawn(common_utils::signals::signal_handler(signal, tx).in_current_span());\n\n loop {\n match rx.try_recv() {\n Err(mpsc::error::TryRecvError::Empty) => {\n interval.tick().await;\n let tenants = state.get_tenants();\n for tenant in tenants {\n let session_state = app_state_to_session_state(state, &tenant)?;\n match run_producer_flow(&session_state, &scheduler_settings).await {\n Ok(_) => (),\n Err(error) => {\n // Intentionally not propagating error to caller.\n // Any errors that occur in the producer flow must be handled here only, as\n // this is the topmost level function which is concerned with the producer flow.\n error!(?error);\n }\n }\n }\n }\n Ok(()) | Err(mpsc::error::TryRecvError::Disconnected) => {\n logger::debug!(\"Awaiting shutdown!\");\n rx.close();\n shutdown_interval.tick().await;\n logger::info!(\"Terminating producer\");\n break;\n }\n }\n }\n handle.close();\n task_handle\n .await\n .change_context(errors::ProcessTrackerError::UnexpectedFlow)?;\n\n Ok(())\n}",
|
| 17 |
+
"after_code": "pub async fn start_producer<T, U, F>(\n state: &T,\n scheduler_settings: Arc<SchedulerSettings>,\n (tx, mut rx): (mpsc::Sender<()>, mpsc::Receiver<()>),\n app_state_to_session_state: F,\n) -> CustomResult<(), errors::ProcessTrackerError>\nwhere\n F: Fn(&T, &id_type::TenantId) -> CustomResult<U, errors::ProcessTrackerError>,\n T: SchedulerAppState,\n U: SchedulerSessionState,\n{\n use std::time::Duration;\n\n use rand::distributions::{Distribution, Uniform};\n\n let mut rng = rand::thread_rng();\n\n // TODO: this can be removed once rand-0.9 is released\n // reference - https://github.com/rust-random/rand/issues/1326#issuecomment-1635331942\n #[allow(clippy::unnecessary_fallible_conversions)]\n let timeout = Uniform::try_from(0..=scheduler_settings.loop_interval)\n .change_context(errors::ProcessTrackerError::ConfigurationError)?;\n\n tokio::time::sleep(Duration::from_millis(timeout.sample(&mut rng))).await;\n\n let mut interval =\n tokio::time::interval(Duration::from_millis(scheduler_settings.loop_interval));\n\n let mut shutdown_interval = tokio::time::interval(Duration::from_millis(\n scheduler_settings.graceful_shutdown_interval,\n ));\n\n let signal = common_utils::signals::get_allowed_signals()\n .map_err(|error| {\n logger::error!(\"Signal Handler Error: {:?}\", error);\n errors::ProcessTrackerError::ConfigurationError\n })\n .attach_printable(\"Failed while creating a signals handler\")?;\n let handle = signal.handle();\n let task_handle =\n tokio::spawn(common_utils::signals::signal_handler(signal, tx).in_current_span());\n\n loop {\n match rx.try_recv() {\n Err(mpsc::error::TryRecvError::Empty) => {\n interval.tick().await;\n let tenants = state.get_tenants();\n for tenant in tenants {\n let session_state = app_state_to_session_state(state, &tenant)?;\n match run_producer_flow(&session_state, &scheduler_settings).await {\n Ok(_) => (),\n Err(error) => {\n // Intentionally not propagating error to caller.\n // Any errors that occur in the producer flow must be handled here only, as\n // this is the topmost level function which is concerned with the producer flow.\n error!(?error);\n }\n }\n }\n }\n Ok(()) | Err(mpsc::error::TryRecvError::Disconnected) => {\n logger::debug!(\"Awaiting shutdown!\");\n rx.close();\n shutdown_interval.tick().await;\n logger::info!(\"Terminating producer\");\n break;\n }\n }\n }\n handle.close();\n task_handle\n .await\n .change_context(errors::ProcessTrackerError::UnexpectedFlow)?;\n\n Ok(())\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " // TODO: this can be removed once rand-0.9 is released\n // reference - https://github.com/rust-random/rand/issues/1326#issuecomment-1635331942\n #[allow(unknown_lints)]\n #[allow(clippy::unnecessary_fallible_conversions)]\n let timeout = Uniform::try_from(0..=scheduler_settings.loop_interval)",
|
| 20 |
+
"after": ""
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "c98bc4c64a085ac152b8aaa7d83f70d93819af83"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/scheduler/src/consumer.rs::function::start_consumer",
|
| 26 |
+
"file": "crates/scheduler/src/consumer.rs",
|
| 27 |
+
"kind": "function_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "pub async fn start_consumer<T: SchedulerAppState + 'static, U: SchedulerSessionState + 'static, F>(\n state: &T,\n settings: sync::Arc<SchedulerSettings>,\n workflow_selector: impl workflows::ProcessTrackerWorkflows<U> + 'static + Copy + std::fmt::Debug,\n (tx, mut rx): (mpsc::Sender<()>, mpsc::Receiver<()>),\n app_state_to_session_state: F,\n) -> CustomResult<(), errors::ProcessTrackerError>\nwhere\n F: Fn(&T, &id_type::TenantId) -> CustomResult<U, errors::ProcessTrackerError>,\n{\n use std::time::Duration;\n\n use rand::distributions::{Distribution, Uniform};\n\n let mut rng = rand::thread_rng();\n\n // TODO: this can be removed once rand-0.9 is released\n // reference - https://github.com/rust-random/rand/issues/1326#issuecomment-1635331942\n #[allow(unknown_lints)]\n #[allow(clippy::unnecessary_fallible_conversions)]\n let timeout = Uniform::try_from(0..=settings.loop_interval)\n .change_context(errors::ProcessTrackerError::ConfigurationError)?;\n\n tokio::time::sleep(Duration::from_millis(timeout.sample(&mut rng))).await;\n\n let mut interval = tokio::time::interval(Duration::from_millis(settings.loop_interval));\n\n let mut shutdown_interval =\n tokio::time::interval(Duration::from_millis(settings.graceful_shutdown_interval));\n\n let consumer_operation_counter = sync::Arc::new(atomic::AtomicU64::new(0));\n let signal = get_allowed_signals()\n .map_err(|error| {\n logger::error!(?error, \"Signal Handler Error\");\n errors::ProcessTrackerError::ConfigurationError\n })\n .attach_printable(\"Failed while creating a signals handler\")?;\n let handle = signal.handle();\n let task_handle =\n tokio::spawn(common_utils::signals::signal_handler(signal, tx).in_current_span());\n\n 'consumer: loop {\n match rx.try_recv() {\n Err(mpsc::error::TryRecvError::Empty) => {\n interval.tick().await;\n\n // A guard from env to disable the consumer\n if settings.consumer.disabled {\n continue;\n }\n consumer_operation_counter.fetch_add(1, atomic::Ordering::SeqCst);\n let start_time = std_time::Instant::now();\n let tenants = state.get_tenants();\n for tenant in tenants {\n let session_state = app_state_to_session_state(state, &tenant)?;\n pt_utils::consumer_operation_handler(\n session_state.clone(),\n settings.clone(),\n |error| {\n logger::error!(?error, \"Failed to perform consumer operation\");\n },\n workflow_selector,\n )\n .await;\n }\n\n let end_time = std_time::Instant::now();\n let duration = end_time.saturating_duration_since(start_time).as_secs_f64();\n logger::debug!(\"Time taken to execute consumer_operation: {}s\", duration);\n\n let current_count =\n consumer_operation_counter.fetch_sub(1, atomic::Ordering::SeqCst);\n logger::info!(\"Current tasks being executed: {}\", current_count);\n }\n Ok(()) | Err(mpsc::error::TryRecvError::Disconnected) => {\n logger::debug!(\"Awaiting shutdown!\");\n rx.close();\n loop {\n shutdown_interval.tick().await;\n let active_tasks = consumer_operation_counter.load(atomic::Ordering::Acquire);\n logger::info!(\"Active tasks: {active_tasks}\");\n match active_tasks {\n 0 => {\n logger::info!(\"Terminating consumer\");\n break 'consumer;\n }\n _ => continue,\n }\n }\n }\n }\n }\n handle.close();\n task_handle\n .await\n .change_context(errors::ProcessTrackerError::UnexpectedFlow)?;\n\n Ok(())\n}",
|
| 32 |
+
"after_code": "pub async fn start_consumer<T: SchedulerAppState + 'static, U: SchedulerSessionState + 'static, F>(\n state: &T,\n settings: sync::Arc<SchedulerSettings>,\n workflow_selector: impl workflows::ProcessTrackerWorkflows<U> + 'static + Copy + std::fmt::Debug,\n (tx, mut rx): (mpsc::Sender<()>, mpsc::Receiver<()>),\n app_state_to_session_state: F,\n) -> CustomResult<(), errors::ProcessTrackerError>\nwhere\n F: Fn(&T, &id_type::TenantId) -> CustomResult<U, errors::ProcessTrackerError>,\n{\n use std::time::Duration;\n\n use rand::distributions::{Distribution, Uniform};\n\n let mut rng = rand::thread_rng();\n\n // TODO: this can be removed once rand-0.9 is released\n // reference - https://github.com/rust-random/rand/issues/1326#issuecomment-1635331942\n #[allow(clippy::unnecessary_fallible_conversions)]\n let timeout = Uniform::try_from(0..=settings.loop_interval)\n .change_context(errors::ProcessTrackerError::ConfigurationError)?;\n\n tokio::time::sleep(Duration::from_millis(timeout.sample(&mut rng))).await;\n\n let mut interval = tokio::time::interval(Duration::from_millis(settings.loop_interval));\n\n let mut shutdown_interval =\n tokio::time::interval(Duration::from_millis(settings.graceful_shutdown_interval));\n\n let consumer_operation_counter = sync::Arc::new(atomic::AtomicU64::new(0));\n let signal = get_allowed_signals()\n .map_err(|error| {\n logger::error!(?error, \"Signal Handler Error\");\n errors::ProcessTrackerError::ConfigurationError\n })\n .attach_printable(\"Failed while creating a signals handler\")?;\n let handle = signal.handle();\n let task_handle =\n tokio::spawn(common_utils::signals::signal_handler(signal, tx).in_current_span());\n\n 'consumer: loop {\n match rx.try_recv() {\n Err(mpsc::error::TryRecvError::Empty) => {\n interval.tick().await;\n\n // A guard from env to disable the consumer\n if settings.consumer.disabled {\n continue;\n }\n consumer_operation_counter.fetch_add(1, atomic::Ordering::SeqCst);\n let start_time = std_time::Instant::now();\n let tenants = state.get_tenants();\n for tenant in tenants {\n let session_state = app_state_to_session_state(state, &tenant)?;\n pt_utils::consumer_operation_handler(\n session_state.clone(),\n settings.clone(),\n |error| {\n logger::error!(?error, \"Failed to perform consumer operation\");\n },\n workflow_selector,\n )\n .await;\n }\n\n let end_time = std_time::Instant::now();\n let duration = end_time.saturating_duration_since(start_time).as_secs_f64();\n logger::debug!(\"Time taken to execute consumer_operation: {}s\", duration);\n\n let current_count =\n consumer_operation_counter.fetch_sub(1, atomic::Ordering::SeqCst);\n logger::info!(\"Current tasks being executed: {}\", current_count);\n }\n Ok(()) | Err(mpsc::error::TryRecvError::Disconnected) => {\n logger::debug!(\"Awaiting shutdown!\");\n rx.close();\n loop {\n shutdown_interval.tick().await;\n let active_tasks = consumer_operation_counter.load(atomic::Ordering::Acquire);\n logger::info!(\"Active tasks: {active_tasks}\");\n match active_tasks {\n 0 => {\n logger::info!(\"Terminating consumer\");\n break 'consumer;\n }\n _ => continue,\n }\n }\n }\n }\n }\n handle.close();\n task_handle\n .await\n .change_context(errors::ProcessTrackerError::UnexpectedFlow)?;\n\n Ok(())\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " // TODO: this can be removed once rand-0.9 is released\n // reference - https://github.com/rust-random/rand/issues/1326#issuecomment-1635331942\n #[allow(unknown_lints)]\n #[allow(clippy::unnecessary_fallible_conversions)]\n let timeout = Uniform::try_from(0..=settings.loop_interval)",
|
| 35 |
+
"after": ""
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "c98bc4c64a085ac152b8aaa7d83f70d93819af83"
|
| 38 |
+
}
|
| 39 |
+
]
|
| 40 |
+
}
|
diffs/pr_10162/cbbf0ca/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10163/cb4e03f/diff.json
ADDED
|
@@ -0,0 +1,49 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "cb4e03f329425db7d0b904105209a6fe4cadc42f",
|
| 3 |
+
"pr_number": 10163,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::AdyenPaymentRequest<'_>::function::try_from",
|
| 10 |
+
"file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result<Self, Self::Error> {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }",
|
| 16 |
+
"after_code": "fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result<Self, Self::Error> {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let (recurring_processing_model, store_payment_method, shopper_reference) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;",
|
| 19 |
+
"after": " let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let (recurring_processing_model, store_payment_method, shopper_reference) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "cb4e03f329425db7d0b904105209a6fe4cadc42f"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::impl::AdyenPaymentRequest<'_>",
|
| 25 |
+
"file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs",
|
| 26 |
+
"kind": "impl_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "impl\n TryFrom<(\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n )> for AdyenPaymentRequest<'_>\n{\n type Error = Error;\n fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result<Self, Self::Error> {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }\n}",
|
| 31 |
+
"after_code": "impl\n TryFrom<(\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n )> for AdyenPaymentRequest<'_>\n{\n type Error = Error;\n fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result<Self, Self::Error> {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let (recurring_processing_model, store_payment_method, shopper_reference) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;",
|
| 34 |
+
"after": " let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let (recurring_processing_model, store_payment_method, shopper_reference) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "cb4e03f329425db7d0b904105209a6fe4cadc42f"
|
| 37 |
+
},
|
| 38 |
+
{
|
| 39 |
+
"id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::function::build_shopper_reference",
|
| 40 |
+
"file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs",
|
| 41 |
+
"kind": "function_item",
|
| 42 |
+
"status": "removed",
|
| 43 |
+
"before_code": "fn build_shopper_reference(item: &PaymentsAuthorizeRouterData) -> Option<String> {\n match item.get_connector_customer_id() {\n Ok(connector_customer_id) => Some(connector_customer_id),\n Err(_) => match item.get_customer_id() {\n Ok(customer_id) => Some(format!(\n \"{}_{}\",\n item.merchant_id.get_string_repr(),\n customer_id.get_string_repr()\n )),\n Err(_) => None,\n },\n }\n}",
|
| 44 |
+
"after_code": null,
|
| 45 |
+
"diff_span": null,
|
| 46 |
+
"commit_sha": "cb4e03f329425db7d0b904105209a6fe4cadc42f"
|
| 47 |
+
}
|
| 48 |
+
]
|
| 49 |
+
}
|
diffs/pr_10197/1022c03/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "1022c037e9060c5378b1ff9450e70864648d551d",
|
| 3 |
+
"pr_number": 10197,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/payments.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/api_models/src/payments.rs::impl::PMBalanceCheckEligibilityResponse",
|
| 10 |
+
"file": "crates/api_models/src/payments.rs",
|
| 11 |
+
"kind": "impl_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "impl PMBalanceCheckEligibilityResponse {\n pub fn get_balance(&self) -> MinorUnit {\n match self {\n PMBalanceCheckEligibilityResponse::Success(resp) => resp.balance,\n PMBalanceCheckEligibilityResponse::Failure(_) => MinorUnit::zero(),\n }\n }\n}",
|
| 16 |
+
"after_code": "impl PMBalanceCheckEligibilityResponse {\n pub fn get_balance(&self) -> MinorUnit {\n match self {\n Self::Success(resp) => resp.balance,\n Self::Failure(_) => MinorUnit::zero(),\n }\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " pub fn get_balance(&self) -> MinorUnit {\n match self {\n PMBalanceCheckEligibilityResponse::Success(resp) => resp.balance,\n PMBalanceCheckEligibilityResponse::Failure(_) => MinorUnit::zero(),\n }\n }",
|
| 19 |
+
"after": " pub fn get_balance(&self) -> MinorUnit {\n match self {\n Self::Success(resp) => resp.balance,\n Self::Failure(_) => MinorUnit::zero(),\n }\n }"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "1022c037e9060c5378b1ff9450e70864648d551d"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/api_models/src/payments.rs::PMBalanceCheckEligibilityResponse::function::get_balance",
|
| 25 |
+
"file": "crates/api_models/src/payments.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "pub fn get_balance(&self) -> MinorUnit {\n match self {\n PMBalanceCheckEligibilityResponse::Success(resp) => resp.balance,\n PMBalanceCheckEligibilityResponse::Failure(_) => MinorUnit::zero(),\n }\n }",
|
| 31 |
+
"after_code": "pub fn get_balance(&self) -> MinorUnit {\n match self {\n Self::Success(resp) => resp.balance,\n Self::Failure(_) => MinorUnit::zero(),\n }\n }",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": "pub fn get_balance(&self) -> MinorUnit {\n match self {\n PMBalanceCheckEligibilityResponse::Success(resp) => resp.balance,\n PMBalanceCheckEligibilityResponse::Failure(_) => MinorUnit::zero(),\n }\n }",
|
| 34 |
+
"after": "pub fn get_balance(&self) -> MinorUnit {\n match self {\n Self::Success(resp) => resp.balance,\n Self::Failure(_) => MinorUnit::zero(),\n }\n }"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "1022c037e9060c5378b1ff9450e70864648d551d"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_10197/234898a/diff.json
ADDED
|
@@ -0,0 +1,251 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597",
|
| 3 |
+
"pr_number": 10197,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/events/payment.rs",
|
| 6 |
+
"crates/api_models/src/payments.rs",
|
| 7 |
+
"crates/openapi/src/openapi_v2.rs",
|
| 8 |
+
"crates/openapi/src/routes/payments.rs",
|
| 9 |
+
"crates/router/src/core/payment_method_balance.rs",
|
| 10 |
+
"crates/router/src/routes/app.rs"
|
| 11 |
+
],
|
| 12 |
+
"diffs": [
|
| 13 |
+
{
|
| 14 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::payments_check_and_apply_pm_data_core",
|
| 15 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 16 |
+
"kind": "function_item",
|
| 17 |
+
"status": "modified",
|
| 18 |
+
"code_changed": true,
|
| 19 |
+
"imports_changed": true,
|
| 20 |
+
"before_code": "pub async fn payments_check_and_apply_pm_data_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n _req_state: ReqState,\n req: ApplyPaymentMethodDataRequest,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<ApplyPaymentMethodDataResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_method_balances = fetch_payment_methods_balances_from_redis_fallible(\n &state,\n &payment_intent.id,\n &req.payment_methods,\n )\n .await\n .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let mut balance_values: Vec<api_models::payments::BalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance: balance.balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n pm.clone(),\n &payment_id,\n )\n .await\n {\n Ok((balance, currency)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::BalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n // Sort balance_values by balance in ascending order (smallest first)\n // This ensures smaller gift cards are fully utilized before larger ones\n balance_values.sort_by(|a, b| {\n let balance_a = match &a.eligibility {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(_) => {\n MinorUnit::zero()\n }\n };\n let balance_b = match &b.eligibility {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(_) => {\n MinorUnit::zero()\n }\n };\n balance_a.cmp(&balance_b)\n });\n\n // Calculate applicable amounts with running total\n let mut running_total = MinorUnit::zero();\n let order_amount = payment_intent.amount_details.order_amount;\n for balance_item in balance_values.iter_mut() {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) =\n &mut balance_item.eligibility\n {\n let remaining_amount = (order_amount - running_total).max(MinorUnit::zero());\n balance_api.applicable_amount = std::cmp::min(balance_api.balance, remaining_amount);\n running_total = running_total + balance_api.applicable_amount;\n }\n }\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n balance_api,\n ) = &value.eligibility\n {\n Some(balance_api.applicable_amount)\n } else {\n None\n }\n })\n .sum();\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount =\n (payment_intent.amount_details.order_amount - total_balance).max(MinorUnit::zero());\n\n let resp = ApplyPaymentMethodDataResponse {\n balances: balance_values,\n remaining_amount,\n currency: payment_intent.amount_details.currency,\n requires_additional_pm_data: remaining_amount.is_greater_than(0),\n surcharge_details: None, // TODO: Implement surcharge recalculation logic\n };\n\n Ok(services::ApplicationResponse::Json(resp))\n}",
|
| 21 |
+
"after_code": "pub async fn payments_check_and_apply_pm_data_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n _req_state: ReqState,\n req: ApplyPaymentMethodDataRequest,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<CheckAndApplyPaymentMethodDataResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_method_balances = fetch_payment_methods_balances_from_redis_fallible(\n &state,\n &payment_intent.id,\n &req.payment_methods,\n )\n .await\n .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let mut balance_values: Vec<api_models::payments::EligibilityBalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance: balance.balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n pm.clone(),\n &payment_id,\n )\n .await\n {\n Ok((balance, currency)) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::EligibilityBalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n // Sort balance_values by balance in ascending order (smallest first)\n // This ensures smaller gift cards are fully utilized before larger ones\n balance_values.sort_by(|a, b| {\n let balance_a = match &a.eligibility {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(_) => {\n MinorUnit::zero()\n }\n };\n let balance_b = match &b.eligibility {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(_) => {\n MinorUnit::zero()\n }\n };\n balance_a.cmp(&balance_b)\n });\n\n // Calculate applicable amounts with running total\n let mut running_total = MinorUnit::zero();\n let order_amount = payment_intent.amount_details.order_amount;\n for balance_item in balance_values.iter_mut() {\n if let api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) =\n &mut balance_item.eligibility\n {\n let remaining_amount = (order_amount - running_total).max(MinorUnit::zero());\n balance_api.applicable_amount = std::cmp::min(balance_api.balance, remaining_amount);\n running_total = running_total + balance_api.applicable_amount;\n }\n }\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) =\n &value.eligibility\n {\n Some(balance_api.applicable_amount)\n } else {\n None\n }\n })\n .sum();\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount =\n (payment_intent.amount_details.order_amount - total_balance).max(MinorUnit::zero());\n\n let resp = CheckAndApplyPaymentMethodDataResponse {\n balances: balance_values,\n remaining_amount,\n currency: payment_intent.amount_details.currency,\n requires_additional_pm_data: remaining_amount.is_greater_than(0),\n surcharge_details: None, // TODO: Implement surcharge recalculation logic\n };\n\n Ok(services::ApplicationResponse::Json(resp))\n}",
|
| 22 |
+
"diff_span": {
|
| 23 |
+
"before": " req: ApplyPaymentMethodDataRequest,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<ApplyPaymentMethodDataResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_method_balances = fetch_payment_methods_balances_from_redis_fallible(\n &state,\n &payment_intent.id,\n &req.payment_methods,\n )\n .await\n .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let mut balance_values: Vec<api_models::payments::BalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance: balance.balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n pm.clone(),\n &payment_id,\n )\n .await\n {\n Ok((balance, currency)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::BalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n // Sort balance_values by balance in ascending order (smallest first)\n // This ensures smaller gift cards are fully utilized before larger ones\n balance_values.sort_by(|a, b| {\n let balance_a = match &a.eligibility {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(_) => {\n MinorUnit::zero()\n }\n };\n let balance_b = match &b.eligibility {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(_) => {\n MinorUnit::zero()\n }\n };\n balance_a.cmp(&balance_b)\n });\n\n // Calculate applicable amounts with running total\n let mut running_total = MinorUnit::zero();\n let order_amount = payment_intent.amount_details.order_amount;\n for balance_item in balance_values.iter_mut() {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) =\n &mut balance_item.eligibility\n {\n let remaining_amount = (order_amount - running_total).max(MinorUnit::zero());\n balance_api.applicable_amount = std::cmp::min(balance_api.balance, remaining_amount);\n running_total = running_total + balance_api.applicable_amount;\n }\n }\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n balance_api,\n ) = &value.eligibility\n {\n Some(balance_api.applicable_amount)\n } else {\n None\n }\n })\n .sum();\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount =\n (payment_intent.amount_details.order_amount - total_balance).max(MinorUnit::zero());\n\n let resp = ApplyPaymentMethodDataResponse {\n balances: balance_values,\n remaining_amount,",
|
| 24 |
+
"after": " req: ApplyPaymentMethodDataRequest,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<CheckAndApplyPaymentMethodDataResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_method_balances = fetch_payment_methods_balances_from_redis_fallible(\n &state,\n &payment_intent.id,\n &req.payment_methods,\n )\n .await\n .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let mut balance_values: Vec<api_models::payments::EligibilityBalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance: balance.balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n pm.clone(),\n &payment_id,\n )\n .await\n {\n Ok((balance, currency)) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::EligibilityBalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n // Sort balance_values by balance in ascending order (smallest first)\n // This ensures smaller gift cards are fully utilized before larger ones\n balance_values.sort_by(|a, b| {\n let balance_a = match &a.eligibility {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(_) => {\n MinorUnit::zero()\n }\n };\n let balance_b = match &b.eligibility {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(_) => {\n MinorUnit::zero()\n }\n };\n balance_a.cmp(&balance_b)\n });\n\n // Calculate applicable amounts with running total\n let mut running_total = MinorUnit::zero();\n let order_amount = payment_intent.amount_details.order_amount;\n for balance_item in balance_values.iter_mut() {\n if let api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) =\n &mut balance_item.eligibility\n {\n let remaining_amount = (order_amount - running_total).max(MinorUnit::zero());\n balance_api.applicable_amount = std::cmp::min(balance_api.balance, remaining_amount);\n running_total = running_total + balance_api.applicable_amount;\n }\n }\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) =\n &value.eligibility\n {\n Some(balance_api.applicable_amount)\n } else {\n None\n }\n })\n .sum();\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount =\n (payment_intent.amount_details.order_amount - total_balance).max(MinorUnit::zero());\n\n let resp = CheckAndApplyPaymentMethodDataResponse {\n balances: balance_values,\n remaining_amount,"
|
| 25 |
+
},
|
| 26 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597",
|
| 27 |
+
"before_imports": [
|
| 28 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi,\n};",
|
| 29 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 30 |
+
],
|
| 31 |
+
"after_imports": [
|
| 32 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckSuccessResponse,\n};",
|
| 33 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 34 |
+
]
|
| 35 |
+
},
|
| 36 |
+
{
|
| 37 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::fetch_payment_methods_balances_from_redis_fallible",
|
| 38 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 39 |
+
"kind": "function_item",
|
| 40 |
+
"status": "modified",
|
| 41 |
+
"code_changed": false,
|
| 42 |
+
"imports_changed": true,
|
| 43 |
+
"before_code": "pub async fn fetch_payment_methods_balances_from_redis_fallible(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<\n HashMap<domain::PaymentMethodBalanceKey, Option<domain::PaymentMethodBalance>>,\n> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned();\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 44 |
+
"after_code": "pub async fn fetch_payment_methods_balances_from_redis_fallible(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<\n HashMap<domain::PaymentMethodBalanceKey, Option<domain::PaymentMethodBalance>>,\n> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned();\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 45 |
+
"diff_span": {
|
| 46 |
+
"before": "",
|
| 47 |
+
"after": ""
|
| 48 |
+
},
|
| 49 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597",
|
| 50 |
+
"before_imports": [
|
| 51 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi,\n};",
|
| 52 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 53 |
+
],
|
| 54 |
+
"after_imports": [
|
| 55 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckSuccessResponse,\n};",
|
| 56 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 57 |
+
]
|
| 58 |
+
},
|
| 59 |
+
{
|
| 60 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::fetch_payment_methods_balances_from_redis",
|
| 61 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 62 |
+
"kind": "function_item",
|
| 63 |
+
"status": "modified",
|
| 64 |
+
"code_changed": false,
|
| 65 |
+
"imports_changed": true,
|
| 66 |
+
"before_code": "pub async fn fetch_payment_methods_balances_from_redis(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<HashMap<domain::PaymentMethodBalanceKey, domain::PaymentMethodBalance>> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned().ok_or(\n errors::ApiErrorResponse::GenericNotFoundError {\n message: \"Balance not found for one or more payment methods\".to_string(),\n },\n )?;\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 67 |
+
"after_code": "pub async fn fetch_payment_methods_balances_from_redis(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<HashMap<domain::PaymentMethodBalanceKey, domain::PaymentMethodBalance>> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned().ok_or(\n errors::ApiErrorResponse::GenericNotFoundError {\n message: \"Balance not found for one or more payment methods\".to_string(),\n },\n )?;\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 68 |
+
"diff_span": {
|
| 69 |
+
"before": "",
|
| 70 |
+
"after": ""
|
| 71 |
+
},
|
| 72 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597",
|
| 73 |
+
"before_imports": [
|
| 74 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi,\n};",
|
| 75 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 76 |
+
],
|
| 77 |
+
"after_imports": [
|
| 78 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckSuccessResponse,\n};",
|
| 79 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 80 |
+
]
|
| 81 |
+
},
|
| 82 |
+
{
|
| 83 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::payments_check_gift_card_balance_core",
|
| 84 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 85 |
+
"kind": "function_item",
|
| 86 |
+
"status": "modified",
|
| 87 |
+
"code_changed": false,
|
| 88 |
+
"imports_changed": true,
|
| 89 |
+
"before_code": "pub async fn payments_check_gift_card_balance_core(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n profile: &domain::Profile,\n _req_state: &ReqState,\n payment_method_data: api_models::payments::BalanceCheckPaymentMethodData,\n payment_id: &id_type::GlobalPaymentId,\n) -> errors::RouterResult<(MinorUnit, common_enums::Currency)> {\n let db = state.store.as_ref();\n\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(state, profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = (balance, currency);\n\n Ok(resp)\n}",
|
| 90 |
+
"after_code": "pub async fn payments_check_gift_card_balance_core(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n profile: &domain::Profile,\n _req_state: &ReqState,\n payment_method_data: api_models::payments::BalanceCheckPaymentMethodData,\n payment_id: &id_type::GlobalPaymentId,\n) -> errors::RouterResult<(MinorUnit, common_enums::Currency)> {\n let db = state.store.as_ref();\n\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(state, profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = (balance, currency);\n\n Ok(resp)\n}",
|
| 91 |
+
"diff_span": {
|
| 92 |
+
"before": "",
|
| 93 |
+
"after": ""
|
| 94 |
+
},
|
| 95 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597",
|
| 96 |
+
"before_imports": [
|
| 97 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi,\n};",
|
| 98 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};",
|
| 99 |
+
"use common_enums::CallConnectorAction;"
|
| 100 |
+
],
|
| 101 |
+
"after_imports": [
|
| 102 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckSuccessResponse,\n};",
|
| 103 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};",
|
| 104 |
+
"use common_enums::CallConnectorAction;"
|
| 105 |
+
]
|
| 106 |
+
},
|
| 107 |
+
{
|
| 108 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::persist_individual_pm_balance_details_in_redis",
|
| 109 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 110 |
+
"kind": "function_item",
|
| 111 |
+
"status": "modified",
|
| 112 |
+
"code_changed": false,
|
| 113 |
+
"imports_changed": true,
|
| 114 |
+
"before_code": "pub async fn persist_individual_pm_balance_details_in_redis<'a>(\n state: &SessionState,\n business_profile: &domain::Profile,\n pm_balance_data: &domain::PaymentMethodBalanceData<'_>,\n) -> errors::RouterResult<()> {\n if !pm_balance_data.is_empty() {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n let redis_key = pm_balance_data.get_pm_balance_redis_key();\n\n let value_list = pm_balance_data\n .get_individual_pm_balance_key_value_pairs()\n .into_iter()\n .map(|(key, value)| {\n value\n .encode_to_string_of_json()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encode to string of json\")\n .map(|encoded_value| (key, encoded_value))\n })\n .collect::<Result<Vec<_>, _>>()?;\n\n let intent_fulfillment_time = business_profile\n .get_order_fulfillment_time()\n .unwrap_or(consts::DEFAULT_FULFILLMENT_TIME);\n\n redis_conn\n .set_hash_fields(\n &redis_key.as_str().into(),\n value_list,\n Some(intent_fulfillment_time),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to write to redis\")?;\n\n logger::debug!(\"Surcharge results stored in redis with key = {}\", redis_key);\n }\n Ok(())\n}",
|
| 115 |
+
"after_code": "pub async fn persist_individual_pm_balance_details_in_redis<'a>(\n state: &SessionState,\n business_profile: &domain::Profile,\n pm_balance_data: &domain::PaymentMethodBalanceData<'_>,\n) -> errors::RouterResult<()> {\n if !pm_balance_data.is_empty() {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n let redis_key = pm_balance_data.get_pm_balance_redis_key();\n\n let value_list = pm_balance_data\n .get_individual_pm_balance_key_value_pairs()\n .into_iter()\n .map(|(key, value)| {\n value\n .encode_to_string_of_json()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encode to string of json\")\n .map(|encoded_value| (key, encoded_value))\n })\n .collect::<Result<Vec<_>, _>>()?;\n\n let intent_fulfillment_time = business_profile\n .get_order_fulfillment_time()\n .unwrap_or(consts::DEFAULT_FULFILLMENT_TIME);\n\n redis_conn\n .set_hash_fields(\n &redis_key.as_str().into(),\n value_list,\n Some(intent_fulfillment_time),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to write to redis\")?;\n\n logger::debug!(\"Surcharge results stored in redis with key = {}\", redis_key);\n }\n Ok(())\n}",
|
| 116 |
+
"diff_span": {
|
| 117 |
+
"before": "",
|
| 118 |
+
"after": ""
|
| 119 |
+
},
|
| 120 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597",
|
| 121 |
+
"before_imports": [
|
| 122 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi,\n};",
|
| 123 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 124 |
+
],
|
| 125 |
+
"after_imports": [
|
| 126 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckSuccessResponse,\n};",
|
| 127 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 128 |
+
]
|
| 129 |
+
},
|
| 130 |
+
{
|
| 131 |
+
"id": "crates/api_models/src/payments.rs::struct::EligibilityBalanceCheckResponseItem",
|
| 132 |
+
"file": "crates/api_models/src/payments.rs",
|
| 133 |
+
"kind": "struct_item",
|
| 134 |
+
"status": "added",
|
| 135 |
+
"before_code": null,
|
| 136 |
+
"after_code": "pub struct EligibilityBalanceCheckResponseItem {\n pub payment_method_data: BalanceCheckPaymentMethodData,\n pub eligibility: PMBalanceCheckEligibilityResponse,\n}",
|
| 137 |
+
"diff_span": null,
|
| 138 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 139 |
+
},
|
| 140 |
+
{
|
| 141 |
+
"id": "crates/api_models/src/payments.rs::struct::CheckAndApplyPaymentMethodDataResponse",
|
| 142 |
+
"file": "crates/api_models/src/payments.rs",
|
| 143 |
+
"kind": "struct_item",
|
| 144 |
+
"status": "added",
|
| 145 |
+
"before_code": null,
|
| 146 |
+
"after_code": "pub struct CheckAndApplyPaymentMethodDataResponse {\n pub balances: Vec<EligibilityBalanceCheckResponseItem>,\n /// The amount left after subtracting applied payment method balance from order amount\n pub remaining_amount: MinorUnit,\n #[schema(value_type = Currency)]\n pub currency: common_enums::Currency,\n /// Whether the applied payment method balance is enough for the order amount or additional PM is required\n pub requires_additional_pm_data: bool,\n pub surcharge_details: Option<Vec<ApplyPaymentMethodDataSurchargeResponseItem>>,\n}",
|
| 147 |
+
"diff_span": null,
|
| 148 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 149 |
+
},
|
| 150 |
+
{
|
| 151 |
+
"id": "crates/api_models/src/events/payment.rs::payments::CheckAndApplyPaymentMethodDataResponse::function::get_api_event_type",
|
| 152 |
+
"file": "crates/api_models/src/events/payment.rs",
|
| 153 |
+
"kind": "function_item",
|
| 154 |
+
"status": "added",
|
| 155 |
+
"before_code": null,
|
| 156 |
+
"after_code": "fn get_api_event_type(&self) -> Option<ApiEventsType> {\n None\n }",
|
| 157 |
+
"diff_span": null,
|
| 158 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 159 |
+
},
|
| 160 |
+
{
|
| 161 |
+
"id": "crates/api_models/src/events/payment.rs::impl::payments::CheckAndApplyPaymentMethodDataResponse",
|
| 162 |
+
"file": "crates/api_models/src/events/payment.rs",
|
| 163 |
+
"kind": "impl_item",
|
| 164 |
+
"status": "added",
|
| 165 |
+
"before_code": null,
|
| 166 |
+
"after_code": "impl ApiEventMetric for payments::CheckAndApplyPaymentMethodDataResponse {\n fn get_api_event_type(&self) -> Option<ApiEventsType> {\n None\n }\n}",
|
| 167 |
+
"diff_span": null,
|
| 168 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 169 |
+
},
|
| 170 |
+
{
|
| 171 |
+
"id": "crates/api_models/src/payments.rs::enum::PMBalanceCheckEligibilityResponse",
|
| 172 |
+
"file": "crates/api_models/src/payments.rs",
|
| 173 |
+
"kind": "enum_item",
|
| 174 |
+
"status": "added",
|
| 175 |
+
"before_code": null,
|
| 176 |
+
"after_code": "pub enum PMBalanceCheckEligibilityResponse {\n Success(PMBalanceCheckSuccessResponse),\n Failure(String),\n}",
|
| 177 |
+
"diff_span": null,
|
| 178 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 179 |
+
},
|
| 180 |
+
{
|
| 181 |
+
"id": "crates/api_models/src/payments.rs::struct::PMBalanceCheckSuccessResponse",
|
| 182 |
+
"file": "crates/api_models/src/payments.rs",
|
| 183 |
+
"kind": "struct_item",
|
| 184 |
+
"status": "added",
|
| 185 |
+
"before_code": null,
|
| 186 |
+
"after_code": "pub struct PMBalanceCheckSuccessResponse {\n pub balance: MinorUnit,\n pub applicable_amount: MinorUnit,\n #[schema(value_type = Currency)]\n pub currency: common_enums::Currency,\n}",
|
| 187 |
+
"diff_span": null,
|
| 188 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 189 |
+
},
|
| 190 |
+
{
|
| 191 |
+
"id": "crates/api_models/src/events/payment.rs::impl::payments::ApplyPaymentMethodDataResponse",
|
| 192 |
+
"file": "crates/api_models/src/events/payment.rs",
|
| 193 |
+
"kind": "impl_item",
|
| 194 |
+
"status": "removed",
|
| 195 |
+
"before_code": "impl ApiEventMetric for payments::ApplyPaymentMethodDataResponse {\n fn get_api_event_type(&self) -> Option<ApiEventsType> {\n None\n }\n}",
|
| 196 |
+
"after_code": null,
|
| 197 |
+
"diff_span": null,
|
| 198 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 199 |
+
},
|
| 200 |
+
{
|
| 201 |
+
"id": "crates/api_models/src/payments.rs::enum::PaymentMethodBalanceCheckEligibility",
|
| 202 |
+
"file": "crates/api_models/src/payments.rs",
|
| 203 |
+
"kind": "enum_item",
|
| 204 |
+
"status": "removed",
|
| 205 |
+
"before_code": "pub enum PaymentMethodBalanceCheckEligibility {\n Success(PaymentMethodBalanceApi),\n Failure(String),\n}",
|
| 206 |
+
"after_code": null,
|
| 207 |
+
"diff_span": null,
|
| 208 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 209 |
+
},
|
| 210 |
+
{
|
| 211 |
+
"id": "crates/api_models/src/payments.rs::struct::BalanceCheckResponseItem",
|
| 212 |
+
"file": "crates/api_models/src/payments.rs",
|
| 213 |
+
"kind": "struct_item",
|
| 214 |
+
"status": "removed",
|
| 215 |
+
"before_code": "pub struct BalanceCheckResponseItem {\n pub payment_method_data: BalanceCheckPaymentMethodData,\n pub eligibility: PaymentMethodBalanceCheckEligibility,\n}",
|
| 216 |
+
"after_code": null,
|
| 217 |
+
"diff_span": null,
|
| 218 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 219 |
+
},
|
| 220 |
+
{
|
| 221 |
+
"id": "crates/api_models/src/payments.rs::struct::PaymentMethodBalanceApi",
|
| 222 |
+
"file": "crates/api_models/src/payments.rs",
|
| 223 |
+
"kind": "struct_item",
|
| 224 |
+
"status": "removed",
|
| 225 |
+
"before_code": "pub struct PaymentMethodBalanceApi {\n pub balance: MinorUnit,\n pub applicable_amount: MinorUnit,\n #[schema(value_type = Currency)]\n pub currency: common_enums::Currency,\n}",
|
| 226 |
+
"after_code": null,
|
| 227 |
+
"diff_span": null,
|
| 228 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 229 |
+
},
|
| 230 |
+
{
|
| 231 |
+
"id": "crates/api_models/src/payments.rs::struct::ApplyPaymentMethodDataResponse",
|
| 232 |
+
"file": "crates/api_models/src/payments.rs",
|
| 233 |
+
"kind": "struct_item",
|
| 234 |
+
"status": "removed",
|
| 235 |
+
"before_code": "pub struct ApplyPaymentMethodDataResponse {\n pub balances: Vec<BalanceCheckResponseItem>,\n pub remaining_amount: MinorUnit,\n #[schema(value_type = Currency)]\n pub currency: common_enums::Currency,\n pub requires_additional_pm_data: bool,\n pub surcharge_details: Option<Vec<ApplyPaymentMethodDataSurchargeResponseItem>>,\n}",
|
| 236 |
+
"after_code": null,
|
| 237 |
+
"diff_span": null,
|
| 238 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 239 |
+
},
|
| 240 |
+
{
|
| 241 |
+
"id": "crates/api_models/src/events/payment.rs::payments::ApplyPaymentMethodDataResponse::function::get_api_event_type",
|
| 242 |
+
"file": "crates/api_models/src/events/payment.rs",
|
| 243 |
+
"kind": "function_item",
|
| 244 |
+
"status": "removed",
|
| 245 |
+
"before_code": "fn get_api_event_type(&self) -> Option<ApiEventsType> {\n None\n }",
|
| 246 |
+
"after_code": null,
|
| 247 |
+
"diff_span": null,
|
| 248 |
+
"commit_sha": "234898a5cf27247301ce272d5d071aef4fd90597"
|
| 249 |
+
}
|
| 250 |
+
]
|
| 251 |
+
}
|
diffs/pr_10197/9ec1575/diff.json
ADDED
|
@@ -0,0 +1,200 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6",
|
| 3 |
+
"pr_number": 10197,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/payments.rs",
|
| 6 |
+
"crates/router/src/core/payment_method_balance.rs",
|
| 7 |
+
"crates/router/src/routes/app.rs",
|
| 8 |
+
"crates/router/src/routes/payments.rs"
|
| 9 |
+
],
|
| 10 |
+
"diffs": [
|
| 11 |
+
{
|
| 12 |
+
"id": "crates/router/src/routes/payments.rs::function::payment_check_gift_card_balance",
|
| 13 |
+
"file": "crates/router/src/routes/payments.rs",
|
| 14 |
+
"kind": "function_item",
|
| 15 |
+
"status": "modified",
|
| 16 |
+
"code_changed": true,
|
| 17 |
+
"imports_changed": true,
|
| 18 |
+
"before_code": "pub async fn payment_check_gift_card_balance(\n state: web::Data<app::AppState>,\n req: actix_web::HttpRequest,\n json_payload: web::Json<api_models::payments::PaymentMethodBalanceCheckRequest>,\n path: web::Path<common_utils::id_type::GlobalPaymentId>,\n) -> impl Responder {\n let flow = Flow::PaymentMethodBalanceCheck;\n\n let global_payment_id = path.into_inner();\n tracing::Span::current().record(\"payment_id\", global_payment_id.get_string_repr());\n\n let internal_payload = internal_payload_types::PaymentsGenericRequestWithResourceId {\n global_payment_id: global_payment_id.clone(),\n payload: json_payload.into_inner(),\n };\n\n let header_payload = match HeaderPayload::foreign_try_from(req.headers()) {\n Ok(headers) => headers,\n Err(err) => {\n return api::log_and_return_error_response(err);\n }\n };\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n internal_payload,\n |state, auth: auth::AuthenticationData, req, req_state| async {\n let payment_id = req.global_payment_id;\n let request = req.payload;\n\n let merchant_context = domain::MerchantContext::NormalMerchant(Box::new(\n domain::Context(auth.merchant_account, auth.key_store),\n ));\n Box::pin(\n payment_method_balance::payments_check_gift_card_balance_core(\n state,\n merchant_context,\n auth.profile,\n req_state,\n request,\n header_payload.clone(),\n payment_id,\n ),\n )\n .await\n },\n auth::api_or_client_auth(\n &auth::V2ApiKeyAuth {\n is_connected_allowed: false,\n is_platform_allowed: false,\n },\n &auth::V2ClientAuth(common_utils::types::authentication::ResourceId::Payment(\n global_payment_id,\n )),\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 19 |
+
"after_code": "pub async fn payment_check_gift_card_balance(\n state: web::Data<app::AppState>,\n req: actix_web::HttpRequest,\n json_payload: web::Json<api_models::payments::PaymentMethodBalanceCheckRequest>,\n path: web::Path<common_utils::id_type::GlobalPaymentId>,\n) -> impl Responder {\n let flow = Flow::PaymentMethodBalanceCheck;\n\n let global_payment_id = path.into_inner();\n tracing::Span::current().record(\"payment_id\", global_payment_id.get_string_repr());\n\n let internal_payload = internal_payload_types::PaymentsGenericRequestWithResourceId {\n global_payment_id: global_payment_id.clone(),\n payload: json_payload.into_inner(),\n };\n\n let header_payload = match HeaderPayload::foreign_try_from(req.headers()) {\n Ok(headers) => headers,\n Err(err) => {\n return api::log_and_return_error_response(err);\n }\n };\n\n todo!()\n}",
|
| 20 |
+
"diff_span": {
|
| 21 |
+
"before": " };\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n internal_payload,\n |state, auth: auth::AuthenticationData, req, req_state| async {\n let payment_id = req.global_payment_id;\n let request = req.payload;\n\n let merchant_context = domain::MerchantContext::NormalMerchant(Box::new(\n domain::Context(auth.merchant_account, auth.key_store),\n ));\n Box::pin(\n payment_method_balance::payments_check_gift_card_balance_core(\n state,\n merchant_context,\n auth.profile,\n req_state,\n request,\n header_payload.clone(),\n payment_id,\n ),\n )\n .await\n },\n auth::api_or_client_auth(\n &auth::V2ApiKeyAuth {\n is_connected_allowed: false,\n is_platform_allowed: false,\n },\n &auth::V2ClientAuth(common_utils::types::authentication::ResourceId::Payment(\n global_payment_id,\n )),\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 22 |
+
"after": " };\n\n todo!()\n}"
|
| 23 |
+
},
|
| 24 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6",
|
| 25 |
+
"before_imports": [
|
| 26 |
+
"use hyperswitch_domain_models::payments::HeaderPayload;",
|
| 27 |
+
"use crate::core::payment_method_balance;",
|
| 28 |
+
"use router_env::{env, instrument, logger, tracing, types, Flow};",
|
| 29 |
+
"use crate::db::domain::merchant_context;",
|
| 30 |
+
"use actix_web::{web, Responder};"
|
| 31 |
+
],
|
| 32 |
+
"after_imports": [
|
| 33 |
+
"use router_env::{env, instrument, logger, tracing, types, Flow};",
|
| 34 |
+
"use actix_web::{web, Responder};",
|
| 35 |
+
"use hyperswitch_domain_models::payments::HeaderPayload;"
|
| 36 |
+
]
|
| 37 |
+
},
|
| 38 |
+
{
|
| 39 |
+
"id": "crates/router/src/routes/payments.rs::function::payments_apply_pm_data",
|
| 40 |
+
"file": "crates/router/src/routes/payments.rs",
|
| 41 |
+
"kind": "function_item",
|
| 42 |
+
"status": "modified",
|
| 43 |
+
"code_changed": true,
|
| 44 |
+
"imports_changed": false,
|
| 45 |
+
"before_code": "pub async fn payments_apply_pm_data(\n state: web::Data<app::AppState>,\n req: actix_web::HttpRequest,\n json_payload: web::Json<api_models::payments::ApplyPaymentMethodDataRequest>,\n path: web::Path<common_utils::id_type::GlobalPaymentId>,\n) -> impl Responder {\n let flow = Flow::ApplyPaymentMethodData;\n\n let global_payment_id = path.into_inner();\n tracing::Span::current().record(\"payment_id\", global_payment_id.get_string_repr());\n\n let internal_payload = internal_payload_types::PaymentsGenericRequestWithResourceId {\n global_payment_id: global_payment_id.clone(),\n payload: json_payload.into_inner(),\n };\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n internal_payload,\n |state, auth: auth::AuthenticationData, req, req_state| async {\n let payment_id = req.global_payment_id;\n let request = req.payload;\n\n let merchant_context = domain::MerchantContext::NormalMerchant(Box::new(\n domain::Context(auth.merchant_account, auth.key_store),\n ));\n Box::pin(payment_method_balance::payments_apply_pm_data_core(\n state,\n merchant_context,\n req_state,\n request,\n payment_id,\n ))\n .await\n },\n auth::api_or_client_auth(\n &auth::V2ApiKeyAuth {\n is_connected_allowed: false,\n is_platform_allowed: false,\n },\n &auth::V2ClientAuth(common_utils::types::authentication::ResourceId::Payment(\n global_payment_id,\n )),\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 46 |
+
"after_code": "pub async fn payments_apply_pm_data(\n state: web::Data<app::AppState>,\n req: actix_web::HttpRequest,\n json_payload: web::Json<api_models::payments::ApplyPaymentMethodDataRequest>,\n path: web::Path<common_utils::id_type::GlobalPaymentId>,\n) -> impl Responder {\n let flow = Flow::ApplyPaymentMethodData;\n\n let global_payment_id = path.into_inner();\n tracing::Span::current().record(\"payment_id\", global_payment_id.get_string_repr());\n\n let internal_payload = internal_payload_types::PaymentsGenericRequestWithResourceId {\n global_payment_id: global_payment_id.clone(),\n payload: json_payload.into_inner(),\n };\n\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n internal_payload,\n |state, auth: auth::AuthenticationData, req, req_state| async {\n let payment_id = req.global_payment_id;\n let request = req.payload;\n\n let merchant_context = domain::MerchantContext::NormalMerchant(Box::new(\n domain::Context(auth.merchant_account, auth.key_store),\n ));\n Box::pin(\n payment_method_balance::payments_check_and_apply_pm_data_core(\n state,\n merchant_context,\n auth.profile,\n req_state,\n request,\n payment_id,\n ),\n )\n .await\n },\n auth::api_or_client_auth(\n &auth::V2ApiKeyAuth {\n is_connected_allowed: false,\n is_platform_allowed: false,\n },\n &auth::V2ClientAuth(common_utils::types::authentication::ResourceId::Payment(\n global_payment_id,\n )),\n req.headers(),\n ),\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}",
|
| 47 |
+
"diff_span": {
|
| 48 |
+
"before": " domain::Context(auth.merchant_account, auth.key_store),\n ));\n Box::pin(payment_method_balance::payments_apply_pm_data_core(\n state,\n merchant_context,\n req_state,\n request,\n payment_id,\n ))\n .await\n },",
|
| 49 |
+
"after": " domain::Context(auth.merchant_account, auth.key_store),\n ));\n Box::pin(\n payment_method_balance::payments_check_and_apply_pm_data_core(\n state,\n merchant_context,\n auth.profile,\n req_state,\n request,\n payment_id,\n ),\n )\n .await\n },"
|
| 50 |
+
},
|
| 51 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6"
|
| 52 |
+
},
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::fetch_payment_methods_balances_from_redis",
|
| 55 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 56 |
+
"kind": "function_item",
|
| 57 |
+
"status": "modified",
|
| 58 |
+
"code_changed": false,
|
| 59 |
+
"imports_changed": true,
|
| 60 |
+
"before_code": "pub async fn fetch_payment_methods_balances_from_redis(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<HashMap<domain::PaymentMethodBalanceKey, domain::PaymentMethodBalance>> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned().ok_or(\n errors::ApiErrorResponse::GenericNotFoundError {\n message: \"Balance not found for one or more payment methods\".to_string(),\n },\n )?;\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 61 |
+
"after_code": "pub async fn fetch_payment_methods_balances_from_redis(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<HashMap<domain::PaymentMethodBalanceKey, domain::PaymentMethodBalance>> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned().ok_or(\n errors::ApiErrorResponse::GenericNotFoundError {\n message: \"Balance not found for one or more payment methods\".to_string(),\n },\n )?;\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 62 |
+
"diff_span": {
|
| 63 |
+
"before": "",
|
| 64 |
+
"after": ""
|
| 65 |
+
},
|
| 66 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6",
|
| 67 |
+
"before_imports": [
|
| 68 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 69 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services,\n services::logger,\n types::{api, domain},\n};"
|
| 70 |
+
],
|
| 71 |
+
"after_imports": [
|
| 72 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi, PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 73 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 74 |
+
]
|
| 75 |
+
},
|
| 76 |
+
{
|
| 77 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::payments_check_gift_card_balance_core",
|
| 78 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 79 |
+
"kind": "function_item",
|
| 80 |
+
"status": "modified",
|
| 81 |
+
"code_changed": true,
|
| 82 |
+
"imports_changed": true,
|
| 83 |
+
"before_code": "pub async fn payments_check_gift_card_balance_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n _req_state: ReqState,\n req: PaymentMethodBalanceCheckRequest,\n _header_payload: HeaderPayload,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<PaymentMethodBalanceCheckResponse> {\n let db = state.store.as_ref();\n\n let key_manager_state = &(&state).into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n &state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n req.payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n &state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(&state, &profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = PaymentMethodBalanceCheckResponse {\n payment_id: payment_intent.id.clone(),\n balance,\n currency,\n };\n\n Ok(services::ApplicationResponse::Json(resp))\n}",
|
| 84 |
+
"after_code": "pub async fn payments_check_gift_card_balance_core(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n profile: &domain::Profile,\n _req_state: &ReqState,\n req: PaymentMethodBalanceCheckRequest,\n payment_id: &id_type::GlobalPaymentId,\n) -> errors::RouterResult<PaymentMethodBalanceCheckResponse> {\n let db = state.store.as_ref();\n\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n &state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n req.payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(state, profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = PaymentMethodBalanceCheckResponse {\n payment_id: payment_intent.id.clone(),\n balance,\n currency,\n };\n\n Ok(resp)\n}",
|
| 85 |
+
"diff_span": {
|
| 86 |
+
"before": "pub async fn payments_check_gift_card_balance_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n _req_state: ReqState,\n req: PaymentMethodBalanceCheckRequest,\n _header_payload: HeaderPayload,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<PaymentMethodBalanceCheckResponse> {\n let db = state.store.as_ref();\n\n let key_manager_state = &(&state).into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n &state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n req.payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n &state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(&state, &profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = PaymentMethodBalanceCheckResponse {\n payment_id: payment_intent.id.clone(),\n balance,\n currency,\n };\n\n Ok(services::ApplicationResponse::Json(resp))\n}",
|
| 87 |
+
"after": "pub async fn payments_check_gift_card_balance_core(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n profile: &domain::Profile,\n _req_state: &ReqState,\n req: PaymentMethodBalanceCheckRequest,\n payment_id: &id_type::GlobalPaymentId,\n) -> errors::RouterResult<PaymentMethodBalanceCheckResponse> {\n let db = state.store.as_ref();\n\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n &state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n req.payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(state, profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = PaymentMethodBalanceCheckResponse {\n payment_id: payment_intent.id.clone(),\n balance,\n currency,\n };\n\n Ok(resp)\n}"
|
| 88 |
+
},
|
| 89 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6",
|
| 90 |
+
"before_imports": [
|
| 91 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 92 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services,\n services::logger,\n types::{api, domain},\n};",
|
| 93 |
+
"use common_enums::CallConnectorAction;"
|
| 94 |
+
],
|
| 95 |
+
"after_imports": [
|
| 96 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};",
|
| 97 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi, PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 98 |
+
"use common_enums::CallConnectorAction;"
|
| 99 |
+
]
|
| 100 |
+
},
|
| 101 |
+
{
|
| 102 |
+
"id": "crates/api_models/src/payments.rs::struct::ApplyPaymentMethodDataResponse",
|
| 103 |
+
"file": "crates/api_models/src/payments.rs",
|
| 104 |
+
"kind": "struct_item",
|
| 105 |
+
"status": "modified",
|
| 106 |
+
"code_changed": true,
|
| 107 |
+
"imports_changed": false,
|
| 108 |
+
"before_code": "pub struct ApplyPaymentMethodDataResponse {\n pub remaining_amount: MinorUnit,\n #[schema(value_type = Currency)]\n pub currency: common_enums::Currency,\n pub requires_additional_pm_data: bool,\n pub surcharge_details: Option<Vec<ApplyPaymentMethodDataSurchargeResponseItem>>,\n}",
|
| 109 |
+
"after_code": "pub struct ApplyPaymentMethodDataResponse {\n pub balances: Vec<BalanceCheckResponseItem>,\n pub remaining_amount: MinorUnit,\n #[schema(value_type = Currency)]\n pub currency: common_enums::Currency,\n pub requires_additional_pm_data: bool,\n pub surcharge_details: Option<Vec<ApplyPaymentMethodDataSurchargeResponseItem>>,\n}",
|
| 110 |
+
"diff_span": {
|
| 111 |
+
"before": "",
|
| 112 |
+
"after": "pub struct ApplyPaymentMethodDataResponse {\n pub balances: Vec<BalanceCheckResponseItem>,\n pub remaining_amount: MinorUnit,\n #[schema(value_type = Currency)]"
|
| 113 |
+
},
|
| 114 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6"
|
| 115 |
+
},
|
| 116 |
+
{
|
| 117 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::persist_individual_pm_balance_details_in_redis",
|
| 118 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 119 |
+
"kind": "function_item",
|
| 120 |
+
"status": "modified",
|
| 121 |
+
"code_changed": false,
|
| 122 |
+
"imports_changed": true,
|
| 123 |
+
"before_code": "pub async fn persist_individual_pm_balance_details_in_redis<'a>(\n state: &SessionState,\n business_profile: &domain::Profile,\n pm_balance_data: &domain::PaymentMethodBalanceData<'_>,\n) -> errors::RouterResult<()> {\n if !pm_balance_data.is_empty() {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n let redis_key = pm_balance_data.get_pm_balance_redis_key();\n\n let value_list = pm_balance_data\n .get_individual_pm_balance_key_value_pairs()\n .into_iter()\n .map(|(key, value)| {\n value\n .encode_to_string_of_json()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encode to string of json\")\n .map(|encoded_value| (key, encoded_value))\n })\n .collect::<Result<Vec<_>, _>>()?;\n\n let intent_fulfillment_time = business_profile\n .get_order_fulfillment_time()\n .unwrap_or(consts::DEFAULT_FULFILLMENT_TIME);\n\n redis_conn\n .set_hash_fields(\n &redis_key.as_str().into(),\n value_list,\n Some(intent_fulfillment_time),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to write to redis\")?;\n\n logger::debug!(\"Surcharge results stored in redis with key = {}\", redis_key);\n }\n Ok(())\n}",
|
| 124 |
+
"after_code": "pub async fn persist_individual_pm_balance_details_in_redis<'a>(\n state: &SessionState,\n business_profile: &domain::Profile,\n pm_balance_data: &domain::PaymentMethodBalanceData<'_>,\n) -> errors::RouterResult<()> {\n if !pm_balance_data.is_empty() {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n let redis_key = pm_balance_data.get_pm_balance_redis_key();\n\n let value_list = pm_balance_data\n .get_individual_pm_balance_key_value_pairs()\n .into_iter()\n .map(|(key, value)| {\n value\n .encode_to_string_of_json()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encode to string of json\")\n .map(|encoded_value| (key, encoded_value))\n })\n .collect::<Result<Vec<_>, _>>()?;\n\n let intent_fulfillment_time = business_profile\n .get_order_fulfillment_time()\n .unwrap_or(consts::DEFAULT_FULFILLMENT_TIME);\n\n redis_conn\n .set_hash_fields(\n &redis_key.as_str().into(),\n value_list,\n Some(intent_fulfillment_time),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to write to redis\")?;\n\n logger::debug!(\"Surcharge results stored in redis with key = {}\", redis_key);\n }\n Ok(())\n}",
|
| 125 |
+
"diff_span": {
|
| 126 |
+
"before": "",
|
| 127 |
+
"after": ""
|
| 128 |
+
},
|
| 129 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6",
|
| 130 |
+
"before_imports": [
|
| 131 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 132 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services,\n services::logger,\n types::{api, domain},\n};"
|
| 133 |
+
],
|
| 134 |
+
"after_imports": [
|
| 135 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi, PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 136 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 137 |
+
]
|
| 138 |
+
},
|
| 139 |
+
{
|
| 140 |
+
"id": "crates/api_models/src/payments.rs::enum::PaymentMethodBalanceCheckEligibility",
|
| 141 |
+
"file": "crates/api_models/src/payments.rs",
|
| 142 |
+
"kind": "enum_item",
|
| 143 |
+
"status": "added",
|
| 144 |
+
"before_code": null,
|
| 145 |
+
"after_code": "pub enum PaymentMethodBalanceCheckEligibility {\n Success(PaymentMethodBalanceApi),\n Failure(String),\n}",
|
| 146 |
+
"diff_span": null,
|
| 147 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6"
|
| 148 |
+
},
|
| 149 |
+
{
|
| 150 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::payments_check_and_apply_pm_data_core",
|
| 151 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 152 |
+
"kind": "function_item",
|
| 153 |
+
"status": "added",
|
| 154 |
+
"before_code": null,
|
| 155 |
+
"after_code": "pub async fn payments_check_and_apply_pm_data_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n _req_state: ReqState,\n req: ApplyPaymentMethodDataRequest,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<ApplyPaymentMethodDataResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_method_balances = fetch_payment_methods_balances_from_redis_fallible(\n &state,\n &payment_intent.id,\n &req.payment_methods,\n )\n .await\n .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let balance_values: Vec<api_models::payments::BalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance: balance.balance,\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n PaymentMethodBalanceCheckRequest {\n payment_method_data: pm.clone(),\n },\n &payment_id,\n )\n .await\n {\n Ok(balance) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance: balance.balance,\n currency: balance.currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::BalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n balance_api,\n ) = &value.eligibility\n {\n Some(balance_api.balance)\n } else {\n None\n }\n })\n .sum();\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount =\n (payment_intent.amount_details.order_amount - total_balance).max(MinorUnit::zero());\n\n let resp = ApplyPaymentMethodDataResponse {\n balances: balance_values,\n remaining_amount,\n currency: payment_intent.amount_details.currency,\n requires_additional_pm_data: remaining_amount.is_greater_than(0),\n surcharge_details: None, // TODO: Implement surcharge recalculation logic\n };\n\n Ok(services::ApplicationResponse::Json(resp))\n}",
|
| 156 |
+
"diff_span": null,
|
| 157 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6"
|
| 158 |
+
},
|
| 159 |
+
{
|
| 160 |
+
"id": "crates/api_models/src/payments.rs::struct::BalanceCheckResponseItem",
|
| 161 |
+
"file": "crates/api_models/src/payments.rs",
|
| 162 |
+
"kind": "struct_item",
|
| 163 |
+
"status": "added",
|
| 164 |
+
"before_code": null,
|
| 165 |
+
"after_code": "pub struct BalanceCheckResponseItem {\n pub payment_method_data: BalanceCheckPaymentMethodData,\n pub eligibility: PaymentMethodBalanceCheckEligibility,\n}",
|
| 166 |
+
"diff_span": null,
|
| 167 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6"
|
| 168 |
+
},
|
| 169 |
+
{
|
| 170 |
+
"id": "crates/api_models/src/payments.rs::struct::PaymentMethodBalanceApi",
|
| 171 |
+
"file": "crates/api_models/src/payments.rs",
|
| 172 |
+
"kind": "struct_item",
|
| 173 |
+
"status": "added",
|
| 174 |
+
"before_code": null,
|
| 175 |
+
"after_code": "pub struct PaymentMethodBalanceApi {\n pub balance: MinorUnit,\n pub currency: common_enums::Currency,\n}",
|
| 176 |
+
"diff_span": null,
|
| 177 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6"
|
| 178 |
+
},
|
| 179 |
+
{
|
| 180 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::fetch_payment_methods_balances_from_redis_fallible",
|
| 181 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 182 |
+
"kind": "function_item",
|
| 183 |
+
"status": "added",
|
| 184 |
+
"before_code": null,
|
| 185 |
+
"after_code": "pub async fn fetch_payment_methods_balances_from_redis_fallible(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<\n HashMap<domain::PaymentMethodBalanceKey, Option<domain::PaymentMethodBalance>>,\n> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned();\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 186 |
+
"diff_span": null,
|
| 187 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6"
|
| 188 |
+
},
|
| 189 |
+
{
|
| 190 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::payments_apply_pm_data_core",
|
| 191 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 192 |
+
"kind": "function_item",
|
| 193 |
+
"status": "removed",
|
| 194 |
+
"before_code": "pub async fn payments_apply_pm_data_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n _req_state: ReqState,\n req: ApplyPaymentMethodDataRequest,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<ApplyPaymentMethodDataResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let balances =\n fetch_payment_methods_balances_from_redis(&state, &payment_intent.id, &req.payment_methods)\n .await\n .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let total_balance: MinorUnit = balances.values().map(|value| value.balance).sum();\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount =\n (payment_intent.amount_details.order_amount - total_balance).max(MinorUnit::zero());\n\n let resp = ApplyPaymentMethodDataResponse {\n remaining_amount,\n currency: payment_intent.amount_details.currency,\n requires_additional_pm_data: remaining_amount.is_greater_than(0),\n surcharge_details: None, // TODO: Implement surcharge recalculation logic\n };\n\n Ok(services::ApplicationResponse::Json(resp))\n}",
|
| 195 |
+
"after_code": null,
|
| 196 |
+
"diff_span": null,
|
| 197 |
+
"commit_sha": "9ec1575300c0d3791ca4e00526dbff452e7d00f6"
|
| 198 |
+
}
|
| 199 |
+
]
|
| 200 |
+
}
|
diffs/pr_10197/d1426a6/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "d1426a696f0c4266c8eedc9f67d5c6fffef0c366",
|
| 3 |
+
"pr_number": 10197,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10197/da4cfe5/diff.json
ADDED
|
@@ -0,0 +1,173 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "da4cfe5d71bf8a7bace807af35f9e531801b49e5",
|
| 3 |
+
"pr_number": 10197,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/payments.rs",
|
| 6 |
+
"crates/openapi/src/openapi_v2.rs",
|
| 7 |
+
"crates/router/src/core/payment_method_balance.rs"
|
| 8 |
+
],
|
| 9 |
+
"diffs": [
|
| 10 |
+
{
|
| 11 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::payments_check_and_apply_pm_data_core",
|
| 12 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 13 |
+
"kind": "function_item",
|
| 14 |
+
"status": "modified",
|
| 15 |
+
"code_changed": true,
|
| 16 |
+
"imports_changed": true,
|
| 17 |
+
"before_code": "pub async fn payments_check_and_apply_pm_data_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n _req_state: ReqState,\n req: ApplyPaymentMethodDataRequest,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<CheckAndApplyPaymentMethodDataResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_method_balances = fetch_payment_methods_balances_from_redis_fallible(\n &state,\n &payment_intent.id,\n &req.payment_methods,\n )\n .await\n .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let mut balance_values: Vec<api_models::payments::EligibilityBalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance: balance.balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n pm.clone(),\n &payment_id,\n )\n .await\n {\n Ok((balance, currency)) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::EligibilityBalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n // Sort balance_values by balance in ascending order (smallest first)\n // This ensures smaller gift cards are fully utilized before larger ones\n balance_values.sort_by(|a, b| {\n let balance_a = match &a.eligibility {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(_) => {\n MinorUnit::zero()\n }\n };\n let balance_b = match &b.eligibility {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(_) => {\n MinorUnit::zero()\n }\n };\n balance_a.cmp(&balance_b)\n });\n\n // Calculate applicable amounts with running total\n let mut running_total = MinorUnit::zero();\n let order_amount = payment_intent.amount_details.order_amount;\n for balance_item in balance_values.iter_mut() {\n if let api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) =\n &mut balance_item.eligibility\n {\n let remaining_amount = (order_amount - running_total).max(MinorUnit::zero());\n balance_api.applicable_amount = std::cmp::min(balance_api.balance, remaining_amount);\n running_total = running_total + balance_api.applicable_amount;\n }\n }\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) =\n &value.eligibility\n {\n Some(balance_api.applicable_amount)\n } else {\n None\n }\n })\n .sum();\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount =\n (payment_intent.amount_details.order_amount - total_balance).max(MinorUnit::zero());\n\n let resp = CheckAndApplyPaymentMethodDataResponse {\n balances: balance_values,\n remaining_amount,\n currency: payment_intent.amount_details.currency,\n requires_additional_pm_data: remaining_amount.is_greater_than(0),\n surcharge_details: None, // TODO: Implement surcharge recalculation logic\n };\n\n Ok(services::ApplicationResponse::Json(resp))\n}",
|
| 18 |
+
"after_code": "pub async fn payments_check_and_apply_pm_data_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n _req_state: ReqState,\n req: ApplyPaymentMethodDataRequest,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<CheckAndApplyPaymentMethodDataResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_method_balances = fetch_payment_methods_balances_from_redis_fallible(\n &state,\n &payment_intent.id,\n &req.payment_methods,\n )\n .await\n .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let mut balance_values: Vec<api_models::payments::EligibilityBalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances\n .get(&pm_balance_key)\n .and_then(|inner| inner.as_ref())\n {\n Some(balance) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance: balance.balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency: balance.currency,\n },\n )\n }\n None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n pm.clone(),\n &payment_id,\n )\n .await\n {\n Ok((balance, currency)) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(\n PMBalanceCheckFailureResponse {\n error: err.to_string(),\n },\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::EligibilityBalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n // Sort balance_values by balance in ascending order (smallest first)\n // This ensures smaller gift cards are fully utilized before larger ones\n balance_values.sort_by(|a, b| {\n a.eligibility\n .get_balance()\n .cmp(&b.eligibility.get_balance())\n });\n\n // Calculate applicable amounts with running total\n let mut running_total = MinorUnit::zero();\n let order_amount = payment_intent.amount_details.order_amount;\n for balance_item in balance_values.iter_mut() {\n if let api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) =\n &mut balance_item.eligibility\n {\n let remaining_amount = (order_amount - running_total).max(MinorUnit::zero());\n balance_api.applicable_amount = std::cmp::min(balance_api.balance, remaining_amount);\n running_total = running_total + balance_api.applicable_amount;\n }\n }\n\n let total_applicable_balance = running_total;\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount = (payment_intent.amount_details.order_amount - total_applicable_balance)\n .max(MinorUnit::zero());\n\n let resp = CheckAndApplyPaymentMethodDataResponse {\n balances: balance_values,\n remaining_amount,\n currency: payment_intent.amount_details.currency,\n requires_additional_pm_data: remaining_amount.is_greater_than(0),\n surcharge_details: None, // TODO: Implement surcharge recalculation logic\n };\n\n Ok(services::ApplicationResponse::Json(resp))\n}",
|
| 19 |
+
"diff_span": {
|
| 20 |
+
"before": " };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance: balance.balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n pm.clone(),\n &payment_id,\n )\n .await\n {\n Ok((balance, currency)) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::EligibilityBalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n // Sort balance_values by balance in ascending order (smallest first)\n // This ensures smaller gift cards are fully utilized before larger ones\n balance_values.sort_by(|a, b| {\n let balance_a = match &a.eligibility {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(_) => {\n MinorUnit::zero()\n }\n };\n let balance_b = match &b.eligibility {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(_) => {\n MinorUnit::zero()\n }\n };\n balance_a.cmp(&balance_b)\n });\n\n // Calculate applicable amounts with running total\n let mut running_total = MinorUnit::zero();\n let order_amount = payment_intent.amount_details.order_amount;\n for balance_item in balance_values.iter_mut() {\n if let api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) =\n &mut balance_item.eligibility\n {\n let remaining_amount = (order_amount - running_total).max(MinorUnit::zero());\n balance_api.applicable_amount = std::cmp::min(balance_api.balance, remaining_amount);\n running_total = running_total + balance_api.applicable_amount;\n }\n }\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) =\n &value.eligibility\n {\n Some(balance_api.applicable_amount)\n } else {\n None\n }\n })\n .sum();\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount =\n (payment_intent.amount_details.order_amount - total_balance).max(MinorUnit::zero());\n\n let resp = CheckAndApplyPaymentMethodDataResponse {",
|
| 21 |
+
"after": " };\n\n let eligibility = match payment_method_balances\n .get(&pm_balance_key)\n .and_then(|inner| inner.as_ref())\n {\n Some(balance) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance: balance.balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency: balance.currency,\n },\n )\n }\n None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n pm.clone(),\n &payment_id,\n )\n .await\n {\n Ok((balance, currency)) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Success(\n PMBalanceCheckSuccessResponse {\n balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PMBalanceCheckEligibilityResponse::Failure(\n PMBalanceCheckFailureResponse {\n error: err.to_string(),\n },\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::EligibilityBalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n // Sort balance_values by balance in ascending order (smallest first)\n // This ensures smaller gift cards are fully utilized before larger ones\n balance_values.sort_by(|a, b| {\n a.eligibility\n .get_balance()\n .cmp(&b.eligibility.get_balance())\n });\n\n // Calculate applicable amounts with running total\n let mut running_total = MinorUnit::zero();\n let order_amount = payment_intent.amount_details.order_amount;\n for balance_item in balance_values.iter_mut() {\n if let api_models::payments::PMBalanceCheckEligibilityResponse::Success(balance_api) =\n &mut balance_item.eligibility\n {\n let remaining_amount = (order_amount - running_total).max(MinorUnit::zero());\n balance_api.applicable_amount = std::cmp::min(balance_api.balance, remaining_amount);\n running_total = running_total + balance_api.applicable_amount;\n }\n }\n\n let total_applicable_balance = running_total;\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount = (payment_intent.amount_details.order_amount - total_applicable_balance)\n .max(MinorUnit::zero());\n\n let resp = CheckAndApplyPaymentMethodDataResponse {"
|
| 22 |
+
},
|
| 23 |
+
"commit_sha": "da4cfe5d71bf8a7bace807af35f9e531801b49e5",
|
| 24 |
+
"before_imports": [
|
| 25 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckSuccessResponse,\n};",
|
| 26 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 27 |
+
],
|
| 28 |
+
"after_imports": [
|
| 29 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckFailureResponse, PMBalanceCheckSuccessResponse,\n};",
|
| 30 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 31 |
+
]
|
| 32 |
+
},
|
| 33 |
+
{
|
| 34 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::fetch_payment_methods_balances_from_redis_fallible",
|
| 35 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 36 |
+
"kind": "function_item",
|
| 37 |
+
"status": "modified",
|
| 38 |
+
"code_changed": false,
|
| 39 |
+
"imports_changed": true,
|
| 40 |
+
"before_code": "pub async fn fetch_payment_methods_balances_from_redis_fallible(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<\n HashMap<domain::PaymentMethodBalanceKey, Option<domain::PaymentMethodBalance>>,\n> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned();\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 41 |
+
"after_code": "pub async fn fetch_payment_methods_balances_from_redis_fallible(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<\n HashMap<domain::PaymentMethodBalanceKey, Option<domain::PaymentMethodBalance>>,\n> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned();\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 42 |
+
"diff_span": {
|
| 43 |
+
"before": "",
|
| 44 |
+
"after": ""
|
| 45 |
+
},
|
| 46 |
+
"commit_sha": "da4cfe5d71bf8a7bace807af35f9e531801b49e5",
|
| 47 |
+
"before_imports": [
|
| 48 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckSuccessResponse,\n};",
|
| 49 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 50 |
+
],
|
| 51 |
+
"after_imports": [
|
| 52 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckFailureResponse, PMBalanceCheckSuccessResponse,\n};",
|
| 53 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 54 |
+
]
|
| 55 |
+
},
|
| 56 |
+
{
|
| 57 |
+
"id": "crates/api_models/src/payments.rs::enum::PMBalanceCheckEligibilityResponse",
|
| 58 |
+
"file": "crates/api_models/src/payments.rs",
|
| 59 |
+
"kind": "enum_item",
|
| 60 |
+
"status": "modified",
|
| 61 |
+
"code_changed": true,
|
| 62 |
+
"imports_changed": false,
|
| 63 |
+
"before_code": "pub enum PMBalanceCheckEligibilityResponse {\n Success(PMBalanceCheckSuccessResponse),\n Failure(String),\n}",
|
| 64 |
+
"after_code": "pub enum PMBalanceCheckEligibilityResponse {\n Success(PMBalanceCheckSuccessResponse),\n Failure(PMBalanceCheckFailureResponse),\n}",
|
| 65 |
+
"diff_span": {
|
| 66 |
+
"before": "pub enum PMBalanceCheckEligibilityResponse {\n Success(PMBalanceCheckSuccessResponse),\n Failure(String),\n}",
|
| 67 |
+
"after": "pub enum PMBalanceCheckEligibilityResponse {\n Success(PMBalanceCheckSuccessResponse),\n Failure(PMBalanceCheckFailureResponse),\n}"
|
| 68 |
+
},
|
| 69 |
+
"commit_sha": "da4cfe5d71bf8a7bace807af35f9e531801b49e5"
|
| 70 |
+
},
|
| 71 |
+
{
|
| 72 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::fetch_payment_methods_balances_from_redis",
|
| 73 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 74 |
+
"kind": "function_item",
|
| 75 |
+
"status": "modified",
|
| 76 |
+
"code_changed": false,
|
| 77 |
+
"imports_changed": true,
|
| 78 |
+
"before_code": "pub async fn fetch_payment_methods_balances_from_redis(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<HashMap<domain::PaymentMethodBalanceKey, domain::PaymentMethodBalance>> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned().ok_or(\n errors::ApiErrorResponse::GenericNotFoundError {\n message: \"Balance not found for one or more payment methods\".to_string(),\n },\n )?;\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 79 |
+
"after_code": "pub async fn fetch_payment_methods_balances_from_redis(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<HashMap<domain::PaymentMethodBalanceKey, domain::PaymentMethodBalance>> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned().ok_or(\n errors::ApiErrorResponse::GenericNotFoundError {\n message: \"Balance not found for one or more payment methods\".to_string(),\n },\n )?;\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 80 |
+
"diff_span": {
|
| 81 |
+
"before": "",
|
| 82 |
+
"after": ""
|
| 83 |
+
},
|
| 84 |
+
"commit_sha": "da4cfe5d71bf8a7bace807af35f9e531801b49e5",
|
| 85 |
+
"before_imports": [
|
| 86 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckSuccessResponse,\n};",
|
| 87 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 88 |
+
],
|
| 89 |
+
"after_imports": [
|
| 90 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckFailureResponse, PMBalanceCheckSuccessResponse,\n};",
|
| 91 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 92 |
+
]
|
| 93 |
+
},
|
| 94 |
+
{
|
| 95 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::payments_check_gift_card_balance_core",
|
| 96 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 97 |
+
"kind": "function_item",
|
| 98 |
+
"status": "modified",
|
| 99 |
+
"code_changed": false,
|
| 100 |
+
"imports_changed": true,
|
| 101 |
+
"before_code": "pub async fn payments_check_gift_card_balance_core(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n profile: &domain::Profile,\n _req_state: &ReqState,\n payment_method_data: api_models::payments::BalanceCheckPaymentMethodData,\n payment_id: &id_type::GlobalPaymentId,\n) -> errors::RouterResult<(MinorUnit, common_enums::Currency)> {\n let db = state.store.as_ref();\n\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(state, profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = (balance, currency);\n\n Ok(resp)\n}",
|
| 102 |
+
"after_code": "pub async fn payments_check_gift_card_balance_core(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n profile: &domain::Profile,\n _req_state: &ReqState,\n payment_method_data: api_models::payments::BalanceCheckPaymentMethodData,\n payment_id: &id_type::GlobalPaymentId,\n) -> errors::RouterResult<(MinorUnit, common_enums::Currency)> {\n let db = state.store.as_ref();\n\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(state, profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = (balance, currency);\n\n Ok(resp)\n}",
|
| 103 |
+
"diff_span": {
|
| 104 |
+
"before": "",
|
| 105 |
+
"after": ""
|
| 106 |
+
},
|
| 107 |
+
"commit_sha": "da4cfe5d71bf8a7bace807af35f9e531801b49e5",
|
| 108 |
+
"before_imports": [
|
| 109 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckSuccessResponse,\n};",
|
| 110 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};",
|
| 111 |
+
"use common_enums::CallConnectorAction;"
|
| 112 |
+
],
|
| 113 |
+
"after_imports": [
|
| 114 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckFailureResponse, PMBalanceCheckSuccessResponse,\n};",
|
| 115 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};",
|
| 116 |
+
"use common_enums::CallConnectorAction;"
|
| 117 |
+
]
|
| 118 |
+
},
|
| 119 |
+
{
|
| 120 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::persist_individual_pm_balance_details_in_redis",
|
| 121 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 122 |
+
"kind": "function_item",
|
| 123 |
+
"status": "modified",
|
| 124 |
+
"code_changed": false,
|
| 125 |
+
"imports_changed": true,
|
| 126 |
+
"before_code": "pub async fn persist_individual_pm_balance_details_in_redis<'a>(\n state: &SessionState,\n business_profile: &domain::Profile,\n pm_balance_data: &domain::PaymentMethodBalanceData<'_>,\n) -> errors::RouterResult<()> {\n if !pm_balance_data.is_empty() {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n let redis_key = pm_balance_data.get_pm_balance_redis_key();\n\n let value_list = pm_balance_data\n .get_individual_pm_balance_key_value_pairs()\n .into_iter()\n .map(|(key, value)| {\n value\n .encode_to_string_of_json()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encode to string of json\")\n .map(|encoded_value| (key, encoded_value))\n })\n .collect::<Result<Vec<_>, _>>()?;\n\n let intent_fulfillment_time = business_profile\n .get_order_fulfillment_time()\n .unwrap_or(consts::DEFAULT_FULFILLMENT_TIME);\n\n redis_conn\n .set_hash_fields(\n &redis_key.as_str().into(),\n value_list,\n Some(intent_fulfillment_time),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to write to redis\")?;\n\n logger::debug!(\"Surcharge results stored in redis with key = {}\", redis_key);\n }\n Ok(())\n}",
|
| 127 |
+
"after_code": "pub async fn persist_individual_pm_balance_details_in_redis<'a>(\n state: &SessionState,\n business_profile: &domain::Profile,\n pm_balance_data: &domain::PaymentMethodBalanceData<'_>,\n) -> errors::RouterResult<()> {\n if !pm_balance_data.is_empty() {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n let redis_key = pm_balance_data.get_pm_balance_redis_key();\n\n let value_list = pm_balance_data\n .get_individual_pm_balance_key_value_pairs()\n .into_iter()\n .map(|(key, value)| {\n value\n .encode_to_string_of_json()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encode to string of json\")\n .map(|encoded_value| (key, encoded_value))\n })\n .collect::<Result<Vec<_>, _>>()?;\n\n let intent_fulfillment_time = business_profile\n .get_order_fulfillment_time()\n .unwrap_or(consts::DEFAULT_FULFILLMENT_TIME);\n\n redis_conn\n .set_hash_fields(\n &redis_key.as_str().into(),\n value_list,\n Some(intent_fulfillment_time),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to write to redis\")?;\n\n logger::debug!(\"Surcharge results stored in redis with key = {}\", redis_key);\n }\n Ok(())\n}",
|
| 128 |
+
"diff_span": {
|
| 129 |
+
"before": "",
|
| 130 |
+
"after": ""
|
| 131 |
+
},
|
| 132 |
+
"commit_sha": "da4cfe5d71bf8a7bace807af35f9e531801b49e5",
|
| 133 |
+
"before_imports": [
|
| 134 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckSuccessResponse,\n};",
|
| 135 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 136 |
+
],
|
| 137 |
+
"after_imports": [
|
| 138 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, CheckAndApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PMBalanceCheckFailureResponse, PMBalanceCheckSuccessResponse,\n};",
|
| 139 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 140 |
+
]
|
| 141 |
+
},
|
| 142 |
+
{
|
| 143 |
+
"id": "crates/api_models/src/payments.rs::struct::PMBalanceCheckFailureResponse",
|
| 144 |
+
"file": "crates/api_models/src/payments.rs",
|
| 145 |
+
"kind": "struct_item",
|
| 146 |
+
"status": "added",
|
| 147 |
+
"before_code": null,
|
| 148 |
+
"after_code": "pub struct PMBalanceCheckFailureResponse {\n pub error: String,\n}",
|
| 149 |
+
"diff_span": null,
|
| 150 |
+
"commit_sha": "da4cfe5d71bf8a7bace807af35f9e531801b49e5"
|
| 151 |
+
},
|
| 152 |
+
{
|
| 153 |
+
"id": "crates/api_models/src/payments.rs::impl::PMBalanceCheckEligibilityResponse",
|
| 154 |
+
"file": "crates/api_models/src/payments.rs",
|
| 155 |
+
"kind": "impl_item",
|
| 156 |
+
"status": "added",
|
| 157 |
+
"before_code": null,
|
| 158 |
+
"after_code": "impl PMBalanceCheckEligibilityResponse {\n pub fn get_balance(&self) -> MinorUnit {\n match self {\n PMBalanceCheckEligibilityResponse::Success(resp) => resp.balance,\n PMBalanceCheckEligibilityResponse::Failure(_) => MinorUnit::zero(),\n }\n }\n}",
|
| 159 |
+
"diff_span": null,
|
| 160 |
+
"commit_sha": "da4cfe5d71bf8a7bace807af35f9e531801b49e5"
|
| 161 |
+
},
|
| 162 |
+
{
|
| 163 |
+
"id": "crates/api_models/src/payments.rs::PMBalanceCheckEligibilityResponse::function::get_balance",
|
| 164 |
+
"file": "crates/api_models/src/payments.rs",
|
| 165 |
+
"kind": "function_item",
|
| 166 |
+
"status": "added",
|
| 167 |
+
"before_code": null,
|
| 168 |
+
"after_code": "pub fn get_balance(&self) -> MinorUnit {\n match self {\n PMBalanceCheckEligibilityResponse::Success(resp) => resp.balance,\n PMBalanceCheckEligibilityResponse::Failure(_) => MinorUnit::zero(),\n }\n }",
|
| 169 |
+
"diff_span": null,
|
| 170 |
+
"commit_sha": "da4cfe5d71bf8a7bace807af35f9e531801b49e5"
|
| 171 |
+
}
|
| 172 |
+
]
|
| 173 |
+
}
|
diffs/pr_10197/e93005a/diff.json
ADDED
|
@@ -0,0 +1,207 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d",
|
| 3 |
+
"pr_number": 10197,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/events/payment.rs",
|
| 6 |
+
"crates/api_models/src/payments.rs",
|
| 7 |
+
"crates/openapi/src/openapi_v2.rs",
|
| 8 |
+
"crates/openapi/src/routes/payments.rs",
|
| 9 |
+
"crates/router/src/core/payment_method_balance.rs",
|
| 10 |
+
"crates/router/src/routes/app.rs",
|
| 11 |
+
"crates/router/src/routes/payments.rs"
|
| 12 |
+
],
|
| 13 |
+
"diffs": [
|
| 14 |
+
{
|
| 15 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::payments_check_and_apply_pm_data_core",
|
| 16 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 17 |
+
"kind": "function_item",
|
| 18 |
+
"status": "modified",
|
| 19 |
+
"code_changed": true,
|
| 20 |
+
"imports_changed": true,
|
| 21 |
+
"before_code": "pub async fn payments_check_and_apply_pm_data_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n _req_state: ReqState,\n req: ApplyPaymentMethodDataRequest,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<ApplyPaymentMethodDataResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_method_balances = fetch_payment_methods_balances_from_redis_fallible(\n &state,\n &payment_intent.id,\n &req.payment_methods,\n )\n .await\n .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let balance_values: Vec<api_models::payments::BalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance: balance.balance,\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n PaymentMethodBalanceCheckRequest {\n payment_method_data: pm.clone(),\n },\n &payment_id,\n )\n .await\n {\n Ok(balance) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance: balance.balance,\n currency: balance.currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::BalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n balance_api,\n ) = &value.eligibility\n {\n Some(balance_api.balance)\n } else {\n None\n }\n })\n .sum();\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount =\n (payment_intent.amount_details.order_amount - total_balance).max(MinorUnit::zero());\n\n let resp = ApplyPaymentMethodDataResponse {\n balances: balance_values,\n remaining_amount,\n currency: payment_intent.amount_details.currency,\n requires_additional_pm_data: remaining_amount.is_greater_than(0),\n surcharge_details: None, // TODO: Implement surcharge recalculation logic\n };\n\n Ok(services::ApplicationResponse::Json(resp))\n}",
|
| 22 |
+
"after_code": "pub async fn payments_check_and_apply_pm_data_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n _req_state: ReqState,\n req: ApplyPaymentMethodDataRequest,\n payment_id: id_type::GlobalPaymentId,\n) -> RouterResponse<ApplyPaymentMethodDataResponse> {\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_method_balances = fetch_payment_methods_balances_from_redis_fallible(\n &state,\n &payment_intent.id,\n &req.payment_methods,\n )\n .await\n .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let mut balance_values: Vec<api_models::payments::BalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance: balance.balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n pm.clone(),\n &payment_id,\n )\n .await\n {\n Ok((balance, currency)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::BalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n // Sort balance_values by balance in ascending order (smallest first)\n // This ensures smaller gift cards are fully utilized before larger ones\n balance_values.sort_by(|a, b| {\n let balance_a = match &a.eligibility {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(_) => {\n MinorUnit::zero()\n }\n };\n let balance_b = match &b.eligibility {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(_) => {\n MinorUnit::zero()\n }\n };\n balance_a.cmp(&balance_b)\n });\n\n // Calculate applicable amounts with running total\n let mut running_total = MinorUnit::zero();\n let order_amount = payment_intent.amount_details.order_amount;\n for balance_item in balance_values.iter_mut() {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) =\n &mut balance_item.eligibility\n {\n let remaining_amount = (order_amount - running_total).max(MinorUnit::zero());\n balance_api.applicable_amount = std::cmp::min(balance_api.balance, remaining_amount);\n running_total = running_total + balance_api.applicable_amount;\n }\n }\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n balance_api,\n ) = &value.eligibility\n {\n Some(balance_api.applicable_amount)\n } else {\n None\n }\n })\n .sum();\n\n // remaining_amount cannot be negative, hence using max with 0. This situation can arise when\n // the gift card balance exceeds the order amount\n let remaining_amount =\n (payment_intent.amount_details.order_amount - total_balance).max(MinorUnit::zero());\n\n let resp = ApplyPaymentMethodDataResponse {\n balances: balance_values,\n remaining_amount,\n currency: payment_intent.amount_details.currency,\n requires_additional_pm_data: remaining_amount.is_greater_than(0),\n surcharge_details: None, // TODO: Implement surcharge recalculation logic\n };\n\n Ok(services::ApplicationResponse::Json(resp))\n}",
|
| 23 |
+
"diff_span": {
|
| 24 |
+
"before": " .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let balance_values: Vec<api_models::payments::BalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance: balance.balance,\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n PaymentMethodBalanceCheckRequest {\n payment_method_data: pm.clone(),\n },\n &payment_id,\n )\n .await\n {\n Ok(balance) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance: balance.balance,\n currency: balance.currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::BalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n balance_api,\n ) = &value.eligibility\n {\n Some(balance_api.balance)\n } else {\n None",
|
| 25 |
+
"after": " .attach_printable(\"Failed to retrieve payment method balances from redis\")?;\n\n let mut balance_values: Vec<api_models::payments::BalanceCheckResponseItem> =\n futures::future::join_all(req.payment_methods.into_iter().map(|pm| async {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n pm.clone();\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n\n let eligibility = match payment_method_balances.get(&pm_balance_key) {\n Some(Some(balance)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance: balance.balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency: balance.currency,\n },\n )\n }\n Some(None) | None => {\n match payments_check_gift_card_balance_core(\n &state,\n &merchant_context,\n &profile,\n &_req_state,\n pm.clone(),\n &payment_id,\n )\n .await\n {\n Ok((balance, currency)) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n PaymentMethodBalanceApi {\n balance,\n applicable_amount: MinorUnit::zero(), // Will be calculated after sorting\n currency,\n },\n )\n }\n Err(err) => {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(\n err.to_string(),\n )\n }\n }\n }\n };\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(\n api_models::payments::BalanceCheckResponseItem {\n payment_method_data: pm,\n eligibility,\n },\n )\n }))\n .await\n .into_iter()\n .collect::<Result<Vec<_>, _>>()?;\n\n // Sort balance_values by balance in ascending order (smallest first)\n // This ensures smaller gift cards are fully utilized before larger ones\n balance_values.sort_by(|a, b| {\n let balance_a = match &a.eligibility {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(_) => {\n MinorUnit::zero()\n }\n };\n let balance_b = match &b.eligibility {\n api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) => {\n balance_api.balance\n }\n api_models::payments::PaymentMethodBalanceCheckEligibility::Failure(_) => {\n MinorUnit::zero()\n }\n };\n balance_a.cmp(&balance_b)\n });\n\n // Calculate applicable amounts with running total\n let mut running_total = MinorUnit::zero();\n let order_amount = payment_intent.amount_details.order_amount;\n for balance_item in balance_values.iter_mut() {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(balance_api) =\n &mut balance_item.eligibility\n {\n let remaining_amount = (order_amount - running_total).max(MinorUnit::zero());\n balance_api.applicable_amount = std::cmp::min(balance_api.balance, remaining_amount);\n running_total = running_total + balance_api.applicable_amount;\n }\n }\n\n let total_balance: MinorUnit = balance_values\n .iter()\n .filter_map(|value| {\n if let api_models::payments::PaymentMethodBalanceCheckEligibility::Success(\n balance_api,\n ) = &value.eligibility\n {\n Some(balance_api.applicable_amount)\n } else {\n None"
|
| 26 |
+
},
|
| 27 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d",
|
| 28 |
+
"before_imports": [
|
| 29 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi, PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 30 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 31 |
+
],
|
| 32 |
+
"after_imports": [
|
| 33 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi,\n};",
|
| 34 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 35 |
+
]
|
| 36 |
+
},
|
| 37 |
+
{
|
| 38 |
+
"id": "crates/api_models/src/payments.rs::struct::PaymentMethodBalanceApi",
|
| 39 |
+
"file": "crates/api_models/src/payments.rs",
|
| 40 |
+
"kind": "struct_item",
|
| 41 |
+
"status": "modified",
|
| 42 |
+
"code_changed": true,
|
| 43 |
+
"imports_changed": false,
|
| 44 |
+
"before_code": "pub struct PaymentMethodBalanceApi {\n pub balance: MinorUnit,\n pub currency: common_enums::Currency,\n}",
|
| 45 |
+
"after_code": "pub struct PaymentMethodBalanceApi {\n pub balance: MinorUnit,\n pub applicable_amount: MinorUnit,\n #[schema(value_type = Currency)]\n pub currency: common_enums::Currency,\n}",
|
| 46 |
+
"diff_span": {
|
| 47 |
+
"before": "",
|
| 48 |
+
"after": "pub struct PaymentMethodBalanceApi {\n pub balance: MinorUnit,\n pub applicable_amount: MinorUnit,\n #[schema(value_type = Currency)]\n pub currency: common_enums::Currency,\n}"
|
| 49 |
+
},
|
| 50 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d"
|
| 51 |
+
},
|
| 52 |
+
{
|
| 53 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::fetch_payment_methods_balances_from_redis_fallible",
|
| 54 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 55 |
+
"kind": "function_item",
|
| 56 |
+
"status": "modified",
|
| 57 |
+
"code_changed": false,
|
| 58 |
+
"imports_changed": true,
|
| 59 |
+
"before_code": "pub async fn fetch_payment_methods_balances_from_redis_fallible(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<\n HashMap<domain::PaymentMethodBalanceKey, Option<domain::PaymentMethodBalance>>,\n> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned();\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 60 |
+
"after_code": "pub async fn fetch_payment_methods_balances_from_redis_fallible(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<\n HashMap<domain::PaymentMethodBalanceKey, Option<domain::PaymentMethodBalance>>,\n> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned();\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 61 |
+
"diff_span": {
|
| 62 |
+
"before": "",
|
| 63 |
+
"after": ""
|
| 64 |
+
},
|
| 65 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d",
|
| 66 |
+
"before_imports": [
|
| 67 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi, PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 68 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 69 |
+
],
|
| 70 |
+
"after_imports": [
|
| 71 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi,\n};",
|
| 72 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 73 |
+
]
|
| 74 |
+
},
|
| 75 |
+
{
|
| 76 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::fetch_payment_methods_balances_from_redis",
|
| 77 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 78 |
+
"kind": "function_item",
|
| 79 |
+
"status": "modified",
|
| 80 |
+
"code_changed": false,
|
| 81 |
+
"imports_changed": true,
|
| 82 |
+
"before_code": "pub async fn fetch_payment_methods_balances_from_redis(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<HashMap<domain::PaymentMethodBalanceKey, domain::PaymentMethodBalance>> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned().ok_or(\n errors::ApiErrorResponse::GenericNotFoundError {\n message: \"Balance not found for one or more payment methods\".to_string(),\n },\n )?;\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 83 |
+
"after_code": "pub async fn fetch_payment_methods_balances_from_redis(\n state: &SessionState,\n payment_intent_id: &id_type::GlobalPaymentId,\n payment_methods: &[api_models::payments::BalanceCheckPaymentMethodData],\n) -> errors::RouterResult<HashMap<domain::PaymentMethodBalanceKey, domain::PaymentMethodBalance>> {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let balance_data = domain::PaymentMethodBalanceData::new(payment_intent_id);\n\n let balance_values: HashMap<String, domain::PaymentMethodBalance> = redis_conn\n .get_hash_fields::<Vec<(String, String)>>(&balance_data.get_pm_balance_redis_key().into())\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to read payment method balance data from redis\")?\n .into_iter()\n .map(|(key, value)| {\n value\n .parse_struct(\"PaymentMethodBalance\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse PaymentMethodBalance\")\n .map(|parsed| (key, parsed))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()?;\n\n payment_methods\n .iter()\n .map(|pm| {\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) = pm;\n let pm_balance_key = domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key: domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose(),\n };\n let redis_key = pm_balance_key.get_redis_key();\n let balance_value = balance_values.get(&redis_key).cloned().ok_or(\n errors::ApiErrorResponse::GenericNotFoundError {\n message: \"Balance not found for one or more payment methods\".to_string(),\n },\n )?;\n Ok((pm_balance_key, balance_value))\n })\n .collect::<errors::RouterResult<HashMap<_, _>>>()\n}",
|
| 84 |
+
"diff_span": {
|
| 85 |
+
"before": "",
|
| 86 |
+
"after": ""
|
| 87 |
+
},
|
| 88 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d",
|
| 89 |
+
"before_imports": [
|
| 90 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi, PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 91 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 92 |
+
],
|
| 93 |
+
"after_imports": [
|
| 94 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi,\n};",
|
| 95 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 96 |
+
]
|
| 97 |
+
},
|
| 98 |
+
{
|
| 99 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::payments_check_gift_card_balance_core",
|
| 100 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 101 |
+
"kind": "function_item",
|
| 102 |
+
"status": "modified",
|
| 103 |
+
"code_changed": true,
|
| 104 |
+
"imports_changed": true,
|
| 105 |
+
"before_code": "pub async fn payments_check_gift_card_balance_core(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n profile: &domain::Profile,\n _req_state: &ReqState,\n req: PaymentMethodBalanceCheckRequest,\n payment_id: &id_type::GlobalPaymentId,\n) -> errors::RouterResult<PaymentMethodBalanceCheckResponse> {\n let db = state.store.as_ref();\n\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n &state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n req.payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(state, profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = PaymentMethodBalanceCheckResponse {\n payment_id: payment_intent.id.clone(),\n balance,\n currency,\n };\n\n Ok(resp)\n}",
|
| 106 |
+
"after_code": "pub async fn payments_check_gift_card_balance_core(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n profile: &domain::Profile,\n _req_state: &ReqState,\n payment_method_data: api_models::payments::BalanceCheckPaymentMethodData,\n payment_id: &id_type::GlobalPaymentId,\n) -> errors::RouterResult<(MinorUnit, common_enums::Currency)> {\n let db = state.store.as_ref();\n\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(state, profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = (balance, currency);\n\n Ok(resp)\n}",
|
| 107 |
+
"diff_span": {
|
| 108 |
+
"before": " profile: &domain::Profile,\n _req_state: &ReqState,\n req: PaymentMethodBalanceCheckRequest,\n payment_id: &id_type::GlobalPaymentId,\n) -> errors::RouterResult<PaymentMethodBalanceCheckResponse> {\n let db = state.store.as_ref();\n\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n &payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n &state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n req.payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(state, profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = PaymentMethodBalanceCheckResponse {\n payment_id: payment_intent.id.clone(),\n balance,\n currency,\n };\n\n Ok(resp)",
|
| 109 |
+
"after": " profile: &domain::Profile,\n _req_state: &ReqState,\n payment_method_data: api_models::payments::BalanceCheckPaymentMethodData,\n payment_id: &id_type::GlobalPaymentId,\n) -> errors::RouterResult<(MinorUnit, common_enums::Currency)> {\n let db = state.store.as_ref();\n\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let redis_conn = db\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not get redis connection\")?;\n\n let gift_card_connector_id: String = redis_conn\n .get_key(&payment_id.get_gift_card_connector_key().as_str().into())\n .await\n .attach_printable(\"Failed to fetch gift card connector from redis\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let gift_card_connector_id = id_type::MerchantConnectorAccountId::wrap(gift_card_connector_id)\n .attach_printable(\"Failed to deserialize MCA\")\n .change_context(errors::ApiErrorResponse::GenericNotFoundError {\n message: \"No connector found with Gift Card Support\".to_string(),\n })?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n state,\n merchant_context.get_merchant_key_store(),\n Some(&gift_card_connector_id),\n )\n .await\n .attach_printable(\n \"failed to fetch merchant connector account for gift card balance check\",\n )?,\n ));\n\n let connector_name = merchant_connector_account\n .get_connector_name()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector name not present for gift card balance check\")?; // always get the connector name from this call\n\n let connector_data = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_name.to_string(),\n api::GetToken::Connector,\n merchant_connector_account.get_mca_id(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?;\n\n let connector_auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let resource_common_data = GiftCardBalanceCheckFlowData;\n\n let api_models::payments::BalanceCheckPaymentMethodData::GiftCard(gift_card_data) =\n payment_method_data;\n\n let router_data: RouterDataV2<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckFlowData,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = RouterDataV2 {\n flow: PhantomData,\n resource_common_data,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_auth_type,\n request: GiftCardBalanceCheckRequestData {\n payment_method_data: domain::PaymentMethodData::GiftCard(Box::new(\n gift_card_data.clone().into(),\n )),\n currency: Some(payment_intent.amount_details.currency),\n minor_amount: Some(payment_intent.amount_details.order_amount),\n },\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n };\n\n let old_router_data = GiftCardBalanceCheckFlowData::to_old_router_data(router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Cannot construct router data for making the gift card balance check api call\",\n )?;\n let connector_integration: services::BoxedGiftCardBalanceCheckIntegrationInterface<\n GiftCardBalanceCheck,\n GiftCardBalanceCheckRequestData,\n GiftCardBalanceCheckResponseData,\n > = connector_data.connector.get_connector_integration();\n\n let connector_response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &old_router_data,\n CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while calling gift card balance check connector api\")?;\n\n let gift_card_balance = connector_response\n .response\n .map_err(|_| errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Error while fetching gift card balance\".to_string(),\n })\n .attach_printable(\"Connector returned invalid response\")?;\n\n let balance = gift_card_balance.balance;\n let currency = gift_card_balance.currency;\n\n let payment_method_key = domain::GiftCardData::from(gift_card_data.clone())\n .get_payment_method_key()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"Unable to get unique key for payment method\".to_string(),\n })?\n .expose();\n\n let balance_data = domain::PaymentMethodBalanceData {\n payment_intent_id: &payment_intent.id,\n pm_balance_data: vec![(\n domain::PaymentMethodBalanceKey {\n payment_method_type: common_enums::PaymentMethod::GiftCard,\n payment_method_subtype: gift_card_data.get_payment_method_type(),\n payment_method_key,\n },\n domain::PaymentMethodBalance { balance, currency },\n )]\n .into_iter()\n .collect(),\n };\n\n persist_individual_pm_balance_details_in_redis(state, profile, &balance_data)\n .await\n .attach_printable(\"Failed to persist gift card balance details in redis\")?;\n\n let resp = (balance, currency);\n\n Ok(resp)"
|
| 110 |
+
},
|
| 111 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d",
|
| 112 |
+
"before_imports": [
|
| 113 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};",
|
| 114 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi, PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 115 |
+
"use common_enums::CallConnectorAction;"
|
| 116 |
+
],
|
| 117 |
+
"after_imports": [
|
| 118 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi,\n};",
|
| 119 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};",
|
| 120 |
+
"use common_enums::CallConnectorAction;"
|
| 121 |
+
]
|
| 122 |
+
},
|
| 123 |
+
{
|
| 124 |
+
"id": "crates/router/src/core/payment_method_balance.rs::function::persist_individual_pm_balance_details_in_redis",
|
| 125 |
+
"file": "crates/router/src/core/payment_method_balance.rs",
|
| 126 |
+
"kind": "function_item",
|
| 127 |
+
"status": "modified",
|
| 128 |
+
"code_changed": false,
|
| 129 |
+
"imports_changed": true,
|
| 130 |
+
"before_code": "pub async fn persist_individual_pm_balance_details_in_redis<'a>(\n state: &SessionState,\n business_profile: &domain::Profile,\n pm_balance_data: &domain::PaymentMethodBalanceData<'_>,\n) -> errors::RouterResult<()> {\n if !pm_balance_data.is_empty() {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n let redis_key = pm_balance_data.get_pm_balance_redis_key();\n\n let value_list = pm_balance_data\n .get_individual_pm_balance_key_value_pairs()\n .into_iter()\n .map(|(key, value)| {\n value\n .encode_to_string_of_json()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encode to string of json\")\n .map(|encoded_value| (key, encoded_value))\n })\n .collect::<Result<Vec<_>, _>>()?;\n\n let intent_fulfillment_time = business_profile\n .get_order_fulfillment_time()\n .unwrap_or(consts::DEFAULT_FULFILLMENT_TIME);\n\n redis_conn\n .set_hash_fields(\n &redis_key.as_str().into(),\n value_list,\n Some(intent_fulfillment_time),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to write to redis\")?;\n\n logger::debug!(\"Surcharge results stored in redis with key = {}\", redis_key);\n }\n Ok(())\n}",
|
| 131 |
+
"after_code": "pub async fn persist_individual_pm_balance_details_in_redis<'a>(\n state: &SessionState,\n business_profile: &domain::Profile,\n pm_balance_data: &domain::PaymentMethodBalanceData<'_>,\n) -> errors::RouterResult<()> {\n if !pm_balance_data.is_empty() {\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n let redis_key = pm_balance_data.get_pm_balance_redis_key();\n\n let value_list = pm_balance_data\n .get_individual_pm_balance_key_value_pairs()\n .into_iter()\n .map(|(key, value)| {\n value\n .encode_to_string_of_json()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encode to string of json\")\n .map(|encoded_value| (key, encoded_value))\n })\n .collect::<Result<Vec<_>, _>>()?;\n\n let intent_fulfillment_time = business_profile\n .get_order_fulfillment_time()\n .unwrap_or(consts::DEFAULT_FULFILLMENT_TIME);\n\n redis_conn\n .set_hash_fields(\n &redis_key.as_str().into(),\n value_list,\n Some(intent_fulfillment_time),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to write to redis\")?;\n\n logger::debug!(\"Surcharge results stored in redis with key = {}\", redis_key);\n }\n Ok(())\n}",
|
| 132 |
+
"diff_span": {
|
| 133 |
+
"before": "",
|
| 134 |
+
"after": ""
|
| 135 |
+
},
|
| 136 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d",
|
| 137 |
+
"before_imports": [
|
| 138 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi, PaymentMethodBalanceCheckRequest, PaymentMethodBalanceCheckResponse,\n};",
|
| 139 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 140 |
+
],
|
| 141 |
+
"after_imports": [
|
| 142 |
+
"use api_models::payments::{\n ApplyPaymentMethodDataRequest, ApplyPaymentMethodDataResponse, GetPaymentMethodType,\n PaymentMethodBalanceApi,\n};",
|
| 143 |
+
"use crate::{\n consts,\n core::{\n errors::{self, RouterResponse},\n payments::helpers,\n },\n db::errors::StorageErrorExt,\n routes::{app::ReqState, SessionState},\n services::{self, logger},\n types::{api, domain},\n};"
|
| 144 |
+
]
|
| 145 |
+
},
|
| 146 |
+
{
|
| 147 |
+
"id": "crates/router/src/routes/payments.rs::function::payment_check_gift_card_balance",
|
| 148 |
+
"file": "crates/router/src/routes/payments.rs",
|
| 149 |
+
"kind": "function_item",
|
| 150 |
+
"status": "removed",
|
| 151 |
+
"before_code": "pub async fn payment_check_gift_card_balance(\n state: web::Data<app::AppState>,\n req: actix_web::HttpRequest,\n json_payload: web::Json<api_models::payments::PaymentMethodBalanceCheckRequest>,\n path: web::Path<common_utils::id_type::GlobalPaymentId>,\n) -> impl Responder {\n let flow = Flow::PaymentMethodBalanceCheck;\n\n let global_payment_id = path.into_inner();\n tracing::Span::current().record(\"payment_id\", global_payment_id.get_string_repr());\n\n let internal_payload = internal_payload_types::PaymentsGenericRequestWithResourceId {\n global_payment_id: global_payment_id.clone(),\n payload: json_payload.into_inner(),\n };\n\n let header_payload = match HeaderPayload::foreign_try_from(req.headers()) {\n Ok(headers) => headers,\n Err(err) => {\n return api::log_and_return_error_response(err);\n }\n };\n\n todo!()\n}",
|
| 152 |
+
"after_code": null,
|
| 153 |
+
"diff_span": null,
|
| 154 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d"
|
| 155 |
+
},
|
| 156 |
+
{
|
| 157 |
+
"id": "crates/api_models/src/payments.rs::struct::PaymentMethodBalanceCheckRequest",
|
| 158 |
+
"file": "crates/api_models/src/payments.rs",
|
| 159 |
+
"kind": "struct_item",
|
| 160 |
+
"status": "removed",
|
| 161 |
+
"before_code": "pub struct PaymentMethodBalanceCheckRequest {\n /// The payment method data to be used for the balance check request. It can\n /// only be a payment method that supports checking balance e.g. gift card\n pub payment_method_data: BalanceCheckPaymentMethodData,\n}",
|
| 162 |
+
"after_code": null,
|
| 163 |
+
"diff_span": null,
|
| 164 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d"
|
| 165 |
+
},
|
| 166 |
+
{
|
| 167 |
+
"id": "crates/api_models/src/events/payment.rs::payments::PaymentMethodBalanceCheckResponse::function::get_api_event_type",
|
| 168 |
+
"file": "crates/api_models/src/events/payment.rs",
|
| 169 |
+
"kind": "function_item",
|
| 170 |
+
"status": "removed",
|
| 171 |
+
"before_code": "fn get_api_event_type(&self) -> Option<ApiEventsType> {\n None\n }",
|
| 172 |
+
"after_code": null,
|
| 173 |
+
"diff_span": null,
|
| 174 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d"
|
| 175 |
+
},
|
| 176 |
+
{
|
| 177 |
+
"id": "crates/api_models/src/events/payment.rs::impl::payments::PaymentMethodBalanceCheckResponse",
|
| 178 |
+
"file": "crates/api_models/src/events/payment.rs",
|
| 179 |
+
"kind": "impl_item",
|
| 180 |
+
"status": "removed",
|
| 181 |
+
"before_code": "impl ApiEventMetric for payments::PaymentMethodBalanceCheckResponse {\n fn get_api_event_type(&self) -> Option<ApiEventsType> {\n None\n }\n}",
|
| 182 |
+
"after_code": null,
|
| 183 |
+
"diff_span": null,
|
| 184 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d"
|
| 185 |
+
},
|
| 186 |
+
{
|
| 187 |
+
"id": "crates/openapi/src/routes/payments.rs::function::payment_check_gift_card_balance",
|
| 188 |
+
"file": "crates/openapi/src/routes/payments.rs",
|
| 189 |
+
"kind": "function_item",
|
| 190 |
+
"status": "removed",
|
| 191 |
+
"before_code": "pub fn payment_check_gift_card_balance() {}",
|
| 192 |
+
"after_code": null,
|
| 193 |
+
"diff_span": null,
|
| 194 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d"
|
| 195 |
+
},
|
| 196 |
+
{
|
| 197 |
+
"id": "crates/api_models/src/payments.rs::struct::PaymentMethodBalanceCheckResponse",
|
| 198 |
+
"file": "crates/api_models/src/payments.rs",
|
| 199 |
+
"kind": "struct_item",
|
| 200 |
+
"status": "removed",
|
| 201 |
+
"before_code": "pub struct PaymentMethodBalanceCheckResponse {\n /// Global Payment Id for the payment\n #[schema(value_type = String)]\n pub payment_id: id_type::GlobalPaymentId,\n /// The balance of the payment method\n pub balance: MinorUnit,\n /// The currency of the payment method\n #[schema(value_type = Currency)]\n pub currency: common_enums::Currency,\n}",
|
| 202 |
+
"after_code": null,
|
| 203 |
+
"diff_span": null,
|
| 204 |
+
"commit_sha": "e93005ab880a5adfa72c56fc02b58afcaebf875d"
|
| 205 |
+
}
|
| 206 |
+
]
|
| 207 |
+
}
|
diffs/pr_10246/2aaf16f/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10277/fa6a2d2/diff.json
ADDED
|
@@ -0,0 +1,137 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215",
|
| 3 |
+
"pr_number": 10277,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/common_enums/src/connector_enums.rs",
|
| 6 |
+
"crates/hyperswitch_connectors/src/connectors/zift.rs",
|
| 7 |
+
"crates/hyperswitch_connectors/src/connectors/zift/transformers.rs",
|
| 8 |
+
"crates/router/src/core/payments/types.rs"
|
| 9 |
+
],
|
| 10 |
+
"diffs": [
|
| 11 |
+
{
|
| 12 |
+
"id": "crates/hyperswitch_connectors/src/connectors/zift.rs::static::ZIFT_SUPPORTED_PAYMENT_METHODS",
|
| 13 |
+
"file": "crates/hyperswitch_connectors/src/connectors/zift.rs",
|
| 14 |
+
"kind": "static_item",
|
| 15 |
+
"status": "modified",
|
| 16 |
+
"code_changed": true,
|
| 17 |
+
"imports_changed": false,
|
| 18 |
+
"before_code": "static ZIFT_SUPPORTED_PAYMENT_METHODS: LazyLock<SupportedPaymentMethods> = LazyLock::new(|| {\n let supported_capture_methods = vec![\n common_enums::CaptureMethod::Automatic,\n common_enums::CaptureMethod::Manual,\n common_enums::CaptureMethod::SequentialAutomatic,\n ];\n\n let supported_card_network = vec![\n common_enums::CardNetwork::AmericanExpress,\n common_enums::CardNetwork::DinersClub,\n common_enums::CardNetwork::JCB,\n common_enums::CardNetwork::Mastercard,\n common_enums::CardNetwork::Visa,\n common_enums::CardNetwork::Discover,\n ];\n\n let mut zift_supported_payment_methods = SupportedPaymentMethods::new();\n\n zift_supported_payment_methods.add(\n common_enums::PaymentMethod::Card,\n common_enums::PaymentMethodType::Credit,\n PaymentMethodDetails {\n mandates: common_enums::FeatureStatus::Supported,\n refunds: common_enums::FeatureStatus::Supported,\n supported_capture_methods: supported_capture_methods.clone(),\n specific_features: Some(\n api_models::feature_matrix::PaymentMethodSpecificFeatures::Card({\n api_models::feature_matrix::CardSpecificFeatures {\n three_ds: common_enums::FeatureStatus::NotSupported,\n no_three_ds: common_enums::FeatureStatus::Supported,\n supported_card_networks: supported_card_network.clone(),\n }\n }),\n ),\n },\n );\n\n zift_supported_payment_methods.add(\n common_enums::PaymentMethod::Card,\n common_enums::PaymentMethodType::Debit,\n PaymentMethodDetails {\n mandates: common_enums::FeatureStatus::Supported,\n refunds: common_enums::FeatureStatus::Supported,\n supported_capture_methods: supported_capture_methods.clone(),\n specific_features: Some(\n api_models::feature_matrix::PaymentMethodSpecificFeatures::Card({\n api_models::feature_matrix::CardSpecificFeatures {\n three_ds: common_enums::FeatureStatus::NotSupported,\n no_three_ds: common_enums::FeatureStatus::Supported,\n supported_card_networks: supported_card_network.clone(),\n }\n }),\n ),\n },\n );\n\n zift_supported_payment_methods\n});",
|
| 19 |
+
"after_code": "static ZIFT_SUPPORTED_PAYMENT_METHODS: LazyLock<SupportedPaymentMethods> = LazyLock::new(|| {\n let supported_capture_methods = vec![\n common_enums::CaptureMethod::Automatic,\n common_enums::CaptureMethod::Manual,\n common_enums::CaptureMethod::SequentialAutomatic,\n ];\n\n let supported_card_network = vec![\n common_enums::CardNetwork::AmericanExpress,\n common_enums::CardNetwork::DinersClub,\n common_enums::CardNetwork::JCB,\n common_enums::CardNetwork::Mastercard,\n common_enums::CardNetwork::Visa,\n common_enums::CardNetwork::Discover,\n ];\n\n let mut zift_supported_payment_methods = SupportedPaymentMethods::new();\n\n zift_supported_payment_methods.add(\n common_enums::PaymentMethod::Card,\n common_enums::PaymentMethodType::Credit,\n PaymentMethodDetails {\n mandates: common_enums::FeatureStatus::Supported,\n refunds: common_enums::FeatureStatus::Supported,\n supported_capture_methods: supported_capture_methods.clone(),\n specific_features: Some(\n api_models::feature_matrix::PaymentMethodSpecificFeatures::Card({\n api_models::feature_matrix::CardSpecificFeatures {\n three_ds: common_enums::FeatureStatus::Supported,\n no_three_ds: common_enums::FeatureStatus::Supported,\n supported_card_networks: supported_card_network.clone(),\n }\n }),\n ),\n },\n );\n\n zift_supported_payment_methods.add(\n common_enums::PaymentMethod::Card,\n common_enums::PaymentMethodType::Debit,\n PaymentMethodDetails {\n mandates: common_enums::FeatureStatus::Supported,\n refunds: common_enums::FeatureStatus::Supported,\n supported_capture_methods: supported_capture_methods.clone(),\n specific_features: Some(\n api_models::feature_matrix::PaymentMethodSpecificFeatures::Card({\n api_models::feature_matrix::CardSpecificFeatures {\n three_ds: common_enums::FeatureStatus::NotSupported,\n no_three_ds: common_enums::FeatureStatus::Supported,\n supported_card_networks: supported_card_network.clone(),\n }\n }),\n ),\n },\n );\n\n zift_supported_payment_methods\n});",
|
| 20 |
+
"diff_span": {
|
| 21 |
+
"before": " api_models::feature_matrix::PaymentMethodSpecificFeatures::Card({\n api_models::feature_matrix::CardSpecificFeatures {\n three_ds: common_enums::FeatureStatus::NotSupported,\n no_three_ds: common_enums::FeatureStatus::Supported,\n supported_card_networks: supported_card_network.clone(),",
|
| 22 |
+
"after": " api_models::feature_matrix::PaymentMethodSpecificFeatures::Card({\n api_models::feature_matrix::CardSpecificFeatures {\n three_ds: common_enums::FeatureStatus::Supported,\n no_three_ds: common_enums::FeatureStatus::Supported,\n supported_card_networks: supported_card_network.clone(),"
|
| 23 |
+
},
|
| 24 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215"
|
| 25 |
+
},
|
| 26 |
+
{
|
| 27 |
+
"id": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs::enum::ZiftPaymentsRequest",
|
| 28 |
+
"file": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs",
|
| 29 |
+
"kind": "enum_item",
|
| 30 |
+
"status": "modified",
|
| 31 |
+
"code_changed": true,
|
| 32 |
+
"imports_changed": false,
|
| 33 |
+
"before_code": "pub enum ZiftPaymentsRequest {\n Card(ZiftCardPaymentRequest),\n Mandate(ZiftMandatePaymentRequest),\n}",
|
| 34 |
+
"after_code": "pub enum ZiftPaymentsRequest {\n Card(ZiftCardPaymentRequest),\n Mandate(ZiftMandatePaymentRequest),\n ExternalThreeDs(ZiftExternalThreeDsPaymentRequest),\n}",
|
| 35 |
+
"diff_span": {
|
| 36 |
+
"before": "",
|
| 37 |
+
"after": " Card(ZiftCardPaymentRequest),\n Mandate(ZiftMandatePaymentRequest),\n ExternalThreeDs(ZiftExternalThreeDsPaymentRequest),\n}"
|
| 38 |
+
},
|
| 39 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215"
|
| 40 |
+
},
|
| 41 |
+
{
|
| 42 |
+
"id": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs::ZiftPaymentsRequest::function::try_from",
|
| 43 |
+
"file": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs",
|
| 44 |
+
"kind": "function_item",
|
| 45 |
+
"status": "modified",
|
| 46 |
+
"code_changed": true,
|
| 47 |
+
"imports_changed": false,
|
| 48 |
+
"before_code": "fn try_from(item: &ZiftRouterData<&PaymentsAuthorizeRouterData>) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n return Err(\n errors::ConnectorError::NotImplemented(\"3DS Authentication\".to_string()).into(),\n );\n }\n let auth = ZiftAuthType::try_from(&item.router_data.connector_auth_type)?;\n let request_type = if item.router_data.request.is_auto_capture()? {\n RequestType::Sale\n } else {\n RequestType::Auth\n };\n match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(card) => {\n let card_request = ZiftCardPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n csc: card.card_cvc,\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Card(card_request))\n }\n PaymentMethodData::MandatePayment => {\n let additional_card_details = match item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })? {\n AdditionalPaymentData::Card(card) => *card,\n _ => Err(errors::ConnectorError::NotSupported {\n message: \"Payment Method Not Supported\".to_string(),\n connector: \"DataTrans\",\n })?,\n };\n let mandate_request = ZiftMandatePaymentRequest {\n request_type,\n auth,\n account_type: AccountType::PaymentCard,\n token: Secret::new(item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?),\n account_accessory: additional_card_details.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardNotPresent,\n holder_name: additional_card_details.get_card_holder_name()?,\n holder_type: HolderType::Personal,\n amount: item.amount.to_owned(),\n transaction_mode_type: TransactionModeType::CardNotPresent,\n transaction_category_type: TransactionCategoryType::Recurring,\n sequence_number: 2, // Its required for MIT\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Mandate(mandate_request))\n }\n _ => Err(errors::ConnectorError::NotImplemented(\"Payment method\".to_string()).into()),\n }\n }",
|
| 49 |
+
"after_code": "fn try_from(item: &ZiftRouterData<&PaymentsAuthorizeRouterData>) -> Result<Self, Self::Error> {\n let auth = ZiftAuthType::try_from(&item.router_data.connector_auth_type)?;\n let request_type = if item.router_data.request.is_auto_capture()? {\n RequestType::Sale\n } else {\n RequestType::Auth\n };\n match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(card) => {\n // Check if this is an external 3DS payment - both is_three_ds() and authentication_data must be present\n if item.router_data.is_three_ds()\n && item.router_data.request.authentication_data.is_some()\n {\n // Handle external 3DS authentication\n let auth_data = item\n .router_data\n .request\n .authentication_data\n .as_ref()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"authentication_data\",\n })?;\n\n let authentication_status = AuthenticationStatus::try_from(auth_data)?;\n\n let external_3ds_request = ZiftExternalThreeDsPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardNotPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n authentication_status,\n authentication_code: auth_data.ds_trans_id.clone().map(Secret::new),\n authentication_verification_value: auth_data.cavv.clone(),\n authentication_version: auth_data\n .message_version\n .as_ref()\n .map(|v| Secret::new(v.to_string())),\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::ExternalThreeDs(external_3ds_request))\n } else {\n let card_request = ZiftCardPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n csc: card.card_cvc,\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Card(card_request))\n }\n }\n PaymentMethodData::MandatePayment => {\n let additional_card_details = match item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })? {\n AdditionalPaymentData::Card(card) => *card,\n _ => Err(errors::ConnectorError::NotSupported {\n message: \"Payment Method Not Supported\".to_string(),\n connector: \"DataTrans\",\n })?,\n };\n let mandate_request = ZiftMandatePaymentRequest {\n request_type,\n auth,\n account_type: AccountType::PaymentCard,\n token: Secret::new(item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?),\n account_accessory: additional_card_details.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardNotPresent,\n holder_name: additional_card_details.get_card_holder_name()?,\n holder_type: HolderType::Personal,\n amount: item.amount.to_owned(),\n transaction_mode_type: TransactionModeType::CardNotPresent,\n transaction_category_type: TransactionCategoryType::Recurring,\n sequence_number: 2, // Its required for MIT\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Mandate(mandate_request))\n }\n _ => Err(errors::ConnectorError::NotImplemented(\"Payment method\".to_string()).into()),\n }\n }",
|
| 50 |
+
"diff_span": {
|
| 51 |
+
"before": "fn try_from(item: &ZiftRouterData<&PaymentsAuthorizeRouterData>) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n return Err(\n errors::ConnectorError::NotImplemented(\"3DS Authentication\".to_string()).into(),\n );\n }\n let auth = ZiftAuthType::try_from(&item.router_data.connector_auth_type)?;\n let request_type = if item.router_data.request.is_auto_capture()? {\n RequestType::Sale\n } else {\n RequestType::Auth\n };\n match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(card) => {\n let card_request = ZiftCardPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n csc: card.card_cvc,\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Card(card_request))\n }\n PaymentMethodData::MandatePayment => {",
|
| 52 |
+
"after": " match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(card) => {\n // Check if this is an external 3DS payment - both is_three_ds() and authentication_data must be present\n if item.router_data.is_three_ds()\n && item.router_data.request.authentication_data.is_some()\n {\n // Handle external 3DS authentication\n let auth_data = item\n .router_data\n .request\n .authentication_data\n .as_ref()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"authentication_data\",\n })?;\n\n let authentication_status = AuthenticationStatus::try_from(auth_data)?;\n\n let external_3ds_request = ZiftExternalThreeDsPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardNotPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n authentication_status,\n authentication_code: auth_data.ds_trans_id.clone().map(Secret::new),\n authentication_verification_value: auth_data.cavv.clone(),\n authentication_version: auth_data\n .message_version\n .as_ref()\n .map(|v| Secret::new(v.to_string())),\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::ExternalThreeDs(external_3ds_request))\n } else {\n let card_request = ZiftCardPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n csc: card.card_cvc,\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Card(card_request))\n }\n }\n PaymentMethodData::MandatePayment => {"
|
| 53 |
+
},
|
| 54 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215"
|
| 55 |
+
},
|
| 56 |
+
{
|
| 57 |
+
"id": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs::impl::ZiftPaymentsRequest",
|
| 58 |
+
"file": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs",
|
| 59 |
+
"kind": "impl_item",
|
| 60 |
+
"status": "modified",
|
| 61 |
+
"code_changed": true,
|
| 62 |
+
"imports_changed": false,
|
| 63 |
+
"before_code": "impl TryFrom<&ZiftRouterData<&PaymentsAuthorizeRouterData>> for ZiftPaymentsRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &ZiftRouterData<&PaymentsAuthorizeRouterData>) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n return Err(\n errors::ConnectorError::NotImplemented(\"3DS Authentication\".to_string()).into(),\n );\n }\n let auth = ZiftAuthType::try_from(&item.router_data.connector_auth_type)?;\n let request_type = if item.router_data.request.is_auto_capture()? {\n RequestType::Sale\n } else {\n RequestType::Auth\n };\n match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(card) => {\n let card_request = ZiftCardPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n csc: card.card_cvc,\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Card(card_request))\n }\n PaymentMethodData::MandatePayment => {\n let additional_card_details = match item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })? {\n AdditionalPaymentData::Card(card) => *card,\n _ => Err(errors::ConnectorError::NotSupported {\n message: \"Payment Method Not Supported\".to_string(),\n connector: \"DataTrans\",\n })?,\n };\n let mandate_request = ZiftMandatePaymentRequest {\n request_type,\n auth,\n account_type: AccountType::PaymentCard,\n token: Secret::new(item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?),\n account_accessory: additional_card_details.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardNotPresent,\n holder_name: additional_card_details.get_card_holder_name()?,\n holder_type: HolderType::Personal,\n amount: item.amount.to_owned(),\n transaction_mode_type: TransactionModeType::CardNotPresent,\n transaction_category_type: TransactionCategoryType::Recurring,\n sequence_number: 2, // Its required for MIT\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Mandate(mandate_request))\n }\n _ => Err(errors::ConnectorError::NotImplemented(\"Payment method\".to_string()).into()),\n }\n }\n}",
|
| 64 |
+
"after_code": "impl TryFrom<&ZiftRouterData<&PaymentsAuthorizeRouterData>> for ZiftPaymentsRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &ZiftRouterData<&PaymentsAuthorizeRouterData>) -> Result<Self, Self::Error> {\n let auth = ZiftAuthType::try_from(&item.router_data.connector_auth_type)?;\n let request_type = if item.router_data.request.is_auto_capture()? {\n RequestType::Sale\n } else {\n RequestType::Auth\n };\n match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(card) => {\n // Check if this is an external 3DS payment - both is_three_ds() and authentication_data must be present\n if item.router_data.is_three_ds()\n && item.router_data.request.authentication_data.is_some()\n {\n // Handle external 3DS authentication\n let auth_data = item\n .router_data\n .request\n .authentication_data\n .as_ref()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"authentication_data\",\n })?;\n\n let authentication_status = AuthenticationStatus::try_from(auth_data)?;\n\n let external_3ds_request = ZiftExternalThreeDsPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardNotPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n authentication_status,\n authentication_code: auth_data.ds_trans_id.clone().map(Secret::new),\n authentication_verification_value: auth_data.cavv.clone(),\n authentication_version: auth_data\n .message_version\n .as_ref()\n .map(|v| Secret::new(v.to_string())),\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::ExternalThreeDs(external_3ds_request))\n } else {\n let card_request = ZiftCardPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n csc: card.card_cvc,\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Card(card_request))\n }\n }\n PaymentMethodData::MandatePayment => {\n let additional_card_details = match item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })? {\n AdditionalPaymentData::Card(card) => *card,\n _ => Err(errors::ConnectorError::NotSupported {\n message: \"Payment Method Not Supported\".to_string(),\n connector: \"DataTrans\",\n })?,\n };\n let mandate_request = ZiftMandatePaymentRequest {\n request_type,\n auth,\n account_type: AccountType::PaymentCard,\n token: Secret::new(item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?),\n account_accessory: additional_card_details.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardNotPresent,\n holder_name: additional_card_details.get_card_holder_name()?,\n holder_type: HolderType::Personal,\n amount: item.amount.to_owned(),\n transaction_mode_type: TransactionModeType::CardNotPresent,\n transaction_category_type: TransactionCategoryType::Recurring,\n sequence_number: 2, // Its required for MIT\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Mandate(mandate_request))\n }\n _ => Err(errors::ConnectorError::NotImplemented(\"Payment method\".to_string()).into()),\n }\n }\n}",
|
| 65 |
+
"diff_span": {
|
| 66 |
+
"before": " type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &ZiftRouterData<&PaymentsAuthorizeRouterData>) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n return Err(\n errors::ConnectorError::NotImplemented(\"3DS Authentication\".to_string()).into(),\n );\n }\n let auth = ZiftAuthType::try_from(&item.router_data.connector_auth_type)?;\n let request_type = if item.router_data.request.is_auto_capture()? {\n RequestType::Sale\n } else {\n RequestType::Auth\n };\n match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(card) => {\n let card_request = ZiftCardPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n csc: card.card_cvc,\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Card(card_request))\n }\n PaymentMethodData::MandatePayment => {",
|
| 67 |
+
"after": " match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(card) => {\n // Check if this is an external 3DS payment - both is_three_ds() and authentication_data must be present\n if item.router_data.is_three_ds()\n && item.router_data.request.authentication_data.is_some()\n {\n // Handle external 3DS authentication\n let auth_data = item\n .router_data\n .request\n .authentication_data\n .as_ref()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"authentication_data\",\n })?;\n\n let authentication_status = AuthenticationStatus::try_from(auth_data)?;\n\n let external_3ds_request = ZiftExternalThreeDsPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardNotPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n authentication_status,\n authentication_code: auth_data.ds_trans_id.clone().map(Secret::new),\n authentication_verification_value: auth_data.cavv.clone(),\n authentication_version: auth_data\n .message_version\n .as_ref()\n .map(|v| Secret::new(v.to_string())),\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::ExternalThreeDs(external_3ds_request))\n } else {\n let card_request = ZiftCardPaymentRequest {\n request_type,\n auth,\n account_number: card.card_number.clone(),\n account_accessory: card.get_expiry_date_as_mmyy()?,\n transaction_industry_type: TransactionIndustryType::CardPresent,\n holder_name: item.router_data.get_billing_full_name()?,\n amount: item.amount.to_owned(),\n account_type: AccountType::PaymentCard,\n holder_type: HolderType::Personal,\n csc: card.card_cvc,\n street: item.router_data.get_optional_billing_line1(),\n city: item.router_data.get_optional_billing_city(),\n state: item.router_data.get_optional_billing_state(),\n zip_code: item.router_data.get_optional_billing_zip(),\n country_code: item.router_data.get_optional_billing_country(),\n email: item.router_data.get_optional_billing_email(),\n phone: item.router_data.get_optional_billing_phone_number(),\n };\n Ok(Self::Card(card_request))\n }\n }\n PaymentMethodData::MandatePayment => {"
|
| 68 |
+
},
|
| 69 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215"
|
| 70 |
+
},
|
| 71 |
+
{
|
| 72 |
+
"id": "crates/common_enums/src/connector_enums.rs::Connector::function::is_separate_authentication_supported",
|
| 73 |
+
"file": "crates/common_enums/src/connector_enums.rs",
|
| 74 |
+
"kind": "function_item",
|
| 75 |
+
"status": "modified",
|
| 76 |
+
"code_changed": true,
|
| 77 |
+
"imports_changed": false,
|
| 78 |
+
"before_code": "pub fn is_separate_authentication_supported(self) -> bool {\n match self {\n #[cfg(feature = \"dummy_connector\")]\n Self::DummyBillingConnector => false,\n #[cfg(feature = \"dummy_connector\")]\n Self::DummyConnector1\n | Self::DummyConnector2\n | Self::DummyConnector3\n | Self::DummyConnector4\n | Self::DummyConnector5\n | Self::DummyConnector6\n | Self::DummyConnector7 => false,\n Self::Aci\n // Add Separate authentication support for connectors\n\t\t\t| Self::Authipay\n | Self::Affirm\n | Self::Adyenplatform\n | Self::Airwallex\n | Self::Amazonpay\n | Self::Authorizedotnet\n | Self::Bambora\n | Self::Bamboraapac\n | Self::Bankofamerica\n | Self::Barclaycard\n | Self::Billwerk\n | Self::Bitpay\n | Self::Bluesnap\n | Self::Blackhawknetwork\n | Self::Calida\n | Self::Boku\n | Self::Braintree\n | Self::Breadpay\n | Self::Cashtocode\n | Self::Celero\n | Self::Chargebee\n | Self::Checkbook\n | Self::Coinbase\n | Self::Coingate\n | Self::Cryptopay\n | Self::Zift\n | Self::Custombilling\n | Self::Deutschebank\n | Self::Digitalvirgo\n | Self::Dlocal\n | Self::Dwolla\n | Self::Ebanx\n | Self::Elavon\n | Self::Facilitapay\n | Self::Finix\n | Self::Fiserv\n | Self::Fiservemea\n | Self::Fiuu\n | Self::Flexiti\n | Self::Forte\n | Self::Getnet\n | Self::Gigadat\n | Self::Globalpay\n | Self::Globepay\n | Self::Gocardless\n | Self::Gpayments\n | Self::Hipay\n | Self::Helcim\n | Self::HyperswitchVault\n | Self::Iatapay\n\t\t\t| Self::Inespay\n | Self::Itaubank\n | Self::Jpmorgan\n | Self::Juspaythreedsserver\n | Self::Klarna\n | Self::Loonio\n | Self::Mifinity\n | Self::Mollie\n | Self::Moneris\n | Self::Multisafepay\n | Self::Nexinets\n | Self::Nexixpay\n | Self::Nomupay\n | Self::Nordea\n | Self::Novalnet\n | Self::Opennode\n | Self::Paybox\n | Self::Payload\n | Self::Payme\n | Self::Payone\n | Self::Paypal\n | Self::Paysafe\n | Self::Paystack\n | Self::Payu\n | Self::Peachpayments\n | Self::Placetopay\n | Self::Powertranz\n | Self::Prophetpay\n | Self::Rapyd\n | Self::Recurly\n | Self::Redsys\n | Self::Santander\n | Self::Shift4\n | Self::Silverflow\n | Self::Square\n | Self::Stax\n | Self::Stripebilling\n | Self::Taxjar\n | Self::Tesouro\n // | Self::Thunes\n | Self::Trustpay\n | Self::Trustpayments\n // | Self::Tokenio\n | Self::Tsys\n // | Self::UnifiedAuthenticationService\n | Self::Vgs\n | Self::Volt\n | Self::Wellsfargo\n // | Self::Wellsfargopayout\n | Self::Wise\n | Self::Worldline\n | Self::Worldpay\n | Self::Worldpayvantiv\n | Self::Worldpayxml\n | Self::Xendit\n | Self::Zen\n | Self::Zsl\n | Self::Signifyd\n | Self::Plaid\n | Self::Razorpay\n | Self::Riskified\n | Self::Threedsecureio\n | Self::Netcetera\n | Self::CtpMastercard\n | Self::Cardinal\n | Self::CtpVisa\n | Self::Noon\n | Self::Tokenex\n | Self::Tokenio\n | Self::Stripe\n | Self::Datatrans\n | Self::Paytm\n | Self::Payjustnow\n | Self::Phonepe => false,\n Self::Checkout | Self::Nmi |Self::Cybersource | Self::Archipel | Self::Nuvei | Self::Adyen => true,\n }\n }",
|
| 79 |
+
"after_code": "pub fn is_separate_authentication_supported(self) -> bool {\n match self {\n #[cfg(feature = \"dummy_connector\")]\n Self::DummyBillingConnector => false,\n #[cfg(feature = \"dummy_connector\")]\n Self::DummyConnector1\n | Self::DummyConnector2\n | Self::DummyConnector3\n | Self::DummyConnector4\n | Self::DummyConnector5\n | Self::DummyConnector6\n | Self::DummyConnector7 => false,\n Self::Aci\n // Add Separate authentication support for connectors\n\t\t\t| Self::Authipay\n | Self::Affirm\n | Self::Adyenplatform\n | Self::Airwallex\n | Self::Amazonpay\n | Self::Authorizedotnet\n | Self::Bambora\n | Self::Bamboraapac\n | Self::Bankofamerica\n | Self::Barclaycard\n | Self::Billwerk\n | Self::Bitpay\n | Self::Bluesnap\n | Self::Blackhawknetwork\n | Self::Calida\n | Self::Boku\n | Self::Braintree\n | Self::Breadpay\n | Self::Cashtocode\n | Self::Celero\n | Self::Chargebee\n | Self::Checkbook\n | Self::Coinbase\n | Self::Coingate\n | Self::Cryptopay\n | Self::Custombilling\n | Self::Deutschebank\n | Self::Digitalvirgo\n | Self::Dlocal\n | Self::Dwolla\n | Self::Ebanx\n | Self::Elavon\n | Self::Facilitapay\n | Self::Finix\n | Self::Fiserv\n | Self::Fiservemea\n | Self::Fiuu\n | Self::Flexiti\n | Self::Forte\n | Self::Getnet\n | Self::Gigadat\n | Self::Globalpay\n | Self::Globepay\n | Self::Gocardless\n | Self::Gpayments\n | Self::Hipay\n | Self::Helcim\n | Self::HyperswitchVault\n | Self::Iatapay\n\t\t\t| Self::Inespay\n | Self::Itaubank\n | Self::Jpmorgan\n | Self::Juspaythreedsserver\n | Self::Klarna\n | Self::Loonio\n | Self::Mifinity\n | Self::Mollie\n | Self::Moneris\n | Self::Multisafepay\n | Self::Nexinets\n | Self::Nexixpay\n | Self::Nomupay\n | Self::Nordea\n | Self::Novalnet\n | Self::Opennode\n | Self::Paybox\n | Self::Payload\n | Self::Payme\n | Self::Payone\n | Self::Paypal\n | Self::Paysafe\n | Self::Paystack\n | Self::Payu\n | Self::Peachpayments\n | Self::Placetopay\n | Self::Powertranz\n | Self::Prophetpay\n | Self::Rapyd\n | Self::Recurly\n | Self::Redsys\n | Self::Santander\n | Self::Shift4\n | Self::Silverflow\n | Self::Square\n | Self::Stax\n | Self::Stripebilling\n | Self::Taxjar\n | Self::Tesouro\n // | Self::Thunes\n | Self::Trustpay\n | Self::Trustpayments\n // | Self::Tokenio\n | Self::Tsys\n // | Self::UnifiedAuthenticationService\n | Self::Vgs\n | Self::Volt\n | Self::Wellsfargo\n // | Self::Wellsfargopayout\n | Self::Wise\n | Self::Worldline\n | Self::Worldpay\n | Self::Worldpayvantiv\n | Self::Worldpayxml\n | Self::Xendit\n | Self::Zen\n | Self::Zsl\n | Self::Signifyd\n | Self::Plaid\n | Self::Razorpay\n | Self::Riskified\n | Self::Threedsecureio\n | Self::Netcetera\n | Self::CtpMastercard\n | Self::Cardinal\n | Self::CtpVisa\n | Self::Noon\n | Self::Tokenex\n | Self::Tokenio\n | Self::Stripe\n | Self::Datatrans\n | Self::Paytm\n | Self::Payjustnow\n | Self::Phonepe => false,\n Self::Checkout |Self::Zift| Self::Nmi |Self::Cybersource | Self::Archipel | Self::Nuvei | Self::Adyen => true,\n }\n }",
|
| 80 |
+
"diff_span": {
|
| 81 |
+
"before": " | Self::Coingate\n | Self::Cryptopay\n | Self::Zift\n | Self::Custombilling\n | Self::Deutschebank\n | Self::Digitalvirgo\n | Self::Dlocal\n | Self::Dwolla\n | Self::Ebanx\n | Self::Elavon\n | Self::Facilitapay\n | Self::Finix\n | Self::Fiserv\n | Self::Fiservemea\n | Self::Fiuu\n | Self::Flexiti\n | Self::Forte\n | Self::Getnet\n | Self::Gigadat\n | Self::Globalpay\n | Self::Globepay\n | Self::Gocardless\n | Self::Gpayments\n | Self::Hipay\n | Self::Helcim\n | Self::HyperswitchVault\n | Self::Iatapay\n\t\t\t| Self::Inespay\n | Self::Itaubank\n | Self::Jpmorgan\n | Self::Juspaythreedsserver\n | Self::Klarna\n | Self::Loonio\n | Self::Mifinity\n | Self::Mollie\n | Self::Moneris\n | Self::Multisafepay\n | Self::Nexinets\n | Self::Nexixpay\n | Self::Nomupay\n | Self::Nordea\n | Self::Novalnet\n | Self::Opennode\n | Self::Paybox\n | Self::Payload\n | Self::Payme\n | Self::Payone\n | Self::Paypal\n | Self::Paysafe\n | Self::Paystack\n | Self::Payu\n | Self::Peachpayments\n | Self::Placetopay\n | Self::Powertranz\n | Self::Prophetpay\n | Self::Rapyd\n | Self::Recurly\n | Self::Redsys\n | Self::Santander\n | Self::Shift4\n | Self::Silverflow\n | Self::Square\n | Self::Stax\n | Self::Stripebilling\n | Self::Taxjar\n | Self::Tesouro\n // | Self::Thunes\n | Self::Trustpay\n | Self::Trustpayments\n // | Self::Tokenio\n | Self::Tsys\n // | Self::UnifiedAuthenticationService\n | Self::Vgs\n | Self::Volt\n | Self::Wellsfargo\n // | Self::Wellsfargopayout\n | Self::Wise\n | Self::Worldline\n | Self::Worldpay\n | Self::Worldpayvantiv\n | Self::Worldpayxml\n | Self::Xendit\n | Self::Zen\n | Self::Zsl\n | Self::Signifyd\n | Self::Plaid\n | Self::Razorpay\n | Self::Riskified\n | Self::Threedsecureio\n | Self::Netcetera\n | Self::CtpMastercard\n | Self::Cardinal\n | Self::CtpVisa\n | Self::Noon\n | Self::Tokenex\n | Self::Tokenio\n | Self::Stripe\n | Self::Datatrans\n | Self::Paytm\n | Self::Payjustnow\n | Self::Phonepe => false,\n Self::Checkout | Self::Nmi |Self::Cybersource | Self::Archipel | Self::Nuvei | Self::Adyen => true,\n }\n }",
|
| 82 |
+
"after": " | Self::Payjustnow\n | Self::Phonepe => false,\n Self::Checkout |Self::Zift| Self::Nmi |Self::Cybersource | Self::Archipel | Self::Nuvei | Self::Adyen => true,\n }\n }"
|
| 83 |
+
},
|
| 84 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215"
|
| 85 |
+
},
|
| 86 |
+
{
|
| 87 |
+
"id": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs::struct::ZiftExternalThreeDsPaymentRequest",
|
| 88 |
+
"file": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs",
|
| 89 |
+
"kind": "struct_item",
|
| 90 |
+
"status": "added",
|
| 91 |
+
"before_code": null,
|
| 92 |
+
"after_code": "pub struct ZiftExternalThreeDsPaymentRequest {\n request_type: RequestType,\n #[serde(flatten)]\n auth: ZiftAuthType,\n account_type: AccountType,\n account_number: cards::CardNumber,\n account_accessory: Secret<String>,\n transaction_industry_type: TransactionIndustryType,\n holder_name: Secret<String>,\n holder_type: HolderType,\n amount: StringMinorUnit,\n // 3DS authentication fields\n authentication_status: AuthenticationStatus,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n authentication_code: Option<Secret<String>>,\n authentication_verification_value: Secret<String>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n authentication_version: Option<Secret<String>>,\n // Billing address\n #[serde(skip_serializing_if = \"Option::is_none\")]\n street: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n city: Option<String>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n state: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n zip_code: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n country_code: Option<CountryAlpha2>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n email: Option<pii::Email>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n phone: Option<Secret<String>>,\n}",
|
| 93 |
+
"diff_span": null,
|
| 94 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215"
|
| 95 |
+
},
|
| 96 |
+
{
|
| 97 |
+
"id": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs::impl::AuthenticationStatus",
|
| 98 |
+
"file": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs",
|
| 99 |
+
"kind": "impl_item",
|
| 100 |
+
"status": "added",
|
| 101 |
+
"before_code": null,
|
| 102 |
+
"after_code": "impl TryFrom<&hyperswitch_domain_models::router_request_types::AuthenticationData>\n for AuthenticationStatus\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n\n fn try_from(\n auth_data: &hyperswitch_domain_models::router_request_types::AuthenticationData,\n ) -> Result<Self, Self::Error> {\n // Map authentication status based on trans_status field\n let authentication_status = match auth_data.transaction_status {\n Some(common_enums::TransactionStatus::Success) => Self::Success,\n Some(common_enums::TransactionStatus::NotVerified) => Self::Attempted,\n Some(common_enums::TransactionStatus::VerificationNotPerformed)\n | Some(common_enums::TransactionStatus::Rejected)\n | Some(common_enums::TransactionStatus::InformationOnly)\n | Some(common_enums::TransactionStatus::Failure)\n | Some(common_enums::TransactionStatus::ChallengeRequired)\n | Some(common_enums::TransactionStatus::ChallengeRequiredDecoupledAuthentication)\n | None => Self::Unavailable,\n };\n Ok(authentication_status)\n }\n}",
|
| 103 |
+
"diff_span": null,
|
| 104 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215"
|
| 105 |
+
},
|
| 106 |
+
{
|
| 107 |
+
"id": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs::AuthenticationStatus::function::try_from",
|
| 108 |
+
"file": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs",
|
| 109 |
+
"kind": "function_item",
|
| 110 |
+
"status": "added",
|
| 111 |
+
"before_code": null,
|
| 112 |
+
"after_code": "fn try_from(\n auth_data: &hyperswitch_domain_models::router_request_types::AuthenticationData,\n ) -> Result<Self, Self::Error> {\n // Map authentication status based on trans_status field\n let authentication_status = match auth_data.transaction_status {\n Some(common_enums::TransactionStatus::Success) => Self::Success,\n Some(common_enums::TransactionStatus::NotVerified) => Self::Attempted,\n Some(common_enums::TransactionStatus::VerificationNotPerformed)\n | Some(common_enums::TransactionStatus::Rejected)\n | Some(common_enums::TransactionStatus::InformationOnly)\n | Some(common_enums::TransactionStatus::Failure)\n | Some(common_enums::TransactionStatus::ChallengeRequired)\n | Some(common_enums::TransactionStatus::ChallengeRequiredDecoupledAuthentication)\n | None => Self::Unavailable,\n };\n Ok(authentication_status)\n }",
|
| 113 |
+
"diff_span": null,
|
| 114 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215"
|
| 115 |
+
},
|
| 116 |
+
{
|
| 117 |
+
"id": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs::enum::AuthenticationStatus",
|
| 118 |
+
"file": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs",
|
| 119 |
+
"kind": "enum_item",
|
| 120 |
+
"status": "added",
|
| 121 |
+
"before_code": null,
|
| 122 |
+
"after_code": "pub enum AuthenticationStatus {\n #[serde(rename = \"Y\")]\n Success,\n #[serde(rename = \"A\")]\n Attempted,\n #[serde(rename = \"U\")]\n Unavailable,\n}",
|
| 123 |
+
"diff_span": null,
|
| 124 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215"
|
| 125 |
+
},
|
| 126 |
+
{
|
| 127 |
+
"id": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs::AuthenticationStatus::type::Error",
|
| 128 |
+
"file": "crates/hyperswitch_connectors/src/connectors/zift/transformers.rs",
|
| 129 |
+
"kind": "type_item",
|
| 130 |
+
"status": "added",
|
| 131 |
+
"before_code": null,
|
| 132 |
+
"after_code": "type Error = error_stack::Report<errors::ConnectorError>;",
|
| 133 |
+
"diff_span": null,
|
| 134 |
+
"commit_sha": "fa6a2d24b812ba46668b567761b81fa3638a3215"
|
| 135 |
+
}
|
| 136 |
+
]
|
| 137 |
+
}
|
diffs/pr_10324/590c7c8/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10324/e080ba2/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10436/2e7d22a/diff.json
ADDED
|
@@ -0,0 +1,205 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed",
|
| 3 |
+
"pr_number": 10436,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::NovalnetCaptureRequest::function::try_from",
|
| 10 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn try_from(\n item: &NovalnetRouterData<&PaymentsCaptureRouterData>,\n ) -> Result<Self, Self::Error> {\n let capture_type = CaptureType::Final;\n let reference = item.router_data.connector_request_reference_id.clone();\n let capture = Capture {\n cap_type: capture_type,\n reference,\n };\n\n let transaction = NovalnetTransaction {\n tid: item.router_data.request.connector_transaction_id.clone(),\n capture,\n amount: Some(item.amount.to_owned()),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .router_data\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string()),\n extra: None,\n };\n Ok(Self {\n transaction,\n custom,\n })\n }",
|
| 16 |
+
"after_code": "fn try_from(\n item: &NovalnetRouterData<&PaymentsCaptureRouterData>,\n ) -> Result<Self, Self::Error> {\n let capture_type = CaptureType::Final;\n let reference = item.router_data.connector_request_reference_id.clone();\n let capture = Capture {\n cap_type: capture_type,\n reference,\n };\n\n let transaction = NovalnetTransaction {\n tid: item.router_data.request.connector_transaction_id.clone(),\n capture,\n amount: Some(item.amount.to_owned()),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .router_data\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string()),\n };\n Ok(Self {\n transaction,\n custom,\n })\n }",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string()),\n extra: None,\n };\n Ok(Self {",
|
| 19 |
+
"after": ""
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::impl::NovalnetCaptureRequest",
|
| 25 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 26 |
+
"kind": "impl_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "impl TryFrom<&NovalnetRouterData<&PaymentsCaptureRouterData>> for NovalnetCaptureRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: &NovalnetRouterData<&PaymentsCaptureRouterData>,\n ) -> Result<Self, Self::Error> {\n let capture_type = CaptureType::Final;\n let reference = item.router_data.connector_request_reference_id.clone();\n let capture = Capture {\n cap_type: capture_type,\n reference,\n };\n\n let transaction = NovalnetTransaction {\n tid: item.router_data.request.connector_transaction_id.clone(),\n capture,\n amount: Some(item.amount.to_owned()),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .router_data\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string()),\n extra: None,\n };\n Ok(Self {\n transaction,\n custom,\n })\n }\n}",
|
| 31 |
+
"after_code": "impl TryFrom<&NovalnetRouterData<&PaymentsCaptureRouterData>> for NovalnetCaptureRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: &NovalnetRouterData<&PaymentsCaptureRouterData>,\n ) -> Result<Self, Self::Error> {\n let capture_type = CaptureType::Final;\n let reference = item.router_data.connector_request_reference_id.clone();\n let capture = Capture {\n cap_type: capture_type,\n reference,\n };\n\n let transaction = NovalnetTransaction {\n tid: item.router_data.request.connector_transaction_id.clone(),\n capture,\n amount: Some(item.amount.to_owned()),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .router_data\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string()),\n };\n Ok(Self {\n transaction,\n custom,\n })\n }\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string()),\n extra: None,\n };\n Ok(Self {",
|
| 34 |
+
"after": ""
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 37 |
+
},
|
| 38 |
+
{
|
| 39 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::NovalnetCancelRequest::function::try_from",
|
| 40 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 41 |
+
"kind": "function_item",
|
| 42 |
+
"status": "modified",
|
| 43 |
+
"code_changed": true,
|
| 44 |
+
"imports_changed": false,
|
| 45 |
+
"before_code": "fn try_from(item: &PaymentsCancelRouterData) -> Result<Self, Self::Error> {\n let transaction = NovalnetCancelTransaction {\n tid: item.request.connector_transaction_id.clone(),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {\n transaction,\n custom,\n })\n }",
|
| 46 |
+
"after_code": "fn try_from(item: &PaymentsCancelRouterData) -> Result<Self, Self::Error> {\n let transaction = NovalnetCancelTransaction {\n tid: item.request.connector_transaction_id.clone(),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n };\n Ok(Self {\n transaction,\n custom,\n })\n }",
|
| 47 |
+
"diff_span": {
|
| 48 |
+
"before": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {",
|
| 49 |
+
"after": ""
|
| 50 |
+
},
|
| 51 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 52 |
+
},
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::impl::NovalnetCancelRequest",
|
| 55 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 56 |
+
"kind": "impl_item",
|
| 57 |
+
"status": "modified",
|
| 58 |
+
"code_changed": true,
|
| 59 |
+
"imports_changed": false,
|
| 60 |
+
"before_code": "impl TryFrom<&PaymentsCancelRouterData> for NovalnetCancelRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &PaymentsCancelRouterData) -> Result<Self, Self::Error> {\n let transaction = NovalnetCancelTransaction {\n tid: item.request.connector_transaction_id.clone(),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {\n transaction,\n custom,\n })\n }\n}",
|
| 61 |
+
"after_code": "impl TryFrom<&PaymentsCancelRouterData> for NovalnetCancelRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &PaymentsCancelRouterData) -> Result<Self, Self::Error> {\n let transaction = NovalnetCancelTransaction {\n tid: item.request.connector_transaction_id.clone(),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n };\n Ok(Self {\n transaction,\n custom,\n })\n }\n}",
|
| 62 |
+
"diff_span": {
|
| 63 |
+
"before": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {",
|
| 64 |
+
"after": ""
|
| 65 |
+
},
|
| 66 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 67 |
+
},
|
| 68 |
+
{
|
| 69 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::impl::NovalnetSyncRequest",
|
| 70 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 71 |
+
"kind": "impl_item",
|
| 72 |
+
"status": "modified",
|
| 73 |
+
"code_changed": true,
|
| 74 |
+
"imports_changed": false,
|
| 75 |
+
"before_code": "impl TryFrom<&RefundSyncRouterData> for NovalnetSyncRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &RefundSyncRouterData) -> Result<Self, Self::Error> {\n let transaction = NovalnetSyncTransaction {\n tid: item.request.connector_transaction_id.clone(),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {\n transaction,\n custom,\n })\n }\n}",
|
| 76 |
+
"after_code": "impl TryFrom<&RefundSyncRouterData> for NovalnetSyncRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &RefundSyncRouterData) -> Result<Self, Self::Error> {\n let transaction = NovalnetSyncTransaction {\n tid: item.request.connector_transaction_id.clone(),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n };\n Ok(Self {\n transaction,\n custom,\n })\n }\n}",
|
| 77 |
+
"diff_span": {
|
| 78 |
+
"before": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {",
|
| 79 |
+
"after": ""
|
| 80 |
+
},
|
| 81 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 82 |
+
},
|
| 83 |
+
{
|
| 84 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::impl::NovalnetRefundRequest",
|
| 85 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 86 |
+
"kind": "impl_item",
|
| 87 |
+
"status": "modified",
|
| 88 |
+
"code_changed": true,
|
| 89 |
+
"imports_changed": false,
|
| 90 |
+
"before_code": "impl<F> TryFrom<&NovalnetRouterData<&RefundsRouterData<F>>> for NovalnetRefundRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &NovalnetRouterData<&RefundsRouterData<F>>) -> Result<Self, Self::Error> {\n let transaction = NovalnetRefundTransaction {\n tid: item.router_data.request.connector_transaction_id.clone(),\n amount: Some(item.amount.to_owned()),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .router_data\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {\n transaction,\n custom,\n })\n }\n}",
|
| 91 |
+
"after_code": "impl<F> TryFrom<&NovalnetRouterData<&RefundsRouterData<F>>> for NovalnetRefundRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &NovalnetRouterData<&RefundsRouterData<F>>) -> Result<Self, Self::Error> {\n let transaction = NovalnetRefundTransaction {\n tid: item.router_data.request.connector_transaction_id.clone(),\n amount: Some(item.amount.to_owned()),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .router_data\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n };\n Ok(Self {\n transaction,\n custom,\n })\n }\n}",
|
| 92 |
+
"diff_span": {
|
| 93 |
+
"before": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {",
|
| 94 |
+
"after": ""
|
| 95 |
+
},
|
| 96 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 97 |
+
},
|
| 98 |
+
{
|
| 99 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::struct::NovalnetCustom",
|
| 100 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 101 |
+
"kind": "struct_item",
|
| 102 |
+
"status": "modified",
|
| 103 |
+
"code_changed": true,
|
| 104 |
+
"imports_changed": true,
|
| 105 |
+
"before_code": "pub struct NovalnetCustom {\n lang: String,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n #[serde(flatten)]\n pub extra: Option<HashMap<String, String>>,\n}",
|
| 106 |
+
"after_code": "pub struct NovalnetCustom {\n lang: String,\n}",
|
| 107 |
+
"diff_span": {
|
| 108 |
+
"before": "pub struct NovalnetCustom {\n lang: String,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n #[serde(flatten)]\n pub extra: Option<HashMap<String, String>>,\n}",
|
| 109 |
+
"after": ""
|
| 110 |
+
},
|
| 111 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed",
|
| 112 |
+
"before_imports": [
|
| 113 |
+
"use std::collections::HashMap;",
|
| 114 |
+
"use common_utils::{\n consts,\n ext_traits::OptionExt,\n pii::Email,\n request::Method,\n types::{MinorUnit, StringMinorUnit},\n};",
|
| 115 |
+
"use crate::{\n types::{\n PaymentsCancelResponseRouterData, PaymentsCaptureResponseRouterData,\n RefundsResponseRouterData, ResponseRouterData,\n },\n utils::{\n self, AddressData, AddressDetailsData, ApplePay, PaymentsAuthorizeRequestData,\n PaymentsCancelRequestData, PaymentsCaptureRequestData, PaymentsSetupMandateRequestData,\n PaymentsSyncRequestData, RefundsRequestData, RouterData as _,\n },\n};",
|
| 116 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{\n BankDebitData, PaymentMethodData, WalletData as WalletDataPaymentMethod,\n },\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::{PaymentsSyncData, ResponseId},\n router_response_types::{\n MandateReference, PaymentsResponseData, RedirectForm, RefundsResponseData,\n },\n types::{\n PaymentsAuthorizeRouterData, PaymentsCancelRouterData, PaymentsCaptureRouterData,\n PaymentsSyncRouterData, RefundSyncRouterData, RefundsRouterData, SetupMandateRouterData,\n },\n};"
|
| 117 |
+
],
|
| 118 |
+
"after_imports": [
|
| 119 |
+
"use crate::{\n types::{\n PaymentsCancelResponseRouterData, PaymentsCaptureResponseRouterData,\n RefundsResponseRouterData, ResponseRouterData,\n },\n utils::{\n self, AddressData, AddressDetailsData, ApplePay, PaymentsAuthorizeRequestData,\n PaymentsCancelRequestData, PaymentsCaptureRequestData, PaymentsSetupMandateRequestData,\n PaymentsSyncRequestData, RefundsRequestData, RouterData as _,\n },\n};",
|
| 120 |
+
"use common_utils::{\n consts,\n ext_traits::OptionExt,\n pii::Email,\n request::Method,\n types::{MinorUnit, StringMinorUnit},\n};",
|
| 121 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{\n BankDebitData, PaymentMethodData, WalletData as WalletDataPaymentMethod,\n },\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::{PaymentsSyncData, ResponseId},\n router_response_types::{\n MandateReference, PaymentsResponseData, RedirectForm, RefundsResponseData,\n },\n types::{\n PaymentsAuthorizeRouterData, PaymentsCancelRouterData, PaymentsCaptureRouterData,\n PaymentsSyncRouterData, RefundSyncRouterData, RefundsRouterData, SetupMandateRouterData,\n },\n};"
|
| 122 |
+
]
|
| 123 |
+
},
|
| 124 |
+
{
|
| 125 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::NovalnetSyncRequest::function::try_from",
|
| 126 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 127 |
+
"kind": "function_item",
|
| 128 |
+
"status": "modified",
|
| 129 |
+
"code_changed": true,
|
| 130 |
+
"imports_changed": false,
|
| 131 |
+
"before_code": "fn try_from(item: &RefundSyncRouterData) -> Result<Self, Self::Error> {\n let transaction = NovalnetSyncTransaction {\n tid: item.request.connector_transaction_id.clone(),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {\n transaction,\n custom,\n })\n }",
|
| 132 |
+
"after_code": "fn try_from(item: &RefundSyncRouterData) -> Result<Self, Self::Error> {\n let transaction = NovalnetSyncTransaction {\n tid: item.request.connector_transaction_id.clone(),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n };\n Ok(Self {\n transaction,\n custom,\n })\n }",
|
| 133 |
+
"diff_span": {
|
| 134 |
+
"before": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {",
|
| 135 |
+
"after": ""
|
| 136 |
+
},
|
| 137 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 138 |
+
},
|
| 139 |
+
{
|
| 140 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::NovalnetRefundRequest::function::try_from",
|
| 141 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 142 |
+
"kind": "function_item",
|
| 143 |
+
"status": "modified",
|
| 144 |
+
"code_changed": true,
|
| 145 |
+
"imports_changed": false,
|
| 146 |
+
"before_code": "fn try_from(item: &NovalnetRouterData<&RefundsRouterData<F>>) -> Result<Self, Self::Error> {\n let transaction = NovalnetRefundTransaction {\n tid: item.router_data.request.connector_transaction_id.clone(),\n amount: Some(item.amount.to_owned()),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .router_data\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {\n transaction,\n custom,\n })\n }",
|
| 147 |
+
"after_code": "fn try_from(item: &NovalnetRouterData<&RefundsRouterData<F>>) -> Result<Self, Self::Error> {\n let transaction = NovalnetRefundTransaction {\n tid: item.router_data.request.connector_transaction_id.clone(),\n amount: Some(item.amount.to_owned()),\n };\n\n let custom = NovalnetCustom {\n lang: item\n .router_data\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n };\n Ok(Self {\n transaction,\n custom,\n })\n }",
|
| 148 |
+
"diff_span": {
|
| 149 |
+
"before": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string()),\n extra: None,\n };\n Ok(Self {",
|
| 150 |
+
"after": ""
|
| 151 |
+
},
|
| 152 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 153 |
+
},
|
| 154 |
+
{
|
| 155 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::impl::NovalnetPaymentsRequest",
|
| 156 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 157 |
+
"kind": "impl_item",
|
| 158 |
+
"status": "modified",
|
| 159 |
+
"code_changed": true,
|
| 160 |
+
"imports_changed": false,
|
| 161 |
+
"before_code": "impl TryFrom<&SetupMandateRouterData> for NovalnetPaymentsRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &SetupMandateRouterData) -> Result<Self, Self::Error> {\n let auth = NovalnetAuthType::try_from(&item.connector_auth_type)?;\n\n let merchant = NovalnetPaymentsRequestMerchant {\n signature: auth.product_activation_key,\n tariff: auth.tariff_id,\n };\n\n let enforce_3d = match item.auth_type {\n enums::AuthenticationType::ThreeDs => Some(1),\n enums::AuthenticationType::NoThreeDs => None,\n };\n let test_mode = get_test_mode(item.test_mode);\n let req_address = item.get_optional_billing();\n\n let billing = NovalnetPaymentsRequestBilling {\n house_no: item.get_optional_billing_line1(),\n street: item.get_optional_billing_line2(),\n city: item.get_optional_billing_city().map(Secret::new),\n zip: item.get_optional_billing_zip(),\n country_code: item.get_optional_billing_country(),\n };\n\n let email = item.get_billing_email().or(item.request.get_email())?;\n\n let customer = NovalnetPaymentsRequestCustomer {\n first_name: req_address.and_then(|addr| addr.get_optional_first_name()),\n last_name: req_address.and_then(|addr| addr.get_optional_last_name()),\n email,\n mobile: item.get_optional_billing_phone_number(),\n billing: Some(billing),\n // no_nc is used to indicate if minimal customer data is passed or not\n no_nc: MINIMAL_CUSTOMER_DATA_PASSED,\n birth_date: Some(String::from(\"1992-06-10\")),\n };\n\n let lang = item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string());\n let extra = metadata_to_novalnet_extra(item.request.metadata.clone().map(|m| m.expose()))?;\n let custom = NovalnetCustom { lang, extra };\n let hook_url = item.request.get_webhook_url()?;\n let return_url = item.request.get_return_url()?;\n let create_token = Some(CREATE_TOKEN_REQUIRED);\n\n match item.request.payment_method_data {\n PaymentMethodData::Card(ref req_card) => {\n let novalnet_card = NovalNetPaymentData::Card(NovalnetCard {\n card_number: req_card.card_number.clone(),\n card_expiry_month: req_card.card_exp_month.clone(),\n card_expiry_year: req_card.card_exp_year.clone(),\n card_cvc: req_card.card_cvc.clone(),\n card_holder: item.get_billing_address()?.get_full_name()?,\n });\n\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::CREDITCARD,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: Some(return_url.clone()),\n error_return_url: Some(return_url.clone()),\n payment_data: Some(novalnet_card),\n enforce_3d,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n\n PaymentMethodData::Wallet(ref wallet_data) => match wallet_data {\n WalletDataPaymentMethod::GooglePay(ref req_wallet) => {\n let novalnet_google_pay: NovalNetPaymentData =\n NovalNetPaymentData::GooglePay(NovalnetGooglePay {\n wallet_data: Secret::new(\n req_wallet\n .tokenization_data\n .get_encrypted_google_pay_token()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"gpay wallet_token\",\n })?\n .clone(),\n ),\n });\n\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::GOOGLEPAY,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: None,\n error_return_url: None,\n payment_data: Some(novalnet_google_pay),\n enforce_3d,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::ApplePay(payment_method_data) => {\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::APPLEPAY,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: None,\n error_return_url: None,\n payment_data: Some(NovalNetPaymentData::ApplePay(NovalnetApplePay {\n wallet_data: payment_method_data.get_applepay_decoded_payment_data()?,\n })),\n enforce_3d: None,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::AliPayQr(_)\n | WalletDataPaymentMethod::AliPayRedirect(_)\n | WalletDataPaymentMethod::AliPayHkRedirect(_)\n | WalletDataPaymentMethod::AmazonPay(_)\n | WalletDataPaymentMethod::AmazonPayRedirect(_)\n | WalletDataPaymentMethod::Paysera(_)\n | WalletDataPaymentMethod::Skrill(_)\n | WalletDataPaymentMethod::BluecodeRedirect {}\n | WalletDataPaymentMethod::MomoRedirect(_)\n | WalletDataPaymentMethod::KakaoPayRedirect(_)\n | WalletDataPaymentMethod::GoPayRedirect(_)\n | WalletDataPaymentMethod::GcashRedirect(_)\n | WalletDataPaymentMethod::ApplePayRedirect(_)\n | WalletDataPaymentMethod::ApplePayThirdPartySdk(_)\n | WalletDataPaymentMethod::DanaRedirect {}\n | WalletDataPaymentMethod::GooglePayRedirect(_)\n | WalletDataPaymentMethod::GooglePayThirdPartySdk(_)\n | WalletDataPaymentMethod::MbWayRedirect(_)\n | WalletDataPaymentMethod::MobilePayRedirect(_)\n | WalletDataPaymentMethod::RevolutPay(_) => {\n Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?\n }\n WalletDataPaymentMethod::PaypalRedirect(_) => {\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::PAYPAL,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: Some(return_url.clone()),\n error_return_url: Some(return_url.clone()),\n payment_data: None,\n enforce_3d: None,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::PaypalSdk(_)\n | WalletDataPaymentMethod::Paze(_)\n | WalletDataPaymentMethod::SamsungPay(_)\n | WalletDataPaymentMethod::TwintRedirect {}\n | WalletDataPaymentMethod::VippsRedirect {}\n | WalletDataPaymentMethod::TouchNGoRedirect(_)\n | WalletDataPaymentMethod::WeChatPayRedirect(_)\n | WalletDataPaymentMethod::CashappQr(_)\n | WalletDataPaymentMethod::SwishQr(_)\n | WalletDataPaymentMethod::WeChatPayQr(_)\n | WalletDataPaymentMethod::Mifinity(_) => {\n Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?\n }\n },\n _ => Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?,\n }\n }\n}",
|
| 162 |
+
"after_code": "impl TryFrom<&SetupMandateRouterData> for NovalnetPaymentsRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &SetupMandateRouterData) -> Result<Self, Self::Error> {\n let auth = NovalnetAuthType::try_from(&item.connector_auth_type)?;\n\n let merchant = NovalnetPaymentsRequestMerchant {\n signature: auth.product_activation_key,\n tariff: auth.tariff_id,\n };\n\n let enforce_3d = match item.auth_type {\n enums::AuthenticationType::ThreeDs => Some(1),\n enums::AuthenticationType::NoThreeDs => None,\n };\n let test_mode = get_test_mode(item.test_mode);\n let req_address = item.get_optional_billing();\n\n let billing = NovalnetPaymentsRequestBilling {\n house_no: item.get_optional_billing_line1(),\n street: item.get_optional_billing_line2(),\n city: item.get_optional_billing_city().map(Secret::new),\n zip: item.get_optional_billing_zip(),\n country_code: item.get_optional_billing_country(),\n };\n\n let email = item.get_billing_email().or(item.request.get_email())?;\n\n let customer = NovalnetPaymentsRequestCustomer {\n first_name: req_address.and_then(|addr| addr.get_optional_first_name()),\n last_name: req_address.and_then(|addr| addr.get_optional_last_name()),\n email,\n mobile: item.get_optional_billing_phone_number(),\n billing: Some(billing),\n // no_nc is used to indicate if minimal customer data is passed or not\n no_nc: MINIMAL_CUSTOMER_DATA_PASSED,\n birth_date: Some(String::from(\"1992-06-10\")),\n };\n\n let lang = item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string());\n\n let custom = NovalnetCustom { lang };\n let hook_url = item.request.get_webhook_url()?;\n let return_url = item.request.get_return_url()?;\n let create_token = Some(CREATE_TOKEN_REQUIRED);\n\n match item.request.payment_method_data {\n PaymentMethodData::Card(ref req_card) => {\n let novalnet_card = NovalNetPaymentData::Card(NovalnetCard {\n card_number: req_card.card_number.clone(),\n card_expiry_month: req_card.card_exp_month.clone(),\n card_expiry_year: req_card.card_exp_year.clone(),\n card_cvc: req_card.card_cvc.clone(),\n card_holder: item.get_billing_address()?.get_full_name()?,\n });\n\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::CREDITCARD,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: Some(return_url.clone()),\n error_return_url: Some(return_url.clone()),\n payment_data: Some(novalnet_card),\n enforce_3d,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n\n PaymentMethodData::Wallet(ref wallet_data) => match wallet_data {\n WalletDataPaymentMethod::GooglePay(ref req_wallet) => {\n let novalnet_google_pay: NovalNetPaymentData =\n NovalNetPaymentData::GooglePay(NovalnetGooglePay {\n wallet_data: Secret::new(\n req_wallet\n .tokenization_data\n .get_encrypted_google_pay_token()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"gpay wallet_token\",\n })?\n .clone(),\n ),\n });\n\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::GOOGLEPAY,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: None,\n error_return_url: None,\n payment_data: Some(novalnet_google_pay),\n enforce_3d,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::ApplePay(payment_method_data) => {\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::APPLEPAY,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: None,\n error_return_url: None,\n payment_data: Some(NovalNetPaymentData::ApplePay(NovalnetApplePay {\n wallet_data: payment_method_data.get_applepay_decoded_payment_data()?,\n })),\n enforce_3d: None,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::AliPayQr(_)\n | WalletDataPaymentMethod::AliPayRedirect(_)\n | WalletDataPaymentMethod::AliPayHkRedirect(_)\n | WalletDataPaymentMethod::AmazonPay(_)\n | WalletDataPaymentMethod::AmazonPayRedirect(_)\n | WalletDataPaymentMethod::Paysera(_)\n | WalletDataPaymentMethod::Skrill(_)\n | WalletDataPaymentMethod::BluecodeRedirect {}\n | WalletDataPaymentMethod::MomoRedirect(_)\n | WalletDataPaymentMethod::KakaoPayRedirect(_)\n | WalletDataPaymentMethod::GoPayRedirect(_)\n | WalletDataPaymentMethod::GcashRedirect(_)\n | WalletDataPaymentMethod::ApplePayRedirect(_)\n | WalletDataPaymentMethod::ApplePayThirdPartySdk(_)\n | WalletDataPaymentMethod::DanaRedirect {}\n | WalletDataPaymentMethod::GooglePayRedirect(_)\n | WalletDataPaymentMethod::GooglePayThirdPartySdk(_)\n | WalletDataPaymentMethod::MbWayRedirect(_)\n | WalletDataPaymentMethod::MobilePayRedirect(_)\n | WalletDataPaymentMethod::RevolutPay(_) => {\n Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?\n }\n WalletDataPaymentMethod::PaypalRedirect(_) => {\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::PAYPAL,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: Some(return_url.clone()),\n error_return_url: Some(return_url.clone()),\n payment_data: None,\n enforce_3d: None,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::PaypalSdk(_)\n | WalletDataPaymentMethod::Paze(_)\n | WalletDataPaymentMethod::SamsungPay(_)\n | WalletDataPaymentMethod::TwintRedirect {}\n | WalletDataPaymentMethod::VippsRedirect {}\n | WalletDataPaymentMethod::TouchNGoRedirect(_)\n | WalletDataPaymentMethod::WeChatPayRedirect(_)\n | WalletDataPaymentMethod::CashappQr(_)\n | WalletDataPaymentMethod::SwishQr(_)\n | WalletDataPaymentMethod::WeChatPayQr(_)\n | WalletDataPaymentMethod::Mifinity(_) => {\n Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?\n }\n },\n _ => Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?,\n }\n }\n}",
|
| 163 |
+
"diff_span": {
|
| 164 |
+
"before": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string());\n let extra = metadata_to_novalnet_extra(item.request.metadata.clone().map(|m| m.expose()))?;\n let custom = NovalnetCustom { lang, extra };\n let hook_url = item.request.get_webhook_url()?;\n let return_url = item.request.get_return_url()?;",
|
| 165 |
+
"after": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string());\n\n let custom = NovalnetCustom { lang };\n let hook_url = item.request.get_webhook_url()?;\n let return_url = item.request.get_return_url()?;"
|
| 166 |
+
},
|
| 167 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 168 |
+
},
|
| 169 |
+
{
|
| 170 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::NovalnetPaymentsRequest::function::try_from",
|
| 171 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 172 |
+
"kind": "function_item",
|
| 173 |
+
"status": "modified",
|
| 174 |
+
"code_changed": true,
|
| 175 |
+
"imports_changed": false,
|
| 176 |
+
"before_code": "fn try_from(item: &SetupMandateRouterData) -> Result<Self, Self::Error> {\n let auth = NovalnetAuthType::try_from(&item.connector_auth_type)?;\n\n let merchant = NovalnetPaymentsRequestMerchant {\n signature: auth.product_activation_key,\n tariff: auth.tariff_id,\n };\n\n let enforce_3d = match item.auth_type {\n enums::AuthenticationType::ThreeDs => Some(1),\n enums::AuthenticationType::NoThreeDs => None,\n };\n let test_mode = get_test_mode(item.test_mode);\n let req_address = item.get_optional_billing();\n\n let billing = NovalnetPaymentsRequestBilling {\n house_no: item.get_optional_billing_line1(),\n street: item.get_optional_billing_line2(),\n city: item.get_optional_billing_city().map(Secret::new),\n zip: item.get_optional_billing_zip(),\n country_code: item.get_optional_billing_country(),\n };\n\n let email = item.get_billing_email().or(item.request.get_email())?;\n\n let customer = NovalnetPaymentsRequestCustomer {\n first_name: req_address.and_then(|addr| addr.get_optional_first_name()),\n last_name: req_address.and_then(|addr| addr.get_optional_last_name()),\n email,\n mobile: item.get_optional_billing_phone_number(),\n billing: Some(billing),\n // no_nc is used to indicate if minimal customer data is passed or not\n no_nc: MINIMAL_CUSTOMER_DATA_PASSED,\n birth_date: Some(String::from(\"1992-06-10\")),\n };\n\n let lang = item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string());\n let extra = metadata_to_novalnet_extra(item.request.metadata.clone().map(|m| m.expose()))?;\n let custom = NovalnetCustom { lang, extra };\n let hook_url = item.request.get_webhook_url()?;\n let return_url = item.request.get_return_url()?;\n let create_token = Some(CREATE_TOKEN_REQUIRED);\n\n match item.request.payment_method_data {\n PaymentMethodData::Card(ref req_card) => {\n let novalnet_card = NovalNetPaymentData::Card(NovalnetCard {\n card_number: req_card.card_number.clone(),\n card_expiry_month: req_card.card_exp_month.clone(),\n card_expiry_year: req_card.card_exp_year.clone(),\n card_cvc: req_card.card_cvc.clone(),\n card_holder: item.get_billing_address()?.get_full_name()?,\n });\n\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::CREDITCARD,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: Some(return_url.clone()),\n error_return_url: Some(return_url.clone()),\n payment_data: Some(novalnet_card),\n enforce_3d,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n\n PaymentMethodData::Wallet(ref wallet_data) => match wallet_data {\n WalletDataPaymentMethod::GooglePay(ref req_wallet) => {\n let novalnet_google_pay: NovalNetPaymentData =\n NovalNetPaymentData::GooglePay(NovalnetGooglePay {\n wallet_data: Secret::new(\n req_wallet\n .tokenization_data\n .get_encrypted_google_pay_token()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"gpay wallet_token\",\n })?\n .clone(),\n ),\n });\n\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::GOOGLEPAY,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: None,\n error_return_url: None,\n payment_data: Some(novalnet_google_pay),\n enforce_3d,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::ApplePay(payment_method_data) => {\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::APPLEPAY,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: None,\n error_return_url: None,\n payment_data: Some(NovalNetPaymentData::ApplePay(NovalnetApplePay {\n wallet_data: payment_method_data.get_applepay_decoded_payment_data()?,\n })),\n enforce_3d: None,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::AliPayQr(_)\n | WalletDataPaymentMethod::AliPayRedirect(_)\n | WalletDataPaymentMethod::AliPayHkRedirect(_)\n | WalletDataPaymentMethod::AmazonPay(_)\n | WalletDataPaymentMethod::AmazonPayRedirect(_)\n | WalletDataPaymentMethod::Paysera(_)\n | WalletDataPaymentMethod::Skrill(_)\n | WalletDataPaymentMethod::BluecodeRedirect {}\n | WalletDataPaymentMethod::MomoRedirect(_)\n | WalletDataPaymentMethod::KakaoPayRedirect(_)\n | WalletDataPaymentMethod::GoPayRedirect(_)\n | WalletDataPaymentMethod::GcashRedirect(_)\n | WalletDataPaymentMethod::ApplePayRedirect(_)\n | WalletDataPaymentMethod::ApplePayThirdPartySdk(_)\n | WalletDataPaymentMethod::DanaRedirect {}\n | WalletDataPaymentMethod::GooglePayRedirect(_)\n | WalletDataPaymentMethod::GooglePayThirdPartySdk(_)\n | WalletDataPaymentMethod::MbWayRedirect(_)\n | WalletDataPaymentMethod::MobilePayRedirect(_)\n | WalletDataPaymentMethod::RevolutPay(_) => {\n Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?\n }\n WalletDataPaymentMethod::PaypalRedirect(_) => {\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::PAYPAL,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: Some(return_url.clone()),\n error_return_url: Some(return_url.clone()),\n payment_data: None,\n enforce_3d: None,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::PaypalSdk(_)\n | WalletDataPaymentMethod::Paze(_)\n | WalletDataPaymentMethod::SamsungPay(_)\n | WalletDataPaymentMethod::TwintRedirect {}\n | WalletDataPaymentMethod::VippsRedirect {}\n | WalletDataPaymentMethod::TouchNGoRedirect(_)\n | WalletDataPaymentMethod::WeChatPayRedirect(_)\n | WalletDataPaymentMethod::CashappQr(_)\n | WalletDataPaymentMethod::SwishQr(_)\n | WalletDataPaymentMethod::WeChatPayQr(_)\n | WalletDataPaymentMethod::Mifinity(_) => {\n Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?\n }\n },\n _ => Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?,\n }\n }",
|
| 177 |
+
"after_code": "fn try_from(item: &SetupMandateRouterData) -> Result<Self, Self::Error> {\n let auth = NovalnetAuthType::try_from(&item.connector_auth_type)?;\n\n let merchant = NovalnetPaymentsRequestMerchant {\n signature: auth.product_activation_key,\n tariff: auth.tariff_id,\n };\n\n let enforce_3d = match item.auth_type {\n enums::AuthenticationType::ThreeDs => Some(1),\n enums::AuthenticationType::NoThreeDs => None,\n };\n let test_mode = get_test_mode(item.test_mode);\n let req_address = item.get_optional_billing();\n\n let billing = NovalnetPaymentsRequestBilling {\n house_no: item.get_optional_billing_line1(),\n street: item.get_optional_billing_line2(),\n city: item.get_optional_billing_city().map(Secret::new),\n zip: item.get_optional_billing_zip(),\n country_code: item.get_optional_billing_country(),\n };\n\n let email = item.get_billing_email().or(item.request.get_email())?;\n\n let customer = NovalnetPaymentsRequestCustomer {\n first_name: req_address.and_then(|addr| addr.get_optional_first_name()),\n last_name: req_address.and_then(|addr| addr.get_optional_last_name()),\n email,\n mobile: item.get_optional_billing_phone_number(),\n billing: Some(billing),\n // no_nc is used to indicate if minimal customer data is passed or not\n no_nc: MINIMAL_CUSTOMER_DATA_PASSED,\n birth_date: Some(String::from(\"1992-06-10\")),\n };\n\n let lang = item\n .request\n .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string());\n\n let custom = NovalnetCustom { lang };\n let hook_url = item.request.get_webhook_url()?;\n let return_url = item.request.get_return_url()?;\n let create_token = Some(CREATE_TOKEN_REQUIRED);\n\n match item.request.payment_method_data {\n PaymentMethodData::Card(ref req_card) => {\n let novalnet_card = NovalNetPaymentData::Card(NovalnetCard {\n card_number: req_card.card_number.clone(),\n card_expiry_month: req_card.card_exp_month.clone(),\n card_expiry_year: req_card.card_exp_year.clone(),\n card_cvc: req_card.card_cvc.clone(),\n card_holder: item.get_billing_address()?.get_full_name()?,\n });\n\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::CREDITCARD,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: Some(return_url.clone()),\n error_return_url: Some(return_url.clone()),\n payment_data: Some(novalnet_card),\n enforce_3d,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n\n PaymentMethodData::Wallet(ref wallet_data) => match wallet_data {\n WalletDataPaymentMethod::GooglePay(ref req_wallet) => {\n let novalnet_google_pay: NovalNetPaymentData =\n NovalNetPaymentData::GooglePay(NovalnetGooglePay {\n wallet_data: Secret::new(\n req_wallet\n .tokenization_data\n .get_encrypted_google_pay_token()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"gpay wallet_token\",\n })?\n .clone(),\n ),\n });\n\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::GOOGLEPAY,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: None,\n error_return_url: None,\n payment_data: Some(novalnet_google_pay),\n enforce_3d,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::ApplePay(payment_method_data) => {\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::APPLEPAY,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: None,\n error_return_url: None,\n payment_data: Some(NovalNetPaymentData::ApplePay(NovalnetApplePay {\n wallet_data: payment_method_data.get_applepay_decoded_payment_data()?,\n })),\n enforce_3d: None,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::AliPayQr(_)\n | WalletDataPaymentMethod::AliPayRedirect(_)\n | WalletDataPaymentMethod::AliPayHkRedirect(_)\n | WalletDataPaymentMethod::AmazonPay(_)\n | WalletDataPaymentMethod::AmazonPayRedirect(_)\n | WalletDataPaymentMethod::Paysera(_)\n | WalletDataPaymentMethod::Skrill(_)\n | WalletDataPaymentMethod::BluecodeRedirect {}\n | WalletDataPaymentMethod::MomoRedirect(_)\n | WalletDataPaymentMethod::KakaoPayRedirect(_)\n | WalletDataPaymentMethod::GoPayRedirect(_)\n | WalletDataPaymentMethod::GcashRedirect(_)\n | WalletDataPaymentMethod::ApplePayRedirect(_)\n | WalletDataPaymentMethod::ApplePayThirdPartySdk(_)\n | WalletDataPaymentMethod::DanaRedirect {}\n | WalletDataPaymentMethod::GooglePayRedirect(_)\n | WalletDataPaymentMethod::GooglePayThirdPartySdk(_)\n | WalletDataPaymentMethod::MbWayRedirect(_)\n | WalletDataPaymentMethod::MobilePayRedirect(_)\n | WalletDataPaymentMethod::RevolutPay(_) => {\n Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?\n }\n WalletDataPaymentMethod::PaypalRedirect(_) => {\n let transaction = NovalnetPaymentsRequestTransaction {\n test_mode,\n payment_type: NovalNetPaymentTypes::PAYPAL,\n amount: NovalNetAmount::Int(0),\n currency: item.request.currency,\n order_no: item.connector_request_reference_id.clone(),\n hook_url: Some(hook_url),\n return_url: Some(return_url.clone()),\n error_return_url: Some(return_url.clone()),\n payment_data: None,\n enforce_3d: None,\n create_token,\n };\n\n Ok(Self {\n merchant,\n transaction,\n customer,\n custom,\n })\n }\n WalletDataPaymentMethod::PaypalSdk(_)\n | WalletDataPaymentMethod::Paze(_)\n | WalletDataPaymentMethod::SamsungPay(_)\n | WalletDataPaymentMethod::TwintRedirect {}\n | WalletDataPaymentMethod::VippsRedirect {}\n | WalletDataPaymentMethod::TouchNGoRedirect(_)\n | WalletDataPaymentMethod::WeChatPayRedirect(_)\n | WalletDataPaymentMethod::CashappQr(_)\n | WalletDataPaymentMethod::SwishQr(_)\n | WalletDataPaymentMethod::WeChatPayQr(_)\n | WalletDataPaymentMethod::Mifinity(_) => {\n Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?\n }\n },\n _ => Err(errors::ConnectorError::NotImplemented(\n utils::get_unimplemented_payment_method_error_message(\"novalnet\"),\n ))?,\n }\n }",
|
| 178 |
+
"diff_span": {
|
| 179 |
+
"before": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string());\n let extra = metadata_to_novalnet_extra(item.request.metadata.clone().map(|m| m.expose()))?;\n let custom = NovalnetCustom { lang, extra };\n let hook_url = item.request.get_webhook_url()?;\n let return_url = item.request.get_return_url()?;",
|
| 180 |
+
"after": " .get_optional_language_from_browser_info()\n .unwrap_or(consts::DEFAULT_LOCALE.to_string().to_string());\n\n let custom = NovalnetCustom { lang };\n let hook_url = item.request.get_webhook_url()?;\n let return_url = item.request.get_return_url()?;"
|
| 181 |
+
},
|
| 182 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 183 |
+
},
|
| 184 |
+
{
|
| 185 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::function::metadata_to_novalnet_extra",
|
| 186 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 187 |
+
"kind": "function_item",
|
| 188 |
+
"status": "removed",
|
| 189 |
+
"before_code": "pub fn metadata_to_novalnet_extra(\n metadata: Option<serde_json::Value>,\n) -> Result<Option<HashMap<String, String>>, Error> {\n let Some(serde_json::Value::Object(map)) = metadata else {\n return Ok(None);\n };\n\n if map.is_empty() {\n return Ok(None);\n }\n\n if map.len() > 7 {\n return Err(errors::ConnectorError::InvalidDataFormat {\n field_name: \"metadata (max 7 allowed for Novalnet\",\n }\n .into());\n }\n\n let mut extra = HashMap::new();\n\n for (idx, (key, val)) in map.iter().enumerate() {\n let slot = idx + 1;\n\n extra.insert(format!(\"input{}\", slot), key.clone());\n\n let val_str = match val {\n serde_json::Value::String(s) => s.clone(),\n _ => val.to_string(),\n };\n\n extra.insert(format!(\"inputval{}\", slot), val_str);\n }\n\n Ok(Some(extra))\n}",
|
| 190 |
+
"after_code": null,
|
| 191 |
+
"diff_span": null,
|
| 192 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 193 |
+
},
|
| 194 |
+
{
|
| 195 |
+
"id": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs::type::Error",
|
| 196 |
+
"file": "crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs",
|
| 197 |
+
"kind": "type_item",
|
| 198 |
+
"status": "removed",
|
| 199 |
+
"before_code": "type Error = error_stack::Report<errors::ConnectorError>;",
|
| 200 |
+
"after_code": null,
|
| 201 |
+
"diff_span": null,
|
| 202 |
+
"commit_sha": "2e7d22a861020fd2f8135d9788e90f4f58e929ed"
|
| 203 |
+
}
|
| 204 |
+
]
|
| 205 |
+
}
|
diffs/pr_10631/7632690/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "7632690858d4493aeae773cd03c9d264f1618f64",
|
| 3 |
+
"pr_number": 10631,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_6706/0013bf4/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "0013bf4027ebb1a2b93556190a36295e15dfe4ff",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/common_enums/src/enums.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_6706/1036cfc/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "1036cfc14c1441470d150c308e9337cb51905971",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_6706/107dd80/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6706/129fdf1/diff.json
ADDED
|
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "129fdf1fcb2020b6c1acf66f37286155165d9ad2",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/common_types/src/lib.rs",
|
| 6 |
+
"crates/common_types/src/payments.rs",
|
| 7 |
+
"crates/common_types/src/refunds.rs"
|
| 8 |
+
],
|
| 9 |
+
"diffs": []
|
| 10 |
+
}
|
diffs/pr_6706/13ea66f/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6706/2568e97/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6706/25e2145/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6706/2b26ce6/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6706/483c6d2/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6706/4e70d21/diff.json
ADDED
|
@@ -0,0 +1,184 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/payments.rs",
|
| 6 |
+
"crates/common_enums/src/enums.rs",
|
| 7 |
+
"crates/common_utils/src/types.rs",
|
| 8 |
+
"crates/router/src/core/payments/helpers.rs",
|
| 9 |
+
"crates/router/src/core/payments/transformers.rs",
|
| 10 |
+
"crates/router/src/core/refunds.rs"
|
| 11 |
+
],
|
| 12 |
+
"diffs": [
|
| 13 |
+
{
|
| 14 |
+
"id": "crates/router/src/core/refunds.rs::function::validate_and_create_refund",
|
| 15 |
+
"file": "crates/router/src/core/refunds.rs",
|
| 16 |
+
"kind": "function_item",
|
| 17 |
+
"status": "modified",
|
| 18 |
+
"code_changed": true,
|
| 19 |
+
"imports_changed": false,
|
| 20 |
+
"before_code": "pub async fn validate_and_create_refund(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n payment_attempt: &storage::PaymentAttempt,\n payment_intent: &storage::PaymentIntent,\n refund_amount: MinorUnit,\n req: refunds::RefundRequest,\n creds_identifier: Option<String>,\n) -> RouterResult<refunds::RefundResponse> {\n let db = &*state.store;\n\n let split_refunds = match payment_intent.split_payments.as_ref() {\n Some(SplitPaymentsRequest::StripeSplitPayment(stripe_payment)) => {\n let refund_request = req\n .split_refunds\n .clone()\n .get_required_value(\"split_refunds\")?;\n\n let options =\n validator::validate_charge_refund(&refund_request, &stripe_payment.charge_type)?;\n\n let charge_id = payment_attempt.charge_id.clone().ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n \"Transaction in invalid. Missing field \\\"charge_id\\\" in payment_attempt.\",\n )\n })?;\n\n Some(SplitRefundsRequest::StripeSplitRefund(StripeSplitRefund {\n charge_id,\n charge_type: stripe_payment.charge_type.clone(),\n transfer_account_id: stripe_payment.transfer_account_id.clone(),\n options,\n }))\n }\n _ => None,\n };\n\n // let split_refunds = match (\n // payment_intent.split_payments.as_ref(),\n // payment_attempt.charge_id.as_ref(),\n // ) {\n // (Some(split_payments), Some(charge_id)) => {\n // let refund_request = req\n // .split_refunds\n // .clone()\n // .get_required_value(\"split_refunds\")?;\n\n // // let stripe_refund = match refund_request {\n // // SplitRefundRequest::StripeSplitRefundRequest(ref stripe_refund) => stripe_refund,\n // // };\n // let SplitRefundRequest::StripeSplitRefundRequest(ref stripe_refund) = refund_request;\n\n // // utils::when(*charge_id != stripe_refund.charge_id, || {\n // // Err(report!(errors::ApiErrorResponse::InvalidDataValue {\n // // field_name: \"split_refunds.charge_id\",\n // // }))\n // // .attach_printable(\"charge_id sent in request mismatches with original charge_id\")\n // // })?;\n\n // // let stripe_payment = match split_payments {\n // // SplitPaymentsRequest::StripeSplitPayment(payment) => payment,\n // // };\n // let SplitPaymentsRequest::StripeSplitPayment(stripe_payment) = split_payments;\n\n // let options =\n // validator::validate_charge_refund(&refund_request, &stripe_payment.charge_type)?;\n\n // let charge_id = payment_attempt.charge_id.clone().ok_or_else(|| {\n // report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n // \"Transaction in invalid. Missing field \\\"charge_id\\\" in payment_attempt.\",\n // )\n // })?;\n\n // // Construct SplitRefundsRequest\n // Some(SplitRefundsRequest::StripeSplitRefund(StripeSplitRefund {\n // charge_id,\n // charge_type: stripe_payment.charge_type.clone(),\n // transfer_account_id: stripe_payment.transfer_account_id.clone(),\n // options,\n // }))\n // }\n // _ => None,\n // };\n\n // Only for initial dev and testing\n let refund_type = req.refund_type.unwrap_or_default();\n\n // If Refund Id not passed in request Generate one.\n\n let refund_id = core_utils::get_or_generate_id(\"refund_id\", &req.refund_id, \"ref\")?;\n\n let predicate = req\n .merchant_id\n .as_ref()\n .map(|merchant_id| merchant_id != merchant_account.get_id());\n\n utils::when(predicate.unwrap_or(false), || {\n Err(report!(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"merchant_id\".to_string(),\n expected_format: \"merchant_id from merchant account\".to_string()\n })\n .attach_printable(\"invalid merchant_id in request\"))\n })?;\n\n let connector_transaction_id = payment_attempt.clone().connector_transaction_id.ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Transaction in invalid. Missing field \\\"connector_transaction_id\\\" in payment_attempt.\")\n })?;\n\n let all_refunds = db\n .find_refund_by_merchant_id_connector_transaction_id(\n merchant_account.get_id(),\n &connector_transaction_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::RefundNotFound)?;\n\n let currency = payment_attempt.currency.get_required_value(\"currency\")?;\n\n //[#249]: Add Connector Based Validation here.\n validator::validate_payment_order_age(&payment_intent.created_at, state.conf.refund.max_age)\n .change_context(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"created_at\".to_string(),\n expected_format: format!(\n \"created_at not older than {} days\",\n state.conf.refund.max_age,\n ),\n })?;\n\n let total_amount_captured = payment_intent\n .amount_captured\n .unwrap_or(payment_attempt.get_total_amount());\n\n validator::validate_refund_amount(\n total_amount_captured.get_amount_as_i64(),\n &all_refunds,\n refund_amount.get_amount_as_i64(),\n )\n .change_context(errors::ApiErrorResponse::RefundAmountExceedsPaymentAmount)?;\n\n validator::validate_maximum_refund_against_payment_attempt(\n &all_refunds,\n state.conf.refund.max_attempts,\n )\n .change_context(errors::ApiErrorResponse::MaximumRefundCount)?;\n\n let connector = payment_attempt\n .connector\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"No connector populated in payment attempt\")?;\n let (connector_transaction_id, connector_transaction_data) =\n ConnectorTransactionId::form_id_and_data(connector_transaction_id);\n let refund_create_req = storage::RefundNew {\n refund_id: refund_id.to_string(),\n internal_reference_id: utils::generate_id(consts::ID_LENGTH, \"refid\"),\n external_reference_id: Some(refund_id.clone()),\n payment_id: req.payment_id,\n merchant_id: merchant_account.get_id().clone(),\n connector_transaction_id,\n connector,\n refund_type: req.refund_type.unwrap_or_default().foreign_into(),\n total_amount: payment_attempt.get_total_amount(),\n refund_amount,\n currency,\n created_at: common_utils::date_time::now(),\n modified_at: common_utils::date_time::now(),\n refund_status: enums::RefundStatus::Pending,\n metadata: req.metadata,\n description: req.reason.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n refund_reason: req.reason,\n profile_id: payment_intent.profile_id.clone(),\n merchant_connector_id: payment_attempt.merchant_connector_id.clone(),\n charges: None,\n split_refunds: req.split_refunds,\n connector_refund_id: None,\n sent_to_gateway: Default::default(),\n refund_arn: None,\n updated_by: Default::default(),\n organization_id: merchant_account.organization_id.clone(),\n connector_refund_data: None,\n connector_transaction_data,\n };\n\n let refund = match db\n .insert_refund(refund_create_req, merchant_account.storage_scheme)\n .await\n {\n Ok(refund) => {\n Box::pin(schedule_refund_execution(\n state,\n refund.clone(),\n refund_type,\n merchant_account,\n key_store,\n payment_attempt,\n payment_intent,\n creds_identifier,\n split_refunds,\n ))\n .await?\n }\n Err(err) => {\n if err.current_context().is_db_unique_violation() {\n Err(errors::ApiErrorResponse::DuplicateRefundRequest)?\n } else {\n return Err(err)\n .change_context(errors::ApiErrorResponse::RefundNotFound)\n .attach_printable(\"Inserting Refund failed\");\n }\n }\n };\n\n Ok(refund.foreign_into())\n}",
|
| 21 |
+
"after_code": "pub async fn validate_and_create_refund(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n payment_attempt: &storage::PaymentAttempt,\n payment_intent: &storage::PaymentIntent,\n refund_amount: MinorUnit,\n req: refunds::RefundRequest,\n creds_identifier: Option<String>,\n) -> RouterResult<refunds::RefundResponse> {\n let db = &*state.store;\n\n let split_refunds = match payment_intent.split_payments.as_ref() {\n Some(SplitPaymentsRequest::StripeSplitPayment(stripe_payment)) => {\n let refund_request = req\n .split_refunds\n .clone()\n .get_required_value(\"split_refunds\")?;\n\n let options =\n validator::validate_charge_refund(&refund_request, &stripe_payment.charge_type)?;\n\n let charge_id = payment_attempt.charge_id.clone().ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n \"Transaction in invalid. Missing field \\\"charge_id\\\" in payment_attempt.\",\n )\n })?;\n\n Some(SplitRefundsRequest::StripeSplitRefund(StripeSplitRefund {\n charge_id,\n charge_type: stripe_payment.charge_type.clone(),\n transfer_account_id: stripe_payment.transfer_account_id.clone(),\n options,\n }))\n }\n _ => None,\n };\n\n // Only for initial dev and testing\n let refund_type = req.refund_type.unwrap_or_default();\n\n // If Refund Id not passed in request Generate one.\n\n let refund_id = core_utils::get_or_generate_id(\"refund_id\", &req.refund_id, \"ref\")?;\n\n let predicate = req\n .merchant_id\n .as_ref()\n .map(|merchant_id| merchant_id != merchant_account.get_id());\n\n utils::when(predicate.unwrap_or(false), || {\n Err(report!(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"merchant_id\".to_string(),\n expected_format: \"merchant_id from merchant account\".to_string()\n })\n .attach_printable(\"invalid merchant_id in request\"))\n })?;\n\n let connector_transaction_id = payment_attempt.clone().connector_transaction_id.ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Transaction in invalid. Missing field \\\"connector_transaction_id\\\" in payment_attempt.\")\n })?;\n\n let all_refunds = db\n .find_refund_by_merchant_id_connector_transaction_id(\n merchant_account.get_id(),\n &connector_transaction_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::RefundNotFound)?;\n\n let currency = payment_attempt.currency.get_required_value(\"currency\")?;\n\n //[#249]: Add Connector Based Validation here.\n validator::validate_payment_order_age(&payment_intent.created_at, state.conf.refund.max_age)\n .change_context(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"created_at\".to_string(),\n expected_format: format!(\n \"created_at not older than {} days\",\n state.conf.refund.max_age,\n ),\n })?;\n\n let total_amount_captured = payment_intent\n .amount_captured\n .unwrap_or(payment_attempt.get_total_amount());\n\n validator::validate_refund_amount(\n total_amount_captured.get_amount_as_i64(),\n &all_refunds,\n refund_amount.get_amount_as_i64(),\n )\n .change_context(errors::ApiErrorResponse::RefundAmountExceedsPaymentAmount)?;\n\n validator::validate_maximum_refund_against_payment_attempt(\n &all_refunds,\n state.conf.refund.max_attempts,\n )\n .change_context(errors::ApiErrorResponse::MaximumRefundCount)?;\n\n let connector = payment_attempt\n .connector\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"No connector populated in payment attempt\")?;\n let (connector_transaction_id, connector_transaction_data) =\n ConnectorTransactionId::form_id_and_data(connector_transaction_id);\n let refund_create_req = storage::RefundNew {\n refund_id: refund_id.to_string(),\n internal_reference_id: utils::generate_id(consts::ID_LENGTH, \"refid\"),\n external_reference_id: Some(refund_id.clone()),\n payment_id: req.payment_id,\n merchant_id: merchant_account.get_id().clone(),\n connector_transaction_id,\n connector,\n refund_type: req.refund_type.unwrap_or_default().foreign_into(),\n total_amount: payment_attempt.get_total_amount(),\n refund_amount,\n currency,\n created_at: common_utils::date_time::now(),\n modified_at: common_utils::date_time::now(),\n refund_status: enums::RefundStatus::Pending,\n metadata: req.metadata,\n description: req.reason.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n refund_reason: req.reason,\n profile_id: payment_intent.profile_id.clone(),\n merchant_connector_id: payment_attempt.merchant_connector_id.clone(),\n charges: None,\n split_refunds: req.split_refunds,\n connector_refund_id: None,\n sent_to_gateway: Default::default(),\n refund_arn: None,\n updated_by: Default::default(),\n organization_id: merchant_account.organization_id.clone(),\n connector_refund_data: None,\n connector_transaction_data,\n };\n\n let refund = match db\n .insert_refund(refund_create_req, merchant_account.storage_scheme)\n .await\n {\n Ok(refund) => {\n Box::pin(schedule_refund_execution(\n state,\n refund.clone(),\n refund_type,\n merchant_account,\n key_store,\n payment_attempt,\n payment_intent,\n creds_identifier,\n split_refunds,\n ))\n .await?\n }\n Err(err) => {\n if err.current_context().is_db_unique_violation() {\n Err(errors::ApiErrorResponse::DuplicateRefundRequest)?\n } else {\n return Err(err)\n .change_context(errors::ApiErrorResponse::RefundNotFound)\n .attach_printable(\"Inserting Refund failed\");\n }\n }\n };\n\n Ok(refund.foreign_into())\n}",
|
| 22 |
+
"diff_span": {
|
| 23 |
+
"before": " _ => None,\n };\n\n // let split_refunds = match (\n // payment_intent.split_payments.as_ref(),\n // payment_attempt.charge_id.as_ref(),\n // ) {\n // (Some(split_payments), Some(charge_id)) => {\n // let refund_request = req\n // .split_refunds\n // .clone()\n // .get_required_value(\"split_refunds\")?;\n\n // // let stripe_refund = match refund_request {\n // // SplitRefundRequest::StripeSplitRefundRequest(ref stripe_refund) => stripe_refund,\n // // };\n // let SplitRefundRequest::StripeSplitRefundRequest(ref stripe_refund) = refund_request;\n\n // // utils::when(*charge_id != stripe_refund.charge_id, || {\n // // Err(report!(errors::ApiErrorResponse::InvalidDataValue {\n // // field_name: \"split_refunds.charge_id\",\n // // }))\n // // .attach_printable(\"charge_id sent in request mismatches with original charge_id\")\n // // })?;\n\n // // let stripe_payment = match split_payments {\n // // SplitPaymentsRequest::StripeSplitPayment(payment) => payment,\n // // };\n // let SplitPaymentsRequest::StripeSplitPayment(stripe_payment) = split_payments;\n\n // let options =\n // validator::validate_charge_refund(&refund_request, &stripe_payment.charge_type)?;\n\n // let charge_id = payment_attempt.charge_id.clone().ok_or_else(|| {\n // report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n // \"Transaction in invalid. Missing field \\\"charge_id\\\" in payment_attempt.\",\n // )\n // })?;\n\n // // Construct SplitRefundsRequest\n // Some(SplitRefundsRequest::StripeSplitRefund(StripeSplitRefund {\n // charge_id,\n // charge_type: stripe_payment.charge_type.clone(),\n // transfer_account_id: stripe_payment.transfer_account_id.clone(),\n // options,\n // }))\n // }\n // _ => None,\n // };\n\n // Only for initial dev and testing",
|
| 24 |
+
"after": ""
|
| 25 |
+
},
|
| 26 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 27 |
+
},
|
| 28 |
+
{
|
| 29 |
+
"id": "crates/router/src/core/payments/transformers.rs::function::construct_router_data_for_psync",
|
| 30 |
+
"file": "crates/router/src/core/payments/transformers.rs",
|
| 31 |
+
"kind": "function_item",
|
| 32 |
+
"status": "modified",
|
| 33 |
+
"code_changed": true,
|
| 34 |
+
"imports_changed": false,
|
| 35 |
+
"before_code": "pub async fn construct_router_data_for_psync<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentStatusData<api::PSync>,\n connector_id: &str,\n merchant_account: &domain::MerchantAccount,\n _key_store: &domain::MerchantKeyStore,\n customer: &'a Option<domain::Customer>,\n merchant_connector_account: &domain::MerchantConnectorAccount,\n _merchant_recipient_data: Option<types::MerchantRecipientData>,\n header_payload: Option<hyperswitch_domain_models::payments::HeaderPayload>,\n) -> RouterResult<types::PaymentsSyncRouterData> {\n use masking::ExposeOptionInterface;\n\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n // TODO: Take Globalid / CustomerReferenceId and convert to connector reference id\n let customer_id = None;\n\n let payment_intent = payment_data.payment_intent;\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let attempt = &payment_data\n .payment_attempt\n .get_required_value(\"attempt\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Payment Attempt is not available in payment data\")?;\n\n let connector_request_reference_id = payment_intent\n .merchant_reference_id\n .map(|id| id.get_string_repr().to_owned())\n .unwrap_or(attempt.id.get_string_repr().to_owned());\n\n let request = types::PaymentsSyncData {\n amount: attempt.amount_details.net_amount,\n integrity_object: None,\n mandate_id: None,\n connector_transaction_id: match attempt.get_connector_payment_id() {\n Some(connector_txn_id) => {\n types::ResponseId::ConnectorTransactionId(connector_txn_id.to_owned())\n }\n None => types::ResponseId::NoResponseId,\n },\n encoded_data: attempt.encoded_data.clone().expose_option(),\n capture_method: Some(payment_intent.capture_method),\n connector_meta: attempt.connector_metadata.clone().expose_option(),\n sync_type: types::SyncRequestType::SinglePaymentSync,\n payment_method_type: Some(attempt.payment_method_subtype),\n currency: payment_intent.amount_details.currency,\n // TODO: Get the charges object from\n split_payments: None,\n payment_experience: None,\n };\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_account.get_id().clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n connector: connector_id.to_owned(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_intent.id.get_string_repr().to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: attempt.get_id().get_string_repr().to_owned(),\n status: attempt.status,\n payment_method: attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: evaluate why we need to send merchant's return url here\n // This should be the return url of application, since application takes care of the redirection\n return_url: payment_intent\n .return_url\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: hyperswitch_domain_models::payment_address::PaymentAddress::default(),\n auth_type: attempt.authentication_type,\n connector_meta_data: None,\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id,\n preprocessing_id: attempt.preprocessing_step_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n psd2_sca_exemption_type: None,\n };\n\n Ok(router_data)\n}",
|
| 36 |
+
"after_code": "pub async fn construct_router_data_for_psync<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentStatusData<api::PSync>,\n connector_id: &str,\n merchant_account: &domain::MerchantAccount,\n _key_store: &domain::MerchantKeyStore,\n customer: &'a Option<domain::Customer>,\n merchant_connector_account: &domain::MerchantConnectorAccount,\n _merchant_recipient_data: Option<types::MerchantRecipientData>,\n header_payload: Option<hyperswitch_domain_models::payments::HeaderPayload>,\n) -> RouterResult<types::PaymentsSyncRouterData> {\n use masking::ExposeOptionInterface;\n\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n // TODO: Take Globalid / CustomerReferenceId and convert to connector reference id\n let customer_id = None;\n\n let payment_intent = payment_data.payment_intent;\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let attempt = &payment_data\n .payment_attempt\n .get_required_value(\"attempt\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Payment Attempt is not available in payment data\")?;\n\n let connector_request_reference_id = payment_intent\n .merchant_reference_id\n .map(|id| id.get_string_repr().to_owned())\n .unwrap_or(attempt.id.get_string_repr().to_owned());\n\n let request = types::PaymentsSyncData {\n amount: attempt.amount_details.net_amount,\n integrity_object: None,\n mandate_id: None,\n connector_transaction_id: match attempt.get_connector_payment_id() {\n Some(connector_txn_id) => {\n types::ResponseId::ConnectorTransactionId(connector_txn_id.to_owned())\n }\n None => types::ResponseId::NoResponseId,\n },\n encoded_data: attempt.encoded_data.clone().expose_option(),\n capture_method: Some(payment_intent.capture_method),\n connector_meta: attempt.connector_metadata.clone().expose_option(),\n sync_type: types::SyncRequestType::SinglePaymentSync,\n payment_method_type: Some(attempt.payment_method_subtype),\n currency: payment_intent.amount_details.currency,\n // TODO: Get the charges object from feature metadata\n split_payments: None,\n payment_experience: None,\n };\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_account.get_id().clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n connector: connector_id.to_owned(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_intent.id.get_string_repr().to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: attempt.get_id().get_string_repr().to_owned(),\n status: attempt.status,\n payment_method: attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: evaluate why we need to send merchant's return url here\n // This should be the return url of application, since application takes care of the redirection\n return_url: payment_intent\n .return_url\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: hyperswitch_domain_models::payment_address::PaymentAddress::default(),\n auth_type: attempt.authentication_type,\n connector_meta_data: None,\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id,\n preprocessing_id: attempt.preprocessing_step_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n psd2_sca_exemption_type: None,\n };\n\n Ok(router_data)\n}",
|
| 37 |
+
"diff_span": {
|
| 38 |
+
"before": " payment_method_type: Some(attempt.payment_method_subtype),\n currency: payment_intent.amount_details.currency,\n // TODO: Get the charges object from\n split_payments: None,\n payment_experience: None,",
|
| 39 |
+
"after": " payment_method_type: Some(attempt.payment_method_subtype),\n currency: payment_intent.amount_details.currency,\n // TODO: Get the charges object from feature metadata\n split_payments: None,\n payment_experience: None,"
|
| 40 |
+
},
|
| 41 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 42 |
+
},
|
| 43 |
+
{
|
| 44 |
+
"id": "crates/router/src/core/payments/transformers.rs::impl::types::PaymentsAuthorizeData",
|
| 45 |
+
"file": "crates/router/src/core/payments/transformers.rs",
|
| 46 |
+
"kind": "impl_item",
|
| 47 |
+
"status": "modified",
|
| 48 |
+
"code_changed": true,
|
| 49 |
+
"imports_changed": false,
|
| 50 |
+
"before_code": "impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsAuthorizeData {\n type Error = error_stack::Report<errors::ApiErrorResponse>;\n\n fn try_from(additional_data: PaymentAdditionalData<'_, F>) -> Result<Self, Self::Error> {\n let payment_data = additional_data.payment_data.clone();\n let router_base_url = &additional_data.router_base_url;\n let connector_name = &additional_data.connector_name;\n let attempt = &payment_data.payment_attempt;\n let browser_info: Option<types::BrowserInformation> = attempt\n .browser_info\n .clone()\n .map(|b| b.parse_value(\"BrowserInformation\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"browser_info\",\n })?;\n\n let order_category = additional_data\n .payment_data\n .payment_intent\n .connector_metadata\n .map(|cm| {\n cm.parse_value::<api_models::payments::ConnectorMetadata>(\"ConnectorMetadata\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed parsing ConnectorMetadata\")\n })\n .transpose()?\n .and_then(|cm| cm.noon.and_then(|noon| noon.order_category));\n\n let order_details = additional_data\n .payment_data\n .payment_intent\n .order_details\n .map(|order_details| {\n order_details\n .iter()\n .map(|data| {\n data.to_owned()\n .parse_value(\"OrderDetailsWithAmount\")\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"OrderDetailsWithAmount\",\n })\n .attach_printable(\"Unable to parse OrderDetailsWithAmount\")\n })\n .collect::<Result<Vec<_>, _>>()\n })\n .transpose()?;\n\n let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n router_base_url,\n attempt,\n connector_name,\n ));\n\n let webhook_url = Some(helpers::create_webhook_url(\n router_base_url,\n &attempt.merchant_id,\n connector_name,\n ));\n let router_return_url = Some(helpers::create_redirect_url(\n router_base_url,\n attempt,\n connector_name,\n payment_data.creds_identifier.as_deref(),\n ));\n\n let additional_payment_method_data = if payment_data.mandate_id.is_some() {\n let parsed_additional_payment_data: Option<api_models::payments::AdditionalPaymentData> =\n payment_data.payment_attempt\n .payment_method_data\n .as_ref().map(|data| data.clone().parse_value(\"AdditionalPaymentData\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse AdditionalPaymentData from payment_data.payment_attempt.payment_method_data\")?;\n parsed_additional_payment_data\n } else {\n None\n };\n\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n let payment_method_data = payment_data.payment_method_data.or_else(|| {\n if payment_data.mandate_id.is_some() {\n Some(domain::PaymentMethodData::MandatePayment)\n } else {\n None\n }\n });\n let amount = payment_data.payment_attempt.get_total_amount();\n\n let customer_name = additional_data\n .customer_data\n .as_ref()\n .and_then(|customer_data| {\n customer_data\n .name\n .as_ref()\n .map(|customer| customer.clone().into_inner())\n });\n\n let customer_id = additional_data\n .customer_data\n .as_ref()\n .map(|data| data.customer_id.clone());\n\n let merchant_order_reference_id = payment_data\n .payment_intent\n .merchant_order_reference_id\n .clone();\n let shipping_cost = payment_data.payment_intent.shipping_cost;\n\n Ok(Self {\n payment_method_data: (payment_method_data.get_required_value(\"payment_method_data\")?),\n setup_future_usage: payment_data.payment_intent.setup_future_usage,\n mandate_id: payment_data.mandate_id.clone(),\n off_session: payment_data.mandate_id.as_ref().map(|_| true),\n setup_mandate_details: payment_data.setup_mandate.clone(),\n confirm: payment_data.payment_attempt.confirm,\n statement_descriptor_suffix: payment_data.payment_intent.statement_descriptor_suffix,\n statement_descriptor: payment_data.payment_intent.statement_descriptor_name,\n capture_method: payment_data.payment_attempt.capture_method,\n amount: amount.get_amount_as_i64(),\n minor_amount: amount,\n currency: payment_data.currency,\n browser_info,\n email: payment_data.email,\n customer_name,\n payment_experience: payment_data.payment_attempt.payment_experience,\n order_details,\n order_category,\n session_token: None,\n enrolled_for_3ds: true,\n related_transaction_id: None,\n payment_method_type: payment_data.payment_attempt.payment_method_type,\n router_return_url,\n webhook_url,\n complete_authorize_url,\n customer_id,\n surcharge_details: payment_data.surcharge_details,\n request_incremental_authorization: matches!(\n payment_data\n .payment_intent\n .request_incremental_authorization,\n Some(RequestIncrementalAuthorization::True)\n | Some(RequestIncrementalAuthorization::Default)\n ),\n metadata: additional_data.payment_data.payment_intent.metadata,\n authentication_data: payment_data\n .authentication\n .as_ref()\n .map(AuthenticationData::foreign_try_from)\n .transpose()?,\n customer_acceptance: payment_data.customer_acceptance,\n split_payments,\n merchant_order_reference_id,\n integrity_object: None,\n additional_payment_method_data,\n shipping_cost,\n })\n }\n}",
|
| 51 |
+
"after_code": "impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsAuthorizeData {\n type Error = error_stack::Report<errors::ApiErrorResponse>;\n\n fn try_from(additional_data: PaymentAdditionalData<'_, F>) -> Result<Self, Self::Error> {\n let payment_data = additional_data.payment_data.clone();\n let router_base_url = &additional_data.router_base_url;\n let connector_name = &additional_data.connector_name;\n let attempt = &payment_data.payment_attempt;\n let browser_info: Option<types::BrowserInformation> = attempt\n .browser_info\n .clone()\n .map(|b| b.parse_value(\"BrowserInformation\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"browser_info\",\n })?;\n\n let order_category = additional_data\n .payment_data\n .payment_intent\n .connector_metadata\n .map(|cm| {\n cm.parse_value::<api_models::payments::ConnectorMetadata>(\"ConnectorMetadata\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed parsing ConnectorMetadata\")\n })\n .transpose()?\n .and_then(|cm| cm.noon.and_then(|noon| noon.order_category));\n\n let order_details = additional_data\n .payment_data\n .payment_intent\n .order_details\n .map(|order_details| {\n order_details\n .iter()\n .map(|data| {\n data.to_owned()\n .parse_value(\"OrderDetailsWithAmount\")\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"OrderDetailsWithAmount\",\n })\n .attach_printable(\"Unable to parse OrderDetailsWithAmount\")\n })\n .collect::<Result<Vec<_>, _>>()\n })\n .transpose()?;\n\n let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n router_base_url,\n attempt,\n connector_name,\n ));\n\n let webhook_url = Some(helpers::create_webhook_url(\n router_base_url,\n &attempt.merchant_id,\n connector_name,\n ));\n let router_return_url = Some(helpers::create_redirect_url(\n router_base_url,\n attempt,\n connector_name,\n payment_data.creds_identifier.as_deref(),\n ));\n\n let additional_payment_method_data = if payment_data.mandate_id.is_some() {\n let parsed_additional_payment_data: Option<api_models::payments::AdditionalPaymentData> =\n payment_data.payment_attempt\n .payment_method_data\n .as_ref().map(|data| data.clone().parse_value(\"AdditionalPaymentData\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse AdditionalPaymentData from payment_data.payment_attempt.payment_method_data\")?;\n parsed_additional_payment_data\n } else {\n None\n };\n let payment_method_data = payment_data.payment_method_data.or_else(|| {\n if payment_data.mandate_id.is_some() {\n Some(domain::PaymentMethodData::MandatePayment)\n } else {\n None\n }\n });\n let amount = payment_data.payment_attempt.get_total_amount();\n\n let customer_name = additional_data\n .customer_data\n .as_ref()\n .and_then(|customer_data| {\n customer_data\n .name\n .as_ref()\n .map(|customer| customer.clone().into_inner())\n });\n\n let customer_id = additional_data\n .customer_data\n .as_ref()\n .map(|data| data.customer_id.clone());\n\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n let merchant_order_reference_id = payment_data\n .payment_intent\n .merchant_order_reference_id\n .clone();\n let shipping_cost = payment_data.payment_intent.shipping_cost;\n\n Ok(Self {\n payment_method_data: (payment_method_data.get_required_value(\"payment_method_data\")?),\n setup_future_usage: payment_data.payment_intent.setup_future_usage,\n mandate_id: payment_data.mandate_id.clone(),\n off_session: payment_data.mandate_id.as_ref().map(|_| true),\n setup_mandate_details: payment_data.setup_mandate.clone(),\n confirm: payment_data.payment_attempt.confirm,\n statement_descriptor_suffix: payment_data.payment_intent.statement_descriptor_suffix,\n statement_descriptor: payment_data.payment_intent.statement_descriptor_name,\n capture_method: payment_data.payment_attempt.capture_method,\n amount: amount.get_amount_as_i64(),\n minor_amount: amount,\n currency: payment_data.currency,\n browser_info,\n email: payment_data.email,\n customer_name,\n payment_experience: payment_data.payment_attempt.payment_experience,\n order_details,\n order_category,\n session_token: None,\n enrolled_for_3ds: true,\n related_transaction_id: None,\n payment_method_type: payment_data.payment_attempt.payment_method_type,\n router_return_url,\n webhook_url,\n complete_authorize_url,\n customer_id,\n surcharge_details: payment_data.surcharge_details,\n request_incremental_authorization: matches!(\n payment_data\n .payment_intent\n .request_incremental_authorization,\n Some(RequestIncrementalAuthorization::True)\n | Some(RequestIncrementalAuthorization::Default)\n ),\n metadata: additional_data.payment_data.payment_intent.metadata,\n authentication_data: payment_data\n .authentication\n .as_ref()\n .map(AuthenticationData::foreign_try_from)\n .transpose()?,\n customer_acceptance: payment_data.customer_acceptance,\n split_payments,\n merchant_order_reference_id,\n integrity_object: None,\n additional_payment_method_data,\n shipping_cost,\n })\n }\n}",
|
| 52 |
+
"diff_span": {
|
| 53 |
+
"before": " None\n };\n\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n let payment_method_data = payment_data.payment_method_data.or_else(|| {\n if payment_data.mandate_id.is_some() {",
|
| 54 |
+
"after": " .as_ref()\n .map(|data| data.customer_id.clone());\n\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n let merchant_order_reference_id = payment_data"
|
| 55 |
+
},
|
| 56 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 57 |
+
},
|
| 58 |
+
{
|
| 59 |
+
"id": "crates/router/src/core/payments/transformers.rs::types::PaymentsAuthorizeData::function::try_from",
|
| 60 |
+
"file": "crates/router/src/core/payments/transformers.rs",
|
| 61 |
+
"kind": "function_item",
|
| 62 |
+
"status": "modified",
|
| 63 |
+
"code_changed": true,
|
| 64 |
+
"imports_changed": false,
|
| 65 |
+
"before_code": "fn try_from(additional_data: PaymentAdditionalData<'_, F>) -> Result<Self, Self::Error> {\n let payment_data = additional_data.payment_data.clone();\n let router_base_url = &additional_data.router_base_url;\n let connector_name = &additional_data.connector_name;\n let attempt = &payment_data.payment_attempt;\n let browser_info: Option<types::BrowserInformation> = attempt\n .browser_info\n .clone()\n .map(|b| b.parse_value(\"BrowserInformation\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"browser_info\",\n })?;\n\n let order_category = additional_data\n .payment_data\n .payment_intent\n .connector_metadata\n .map(|cm| {\n cm.parse_value::<api_models::payments::ConnectorMetadata>(\"ConnectorMetadata\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed parsing ConnectorMetadata\")\n })\n .transpose()?\n .and_then(|cm| cm.noon.and_then(|noon| noon.order_category));\n\n let order_details = additional_data\n .payment_data\n .payment_intent\n .order_details\n .map(|order_details| {\n order_details\n .iter()\n .map(|data| {\n data.to_owned()\n .parse_value(\"OrderDetailsWithAmount\")\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"OrderDetailsWithAmount\",\n })\n .attach_printable(\"Unable to parse OrderDetailsWithAmount\")\n })\n .collect::<Result<Vec<_>, _>>()\n })\n .transpose()?;\n\n let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n router_base_url,\n attempt,\n connector_name,\n ));\n\n let webhook_url = Some(helpers::create_webhook_url(\n router_base_url,\n &attempt.merchant_id,\n connector_name,\n ));\n let router_return_url = Some(helpers::create_redirect_url(\n router_base_url,\n attempt,\n connector_name,\n payment_data.creds_identifier.as_deref(),\n ));\n\n let additional_payment_method_data = if payment_data.mandate_id.is_some() {\n let parsed_additional_payment_data: Option<api_models::payments::AdditionalPaymentData> =\n payment_data.payment_attempt\n .payment_method_data\n .as_ref().map(|data| data.clone().parse_value(\"AdditionalPaymentData\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse AdditionalPaymentData from payment_data.payment_attempt.payment_method_data\")?;\n parsed_additional_payment_data\n } else {\n None\n };\n\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n let payment_method_data = payment_data.payment_method_data.or_else(|| {\n if payment_data.mandate_id.is_some() {\n Some(domain::PaymentMethodData::MandatePayment)\n } else {\n None\n }\n });\n let amount = payment_data.payment_attempt.get_total_amount();\n\n let customer_name = additional_data\n .customer_data\n .as_ref()\n .and_then(|customer_data| {\n customer_data\n .name\n .as_ref()\n .map(|customer| customer.clone().into_inner())\n });\n\n let customer_id = additional_data\n .customer_data\n .as_ref()\n .map(|data| data.customer_id.clone());\n\n let merchant_order_reference_id = payment_data\n .payment_intent\n .merchant_order_reference_id\n .clone();\n let shipping_cost = payment_data.payment_intent.shipping_cost;\n\n Ok(Self {\n payment_method_data: (payment_method_data.get_required_value(\"payment_method_data\")?),\n setup_future_usage: payment_data.payment_intent.setup_future_usage,\n mandate_id: payment_data.mandate_id.clone(),\n off_session: payment_data.mandate_id.as_ref().map(|_| true),\n setup_mandate_details: payment_data.setup_mandate.clone(),\n confirm: payment_data.payment_attempt.confirm,\n statement_descriptor_suffix: payment_data.payment_intent.statement_descriptor_suffix,\n statement_descriptor: payment_data.payment_intent.statement_descriptor_name,\n capture_method: payment_data.payment_attempt.capture_method,\n amount: amount.get_amount_as_i64(),\n minor_amount: amount,\n currency: payment_data.currency,\n browser_info,\n email: payment_data.email,\n customer_name,\n payment_experience: payment_data.payment_attempt.payment_experience,\n order_details,\n order_category,\n session_token: None,\n enrolled_for_3ds: true,\n related_transaction_id: None,\n payment_method_type: payment_data.payment_attempt.payment_method_type,\n router_return_url,\n webhook_url,\n complete_authorize_url,\n customer_id,\n surcharge_details: payment_data.surcharge_details,\n request_incremental_authorization: matches!(\n payment_data\n .payment_intent\n .request_incremental_authorization,\n Some(RequestIncrementalAuthorization::True)\n | Some(RequestIncrementalAuthorization::Default)\n ),\n metadata: additional_data.payment_data.payment_intent.metadata,\n authentication_data: payment_data\n .authentication\n .as_ref()\n .map(AuthenticationData::foreign_try_from)\n .transpose()?,\n customer_acceptance: payment_data.customer_acceptance,\n split_payments,\n merchant_order_reference_id,\n integrity_object: None,\n additional_payment_method_data,\n shipping_cost,\n })\n }",
|
| 66 |
+
"after_code": "fn try_from(additional_data: PaymentAdditionalData<'_, F>) -> Result<Self, Self::Error> {\n let payment_data = additional_data.payment_data.clone();\n let router_base_url = &additional_data.router_base_url;\n let connector_name = &additional_data.connector_name;\n let attempt = &payment_data.payment_attempt;\n let browser_info: Option<types::BrowserInformation> = attempt\n .browser_info\n .clone()\n .map(|b| b.parse_value(\"BrowserInformation\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"browser_info\",\n })?;\n\n let order_category = additional_data\n .payment_data\n .payment_intent\n .connector_metadata\n .map(|cm| {\n cm.parse_value::<api_models::payments::ConnectorMetadata>(\"ConnectorMetadata\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed parsing ConnectorMetadata\")\n })\n .transpose()?\n .and_then(|cm| cm.noon.and_then(|noon| noon.order_category));\n\n let order_details = additional_data\n .payment_data\n .payment_intent\n .order_details\n .map(|order_details| {\n order_details\n .iter()\n .map(|data| {\n data.to_owned()\n .parse_value(\"OrderDetailsWithAmount\")\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"OrderDetailsWithAmount\",\n })\n .attach_printable(\"Unable to parse OrderDetailsWithAmount\")\n })\n .collect::<Result<Vec<_>, _>>()\n })\n .transpose()?;\n\n let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n router_base_url,\n attempt,\n connector_name,\n ));\n\n let webhook_url = Some(helpers::create_webhook_url(\n router_base_url,\n &attempt.merchant_id,\n connector_name,\n ));\n let router_return_url = Some(helpers::create_redirect_url(\n router_base_url,\n attempt,\n connector_name,\n payment_data.creds_identifier.as_deref(),\n ));\n\n let additional_payment_method_data = if payment_data.mandate_id.is_some() {\n let parsed_additional_payment_data: Option<api_models::payments::AdditionalPaymentData> =\n payment_data.payment_attempt\n .payment_method_data\n .as_ref().map(|data| data.clone().parse_value(\"AdditionalPaymentData\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse AdditionalPaymentData from payment_data.payment_attempt.payment_method_data\")?;\n parsed_additional_payment_data\n } else {\n None\n };\n let payment_method_data = payment_data.payment_method_data.or_else(|| {\n if payment_data.mandate_id.is_some() {\n Some(domain::PaymentMethodData::MandatePayment)\n } else {\n None\n }\n });\n let amount = payment_data.payment_attempt.get_total_amount();\n\n let customer_name = additional_data\n .customer_data\n .as_ref()\n .and_then(|customer_data| {\n customer_data\n .name\n .as_ref()\n .map(|customer| customer.clone().into_inner())\n });\n\n let customer_id = additional_data\n .customer_data\n .as_ref()\n .map(|data| data.customer_id.clone());\n\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n let merchant_order_reference_id = payment_data\n .payment_intent\n .merchant_order_reference_id\n .clone();\n let shipping_cost = payment_data.payment_intent.shipping_cost;\n\n Ok(Self {\n payment_method_data: (payment_method_data.get_required_value(\"payment_method_data\")?),\n setup_future_usage: payment_data.payment_intent.setup_future_usage,\n mandate_id: payment_data.mandate_id.clone(),\n off_session: payment_data.mandate_id.as_ref().map(|_| true),\n setup_mandate_details: payment_data.setup_mandate.clone(),\n confirm: payment_data.payment_attempt.confirm,\n statement_descriptor_suffix: payment_data.payment_intent.statement_descriptor_suffix,\n statement_descriptor: payment_data.payment_intent.statement_descriptor_name,\n capture_method: payment_data.payment_attempt.capture_method,\n amount: amount.get_amount_as_i64(),\n minor_amount: amount,\n currency: payment_data.currency,\n browser_info,\n email: payment_data.email,\n customer_name,\n payment_experience: payment_data.payment_attempt.payment_experience,\n order_details,\n order_category,\n session_token: None,\n enrolled_for_3ds: true,\n related_transaction_id: None,\n payment_method_type: payment_data.payment_attempt.payment_method_type,\n router_return_url,\n webhook_url,\n complete_authorize_url,\n customer_id,\n surcharge_details: payment_data.surcharge_details,\n request_incremental_authorization: matches!(\n payment_data\n .payment_intent\n .request_incremental_authorization,\n Some(RequestIncrementalAuthorization::True)\n | Some(RequestIncrementalAuthorization::Default)\n ),\n metadata: additional_data.payment_data.payment_intent.metadata,\n authentication_data: payment_data\n .authentication\n .as_ref()\n .map(AuthenticationData::foreign_try_from)\n .transpose()?,\n customer_acceptance: payment_data.customer_acceptance,\n split_payments,\n merchant_order_reference_id,\n integrity_object: None,\n additional_payment_method_data,\n shipping_cost,\n })\n }",
|
| 67 |
+
"diff_span": {
|
| 68 |
+
"before": " None\n };\n\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n let payment_method_data = payment_data.payment_method_data.or_else(|| {\n if payment_data.mandate_id.is_some() {",
|
| 69 |
+
"after": " .as_ref()\n .map(|data| data.customer_id.clone());\n\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n let merchant_order_reference_id = payment_data"
|
| 70 |
+
},
|
| 71 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 72 |
+
},
|
| 73 |
+
{
|
| 74 |
+
"id": "crates/router/src/core/payments/helpers.rs::function::validate_platform_fees_for_marketplace",
|
| 75 |
+
"file": "crates/router/src/core/payments/helpers.rs",
|
| 76 |
+
"kind": "function_item",
|
| 77 |
+
"status": "modified",
|
| 78 |
+
"code_changed": true,
|
| 79 |
+
"imports_changed": false,
|
| 80 |
+
"before_code": "pub fn validate_platform_fees_for_marketplace(\n amount: api::Amount,\n split_payments: Option<SplitPaymentsRequest>,\n) -> Result<(), errors::ApiErrorResponse> {\n if let Some(SplitPaymentsRequest::StripeSplitPayment(stripe_split_payment)) = split_payments {\n match amount {\n api::Amount::Zero => {\n if stripe_split_payment.application_fees.get_amount_as_i64() != 0 {\n return Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"split_payments.fees\",\n });\n }\n }\n api::Amount::Value(amount) => {\n if stripe_split_payment.application_fees.get_amount_as_i64() > amount.into() {\n return Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"split_payments.fees\",\n });\n }\n }\n }\n }\n Ok(())\n}",
|
| 81 |
+
"after_code": "pub fn validate_platform_fees_for_marketplace(\n amount: api::Amount,\n split_payments: Option<SplitPaymentsRequest>,\n) -> Result<(), errors::ApiErrorResponse> {\n if let Some(SplitPaymentsRequest::StripeSplitPayment(stripe_split_payment)) = split_payments {\n match amount {\n api::Amount::Zero => {\n if stripe_split_payment.application_fees.get_amount_as_i64() != 0 {\n return Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"split_payments.stripe_split_payment.application_fees\",\n });\n }\n }\n api::Amount::Value(amount) => {\n if stripe_split_payment.application_fees.get_amount_as_i64() > amount.into() {\n return Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"split_payments.stripe_split_payment.application_fees\",\n });\n }\n }\n }\n }\n Ok(())\n}",
|
| 82 |
+
"diff_span": {
|
| 83 |
+
"before": " if stripe_split_payment.application_fees.get_amount_as_i64() != 0 {\n return Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"split_payments.fees\",\n });\n }\n }\n api::Amount::Value(amount) => {\n if stripe_split_payment.application_fees.get_amount_as_i64() > amount.into() {\n return Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"split_payments.fees\",\n });\n }",
|
| 84 |
+
"after": " if stripe_split_payment.application_fees.get_amount_as_i64() != 0 {\n return Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"split_payments.stripe_split_payment.application_fees\",\n });\n }\n }\n api::Amount::Value(amount) => {\n if stripe_split_payment.application_fees.get_amount_as_i64() > amount.into() {\n return Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"split_payments.stripe_split_payment.application_fees\",\n });\n }"
|
| 85 |
+
},
|
| 86 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 87 |
+
},
|
| 88 |
+
{
|
| 89 |
+
"id": "crates/common_utils/src/types.rs::struct::StripeSplitPayment",
|
| 90 |
+
"file": "crates/common_utils/src/types.rs",
|
| 91 |
+
"kind": "struct_item",
|
| 92 |
+
"status": "modified",
|
| 93 |
+
"code_changed": true,
|
| 94 |
+
"imports_changed": false,
|
| 95 |
+
"before_code": "pub struct StripeSplitPayment {\n /// Payment charge type\n #[schema(value_type = PaymentChargeType, example = \"direct\")]\n pub charge_type: enums::PaymentChargeType,\n\n /// Platform fees to be collected on the payment\n #[schema(value_type = i64, example = 6540)]\n pub application_fees: MinorUnit,\n\n /// Identifier for the reseller's account to send the funds to\n pub transfer_account_id: String,\n}",
|
| 96 |
+
"after_code": "pub struct StripeSplitPayment {\n /// Stripe's charge type\n #[schema(value_type = PaymentChargeType, example = \"direct\")]\n pub charge_type: enums::PaymentChargeType,\n\n /// Platform fees to be collected on the payment\n #[schema(value_type = i64, example = 6540)]\n pub application_fees: MinorUnit,\n\n /// Identifier for the reseller's account to send the funds to\n pub transfer_account_id: String,\n}",
|
| 97 |
+
"diff_span": {
|
| 98 |
+
"before": "pub struct StripeSplitPayment {\n /// Payment charge type\n #[schema(value_type = PaymentChargeType, example = \"direct\")]\n pub charge_type: enums::PaymentChargeType,",
|
| 99 |
+
"after": "pub struct StripeSplitPayment {\n /// Stripe's charge type\n #[schema(value_type = PaymentChargeType, example = \"direct\")]\n pub charge_type: enums::PaymentChargeType,"
|
| 100 |
+
},
|
| 101 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 102 |
+
},
|
| 103 |
+
{
|
| 104 |
+
"id": "crates/common_utils/src/types.rs::struct::StripeSplitRefundRequest",
|
| 105 |
+
"file": "crates/common_utils/src/types.rs",
|
| 106 |
+
"kind": "struct_item",
|
| 107 |
+
"status": "modified",
|
| 108 |
+
"code_changed": true,
|
| 109 |
+
"imports_changed": false,
|
| 110 |
+
"before_code": "pub struct StripeSplitRefundRequest {\n /// Identifier for charge created for the payment\n // pub charge_id: String,\n\n /// Toggle for reverting the application fee that was collected for the payment.\n /// If set to false, the funds are pulled from the destination account.\n pub revert_platform_fee: Option<bool>,\n\n /// Toggle for reverting the transfer that was made during the charge.\n /// If set to false, the funds are pulled from the main platform's account.\n pub revert_transfer: Option<bool>,\n}",
|
| 111 |
+
"after_code": "pub struct StripeSplitRefundRequest {\n /// Toggle for reverting the application fee that was collected for the payment.\n /// If set to false, the funds are pulled from the destination account.\n pub revert_platform_fee: Option<bool>,\n\n /// Toggle for reverting the transfer that was made during the charge.\n /// If set to false, the funds are pulled from the main platform's account.\n pub revert_transfer: Option<bool>,\n}",
|
| 112 |
+
"diff_span": {
|
| 113 |
+
"before": "pub struct StripeSplitRefundRequest {\n /// Identifier for charge created for the payment\n // pub charge_id: String,\n\n /// Toggle for reverting the application fee that was collected for the payment.\n /// If set to false, the funds are pulled from the destination account.",
|
| 114 |
+
"after": ""
|
| 115 |
+
},
|
| 116 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 117 |
+
},
|
| 118 |
+
{
|
| 119 |
+
"id": "crates/router/src/core/refunds.rs::function::trigger_refund_execute_workflow",
|
| 120 |
+
"file": "crates/router/src/core/refunds.rs",
|
| 121 |
+
"kind": "function_item",
|
| 122 |
+
"status": "modified",
|
| 123 |
+
"code_changed": true,
|
| 124 |
+
"imports_changed": false,
|
| 125 |
+
"before_code": "pub async fn trigger_refund_execute_workflow(\n state: &SessionState,\n refund_tracker: &storage::ProcessTracker,\n) -> Result<(), errors::ProcessTrackerError> {\n let db = &*state.store;\n let refund_core =\n serde_json::from_value::<storage::RefundCoreWorkflow>(refund_tracker.tracking_data.clone())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| {\n format!(\n \"unable to convert into refund_core {:?}\",\n refund_tracker.tracking_data\n )\n })?;\n let key_manager_state = &state.into();\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &refund_core.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await?;\n\n let merchant_account = db\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &refund_core.merchant_id,\n &key_store,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let refund = db\n .find_refund_by_internal_reference_id_merchant_id(\n &refund_core.refund_internal_reference_id,\n &refund_core.merchant_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::RefundNotFound)?;\n match (&refund.sent_to_gateway, &refund.refund_status) {\n (false, enums::RefundStatus::Pending) => {\n let merchant_account = db\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &refund.merchant_id,\n &key_store,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let payment_attempt = db\n .find_payment_attempt_by_connector_transaction_id_payment_id_merchant_id(\n &refund.connector_transaction_id,\n &refund_core.payment_id,\n &refund.merchant_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_intent = db\n .find_payment_intent_by_payment_id_merchant_id(\n &(state.into()),\n &payment_attempt.payment_id,\n &refund.merchant_id,\n &key_store,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let split_refunds = match payment_intent.split_payments.as_ref() {\n Some(SplitPaymentsRequest::StripeSplitPayment(stripe_payment)) => {\n let refund_request = refund\n .split_refunds\n .clone()\n .get_required_value(\"split_refunds\")?;\n\n let options = validator::validate_charge_refund(\n &refund_request,\n &stripe_payment.charge_type,\n )?;\n\n let charge_id = payment_attempt.charge_id.clone().ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n \"Transaction in invalid. Missing field \\\"charge_id\\\" in payment_attempt.\",\n )\n })?;\n\n Some(SplitRefundsRequest::StripeSplitRefund(StripeSplitRefund {\n charge_id,\n charge_type: stripe_payment.charge_type.clone(),\n transfer_account_id: stripe_payment.transfer_account_id.clone(),\n options,\n }))\n }\n _ => None,\n };\n\n // let split_refunds = match (\n // payment_intent.split_payments.as_ref(),\n // payment_attempt.charge_id.as_ref(),\n // ) {\n // (Some(split_payments), Some(charge_id)) => {\n // let refund_request = refund\n // .split_refunds\n // .clone()\n // .get_required_value(\"split_refunds\")?;\n\n // // Match the enum variant of SplitRefundRequest\n // // let stripe_refund = match refund_request {\n // // SplitRefundRequest::StripeSplitRefundRequest(ref stripe_refund) => {\n // // stripe_refund\n // // }\n // // };\n // let SplitRefundRequest::StripeSplitRefundRequest(ref stripe_refund) =\n // refund_request;\n\n // // Validate charge_id\n // // utils::when(*charge_id != stripe_refund.charge_id, || {\n // // Err(report!(errors::ApiErrorResponse::InvalidDataValue {\n // // field_name: \"split_refunds.charge_id\",\n // // }))\n // // .attach_printable(\n // // \"charge_id sent in request mismatches with original charge_id\",\n // // )\n // // })?;\n\n // // Match the variant of SplitPaymentsRequest\n // // let stripe_payment = match split_payments {\n // // SplitPaymentsRequest::StripeSplitPayment(payment) => payment,\n // // };\n // let SplitPaymentsRequest::StripeSplitPayment(stripe_payment) = split_payments;\n\n // // Validate refund options with correct `charge_type`\n // let options = validator::validate_charge_refund(\n // &refund_request,\n // &stripe_payment.charge_type,\n // )?;\n // let charge_id = payment_attempt.charge_id.clone().ok_or_else(|| {\n // report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n // \"Transaction in invalid. Missing field \\\"charge_id\\\" in payment_attempt.\",\n // )\n // })?;\n // // Construct SplitRefundsRequest\n // Some(SplitRefundsRequest::StripeSplitRefund(StripeSplitRefund {\n // charge_id,\n // charge_type: stripe_payment.charge_type.clone(),\n // transfer_account_id: stripe_payment.transfer_account_id.clone(),\n // options,\n // }))\n // }\n // _ => None,\n // };\n //trigger refund request to gateway\n let updated_refund = Box::pin(trigger_refund_to_gateway(\n state,\n &refund,\n &merchant_account,\n &key_store,\n &payment_attempt,\n &payment_intent,\n None,\n split_refunds,\n ))\n .await?;\n add_refund_sync_task(\n db,\n &updated_refund,\n storage::ProcessTrackerRunner::RefundWorkflowRouter,\n )\n .await?;\n }\n (true, enums::RefundStatus::Pending) => {\n // create sync task\n add_refund_sync_task(\n db,\n &refund,\n storage::ProcessTrackerRunner::RefundWorkflowRouter,\n )\n .await?;\n }\n (_, _) => {\n //mark task as finished\n db.as_scheduler()\n .finish_process_with_business_status(\n refund_tracker.clone(),\n business_status::COMPLETED_BY_PT,\n )\n .await?;\n }\n };\n Ok(())\n}",
|
| 126 |
+
"after_code": "pub async fn trigger_refund_execute_workflow(\n state: &SessionState,\n refund_tracker: &storage::ProcessTracker,\n) -> Result<(), errors::ProcessTrackerError> {\n let db = &*state.store;\n let refund_core =\n serde_json::from_value::<storage::RefundCoreWorkflow>(refund_tracker.tracking_data.clone())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| {\n format!(\n \"unable to convert into refund_core {:?}\",\n refund_tracker.tracking_data\n )\n })?;\n let key_manager_state = &state.into();\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &refund_core.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await?;\n\n let merchant_account = db\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &refund_core.merchant_id,\n &key_store,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let refund = db\n .find_refund_by_internal_reference_id_merchant_id(\n &refund_core.refund_internal_reference_id,\n &refund_core.merchant_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::RefundNotFound)?;\n match (&refund.sent_to_gateway, &refund.refund_status) {\n (false, enums::RefundStatus::Pending) => {\n let merchant_account = db\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &refund.merchant_id,\n &key_store,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;\n\n let payment_attempt = db\n .find_payment_attempt_by_connector_transaction_id_payment_id_merchant_id(\n &refund.connector_transaction_id,\n &refund_core.payment_id,\n &refund.merchant_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_intent = db\n .find_payment_intent_by_payment_id_merchant_id(\n &(state.into()),\n &payment_attempt.payment_id,\n &refund.merchant_id,\n &key_store,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let split_refunds = match payment_intent.split_payments.as_ref() {\n Some(SplitPaymentsRequest::StripeSplitPayment(stripe_payment)) => {\n let refund_request = refund\n .split_refunds\n .clone()\n .get_required_value(\"split_refunds\")?;\n\n let options = validator::validate_charge_refund(\n &refund_request,\n &stripe_payment.charge_type,\n )?;\n\n let charge_id = payment_attempt.charge_id.clone().ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n \"Transaction in invalid. Missing field \\\"charge_id\\\" in payment_attempt.\",\n )\n })?;\n\n Some(SplitRefundsRequest::StripeSplitRefund(StripeSplitRefund {\n charge_id,\n charge_type: stripe_payment.charge_type.clone(),\n transfer_account_id: stripe_payment.transfer_account_id.clone(),\n options,\n }))\n }\n _ => None,\n };\n\n //trigger refund request to gateway\n let updated_refund = Box::pin(trigger_refund_to_gateway(\n state,\n &refund,\n &merchant_account,\n &key_store,\n &payment_attempt,\n &payment_intent,\n None,\n split_refunds,\n ))\n .await?;\n add_refund_sync_task(\n db,\n &updated_refund,\n storage::ProcessTrackerRunner::RefundWorkflowRouter,\n )\n .await?;\n }\n (true, enums::RefundStatus::Pending) => {\n // create sync task\n add_refund_sync_task(\n db,\n &refund,\n storage::ProcessTrackerRunner::RefundWorkflowRouter,\n )\n .await?;\n }\n (_, _) => {\n //mark task as finished\n db.as_scheduler()\n .finish_process_with_business_status(\n refund_tracker.clone(),\n business_status::COMPLETED_BY_PT,\n )\n .await?;\n }\n };\n Ok(())\n}",
|
| 127 |
+
"diff_span": {
|
| 128 |
+
"before": " };\n\n // let split_refunds = match (\n // payment_intent.split_payments.as_ref(),\n // payment_attempt.charge_id.as_ref(),\n // ) {\n // (Some(split_payments), Some(charge_id)) => {\n // let refund_request = refund\n // .split_refunds\n // .clone()\n // .get_required_value(\"split_refunds\")?;\n\n // // Match the enum variant of SplitRefundRequest\n // // let stripe_refund = match refund_request {\n // // SplitRefundRequest::StripeSplitRefundRequest(ref stripe_refund) => {\n // // stripe_refund\n // // }\n // // };\n // let SplitRefundRequest::StripeSplitRefundRequest(ref stripe_refund) =\n // refund_request;\n\n // // Validate charge_id\n // // utils::when(*charge_id != stripe_refund.charge_id, || {\n // // Err(report!(errors::ApiErrorResponse::InvalidDataValue {\n // // field_name: \"split_refunds.charge_id\",\n // // }))\n // // .attach_printable(\n // // \"charge_id sent in request mismatches with original charge_id\",\n // // )\n // // })?;\n\n // // Match the variant of SplitPaymentsRequest\n // // let stripe_payment = match split_payments {\n // // SplitPaymentsRequest::StripeSplitPayment(payment) => payment,\n // // };\n // let SplitPaymentsRequest::StripeSplitPayment(stripe_payment) = split_payments;\n\n // // Validate refund options with correct `charge_type`\n // let options = validator::validate_charge_refund(\n // &refund_request,\n // &stripe_payment.charge_type,\n // )?;\n // let charge_id = payment_attempt.charge_id.clone().ok_or_else(|| {\n // report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n // \"Transaction in invalid. Missing field \\\"charge_id\\\" in payment_attempt.\",\n // )\n // })?;\n // // Construct SplitRefundsRequest\n // Some(SplitRefundsRequest::StripeSplitRefund(StripeSplitRefund {\n // charge_id,\n // charge_type: stripe_payment.charge_type.clone(),\n // transfer_account_id: stripe_payment.transfer_account_id.clone(),\n // options,\n // }))\n // }\n // _ => None,\n // };\n //trigger refund request to gateway\n let updated_refund = Box::pin(trigger_refund_to_gateway(",
|
| 129 |
+
"after": ""
|
| 130 |
+
},
|
| 131 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 132 |
+
},
|
| 133 |
+
{
|
| 134 |
+
"id": "crates/router/src/core/payments/transformers.rs::types::PaymentsSyncData::function::try_from",
|
| 135 |
+
"file": "crates/router/src/core/payments/transformers.rs",
|
| 136 |
+
"kind": "function_item",
|
| 137 |
+
"status": "modified",
|
| 138 |
+
"code_changed": true,
|
| 139 |
+
"imports_changed": false,
|
| 140 |
+
"before_code": "fn try_from(additional_data: PaymentAdditionalData<'_, F>) -> Result<Self, Self::Error> {\n let payment_data = additional_data.payment_data;\n let capture_method = payment_data.get_capture_method();\n let amount = payment_data.payment_attempt.get_total_amount();\n\n let payment_method_type = payment_data\n .payment_attempt\n .get_payment_method_type()\n .to_owned();\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n Ok(Self {\n amount,\n integrity_object: None,\n mandate_id: payment_data.mandate_id.clone(),\n connector_transaction_id: match payment_data.payment_attempt.get_connector_payment_id()\n {\n Some(connector_txn_id) => {\n types::ResponseId::ConnectorTransactionId(connector_txn_id.to_owned())\n }\n None => types::ResponseId::NoResponseId,\n },\n encoded_data: payment_data.payment_attempt.encoded_data,\n capture_method,\n connector_meta: payment_data.payment_attempt.connector_metadata,\n sync_type: match payment_data.multiple_capture_data {\n Some(multiple_capture_data) => types::SyncRequestType::MultipleCaptureSync(\n multiple_capture_data.get_pending_connector_capture_ids(),\n ),\n None => types::SyncRequestType::SinglePaymentSync,\n },\n payment_method_type,\n currency: payment_data.currency,\n split_payments,\n payment_experience: payment_data.payment_attempt.payment_experience,\n })\n }",
|
| 141 |
+
"after_code": "fn try_from(additional_data: PaymentAdditionalData<'_, F>) -> Result<Self, Self::Error> {\n let payment_data = additional_data.payment_data;\n let capture_method = payment_data.get_capture_method();\n let amount = payment_data.payment_attempt.get_total_amount();\n\n let payment_method_type = payment_data\n .payment_attempt\n .get_payment_method_type()\n .to_owned();\n Ok(Self {\n amount,\n integrity_object: None,\n mandate_id: payment_data.mandate_id.clone(),\n connector_transaction_id: match payment_data.payment_attempt.get_connector_payment_id()\n {\n Some(connector_txn_id) => {\n types::ResponseId::ConnectorTransactionId(connector_txn_id.to_owned())\n }\n None => types::ResponseId::NoResponseId,\n },\n encoded_data: payment_data.payment_attempt.encoded_data,\n capture_method,\n connector_meta: payment_data.payment_attempt.connector_metadata,\n sync_type: match payment_data.multiple_capture_data {\n Some(multiple_capture_data) => types::SyncRequestType::MultipleCaptureSync(\n multiple_capture_data.get_pending_connector_capture_ids(),\n ),\n None => types::SyncRequestType::SinglePaymentSync,\n },\n payment_method_type,\n currency: payment_data.currency,\n split_payments: payment_data.payment_intent.split_payments,\n payment_experience: payment_data.payment_attempt.payment_experience,\n })\n }",
|
| 142 |
+
"diff_span": {
|
| 143 |
+
"before": " .get_payment_method_type()\n .to_owned();\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n Ok(Self {\n amount,\n integrity_object: None,\n mandate_id: payment_data.mandate_id.clone(),\n connector_transaction_id: match payment_data.payment_attempt.get_connector_payment_id()\n {\n Some(connector_txn_id) => {\n types::ResponseId::ConnectorTransactionId(connector_txn_id.to_owned())\n }\n None => types::ResponseId::NoResponseId,\n },\n encoded_data: payment_data.payment_attempt.encoded_data,\n capture_method,\n connector_meta: payment_data.payment_attempt.connector_metadata,\n sync_type: match payment_data.multiple_capture_data {\n Some(multiple_capture_data) => types::SyncRequestType::MultipleCaptureSync(\n multiple_capture_data.get_pending_connector_capture_ids(),\n ),\n None => types::SyncRequestType::SinglePaymentSync,\n },\n payment_method_type,\n currency: payment_data.currency,\n split_payments,\n payment_experience: payment_data.payment_attempt.payment_experience,\n })",
|
| 144 |
+
"after": " payment_method_type,\n currency: payment_data.currency,\n split_payments: payment_data.payment_intent.split_payments,\n payment_experience: payment_data.payment_attempt.payment_experience,\n })"
|
| 145 |
+
},
|
| 146 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 147 |
+
},
|
| 148 |
+
{
|
| 149 |
+
"id": "crates/router/src/core/payments/transformers.rs::impl::types::PaymentsSyncData",
|
| 150 |
+
"file": "crates/router/src/core/payments/transformers.rs",
|
| 151 |
+
"kind": "impl_item",
|
| 152 |
+
"status": "modified",
|
| 153 |
+
"code_changed": true,
|
| 154 |
+
"imports_changed": false,
|
| 155 |
+
"before_code": "impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsSyncData {\n type Error = error_stack::Report<errors::ApiErrorResponse>;\n\n fn try_from(additional_data: PaymentAdditionalData<'_, F>) -> Result<Self, Self::Error> {\n let payment_data = additional_data.payment_data;\n let capture_method = payment_data.get_capture_method();\n let amount = payment_data.payment_attempt.get_total_amount();\n\n let payment_method_type = payment_data\n .payment_attempt\n .get_payment_method_type()\n .to_owned();\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n Ok(Self {\n amount,\n integrity_object: None,\n mandate_id: payment_data.mandate_id.clone(),\n connector_transaction_id: match payment_data.payment_attempt.get_connector_payment_id()\n {\n Some(connector_txn_id) => {\n types::ResponseId::ConnectorTransactionId(connector_txn_id.to_owned())\n }\n None => types::ResponseId::NoResponseId,\n },\n encoded_data: payment_data.payment_attempt.encoded_data,\n capture_method,\n connector_meta: payment_data.payment_attempt.connector_metadata,\n sync_type: match payment_data.multiple_capture_data {\n Some(multiple_capture_data) => types::SyncRequestType::MultipleCaptureSync(\n multiple_capture_data.get_pending_connector_capture_ids(),\n ),\n None => types::SyncRequestType::SinglePaymentSync,\n },\n payment_method_type,\n currency: payment_data.currency,\n split_payments,\n payment_experience: payment_data.payment_attempt.payment_experience,\n })\n }\n}",
|
| 156 |
+
"after_code": "impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsSyncData {\n type Error = error_stack::Report<errors::ApiErrorResponse>;\n\n fn try_from(additional_data: PaymentAdditionalData<'_, F>) -> Result<Self, Self::Error> {\n let payment_data = additional_data.payment_data;\n let capture_method = payment_data.get_capture_method();\n let amount = payment_data.payment_attempt.get_total_amount();\n\n let payment_method_type = payment_data\n .payment_attempt\n .get_payment_method_type()\n .to_owned();\n Ok(Self {\n amount,\n integrity_object: None,\n mandate_id: payment_data.mandate_id.clone(),\n connector_transaction_id: match payment_data.payment_attempt.get_connector_payment_id()\n {\n Some(connector_txn_id) => {\n types::ResponseId::ConnectorTransactionId(connector_txn_id.to_owned())\n }\n None => types::ResponseId::NoResponseId,\n },\n encoded_data: payment_data.payment_attempt.encoded_data,\n capture_method,\n connector_meta: payment_data.payment_attempt.connector_metadata,\n sync_type: match payment_data.multiple_capture_data {\n Some(multiple_capture_data) => types::SyncRequestType::MultipleCaptureSync(\n multiple_capture_data.get_pending_connector_capture_ids(),\n ),\n None => types::SyncRequestType::SinglePaymentSync,\n },\n payment_method_type,\n currency: payment_data.currency,\n split_payments: payment_data.payment_intent.split_payments,\n payment_experience: payment_data.payment_attempt.payment_experience,\n })\n }\n}",
|
| 157 |
+
"diff_span": {
|
| 158 |
+
"before": " .get_payment_method_type()\n .to_owned();\n let split_payments = payment_data.payment_intent.split_payments.clone();\n\n Ok(Self {\n amount,\n integrity_object: None,\n mandate_id: payment_data.mandate_id.clone(),\n connector_transaction_id: match payment_data.payment_attempt.get_connector_payment_id()\n {\n Some(connector_txn_id) => {\n types::ResponseId::ConnectorTransactionId(connector_txn_id.to_owned())\n }\n None => types::ResponseId::NoResponseId,\n },\n encoded_data: payment_data.payment_attempt.encoded_data,\n capture_method,\n connector_meta: payment_data.payment_attempt.connector_metadata,\n sync_type: match payment_data.multiple_capture_data {\n Some(multiple_capture_data) => types::SyncRequestType::MultipleCaptureSync(\n multiple_capture_data.get_pending_connector_capture_ids(),\n ),\n None => types::SyncRequestType::SinglePaymentSync,\n },\n payment_method_type,\n currency: payment_data.currency,\n split_payments,\n payment_experience: payment_data.payment_attempt.payment_experience,\n })",
|
| 159 |
+
"after": " payment_method_type,\n currency: payment_data.currency,\n split_payments: payment_data.payment_intent.split_payments,\n payment_experience: payment_data.payment_attempt.payment_experience,\n })"
|
| 160 |
+
},
|
| 161 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 162 |
+
},
|
| 163 |
+
{
|
| 164 |
+
"id": "crates/common_enums/src/enums.rs::impl::PaymentChargeType",
|
| 165 |
+
"file": "crates/common_enums/src/enums.rs",
|
| 166 |
+
"kind": "impl_item",
|
| 167 |
+
"status": "removed",
|
| 168 |
+
"before_code": "impl Default for PaymentChargeType {\n fn default() -> Self {\n Self::Stripe(StripeChargeType::default())\n }\n}",
|
| 169 |
+
"after_code": null,
|
| 170 |
+
"diff_span": null,
|
| 171 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 172 |
+
},
|
| 173 |
+
{
|
| 174 |
+
"id": "crates/common_enums/src/enums.rs::PaymentChargeType::function::default",
|
| 175 |
+
"file": "crates/common_enums/src/enums.rs",
|
| 176 |
+
"kind": "function_item",
|
| 177 |
+
"status": "removed",
|
| 178 |
+
"before_code": "fn default() -> Self {\n Self::Stripe(StripeChargeType::default())\n }",
|
| 179 |
+
"after_code": null,
|
| 180 |
+
"diff_span": null,
|
| 181 |
+
"commit_sha": "4e70d2136a76f6a5ea7b158ded7808149fa85494"
|
| 182 |
+
}
|
| 183 |
+
]
|
| 184 |
+
}
|
diffs/pr_6706/570c056/diff.json
ADDED
|
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "570c0561d7530c0887abfbdf46a55bfe9602eb44",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/openapi/src/openapi.rs",
|
| 6 |
+
"crates/openapi/src/openapi_v2.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": []
|
| 9 |
+
}
|
diffs/pr_6706/88d8e6f/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6706/9a34e69/diff.json
ADDED
|
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "9a34e69e3506a4fe3afb33a8c461a9a69f63096b",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/openapi/src/openapi.rs",
|
| 6 |
+
"crates/openapi/src/openapi_v2.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": []
|
| 9 |
+
}
|
diffs/pr_6706/a8db548/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6706/bb8ae08/diff.json
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "bb8ae08483ab16b27d5595734ba1f0572f37ae07",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/refunds.rs",
|
| 6 |
+
"crates/openapi/src/openapi.rs",
|
| 7 |
+
"crates/openapi/src/openapi_v2.rs"
|
| 8 |
+
],
|
| 9 |
+
"diffs": [
|
| 10 |
+
{
|
| 11 |
+
"id": "crates/api_models/src/refunds.rs::struct::RefundRequest",
|
| 12 |
+
"file": "crates/api_models/src/refunds.rs",
|
| 13 |
+
"kind": "struct_item",
|
| 14 |
+
"status": "modified",
|
| 15 |
+
"code_changed": true,
|
| 16 |
+
"imports_changed": false,
|
| 17 |
+
"before_code": "pub struct RefundRequest {\n /// The payment id against which refund is to be initiated\n #[schema(\n max_length = 30,\n min_length = 30,\n example = \"pay_mbabizu24mvu3mela5njyhpit4\",\n value_type = String,\n )]\n pub payment_id: common_utils::id_type::PaymentId,\n\n /// Unique Identifier for the Refund. This is to ensure idempotency for multiple partial refunds initiated against the same payment. If this is not passed by the merchant, this field shall be auto generated and provided in the API response. It is recommended to generate uuid(v4) as the refund_id.\n #[schema(\n max_length = 30,\n min_length = 30,\n example = \"ref_mbabizu24mvu3mela5njyhpit4\"\n )]\n pub refund_id: Option<String>,\n\n /// The identifier for the Merchant Account\n #[schema(max_length = 255, example = \"y3oqhf46pyzuxjbcn2giaqnb44\", value_type = Option<String>)]\n pub merchant_id: Option<common_utils::id_type::MerchantId>,\n\n /// Total amount for which the refund is to be initiated. Amount for the payment in lowest denomination of the currency. (i.e) in cents for USD denomination, in paisa for INR denomination etc., If not provided, this will default to the full payment amount\n #[schema(value_type = Option<i64> , minimum = 100, example = 6540)]\n pub amount: Option<MinorUnit>,\n\n /// Reason for the refund. Often useful for displaying to users and your customer support executive. In case the payment went through Stripe, this field needs to be passed with one of these enums: `duplicate`, `fraudulent`, or `requested_by_customer`\n #[schema(max_length = 255, example = \"Customer returned the product\")]\n pub reason: Option<String>,\n\n /// To indicate whether to refund needs to be instant or scheduled. Default value is instant\n #[schema(default = \"Instant\", example = \"Instant\")]\n pub refund_type: Option<RefundType>,\n\n /// You can specify up to 50 keys, with key names up to 40 characters long and values up to 500 characters long. Metadata is useful for storing additional, structured information on an object.\n #[schema(value_type = Option<Object>, example = r#\"{ \"city\": \"NY\", \"unit\": \"245\" }\"#)]\n pub metadata: Option<pii::SecretSerdeValue>,\n\n /// Merchant connector details used to make payments.\n #[schema(value_type = Option<MerchantConnectorDetailsWrap>)]\n pub merchant_connector_details: Option<admin::MerchantConnectorDetailsWrap>,\n\n /// Charge specific fields for controlling the revert of funds from either platform or connected account\n #[schema(value_type = Option<SplitRefundRequest>)]\n pub split_refunds: Option<SplitRefund>,\n}",
|
| 18 |
+
"after_code": "pub struct RefundRequest {\n /// The payment id against which refund is to be initiated\n #[schema(\n max_length = 30,\n min_length = 30,\n example = \"pay_mbabizu24mvu3mela5njyhpit4\",\n value_type = String,\n )]\n pub payment_id: common_utils::id_type::PaymentId,\n\n /// Unique Identifier for the Refund. This is to ensure idempotency for multiple partial refunds initiated against the same payment. If this is not passed by the merchant, this field shall be auto generated and provided in the API response. It is recommended to generate uuid(v4) as the refund_id.\n #[schema(\n max_length = 30,\n min_length = 30,\n example = \"ref_mbabizu24mvu3mela5njyhpit4\"\n )]\n pub refund_id: Option<String>,\n\n /// The identifier for the Merchant Account\n #[schema(max_length = 255, example = \"y3oqhf46pyzuxjbcn2giaqnb44\", value_type = Option<String>)]\n pub merchant_id: Option<common_utils::id_type::MerchantId>,\n\n /// Total amount for which the refund is to be initiated. Amount for the payment in lowest denomination of the currency. (i.e) in cents for USD denomination, in paisa for INR denomination etc., If not provided, this will default to the full payment amount\n #[schema(value_type = Option<i64> , minimum = 100, example = 6540)]\n pub amount: Option<MinorUnit>,\n\n /// Reason for the refund. Often useful for displaying to users and your customer support executive. In case the payment went through Stripe, this field needs to be passed with one of these enums: `duplicate`, `fraudulent`, or `requested_by_customer`\n #[schema(max_length = 255, example = \"Customer returned the product\")]\n pub reason: Option<String>,\n\n /// To indicate whether to refund needs to be instant or scheduled. Default value is instant\n #[schema(default = \"Instant\", example = \"Instant\")]\n pub refund_type: Option<RefundType>,\n\n /// You can specify up to 50 keys, with key names up to 40 characters long and values up to 500 characters long. Metadata is useful for storing additional, structured information on an object.\n #[schema(value_type = Option<Object>, example = r#\"{ \"city\": \"NY\", \"unit\": \"245\" }\"#)]\n pub metadata: Option<pii::SecretSerdeValue>,\n\n /// Merchant connector details used to make payments.\n #[schema(value_type = Option<MerchantConnectorDetailsWrap>)]\n pub merchant_connector_details: Option<admin::MerchantConnectorDetailsWrap>,\n\n /// Charge specific fields for controlling the revert of funds from either platform or connected account\n #[schema(value_type = Option<SplitRefund>)]\n pub split_refunds: Option<SplitRefund>,\n}",
|
| 19 |
+
"diff_span": {
|
| 20 |
+
"before": "\n /// Charge specific fields for controlling the revert of funds from either platform or connected account\n #[schema(value_type = Option<SplitRefundRequest>)]\n pub split_refunds: Option<SplitRefund>,\n}",
|
| 21 |
+
"after": "\n /// Charge specific fields for controlling the revert of funds from either platform or connected account\n #[schema(value_type = Option<SplitRefund>)]\n pub split_refunds: Option<SplitRefund>,\n}"
|
| 22 |
+
},
|
| 23 |
+
"commit_sha": "bb8ae08483ab16b27d5595734ba1f0572f37ae07"
|
| 24 |
+
}
|
| 25 |
+
]
|
| 26 |
+
}
|
diffs/pr_6706/c46282c/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "c46282c579920bdf21ec2de0c3820ae66d3e4c0a",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_6706/cc12206/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6706/cc56676/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "cc56676010d2c56f1a6d35c0c77c1adb4a81c766",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/payments/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_6706/d1ee42b/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "d1ee42b2e0cb5692f5b440ed2dd19abb71796336",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/refunds.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/refunds.rs::function::refund_retrieve_core",
|
| 10 |
+
"file": "crates/router/src/core/refunds.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub async fn refund_retrieve_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n profile_id: Option<common_utils::id_type::ProfileId>,\n key_store: domain::MerchantKeyStore,\n request: refunds::RefundsRetrieveRequest,\n refund: storage::Refund,\n) -> RouterResult<storage::Refund> {\n let db = &*state.store;\n let merchant_id = merchant_account.get_id();\n core_utils::validate_profile_id_from_auth_layer(profile_id, &refund)?;\n let payment_id = &refund.payment_id;\n let payment_intent = db\n .find_payment_intent_by_payment_id_merchant_id(\n &(&state).into(),\n payment_id,\n merchant_id,\n &key_store,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_attempt = db\n .find_payment_attempt_by_connector_transaction_id_payment_id_merchant_id(\n &refund.connector_transaction_id,\n payment_id,\n merchant_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)?;\n\n let creds_identifier = request\n .merchant_connector_details\n .as_ref()\n .map(|mcd| mcd.creds_identifier.to_owned());\n request\n .merchant_connector_details\n .to_owned()\n .async_map(|mcd| async {\n payments::helpers::insert_merchant_connector_creds_to_config(db, merchant_id, mcd).await\n })\n .await\n .transpose()?;\n\n let split_refunds_req: Option<SplitRefundsRequest> = payment_intent\n .split_payments\n .clone()\n .zip(refund.split_refunds.clone())\n .map(|(split_payments, split_refunds)| {\n SplitRefundInput {\n refund_request: split_refunds,\n payment_charges: split_payments,\n charge_id: payment_attempt.charge_id.clone(),\n }\n .try_into()\n })\n .transpose()?;\n\n let response = if should_call_refund(&refund, request.force_sync.unwrap_or(false)) {\n Box::pin(sync_refund_with_gateway(\n &state,\n &merchant_account,\n &key_store,\n &payment_attempt,\n &payment_intent,\n &refund,\n creds_identifier,\n split_refunds_req,\n ))\n .await\n } else {\n Ok(refund)\n }?;\n\n Ok(response)\n}",
|
| 16 |
+
"after_code": "pub async fn refund_retrieve_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n profile_id: Option<common_utils::id_type::ProfileId>,\n key_store: domain::MerchantKeyStore,\n request: refunds::RefundsRetrieveRequest,\n refund: storage::Refund,\n) -> RouterResult<storage::Refund> {\n let db = &*state.store;\n let merchant_id = merchant_account.get_id();\n core_utils::validate_profile_id_from_auth_layer(profile_id, &refund)?;\n let payment_id = &refund.payment_id;\n let payment_intent = db\n .find_payment_intent_by_payment_id_merchant_id(\n &(&state).into(),\n payment_id,\n merchant_id,\n &key_store,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payment_attempt = db\n .find_payment_attempt_by_connector_transaction_id_payment_id_merchant_id(\n &refund.connector_transaction_id,\n payment_id,\n merchant_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)?;\n\n let creds_identifier = request\n .merchant_connector_details\n .as_ref()\n .map(|mcd| mcd.creds_identifier.to_owned());\n request\n .merchant_connector_details\n .to_owned()\n .async_map(|mcd| async {\n payments::helpers::insert_merchant_connector_creds_to_config(db, merchant_id, mcd).await\n })\n .await\n .transpose()?;\n\n let split_refunds_req: Option<SplitRefundsRequest> = payment_intent\n .split_payments\n .clone()\n .zip(refund.split_refunds.clone())\n .map(|(split_payments, split_refunds)| {\n SplitRefundsRequest::try_from(SplitRefundInput {\n refund_request: split_refunds,\n payment_charges: split_payments,\n charge_id: payment_attempt.charge_id.clone(),\n })\n })\n .transpose()?;\n\n let response = if should_call_refund(&refund, request.force_sync.unwrap_or(false)) {\n Box::pin(sync_refund_with_gateway(\n &state,\n &merchant_account,\n &key_store,\n &payment_attempt,\n &payment_intent,\n &refund,\n creds_identifier,\n split_refunds_req,\n ))\n .await\n } else {\n Ok(refund)\n }?;\n\n Ok(response)\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " .zip(refund.split_refunds.clone())\n .map(|(split_payments, split_refunds)| {\n SplitRefundInput {\n refund_request: split_refunds,\n payment_charges: split_payments,\n charge_id: payment_attempt.charge_id.clone(),\n }\n .try_into()\n })\n .transpose()?;",
|
| 19 |
+
"after": " .zip(refund.split_refunds.clone())\n .map(|(split_payments, split_refunds)| {\n SplitRefundsRequest::try_from(SplitRefundInput {\n refund_request: split_refunds,\n payment_charges: split_payments,\n charge_id: payment_attempt.charge_id.clone(),\n })\n })\n .transpose()?;"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "d1ee42b2e0cb5692f5b440ed2dd19abb71796336"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_6706/d1f446c/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "d1f446cf7bf9adbe92fa8328b7d2f64f78cc5be8",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_6706/df3ec15/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6706/f363b77/diff.json
ADDED
|
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "f363b775fdd3f3a6e3abd5be613919cd5588dad9",
|
| 3 |
+
"pr_number": 6706,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/diesel_models/src/payment_intent.rs",
|
| 6 |
+
"crates/diesel_models/src/schema_v2.rs",
|
| 7 |
+
"crates/hyperswitch_domain_models/src/payments/payment_intent.rs"
|
| 8 |
+
],
|
| 9 |
+
"diffs": []
|
| 10 |
+
}
|
diffs/pr_6706/f5930fe/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6757/12df43a/diff.json
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "12df43a10afc31e5b08c5ca0ea77231f8dcdb642",
|
| 3 |
+
"pr_number": 6757,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_domain_models/src/business_profile.rs",
|
| 6 |
+
"crates/openapi/src/openapi.rs",
|
| 7 |
+
"crates/openapi/src/openapi_v2.rs"
|
| 8 |
+
],
|
| 9 |
+
"diffs": [
|
| 10 |
+
{
|
| 11 |
+
"id": "crates/hyperswitch_domain_models/src/business_profile.rs::enum::ProfileUpdate",
|
| 12 |
+
"file": "crates/hyperswitch_domain_models/src/business_profile.rs",
|
| 13 |
+
"kind": "enum_item",
|
| 14 |
+
"status": "modified",
|
| 15 |
+
"code_changed": true,
|
| 16 |
+
"imports_changed": false,
|
| 17 |
+
"before_code": "pub enum ProfileUpdate {\n Update(Box<ProfileGeneralUpdate>),\n RoutingAlgorithmUpdate {\n routing_algorithm_id: Option<common_utils::id_type::RoutingId>,\n payout_routing_algorithm_id: Option<common_utils::id_type::RoutingId>,\n },\n DefaultRoutingFallbackUpdate {\n default_fallback_routing: Option<pii::SecretSerdeValue>,\n },\n ExtendedCardInfoUpdate {\n is_extended_card_info_enabled: bool,\n },\n ConnectorAgnosticMitUpdate {\n is_connector_agnostic_mit_enabled: bool,\n },\n NetworkTokenizationUpdate {\n is_network_tokenization_enabled: bool,\n },\n CollectCvvDuringPaymentUpdate {\n should_collect_cvv_during_payment: bool,\n },\n ClickToPayUpdate {\n is_click_to_pay_enabled: bool,\n },\n}",
|
| 18 |
+
"after_code": "pub enum ProfileUpdate {\n Update(Box<ProfileGeneralUpdate>),\n RoutingAlgorithmUpdate {\n routing_algorithm_id: Option<common_utils::id_type::RoutingId>,\n payout_routing_algorithm_id: Option<common_utils::id_type::RoutingId>,\n },\n DefaultRoutingFallbackUpdate {\n default_fallback_routing: Option<pii::SecretSerdeValue>,\n },\n ExtendedCardInfoUpdate {\n is_extended_card_info_enabled: bool,\n },\n ConnectorAgnosticMitUpdate {\n is_connector_agnostic_mit_enabled: bool,\n },\n NetworkTokenizationUpdate {\n is_network_tokenization_enabled: bool,\n },\n CollectCvvDuringPaymentUpdate {\n should_collect_cvv_during_payment: bool,\n },\n}",
|
| 19 |
+
"diff_span": {
|
| 20 |
+
"before": " should_collect_cvv_during_payment: bool,\n },\n ClickToPayUpdate {\n is_click_to_pay_enabled: bool,\n },\n}",
|
| 21 |
+
"after": ""
|
| 22 |
+
},
|
| 23 |
+
"commit_sha": "12df43a10afc31e5b08c5ca0ea77231f8dcdb642"
|
| 24 |
+
}
|
| 25 |
+
]
|
| 26 |
+
}
|