diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 59f707ea9..031f4fc87 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -128,22 +128,22 @@ message BTSAccount{ string description = 40; // is this inherited by sub-accounts ? bool is_active = 50; - repeated AccountProductPositionLimit product_position_limits = 60; - repeated AccountSecurityPositionLimit security_position_limits = 70; + repeated AccountProductPositionLimitUnit product_position_limits = 60; + repeated AccountSecurityPositionLimitUnit security_position_limits = 70; AccountMarginLimit margin_limit = 80; - AccountSecurityClipLimit security_clips = 90; - AccountExchangeConnection connections = 100; + AccountSecurityClipLimits security_clip_limits = 90; + AccountExchangeConnections connections = 100; ExchangeAccountData exchange_account_data = 110; } -message AccountProductPositionLimit{ +message AccountProductPositionLimitUnit{ ProductScope product = 10; uint32 long_position_limit = 20; uint32 short_position_limit = 30; uint32 net_position_limit = 40; } -message AccountSecurityPositionLimit{ +message AccountSecurityPositionLimitUnit{ SecurityScope security = 10; uint32 long_position_limit = 20; uint32 short_position_limit = 30; @@ -161,14 +161,12 @@ message AccountSecurityClipLimitUnit{ uint32 clip_size = 20; } -message AccountSecurityClipLimit{ - bool is_derived = 10; - repeated AccountSecurityClipLimitUnit limit = 20; +message AccountSecurityClipLimits{ + repeated AccountSecurityClipLimitUnit limit = 10; } -message AccountExchangeConnection{ - bool is_derived = 10; - repeated int32 exchange_connections = 20; +message AccountExchangeConnections{ + repeated int32 exchange_connections = 10; } /************************************************************************/ @@ -313,19 +311,17 @@ message AccountCreateAPIArgument{ message AccountSecurityClipLimitsAPIArgument{ int32 account_id = 10; - // for all derivable data setting it to null will - // derive the values from the parents - AccountSecurityClipLimit complete_data = 20; + AccountSecurityClipLimits complete_data = 20; } message AccountProductPositionLimitsAPIArgument{ int32 account_id = 10; - repeated AccountProductPositionLimit complete_data = 20; + repeated AccountProductPositionLimitUnit complete_data = 20; } message AccountSecurityPositionLimitsAPIArgument{ int32 account_id = 10; - repeated AccountSecurityPositionLimit complete_data = 20; + repeated AccountSecurityPositionLimitUnit complete_data = 20; } message AccountMarginLimitAPIArgument{ @@ -335,7 +331,7 @@ message AccountMarginLimitAPIArgument{ message AccountConnectionsAPIArgument{ int32 account_id = 10; - AccountExchangeConnection complete_data = 20; + AccountExchangeConnections complete_data = 20; } message AccountExchangeDataAPIArgument{ @@ -375,11 +371,11 @@ service AdminService { option (bts.api.service_description) = "Provides a management interface to the user model"; // account rpc create_account (AccountCreateAPIArgument) returns (PersistRequestResult); - rpc set_account_clip_limits(AccountSecurityClipLimitsAPIArgument) returns (bts.api.VoidMessage); + rpc set_account_clip_limits(AccountSecurityClipLimitsAPIArgument) returns (PersistRequestResult); rpc set_account_product_position_limits(AccountProductPositionLimitsAPIArgument) returns (bts.api.VoidMessage); rpc set_account_security_position_limits(AccountSecurityPositionLimitsAPIArgument) returns (bts.api.VoidMessage); - rpc set_account_margin_limits(AccountMarginLimitAPIArgument) returns (bts.api.VoidMessage); - rpc set_account_connections(AccountConnectionsAPIArgument) returns (bts.api.VoidMessage); + rpc set_account_margin_limits(AccountMarginLimitAPIArgument) returns (PersistRequestResult); + rpc set_account_connections(AccountConnectionsAPIArgument) returns (PersistRequestResult); rpc set_account_exchange_data(AccountExchangeDataAPIArgument) returns (PersistRequestResult); // users rpc create_user(UserCreateAPIArgument) returns (PersistRequestResult); diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 25a6df2d9..4ca3b1b4e 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -76,20 +76,18 @@ void AdminServiceServer::create_account(const api::admin::AccountCreateAPIArgume reply(result); } -void AdminServiceServer::set_account_clip_limits(const api::admin::AccountSecurityClipLimitsAPIArgument& acct_clips_arg, - const api::Response<::bts::api::VoidMessage>&) +void AdminServiceServer::set_account_clip_limits(const api::admin::AccountSecurityClipLimitsAPIArgument& arg, + const api::Response<::bts::api::admin::PersistRequestResult>& reply) { - bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, acct_clips_arg.account_id()); + bts::api::admin::PersistRequestResult result; result.set_is_success(true); + bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, arg.account_id()); if (account != nullptr) - { - // if(!account->has_account_data()) - // { - // account->mutable_account_data()->mutable_security_clip_limits()->mutable_limit()->Clear(); - // } - } + account->mutable_security_clip_limits()->CopyFrom(arg.complete_data()); else{ - // TODO: return error + result.set_is_success(false); + result.set_error_text("User does not exist"); } + reply(result); } @@ -103,20 +101,40 @@ void AdminServiceServer::set_account_security_position_limits(const api::admin:: { } -void AdminServiceServer::set_account_margin_limits(const api::admin::AccountMarginLimitAPIArgument&, - const api::Response<::bts::api::VoidMessage>&) +void AdminServiceServer::set_account_margin_limits(const api::admin::AccountMarginLimitAPIArgument& arg, + const api::Response& reply) { + bts::api::admin::PersistRequestResult 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"); + } + reply(result); } -void AdminServiceServer::set_account_connections(const api::admin::AccountConnectionsAPIArgument&, - const api::Response<::bts::api::VoidMessage>&) +void AdminServiceServer::set_account_connections(const api::admin::AccountConnectionsAPIArgument& arg, + const api::Response& reply) { + bts::api::admin::PersistRequestResult 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"); + } + reply(result); } void AdminServiceServer::set_account_exchange_data(const api::admin::AccountExchangeDataAPIArgument& account_exchange_data, const api::Response<::bts::api::admin::PersistRequestResult>& reply) { - bts::api::admin::PersistRequestResult result; result.set_is_success(true); + bts::api::admin::PersistRequestResult 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()); diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index dc2b90883..8dc302fac 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -26,7 +26,7 @@ public: const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void set_account_clip_limits(const api::admin::AccountSecurityClipLimitsAPIArgument& request, - const api::Response<::bts::api::VoidMessage>& reply) override; + const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void set_account_product_position_limits(const api::admin::AccountProductPositionLimitsAPIArgument& request, const api::Response<::bts::api::VoidMessage>& reply) override; @@ -35,10 +35,10 @@ public: const api::Response<::bts::api::VoidMessage>& reply) override; void set_account_margin_limits(const api::admin::AccountMarginLimitAPIArgument& request, - const api::Response<::bts::api::VoidMessage>& reply) override; + const api::Response& reply) override; void set_account_connections(const api::admin::AccountConnectionsAPIArgument& request, - const api::Response<::bts::api::VoidMessage>& reply) override; + const api::Response& reply) override; void set_account_exchange_data(const api::admin::AccountExchangeDataAPIArgument& request, const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; diff --git a/src/server/sparkd/user/AdminServiceUtils.h b/src/server/sparkd/user/AdminServiceUtils.h index 1a52a8ef4..def6b9fe1 100644 --- a/src/server/sparkd/user/AdminServiceUtils.h +++ b/src/server/sparkd/user/AdminServiceUtils.h @@ -160,7 +160,7 @@ public: account->mutable_exchange_account_data(); account->mutable_exchange_account_data()->mutable_cme_account_data()->CopyFrom(cme_account_data); } - // creation + // group creation /////////////////////////////// static void create_group (bts::api::admin::AdminData* data, const bts::api::admin::BTSUserGroup& new_group){ bts::api::admin::BTSUserGroup* new_group_ptr = data->add_user_groups();