feat(router): add outgoing payment webhooks for v2

crates/diesel_models/src/events.rs

@@ -62,21 +62,39 @@ pub struct Event {
 #[derive(Clone, Debug, Deserialize, Serialize, AsExpression, diesel::FromSqlRow)]
 #[diesel(sql_type = diesel::sql_types::Jsonb)]
 pub enum EventMetadata {
+    #[cfg(feature = "v1")]
     Payment {
         payment_id: common_utils::id_type::PaymentId,
     },
+    #[cfg(feature = "v2")]
+    Payment {
+        payment_id: common_utils::id_type::GlobalPaymentId,
+    },
     Payout {
         payout_id: String,
     },
+    #[cfg(feature = "v1")]
     Refund {
         payment_id: common_utils::id_type::PaymentId,
         refund_id: String,
     },
+    #[cfg(feature = "v2")]
+    Refund {
+        payment_id: common_utils::id_type::GlobalPaymentId,
+        refund_id: common_utils::id_type::GlobalRefundId,
+    },
+    #[cfg(feature = "v1")]
     Dispute {
         payment_id: common_utils::id_type::PaymentId,
         attempt_id: String,
         dispute_id: String,
     },
+    #[cfg(feature = "v2")]
+    Dispute {
+        payment_id: common_utils::id_type::GlobalPaymentId,
+        attempt_id: String,
+        dispute_id: String,
+    },
     Mandate {
         payment_method_id: String,
         mandate_id: String,

crates/router/src/core/webhooks.rs

@@ -4,13 +4,13 @@ mod incoming;
 mod incoming_v2;
 #[cfg(feature = "v1")]
 mod outgoing;
+#[cfg(feature = "v2")]
+mod outgoing_v2;
 pub mod types;
 pub mod utils;
 #[cfg(feature = "olap")]
 pub mod webhook_events;
 
-#[cfg(feature = "v2")]
-pub(crate) use self::incoming_v2::incoming_webhooks_wrapper;
 #[cfg(feature = "v1")]
 pub(crate) use self::{
     incoming::incoming_webhooks_wrapper,
@@ -19,5 +19,9 @@ pub(crate) use self::{
         trigger_webhook_and_raise_event,
     },
 };
+#[cfg(feature = "v2")]
+pub(crate) use self::{
+    incoming_v2::incoming_webhooks_wrapper, outgoing_v2::create_event_and_trigger_outgoing_webhook,
+};
 
 const MERCHANT_ID: &str = "merchant_id";

crates/router/src/core/webhooks/incoming_v2.rs

@@ -433,7 +433,7 @@ async fn payments_incoming_webhook_flow(
                     req_state,
                     merchant_account.clone(),
                     key_store.clone(),
-                    profile,
+                    profile.clone(),
                     payments::operations::PaymentGet,
                     api::PaymentsRetrieveRequest {
                         force_sync: true,
@@ -499,22 +499,22 @@ async fn payments_incoming_webhook_flow(
             let event_type: Option<enums::EventType> = payments_response.status.foreign_into();
 
             // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook
-            if let Some(_outgoing_event_type) = event_type {
-                let _primary_object_created_at = payments_response.created;
+            if let Some(outgoing_event_type) = event_type {
+                let primary_object_created_at = payments_response.created;
                 // TODO: trigger an outgoing webhook to merchant
-                // Box::pin(super::create_event_and_trigger_outgoing_webhook(
-                //     state,
-                //     merchant_account,
-                //     profile,
-                //     &key_store,
-                //     outgoing_event_type,
-                //     enums::EventClass::Payments,
-                //     payment_id.get_string_repr().to_owned(),
-                //     enums::EventObjectType::PaymentDetails,
-                //     api::OutgoingWebhookContent::PaymentDetails(Box::new(payments_response)),
-                //     Some(primary_object_created_at),
-                // ))
-                // .await?;
+                Box::pin(super::create_event_and_trigger_outgoing_webhook(
+                    state,
+                    merchant_account,
+                    profile,
+                    &key_store,
+                    outgoing_event_type,
+                    enums::EventClass::Payments,
+                    payment_id.get_string_repr().to_owned(),
+                    enums::EventObjectType::PaymentDetails,
+                    api::OutgoingWebhookContent::PaymentDetails(Box::new(payments_response)),
+                    Some(primary_object_created_at),
+                ))
+                .await?;
             };
 
             let response = WebhookResponseTracker::Payment { payment_id, status };