refactor(events): refactor apievent traits

crates/api_models/src/admin.rs

@@ -893,6 +893,8 @@ pub struct ToggleKVResponse {
 
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
 pub struct ToggleKVRequest {
+    #[serde(skip_deserializing)]
+    pub merchant_id: String,
     /// Status of KV for the specific merchant
     #[schema(example = true)]
     pub kv_enabled: bool,

crates/api_models/src/api_keys.rs

@@ -129,6 +129,12 @@ pub struct UpdateApiKeyRequest {
     /// rotating your keys once every 6 months.
     #[schema(example = "2022-09-10T10:11:12Z")]
     pub expiration: Option<ApiKeyExpiration>,
+
+    #[serde(skip_deserializing)]
+    pub key_id: String,
+
+    #[serde(skip_deserializing)]
+    pub merchant_id: String,
 }
 
 /// The response body for revoking an API Key.

crates/api_models/src/events.rs

@@ -0,0 +1,73 @@
+pub mod customer;
+pub mod payment;
+pub mod payouts;
+pub mod refund;
+pub mod routing;
+
+use common_utils::{
+    events::{ApiEventMetric, ApiEventsType},
+    impl_misc_api_event_type,
+};
+
+use crate::{
+    admin::*, api_keys::*, cards_info::*, disputes::*, files::*, mandates::*, payment_methods::*,
+    payments::*, verifications::*,
+};
+
+impl ApiEventMetric for TimeRange {}
+
+impl_misc_api_event_type!(
+    PaymentMethodId,
+    PaymentsSessionResponse,
+    PaymentMethodListResponse,
+    PaymentMethodCreate,
+    PaymentLinkInitiateRequest,
+    RetrievePaymentLinkResponse,
+    MandateListConstraints,
+    CreateFileResponse,
+    DisputeResponse,
+    SubmitEvidenceRequest,
+    MerchantConnectorResponse,
+    MerchantConnectorId,
+    MandateResponse,
+    MandateRevokedResponse,
+    RetrievePaymentLinkRequest,
+    MandateId,
+    DisputeListConstraints,
+    RetrieveApiKeyResponse,
+    BusinessProfileResponse,
+    BusinessProfileUpdate,
+    BusinessProfileCreate,
+    RevokeApiKeyResponse,
+    ToggleKVResponse,
+    ToggleKVRequest,
+    MerchantAccountDeleteResponse,
+    MerchantAccountUpdate,
+    CardInfoResponse,
+    CreateApiKeyResponse,
+    CreateApiKeyRequest,
+    MerchantConnectorDeleteResponse,
+    MerchantConnectorUpdate,
+    MerchantConnectorCreate,
+    MerchantId,
+    CardsInfoRequest,
+    MerchantAccountResponse,
+    MerchantAccountListRequest,
+    MerchantAccountCreate,
+    PaymentsSessionRequest,
+    ApplepayMerchantVerificationRequest,
+    ApplepayMerchantResponse,
+    ApplepayVerifiedDomainsResponse,
+    UpdateApiKeyRequest
+);
+
+#[cfg(feature = "stripe")]
+impl_misc_api_event_type!(
+    StripeSetupIntentResponse,
+    StripeRefundResponse,
+    StripePaymentIntentListResponse,
+    StripePaymentIntentResponse,
+    CustomerDeleteResponse,
+    CustomerPaymentMethodListResponse,
+    CreateCustomerResponse
+);

crates/api_models/src/events/customer.rs

@@ -0,0 +1,41 @@
+use common_utils::events::{ApiEventMetric, ApiEventsType};
+
+use crate::customers::{CustomerDeleteResponse, CustomerId, CustomerRequest, CustomerResponse};
+
+impl ApiEventMetric for CustomerDeleteResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Customer {
+            customer_id: self.customer_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for CustomerRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Customer {
+            customer_id: self.customer_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for CustomerResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Customer {
+            customer_id: self.customer_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for CustomerId {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Customer {
+            customer_id: self.customer_id.clone(),
+        })
+    }
+}
+
+// impl ApiEventMetric for (PaymentMethodListRequest, CustomerId) {
+//     fn get_api_event_type(&self) -> Option<ApiEventsType> {
+//         self.1.get_api_event_type()
+//     }
+// }

crates/api_models/src/events/payment.rs

@@ -0,0 +1,151 @@
+use common_utils::events::{ApiEventMetric, ApiEventsType};
+
+use crate::{
+    payment_methods::{
+        CustomerPaymentMethodsListResponse, PaymentMethodDeleteResponse, PaymentMethodListRequest,
+        PaymentMethodResponse, PaymentMethodUpdate,
+    },
+    payments::{
+        PaymentIdType, PaymentListConstraints, PaymentListFilterConstraints, PaymentListFilters,
+        PaymentListResponse, PaymentListResponseV2, PaymentsApproveRequest, PaymentsCancelRequest,
+        PaymentsCaptureRequest, PaymentsRejectRequest, PaymentsRequest, PaymentsResponse,
+        PaymentsRetrieveRequest, PaymentsStartRequest, RedirectionResponse,
+    },
+};
+impl ApiEventMetric for PaymentsRetrieveRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        match self.resource_id {
+            PaymentIdType::PaymentIntentId(ref id) => Some(ApiEventsType::Payment {
+                payment_id: id.clone(),
+            }),
+            _ => None,
+        }
+    }
+}
+
+impl ApiEventMetric for PaymentsStartRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Payment {
+            payment_id: self.payment_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for PaymentsCaptureRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Payment {
+            payment_id: self.payment_id.to_owned(),
+        })
+    }
+}
+
+impl ApiEventMetric for PaymentsCancelRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Payment {
+            payment_id: self.payment_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for PaymentsApproveRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Payment {
+            payment_id: self.payment_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for PaymentsRejectRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Payment {
+            payment_id: self.payment_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for PaymentsRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        match self.payment_id {
+            Some(PaymentIdType::PaymentIntentId(ref id)) => Some(ApiEventsType::Payment {
+                payment_id: id.clone(),
+            }),
+            _ => None,
+        }
+    }
+}
+
+impl ApiEventMetric for PaymentsResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        self.payment_id
+            .clone()
+            .map(|payment_id| ApiEventsType::Payment { payment_id })
+    }
+}
+
+impl ApiEventMetric for PaymentMethodResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::PaymentMethod {
+            payment_method_id: self.payment_method_id.clone(),
+            payment_method: Some(self.payment_method),
+            payment_method_type: self.payment_method_type,
+        })
+    }
+}
+
+impl ApiEventMetric for PaymentMethodUpdate {}
+
+impl ApiEventMetric for PaymentMethodDeleteResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::PaymentMethod {
+            payment_method_id: self.payment_method_id.clone(),
+            payment_method: None,
+            payment_method_type: None,
+        })
+    }
+}
+
+impl ApiEventMetric for CustomerPaymentMethodsListResponse {}
+
+impl ApiEventMetric for PaymentMethodListRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::PaymentMethodList {
+            payment_id: self
+                .client_secret
+                .as_ref()
+                .and_then(|cs| cs.rsplit_once("_secret_"))
+                .map(|(pid, _)| pid.to_string()),
+        })
+    }
+}
+
+impl ApiEventMetric for PaymentListFilterConstraints {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::ResourceListAPI)
+    }
+}
+
+impl ApiEventMetric for PaymentListFilters {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::ResourceListAPI)
+    }
+}
+
+impl ApiEventMetric for PaymentListConstraints {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::ResourceListAPI)
+    }
+}
+
+impl ApiEventMetric for PaymentListResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::ResourceListAPI)
+    }
+}
+
+impl ApiEventMetric for PaymentListResponseV2 {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::ResourceListAPI)
+    }
+}
+
+impl ApiEventMetric for RedirectionResponse {}

crates/api_models/src/events/payouts.rs

@@ -0,0 +1,29 @@
+use common_utils::events::{ApiEventMetric, ApiEventsType};
+
+use crate::payouts::{
+    PayoutActionRequest, PayoutCreateRequest, PayoutCreateResponse, PayoutRetrieveRequest,
+};
+
+impl ApiEventMetric for PayoutRetrieveRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Payout)
+    }
+}
+
+impl ApiEventMetric for PayoutCreateRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Payout)
+    }
+}
+
+impl ApiEventMetric for PayoutCreateResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Payout)
+    }
+}
+
+impl ApiEventMetric for PayoutActionRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Payout)
+    }
+}

crates/api_models/src/events/refund.rs

@@ -0,0 +1,63 @@
+use common_utils::events::{ApiEventMetric, ApiEventsType};
+
+use crate::refunds::{
+    RefundListMetaData, RefundListRequest, RefundListResponse, RefundRequest, RefundResponse,
+    RefundUpdateRequest, RefundsRetrieveRequest,
+};
+
+impl ApiEventMetric for RefundRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        let payment_id = self.payment_id.clone();
+        self.refund_id
+            .clone()
+            .map(|refund_id| ApiEventsType::Refund {
+                payment_id: Some(payment_id),
+                refund_id,
+            })
+    }
+}
+
+impl ApiEventMetric for RefundResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Refund {
+            payment_id: Some(self.payment_id.clone()),
+            refund_id: self.refund_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for RefundsRetrieveRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Refund {
+            payment_id: None,
+            refund_id: self.refund_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for RefundUpdateRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Refund {
+            payment_id: None,
+            refund_id: self.refund_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for RefundListRequest {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::ResourceListAPI)
+    }
+}
+
+impl ApiEventMetric for RefundListResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::ResourceListAPI)
+    }
+}
+
+impl ApiEventMetric for RefundListMetaData {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::ResourceListAPI)
+    }
+}