Merge branch 'main' into change-password-and-update-user-info

Author: apoorvdixit88

CHANGELOG.md

@@ -4,6 +4,30 @@ All notable changes to HyperSwitch will be documented here.
 
 - - -
 
+## 1.89.0 (2023-11-24)
+
+### Features
+
+- **router:** Add `connector_transaction_id` in error_response from connector flows ([#2972](https://github.com/juspay/hyperswitch/pull/2972)) ([`3322103`](https://github.com/juspay/hyperswitch/commit/3322103f5c9b7c2a5b663980246c6ca36b8dc63e))
+
+### Bug Fixes
+
+- **connector:** [BANKOFAMERICA] Add status VOIDED in enum Bankofameri… ([#2969](https://github.com/juspay/hyperswitch/pull/2969)) ([`203bbd7`](https://github.com/juspay/hyperswitch/commit/203bbd73751e1513206e81d7cf920ec263f83c58))
+- **core:** Error propagation for not supporting partial refund ([#2976](https://github.com/juspay/hyperswitch/pull/2976)) ([`97a38a7`](https://github.com/juspay/hyperswitch/commit/97a38a78e514e4fa3b5db46b6de985be6312dcc3))
+- **router:** Mark refund status as failure for not_implemented error from connector flows ([#2978](https://github.com/juspay/hyperswitch/pull/2978)) ([`d56d805`](https://github.com/juspay/hyperswitch/commit/d56d80557050336d5ed37282f1aa34b6c17389d1))
+- Return none instead of err when payment method data is not found for bank debit during listing ([#2967](https://github.com/juspay/hyperswitch/pull/2967)) ([`5cc829a`](https://github.com/juspay/hyperswitch/commit/5cc829a11f515a413fe19f657a90aa05cebb99b5))
+- Surcharge related status and rules fix ([#2974](https://github.com/juspay/hyperswitch/pull/2974)) ([`3db7213`](https://github.com/juspay/hyperswitch/commit/3db721388a7f0e291d7eb186661fc69a57068ea6))
+
+### Documentation
+
+- **README:** Updated Community Platform Mentions ([#2960](https://github.com/juspay/hyperswitch/pull/2960)) ([`e0bde43`](https://github.com/juspay/hyperswitch/commit/e0bde433282a34eb9eb28a2d9c43c2b17b5e65e5))
+- Add Rust locker information in architecture doc ([#2964](https://github.com/juspay/hyperswitch/pull/2964)) ([`b2f7dd1`](https://github.com/juspay/hyperswitch/commit/b2f7dd13925a1429e316cd9eaf0e2d31d46b6d4a))
+
+**Full Changelog:** [`v1.88.0...v1.89.0`](https://github.com/juspay/hyperswitch/compare/v1.88.0...v1.89.0)
+
+- - -
+
+
 ## 1.88.0 (2023-11-23)
 
 ### Features

README.md

@@ -252,7 +252,8 @@ We welcome contributions from the community. Please read through our
 Included are directions for opening issues, coding standards, and notes on
 development.
 
-🦀 **Important note for Rust developers**: We aim for contributions from the community
+- We appreciate all types of contributions: code, documentation, demo creation, or something new way you want to contribute to us. We will reward every contribution with a Hyperswitch branded t-shirt. 
+- 🦀 **Important note for Rust developers**: We aim for contributions from the community
 across a broad range of tracks. Hence, we have prioritised simplicity and code
 readability over purely idiomatic code. For example, some of the code in core
 functions (e.g., `payments_core`) is written to be more readable than
@@ -264,10 +265,9 @@ pure-idiomatic.
 
 Get updates on Hyperswitch development and chat with the community:
 
-- Read and subscribe to [the official Hyperswitch blog][blog].
-- Join our [Discord server][discord].
-- Join our [Slack workspace][slack].
-- Ask and explore our [GitHub Discussions][github-discussions].
+- [Discord server][discord] for questions related to contributing to hyperswitch, questions about the architecture, components, etc.
+- [Slack workspace][slack] for questions related to integrating hyperswitch, integrating a connector in hyperswitch, etc.
+- [GitHub Discussions][github-discussions] to drop feature requests or suggest anything payments-related you need for your stack.
 
 [blog]: https://hyperswitch.io/blog
 [discord]: https://discord.gg/wJZ7DVW8mm

crates/api_models/src/payment_methods.rs

@@ -352,6 +352,9 @@ impl SurchargeDetailsResponse {
         request_surcharge_details.surcharge_amount == self.surcharge_amount
             && request_surcharge_details.tax_amount.unwrap_or(0) == self.tax_on_surcharge_amount
     }
+    pub fn get_total_surcharge_amount(&self) -> i64 {
+        self.surcharge_amount + self.tax_on_surcharge_amount
+    }
 }
 
 #[derive(Clone, Debug)]

crates/api_models/src/payments.rs

@@ -347,6 +347,9 @@ impl RequestSurchargeDetails {
             final_amount: original_amount + surcharge_amount + tax_on_surcharge_amount,
         }
     }
+    pub fn get_total_surcharge_amount(&self) -> i64 {
+        self.surcharge_amount + self.tax_amount.unwrap_or(0)
+    }
 }
 
 #[derive(Default, Debug, Clone, Copy)]

crates/data_models/src/payments/payment_attempt.rs

@@ -264,6 +264,8 @@ pub enum PaymentAttemptUpdate {
         error_message: Option<Option<String>>,
         amount_capturable: Option<i64>,
         updated_by: String,
+        surcharge_amount: Option<i64>,
+        tax_amount: Option<i64>,
         merchant_connector_id: Option<String>,
     },
     RejectUpdate {
@@ -291,8 +293,6 @@ pub enum PaymentAttemptUpdate {
         error_reason: Option<Option<String>>,
         connector_response_reference_id: Option<String>,
         amount_capturable: Option<i64>,
-        surcharge_amount: Option<i64>,
-        tax_amount: Option<i64>,
         updated_by: String,
         authentication_data: Option<serde_json::Value>,
         encoded_data: Option<String>,
@@ -321,8 +321,6 @@ pub enum PaymentAttemptUpdate {
         error_message: Option<Option<String>>,
         error_reason: Option<Option<String>>,
         amount_capturable: Option<i64>,
-        surcharge_amount: Option<i64>,
-        tax_amount: Option<i64>,
         updated_by: String,
         unified_code: Option<Option<String>>,
         unified_message: Option<Option<String>>,

crates/diesel_models/src/payment_attempt.rs

@@ -180,6 +180,8 @@ pub enum PaymentAttemptUpdate {
         error_code: Option<Option<String>>,
         error_message: Option<Option<String>>,
         amount_capturable: Option<i64>,
+        surcharge_amount: Option<i64>,
+        tax_amount: Option<i64>,
         updated_by: String,
         merchant_connector_id: Option<String>,
     },
@@ -208,8 +210,6 @@ pub enum PaymentAttemptUpdate {
         error_reason: Option<Option<String>>,
         connector_response_reference_id: Option<String>,
         amount_capturable: Option<i64>,
-        surcharge_amount: Option<i64>,
-        tax_amount: Option<i64>,
         updated_by: String,
         authentication_data: Option<serde_json::Value>,
         encoded_data: Option<String>,
@@ -238,8 +238,6 @@ pub enum PaymentAttemptUpdate {
         error_message: Option<Option<String>>,
         error_reason: Option<Option<String>>,
         amount_capturable: Option<i64>,
-        surcharge_amount: Option<i64>,
-        tax_amount: Option<i64>,
         updated_by: String,
         unified_code: Option<Option<String>>,
         unified_message: Option<Option<String>>,
@@ -443,6 +441,8 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 amount_capturable,
                 updated_by,
                 merchant_connector_id,
+                surcharge_amount,
+                tax_amount,
             } => Self {
                 amount: Some(amount),
                 currency: Some(currency),
@@ -463,6 +463,8 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 amount_capturable,
                 updated_by,
                 merchant_connector_id,
+                surcharge_amount,
+                tax_amount,
                 ..Default::default()
             },
             PaymentAttemptUpdate::VoidUpdate {
@@ -501,8 +503,6 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 error_reason,
                 connector_response_reference_id,
                 amount_capturable,
-                surcharge_amount,
-                tax_amount,
                 updated_by,
                 authentication_data,
                 encoded_data,
@@ -524,8 +524,6 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 connector_response_reference_id,
                 amount_capturable,
                 updated_by,
-                surcharge_amount,
-                tax_amount,
                 authentication_data,
                 encoded_data,
                 unified_code,
@@ -539,8 +537,6 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 error_message,
                 error_reason,
                 amount_capturable,
-                surcharge_amount,
-                tax_amount,
                 updated_by,
                 unified_code,
                 unified_message,
@@ -554,8 +550,6 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 error_reason,
                 amount_capturable,
                 updated_by,
-                surcharge_amount,
-                tax_amount,
                 unified_code,
                 unified_message,
                 connector_transaction_id,

crates/euclid/src/backend/vir_interpreter/types.rs

@@ -74,6 +74,10 @@ impl Context {
             }
         }
 
+        if let Some(card_network) = payment_method.card_network {
+            enum_values.insert(EuclidValue::CardNetwork(card_network));
+        }
+
         if let Some(at) = payment.authentication_type {
             enum_values.insert(EuclidValue::AuthenticationType(at));
         }

crates/router/src/analytics/routes.rs

@@ -8,7 +8,10 @@ use router_env::AnalyticsFlow;
 use super::{core::*, payments, refunds, types::AnalyticsDomain};
 use crate::{
     core::api_locking,
-    services::{api, authentication as auth, authentication::AuthenticationData},
+    services::{
+        api, authentication as auth, authentication::AuthenticationData,
+        authorization::permissions::Permission,
+    },
     AppState,
 };
 
@@ -68,7 +71,11 @@ pub async fn get_payment_metrics(
         |state, auth: AuthenticationData, req| {
             payments::get_metrics(state.pool.clone(), auth.merchant_account, req)
         },
-        auth::auth_type(&auth::ApiKeyAuth, &auth::JWTAuth, req.headers()),
+        auth::auth_type(
+            &auth::ApiKeyAuth,
+            &auth::JWTAuth(Permission::Analytics),
+            req.headers(),
+        ),
         api_locking::LockAction::NotApplicable,
     )
     .await
@@ -98,7 +105,11 @@ pub async fn get_refunds_metrics(
         |state, auth: AuthenticationData, req| {
             refunds::get_metrics(state.pool.clone(), auth.merchant_account, req)
         },
-        auth::auth_type(&auth::ApiKeyAuth, &auth::JWTAuth, req.headers()),
+        auth::auth_type(
+            &auth::ApiKeyAuth,
+            &auth::JWTAuth(Permission::Analytics),
+            req.headers(),
+        ),
         api_locking::LockAction::NotApplicable,
     )
     .await
@@ -118,7 +129,11 @@ pub async fn get_payment_filters(
         |state, auth: AuthenticationData, req| {
             payment_filters_core(state.pool.clone(), req, auth.merchant_account)
         },
-        auth::auth_type(&auth::ApiKeyAuth, &auth::JWTAuth, req.headers()),
+        auth::auth_type(
+            &auth::ApiKeyAuth,
+            &auth::JWTAuth(Permission::Analytics),
+            req.headers(),
+        ),
         api_locking::LockAction::NotApplicable,
     )
     .await
@@ -138,7 +153,11 @@ pub async fn get_refund_filters(
         |state, auth: AuthenticationData, req: GetRefundFilterRequest| {
             refund_filter_core(state.pool.clone(), req, auth.merchant_account)
         },
-        auth::auth_type(&auth::ApiKeyAuth, &auth::JWTAuth, req.headers()),
+        auth::auth_type(
+            &auth::ApiKeyAuth,
+            &auth::JWTAuth(Permission::Analytics),
+            req.headers(),
+        ),
         api_locking::LockAction::NotApplicable,
     )
     .await

crates/router/src/connector/prophetpay/transformers.rs

@@ -583,10 +583,7 @@ impl<F> TryFrom<&ProphetpayRouterData<&types::RefundsRouterData<F>>> for Prophet
                 action_type: ProphetpayActionType::get_action_type(&ProphetpayActionType::Refund),
             })
         } else {
-            Err(errors::ConnectorError::NotImplemented(
-                "Partial Refund is Not Supported".to_string(),
-            )
-            .into())
+            Err(errors::ConnectorError::NotImplemented("Partial Refund".to_string()).into())
         }
     }
 }

crates/router/src/connector/utils.rs

@@ -113,7 +113,8 @@ where
             enums::AttemptStatus::Charged => {
                 let captured_amount =
                     types::Capturable::get_capture_amount(&self.request, payment_data);
-                if Some(payment_data.payment_attempt.get_total_amount()) == captured_amount {
+                let total_capturable_amount = payment_data.payment_attempt.get_total_amount();
+                if Some(total_capturable_amount) == captured_amount {
                     enums::AttemptStatus::Charged
                 } else if captured_amount.is_some() {
                     enums::AttemptStatus::PartialCharged