diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index f87cf4797..bb9186b5e 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -321,40 +321,9 @@ message AccountCreateAPIArgument{ string account_name = 20; string description = 30; } - message AccountUpdateAPIArgument{ BTSAccount complete_data=10; } -message AccountSecurityClipLimitsAPIArgument{ - int32 account_id = 10; - AccountSecurityClipLimits complete_data = 20; -} - -message AccountProductPositionLimitsAPIArgument{ - int32 account_id = 10; - repeated AccountProductPositionLimitUnit complete_data = 20; -} - -message AccountSecurityPositionLimitsAPIArgument{ - int32 account_id = 10; - repeated AccountSecurityPositionLimitUnit complete_data = 20; -} - -message AccountMarginLimitAPIArgument{ - int32 account_id = 10; - AccountMarginLimit complete_data = 20; -} - -message AccountConnectionsAPIArgument{ - int32 account_id = 10; - AccountExchangeConnections complete_data = 20; -} - -message AccountExchangeDataAPIArgument{ - int32 account_id = 10; - ExchangeAccountData complete_data = 20; -} - message UserCreateAPIArgument{ uint32 parent_group_id = 20; string name = 30; @@ -362,31 +331,9 @@ message UserCreateAPIArgument{ LicenseData license_data = 50; LicenseEntitlements license_entitlements = 70; } - message UserUpdateAPIArgument{ BTSUser complete_data=10; } - -message UserPasswordAPIArgument{ - int32 user_id = 10; - string password = 20; -} - -message UserAccountAssociationAPIArgument{ - int32 user_id = 10; - UserAccountPermissions complete_data = 20; -} - -message ExchangeUserMarketDataEntitlementDataAPIArgument{ - int32 user_id = 10; - ExchangeUserMarketDataEntitlementData complete_data = 20; -} - -message ExchangeUserDataAPIArgument{ - int32 user_id = 10; - ExchangeUserData complete_data = 20; -} - message IDAPIArgument{ uint32 id = 10; } @@ -411,21 +358,11 @@ service AdminService { // account rpc create_account (AccountCreateAPIArgument) returns (AdminServiceCreateAccountResult); rpc update_account (AccountUpdateAPIArgument) returns (AdminServiceOperationResult); - rpc set_account_clip_limits(AccountSecurityClipLimitsAPIArgument) returns (AdminServiceOperationResult); - rpc set_account_product_position_limits(AccountProductPositionLimitsAPIArgument) returns (AdminServiceOperationResult); - rpc set_account_security_position_limits(AccountSecurityPositionLimitsAPIArgument) returns (AdminServiceOperationResult); - rpc set_account_margin_limits(AccountMarginLimitAPIArgument) returns (AdminServiceOperationResult); - rpc set_account_connections(AccountConnectionsAPIArgument) returns (AdminServiceOperationResult); - rpc set_account_exchange_data(AccountExchangeDataAPIArgument) returns (AdminServiceOperationResult); + rpc delete_account(IDAPIArgument) returns (AdminServiceOperationResult); // users rpc create_user(UserCreateAPIArgument) returns (AdminServiceCreateEntityResult); rpc update_user(UserUpdateAPIArgument) returns (AdminServiceOperationResult); - rpc change_user_password (UserPasswordAPIArgument) returns (AdminServiceOperationResult); - rpc set_user_account_association(UserAccountAssociationAPIArgument) returns (AdminServiceOperationResult); - rpc set_user_exchange_routing_data(ExchangeUserDataAPIArgument) returns (AdminServiceOperationResult); - rpc set_user_md_entitlement_data(ExchangeUserMarketDataEntitlementDataAPIArgument) returns (AdminServiceOperationResult); - rpc delete_user(IDAPIArgument) returns (AdminServiceOperationResult); - rpc delete_account(IDAPIArgument) returns (AdminServiceOperationResult); + rpc delete_user(IDAPIArgument) returns (AdminServiceOperationResult); // subscription rpc admin_data(bts.api.VoidMessage) returns (stream AdminData); rpc get_admin_data(bts.api.VoidMessage) returns (AdminData); diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index f4c368578..8354e8c2f 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -65,86 +65,6 @@ void AdminServiceServer::update_account(const api::admin::AccountUpdateAPIArgume _update_and_publish(false); reply(result); } -void AdminServiceServer::set_account_clip_limits(const api::admin::AccountSecurityClipLimitsAPIArgument& arg, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply){ - bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); - bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, arg.account_id()); - if (account != nullptr) - account->mutable_security_clip_limits()->CopyFrom(arg.complete_data()); - else{ - result.set_is_success(false); - result.set_error_text("Account does not exist"); - } - _update_and_publish(false); - reply(result); -} -void AdminServiceServer::set_account_product_position_limits(const api::admin::AccountProductPositionLimitsAPIArgument& arg, - const api::Response& reply){ - bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); - bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, arg.account_id()); - if (account != nullptr) - account->mutable_product_position_limits()->CopyFrom(arg.complete_data()); - else{ - result.set_is_success(false); - result.set_error_text("Account does not exist"); - } - _update_and_publish(false); - reply(result); -} -void AdminServiceServer::set_account_security_position_limits(const api::admin::AccountSecurityPositionLimitsAPIArgument& arg, - const api::Response& reply){ - bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); - bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, arg.account_id()); - if (account != nullptr) - account->mutable_security_position_limits()->CopyFrom(arg.complete_data()); - else{ - result.set_is_success(false); - result.set_error_text("Account does not exist"); - } - _update_and_publish(false); - reply(result); -} -void AdminServiceServer::set_account_margin_limits(const api::admin::AccountMarginLimitAPIArgument& arg, - const api::Response& reply){ - bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); - bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, arg.account_id()); - if(account != nullptr){ - account->mutable_margin_limit()->CopyFrom(arg.complete_data()); - } - else{ - result.set_is_success(false); - result.set_error_text("Could not find account"); - } - _update_and_publish(false); - reply(result); -} -void AdminServiceServer::set_account_connections(const api::admin::AccountConnectionsAPIArgument& arg, - const api::Response& reply){ - bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); - bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, arg.account_id()); - if(account != nullptr){ - account->mutable_connections()->CopyFrom(arg.complete_data()); - } - else{ - result.set_is_success(false); - result.set_error_text("Could not find account"); - } - _update_and_publish(false); - reply(result); -} -void AdminServiceServer::set_account_exchange_data(const api::admin::AccountExchangeDataAPIArgument& account_exchange_data, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply){ - bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); - bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, account_exchange_data.account_id()); - if(account != nullptr) - account->mutable_exchange_account_data()->CopyFrom(account_exchange_data.complete_data()); - else{ - result.set_is_success(false); - result.set_error_text("Could not find account"); - } - _update_and_publish(false); - reply(result); -} void AdminServiceServer::create_user(const api::admin::UserCreateAPIArgument& request, const api::Response<::bts::api::admin::AdminServiceCreateEntityResult>& reply){ bts::api::admin::AdminServiceCreateEntityResult result; @@ -160,64 +80,6 @@ void AdminServiceServer::update_user(const api::admin::UserUpdateAPIArgument& re _update_and_publish(false); reply(result); } -void AdminServiceServer::change_user_password(const bts::api::admin::UserPasswordAPIArgument& arg, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply){ - bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); - bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, arg.user_id()); - if (user != nullptr) - user->set_password(arg.password()); - else{ - result.set_is_success(false); - result.set_error_text("Could not find user"); - } - _update_and_publish(false); - reply(result); -} -void AdminServiceServer::set_user_account_association(const api::admin::UserAccountAssociationAPIArgument& arg, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply){ - bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); - bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, arg.user_id()); - if (user != nullptr){ - if (arg.has_complete_data()) - AdminServiceUtils::set_user_accounts(user, arg.complete_data()); - else - AdminServiceUtils::clear_user_accounts(user); - } - else{ - result.set_is_success(false); - result.set_error_text("Could not find user"); - } - _update_and_publish(false); - reply(result); -} -void AdminServiceServer::set_user_exchange_routing_data(const api::admin::ExchangeUserDataAPIArgument& user_exchange_routing_data, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply){ - bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, user_exchange_routing_data.user_id()); - bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); - if (user != nullptr){ - AdminServiceUtils::set_user_exchange_data(user, user_exchange_routing_data.complete_data()); - } - else{ - result.set_is_success(false); - result.set_error_text("Could not find user"); - } - _update_and_publish(false); - reply(result); -} -void AdminServiceServer::set_user_md_entitlement_data(const bts::api::admin::ExchangeUserMarketDataEntitlementDataAPIArgument& user_md_entitlement_data, - const bts::api::Response<::bts::api::admin::AdminServiceOperationResult>& reply){ - bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, user_md_entitlement_data.user_id()); - bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); - if (user != nullptr){ - AdminServiceUtils::set_user_md_entitlement_data(user, user_md_entitlement_data.complete_data()); - } - else{ - result.set_is_success(false); - result.set_error_text("Could not find user"); - } - _update_and_publish(false); - reply(result); -} void AdminServiceServer::get_admin_data(const bts::api::VoidMessage&, const api::Response<::bts::api::admin::AdminData>& reply){ reply(_state); diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index ca098d7bd..c25371d17 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -28,42 +28,12 @@ public: void update_account(const api::admin::AccountUpdateAPIArgument& request, const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply) override; - - void set_account_clip_limits(const api::admin::AccountSecurityClipLimitsAPIArgument& request, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply) override; - - void set_account_product_position_limits(const api::admin::AccountProductPositionLimitsAPIArgument& request, - const api::Response& reply) override; - - void set_account_security_position_limits(const api::admin::AccountSecurityPositionLimitsAPIArgument& request, - const api::Response& reply) override; - - void set_account_margin_limits(const api::admin::AccountMarginLimitAPIArgument& request, - const api::Response& reply) override; - - void set_account_connections(const api::admin::AccountConnectionsAPIArgument& request, - const api::Response& reply) override; - - void set_account_exchange_data(const api::admin::AccountExchangeDataAPIArgument& request, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply) override; void create_user(const api::admin::UserCreateAPIArgument& request, const api::Response<::bts::api::admin::AdminServiceCreateEntityResult>& reply) override; void update_user(const api::admin::UserUpdateAPIArgument& request, const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply) override; - - void change_user_password(const bts::api::admin::UserPasswordAPIArgument& request, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply) override; - - void set_user_account_association(const api::admin::UserAccountAssociationAPIArgument& request, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply) override; - - void set_user_exchange_routing_data(const api::admin::ExchangeUserDataAPIArgument& request, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply) override; - - void set_user_md_entitlement_data(const api::admin::ExchangeUserMarketDataEntitlementDataAPIArgument& request, - const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply) override; void get_admin_data(const bts::api::VoidMessage& request, const api::Response<::bts::api::admin::AdminData>& reply) override;