fix: add offset and limit to key transfer API

crates/analytics/src/types.rs

@@ -3,7 +3,7 @@ use std::{fmt::Display, str::FromStr};
 use common_utils::{
     errors::{CustomResult, ErrorSwitch, ParsingError},
     events::{ApiEventMetric, ApiEventsType},
-    impl_misc_api_event_type,
+    impl_api_event_type,
 };
 use error_stack::{report, Report, ResultExt};
 
@@ -150,4 +150,4 @@ impl ErrorSwitch<AnalyticsError> for FiltersError {
     }
 }
 
-impl_misc_api_event_type!(AnalyticsDomain);
+impl_api_event_type!(Miscellaneous, (AnalyticsDomain));

crates/api_models/src/admin.rs

@@ -1053,6 +1053,16 @@ pub struct ToggleKVResponse {
     pub kv_enabled: bool,
 }
 
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize, ToSchema)]
+pub struct MerchantKeyTransferRequest {
+    /// Offset for merchant account
+    #[schema(example = 32)]
+    pub from: u32,
+    /// Limit for merchant account
+    #[schema(example = 32)]
+    pub limit: u32,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
 pub struct TransferKeyResponse {
     /// The identifier for the Merchant Account

crates/api_models/src/events.rs

@@ -16,7 +16,7 @@ pub mod user_role;
 
 use common_utils::{
     events::{ApiEventMetric, ApiEventsType},
-    impl_misc_api_event_type,
+    impl_api_event_type,
 };
 
 #[allow(unused_imports)]
@@ -33,6 +33,7 @@ use crate::{
     mandates::*,
     payment_methods::*,
     payments::*,
+    user::{UserKeyTransferRequest, UserTransferKeyResponse},
     verifications::*,
 };
 
@@ -56,87 +57,102 @@ impl ApiEventMetric for PaymentIntentFiltersResponse {
     }
 }
 
-impl_misc_api_event_type!(
-    PaymentMethodId,
-    PaymentMethodCreate,
-    PaymentLinkInitiateRequest,
-    RetrievePaymentLinkResponse,
-    MandateListConstraints,
-    CreateFileResponse,
-    MerchantConnectorResponse,
-    MerchantConnectorId,
-    MandateResponse,
-    MandateRevokedResponse,
-    RetrievePaymentLinkRequest,
-    PaymentLinkListConstraints,
-    MandateId,
-    DisputeListConstraints,
-    RetrieveApiKeyResponse,
-    BusinessProfileResponse,
-    BusinessProfileUpdate,
-    BusinessProfileCreate,
-    RevokeApiKeyResponse,
-    ToggleKVResponse,
-    ToggleKVRequest,
-    ToggleAllKVRequest,
-    ToggleAllKVResponse,
-    TransferKeyResponse,
-    MerchantAccountDeleteResponse,
-    MerchantAccountUpdate,
-    CardInfoResponse,
-    CreateApiKeyResponse,
-    CreateApiKeyRequest,
-    MerchantConnectorDeleteResponse,
-    MerchantConnectorUpdate,
-    MerchantConnectorCreate,
-    MerchantId,
-    CardsInfoRequest,
-    MerchantAccountResponse,
-    MerchantAccountListRequest,
-    MerchantAccountCreate,
-    PaymentsSessionRequest,
-    ApplepayMerchantVerificationRequest,
-    ApplepayMerchantResponse,
-    ApplepayVerifiedDomainsResponse,
-    UpdateApiKeyRequest,
-    GetApiEventFiltersRequest,
-    ApiEventFiltersResponse,
-    GetInfoResponse,
-    GetPaymentMetricRequest,
-    GetRefundMetricRequest,
-    GetActivePaymentsMetricRequest,
-    GetSdkEventMetricRequest,
-    GetAuthEventMetricRequest,
-    GetPaymentFiltersRequest,
-    PaymentFiltersResponse,
-    GetRefundFilterRequest,
-    RefundFiltersResponse,
-    GetSdkEventFiltersRequest,
-    SdkEventFiltersResponse,
-    ApiLogsRequest,
-    GetApiEventMetricRequest,
-    SdkEventsRequest,
-    ReportRequest,
-    ConnectorEventsRequest,
-    OutgoingWebhookLogsRequest,
-    GetGlobalSearchRequest,
-    GetSearchRequest,
-    GetSearchResponse,
-    GetSearchRequestWithIndex,
-    GetDisputeFilterRequest,
-    DisputeFiltersResponse,
-    GetDisputeMetricRequest
+impl_api_event_type!(
+    Miscellaneous,
+    (
+        PaymentMethodId,
+        PaymentMethodCreate,
+        PaymentLinkInitiateRequest,
+        RetrievePaymentLinkResponse,
+        MandateListConstraints,
+        CreateFileResponse,
+        MerchantConnectorResponse,
+        MerchantConnectorId,
+        MandateResponse,
+        MandateRevokedResponse,
+        RetrievePaymentLinkRequest,
+        PaymentLinkListConstraints,
+        MandateId,
+        DisputeListConstraints,
+        RetrieveApiKeyResponse,
+        BusinessProfileResponse,
+        BusinessProfileUpdate,
+        BusinessProfileCreate,
+        RevokeApiKeyResponse,
+        ToggleKVResponse,
+        ToggleKVRequest,
+        ToggleAllKVRequest,
+        ToggleAllKVResponse,
+        MerchantAccountDeleteResponse,
+        MerchantAccountUpdate,
+        CardInfoResponse,
+        CreateApiKeyResponse,
+        CreateApiKeyRequest,
+        MerchantConnectorDeleteResponse,
+        MerchantConnectorUpdate,
+        MerchantConnectorCreate,
+        MerchantId,
+        CardsInfoRequest,
+        MerchantAccountResponse,
+        MerchantAccountListRequest,
+        MerchantAccountCreate,
+        PaymentsSessionRequest,
+        ApplepayMerchantVerificationRequest,
+        ApplepayMerchantResponse,
+        ApplepayVerifiedDomainsResponse,
+        UpdateApiKeyRequest,
+        GetApiEventFiltersRequest,
+        ApiEventFiltersResponse,
+        GetInfoResponse,
+        GetPaymentMetricRequest,
+        GetRefundMetricRequest,
+        GetActivePaymentsMetricRequest,
+        GetSdkEventMetricRequest,
+        GetAuthEventMetricRequest,
+        GetPaymentFiltersRequest,
+        PaymentFiltersResponse,
+        GetRefundFilterRequest,
+        RefundFiltersResponse,
+        GetSdkEventFiltersRequest,
+        SdkEventFiltersResponse,
+        ApiLogsRequest,
+        GetApiEventMetricRequest,
+        SdkEventsRequest,
+        ReportRequest,
+        ConnectorEventsRequest,
+        OutgoingWebhookLogsRequest,
+        GetGlobalSearchRequest,
+        GetSearchRequest,
+        GetSearchResponse,
+        GetSearchRequestWithIndex,
+        GetDisputeFilterRequest,
+        DisputeFiltersResponse,
+        GetDisputeMetricRequest
+    )
+);
+
+impl_api_event_type!(
+    Keymanager,
+    (
+        TransferKeyResponse,
+        MerchantKeyTransferRequest,
+        UserKeyTransferRequest,
+        UserTransferKeyResponse
+    )
 );
 
 #[cfg(feature = "stripe")]
-impl_misc_api_event_type!(
-    StripeSetupIntentResponse,
-    StripeRefundResponse,
-    StripePaymentIntentListResponse,
-    StripePaymentIntentResponse,
-    CustomerDeleteResponse,
-    CustomerPaymentMethodListResponse,
-    CreateCustomerResponse
+impl_api_event_type!(
+    Miscellaneous,
+    (
+        StripeSetupIntentResponse,
+        StripeRefundResponse,
+        StripePaymentIntentListResponse,
+        StripePaymentIntentResponse,
+        CustomerDeleteResponse,
+        CustomerPaymentMethodListResponse,
+        CreateCustomerResponse
+    )
 );
 
 impl<T> ApiEventMetric for MetricsResponse<T> {

crates/api_models/src/events/connector_onboarding.rs

@@ -5,10 +5,13 @@ use crate::connector_onboarding::{
     ResetTrackingIdRequest,
 };
 
-common_utils::impl_misc_api_event_type!(
-    ActionUrlRequest,
-    ActionUrlResponse,
-    OnboardingSyncRequest,
-    OnboardingStatus,
-    ResetTrackingIdRequest
+common_utils::impl_api_event_type!(
+    Miscellaneous,
+    (
+        ActionUrlRequest,
+        ActionUrlResponse,
+        OnboardingSyncRequest,
+        OnboardingStatus,
+        ResetTrackingIdRequest
+    )
 );

crates/api_models/src/events/user.rs

@@ -20,7 +20,7 @@ use crate::user::{
     SsoSignInRequest, SwitchMerchantIdRequest, TokenOrPayloadResponse, TokenResponse,
     TwoFactorAuthStatusResponse, UpdateUserAccountDetailsRequest,
     UpdateUserAuthenticationMethodRequest, UserFromEmailRequest, UserMerchantCreate,
-    UserTransferKeyResponse, VerifyEmailRequest, VerifyRecoveryCodeRequest, VerifyTotpRequest,
+    VerifyEmailRequest, VerifyRecoveryCodeRequest, VerifyTotpRequest,
 };
 
 impl ApiEventMetric for DashboardEntryResponse {
@@ -46,48 +46,50 @@ impl<T> ApiEventMetric for TokenOrPayloadResponse<T> {
     }
 }
 
-common_utils::impl_misc_api_event_type!(
-    SignUpRequest,
-    SignUpWithMerchantIdRequest,
-    ChangePasswordRequest,
-    GetMultipleMetaDataPayload,
-    GetMetaDataResponse,
-    GetMetaDataRequest,
-    SetMetaDataRequest,
-    SwitchMerchantIdRequest,
-    CreateInternalUserRequest,
-    UserMerchantCreate,
-    ListUsersResponse,
-    AuthorizeResponse,
-    ConnectAccountRequest,
-    ForgotPasswordRequest,
-    ResetPasswordRequest,
-    RotatePasswordRequest,
-    InviteUserRequest,
-    ReInviteUserRequest,
-    VerifyEmailRequest,
-    SendVerifyEmailRequest,
-    AcceptInviteFromEmailRequest,
-    SignInResponse,
-    UpdateUserAccountDetailsRequest,
-    GetUserDetailsResponse,
-    GetUserRoleDetailsRequest,
-    GetUserRoleDetailsResponse,
-    TokenResponse,
-    TwoFactorAuthStatusResponse,
-    UserFromEmailRequest,
-    BeginTotpResponse,
-    VerifyRecoveryCodeRequest,
-    VerifyTotpRequest,
-    RecoveryCodes,
-    GetUserAuthenticationMethodsRequest,
-    CreateUserAuthenticationMethodRequest,
-    UpdateUserAuthenticationMethodRequest,
-    GetSsoAuthUrlRequest,
-    SsoSignInRequest,
-    UserTransferKeyResponse,
-    AuthSelectRequest
+common_utils::impl_api_event_type!(
+    Miscellaneous,
+    (
+        SignUpRequest,
+        SignUpWithMerchantIdRequest,
+        ChangePasswordRequest,
+        GetMultipleMetaDataPayload,
+        GetMetaDataResponse,
+        GetMetaDataRequest,
+        SetMetaDataRequest,
+        SwitchMerchantIdRequest,
+        CreateInternalUserRequest,
+        UserMerchantCreate,
+        ListUsersResponse,
+        AuthorizeResponse,
+        ConnectAccountRequest,
+        ForgotPasswordRequest,
+        ResetPasswordRequest,
+        RotatePasswordRequest,
+        InviteUserRequest,
+        ReInviteUserRequest,
+        VerifyEmailRequest,
+        SendVerifyEmailRequest,
+        AcceptInviteFromEmailRequest,
+        SignInResponse,
+        UpdateUserAccountDetailsRequest,
+        GetUserDetailsResponse,
+        GetUserRoleDetailsRequest,
+        GetUserRoleDetailsResponse,
+        TokenResponse,
+        TwoFactorAuthStatusResponse,
+        UserFromEmailRequest,
+        BeginTotpResponse,
+        VerifyRecoveryCodeRequest,
+        VerifyTotpRequest,
+        RecoveryCodes,
+        GetUserAuthenticationMethodsRequest,
+        CreateUserAuthenticationMethodRequest,
+        UpdateUserAuthenticationMethodRequest,
+        GetSsoAuthUrlRequest,
+        SsoSignInRequest,
+        AuthSelectRequest
+    )
 );
 
 #[cfg(feature = "dummy_connector")]
-common_utils::impl_misc_api_event_type!(SampleDataRequest);
+common_utils::impl_api_event_type!(Miscellaneous, (SampleDataRequest));

crates/api_models/src/events/user_role.rs

@@ -10,19 +10,22 @@ use crate::user_role::{
     MerchantSelectRequest, TransferOrgOwnershipRequest, UpdateUserRoleRequest,
 };
 
-common_utils::impl_misc_api_event_type!(
-    RoleInfoWithPermissionsResponse,
-    GetRoleRequest,
-    AuthorizationInfoResponse,
-    UpdateUserRoleRequest,
-    MerchantSelectRequest,
-    AcceptInvitationRequest,
-    DeleteUserRoleRequest,
-    TransferOrgOwnershipRequest,
-    CreateRoleRequest,
-    UpdateRoleRequest,
-    ListRolesResponse,
-    RoleInfoResponse,
-    GetRoleFromTokenResponse,
-    RoleInfoWithGroupsResponse
+common_utils::impl_api_event_type!(
+    Miscellaneous,
+    (
+        RoleInfoWithPermissionsResponse,
+        GetRoleRequest,
+        AuthorizationInfoResponse,
+        UpdateUserRoleRequest,
+        MerchantSelectRequest,
+        AcceptInvitationRequest,
+        DeleteUserRoleRequest,
+        TransferOrgOwnershipRequest,
+        CreateRoleRequest,
+        UpdateRoleRequest,
+        ListRolesResponse,
+        RoleInfoResponse,
+        GetRoleFromTokenResponse,
+        RoleInfoWithGroupsResponse
+    )
 );