diff --git a/src/lib/api/services/AccountService.proto b/src/lib/api/services/AccountService.proto index 6a387dc23..6d21cd3b1 100644 --- a/src/lib/api/services/AccountService.proto +++ b/src/lib/api/services/AccountService.proto @@ -128,14 +128,9 @@ message BTSAccount{ repeated AccountProductPositionLimit product_position_limits = 60; repeated AccountSecurityPositionLimit security_position_limits = 70; AccountMarginLimit margin_limit = 80; - BTSAccountDerivableData account_data = 90; -} - -message BTSAccountDerivableData{ - repeated AccountSecurityClipLimit security_clip_limits = 10; - // echange connections this account can connect to - repeated int32 exchange_connections = 30; - ExchangeAccountData exchange_account_data = 40; + AccountSecurityClipLimit security_clips = 90; + AccountExchangeConnection connections = 100; + ExchangeAccountData exchange_account_data = 110; } message AccountProductPositionLimit{ @@ -152,17 +147,27 @@ message AccountSecurityPositionLimit{ uint32 net_position_limit = 40; } -message AccountSecurityClipLimit{ - SecurityResolution security = 10; - uint32 clip_size = 20; -} - message AccountMarginLimit{ bool enforce_margin = 10; double cash_balance = 20; double leverage_factor_percentage = 30; } +message AccountSecurityClipLimitUnit{ + SecurityResolution security = 10; + uint32 clip_size = 20; +} + +message AccountSecurityClipLimit{ + bool is_derived = 10; + repeated AccountSecurityClipLimitUnit limit = 20; +} + +message AccountExchangeConnection{ + bool is_derived = 10; + repeated int32 exchange_connections = 20; +} + /************************************************************************/ /***************************Exchange Data********************************/ /************************************************************************/ @@ -307,7 +312,7 @@ message AccountSecurityClipLimitsAPIArgument{ int32 account_id = 10; // for all derivable data setting it to null will // derive the values from the parents - repeated AccountSecurityClipLimit complete_data = 20; + AccountSecurityClipLimit complete_data = 20; } message AccountProductPositionLimitsAPIArgument{ int32 account_id = 10; @@ -323,7 +328,7 @@ message AccountMarginLimitAPIArgument{ } message AccountConnectionsAPIArgument{ int32 account_id = 10; - repeated int32 all_connections = 20; + AccountExchangeConnection complete_data = 20; } message AccountExchangeDataAPIArgument{ int32 account_id = 10; diff --git a/src/server/sparkd/user/UserModelServiceServer.cpp b/src/server/sparkd/user/UserModelServiceServer.cpp index cec5caa04..6d67832c8 100644 --- a/src/server/sparkd/user/UserModelServiceServer.cpp +++ b/src/server/sparkd/user/UserModelServiceServer.cpp @@ -64,9 +64,20 @@ void UserModelServiceServer::create_account(const api::account::AccountCreateAPI } } -void UserModelServiceServer::set_account_clip_limits(const api::account::AccountSecurityClipLimitsAPIArgument&, +void UserModelServiceServer::set_account_clip_limits(const api::account::AccountSecurityClipLimitsAPIArgument& acct_clips_arg, const api::Response<::bts::api::VoidMessage>&) { + bts::api::account::BTSAccount* account = _find_account(acct_clips_arg.account_id()); + if (account != nullptr) + { + // if(!account->has_account_data()) + // { + // account->mutable_account_data()->mutable_security_clip_limits()->mutable_limit()->Clear(); + // } + } + else{ + // TODO: return error + } } @@ -142,6 +153,15 @@ bts::api::account::BTSAccount* UserModelServiceServer::_find_account (const std: return nullptr; } +bts::api::account::BTSAccount* UserModelServiceServer::_find_account (int id){ + for(int i=0; i<_state.accounts_size(); i++){ + bts::api::account::BTSAccount* acct = _state.mutable_accounts(i); + if(id == acct->id()) + return acct; + } + return nullptr; +} + bts::api::account::BTSUser* UserModelServiceServer::_find_user (const std::string& user_name){ for(int i=0; i<_state.users_size(); i++){ bts::api::account::BTSUser* user = _state.mutable_users(i); @@ -151,7 +171,26 @@ bts::api::account::BTSUser* UserModelServiceServer::_find_user (const std::strin return nullptr; } +bts::api::account::BTSUser* UserModelServiceServer::_find_user (const int id){ + for(int i=0; i<_state.users_size(); i++){ + bts::api::account::BTSUser* user = _state.mutable_users(i); + if(id == user->id()) + return user; + } + return nullptr; +} + int UserModelServiceServer::_find_curr_acct_id (){ + int rv = 0; + for(int i=0; i<_state.accounts_size(); i++){ + bts::api::account::BTSAccount* acct = _state.mutable_accounts(i); + if (acct->id() > rv) + rv = acct->id(); + } + return rv; +} + +int UserModelServiceServer::_find_curr_user_id (){ int rv = 0; for(int i=0; i<_state.users_size(); i++){ bts::api::account::BTSUser* user = _state.mutable_users(i); diff --git a/src/server/sparkd/user/UserModelServiceServer.h b/src/server/sparkd/user/UserModelServiceServer.h index bf5f2a1de..51dff4cb7 100644 --- a/src/server/sparkd/user/UserModelServiceServer.h +++ b/src/server/sparkd/user/UserModelServiceServer.h @@ -73,7 +73,10 @@ private: void _update_and_publish (); // returns nullptr if not found bts::api::account::BTSAccount* _find_account (const std::string& acct_name); + bts::api::account::BTSAccount* _find_account (int id); bts::api::account::BTSUser* _find_user (const std::string& user_name); + bts::api::account::BTSUser* _find_user (int id); int _find_curr_acct_id (); + int _find_curr_user_id (); }; }} \ No newline at end of file