diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index f6cab614e..c5dc5b73b 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -14,13 +14,13 @@ message NullableID{ int32 id = 10; } -message ProductResolution{ +message ProductScope{ api.Venue exchange = 10; api.SecurityType security_type = 20; string security_symbol = 30; } -message SecurityResolution{ +message SecurityScope{ api.Venue exchange = 10; api.SecurityType security_type = 20; string security_symbol = 30; @@ -113,7 +113,7 @@ message UserPermissions{ // unused now message UserSecurityTradingLimit{ - SecurityResolution security = 10; + SecurityScope security = 10; uint32 clip_size = 20; bool can_trade = 30; } @@ -138,14 +138,14 @@ message BTSAccount{ } message AccountProductPositionLimit{ - ProductResolution product = 10; + ProductScope product = 10; uint32 long_position_limit = 20; uint32 short_position_limit = 30; uint32 net_position_limit = 40; } message AccountSecurityPositionLimit{ - SecurityResolution security = 10; + SecurityScope security = 10; uint32 long_position_limit = 20; uint32 short_position_limit = 30; uint32 net_position_limit = 40; @@ -158,7 +158,7 @@ message AccountMarginLimit{ } message AccountSecurityClipLimitUnit{ - SecurityResolution security = 10; + SecurityScope security = 10; uint32 clip_size = 20; } diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index 821dc4aa9..49c58c3f8 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -42,4 +42,4 @@ target_link_libraries( sparkd -pthread) # copy test data -file(COPY jetfix/tests/sample_fix.dat DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test_data) \ No newline at end of file +file(COPY jetfix/tests/sample_fix.dat DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test_data) diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index b43e5e8b3..182d5c81d 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -2,8 +2,8 @@ #include "server/sparkd/persistence/SqliteStore.h" #include "lib/logging/logging.h" -#include "lib/api/services/AccountService.pb.h" #include "lib/utils/PBUtils.h" +#include "AdminServiceUtils.h" #include #include @@ -12,7 +12,7 @@ #include namespace bts { -namespace account{ +namespace admin{ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) : @@ -24,39 +24,37 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) { LOG(Gen, Info, "AdminServiceServer created"); std::map> all_data = _store->retrieve_all(); - if (all_data.size()==0) - // write the first row - _update_and_publish(); - else + auto table = all_data.find(_table_name); + bool data_found = false; + if (table != all_data.end()) { - auto table = all_data.find(_table_name); - bool data_found = false; - if (table != all_data.end()) + auto row = table->second.find(_unique_key); + if (row != table->second.end()) { - auto row = table->second.find(_unique_key); - if (row != table->second.end()) + std::string& ser_data = row->second; + if (_state.ParseFromString(ser_data)) { - std::string& ser_data = row->second; - if (_state.ParseFromString(ser_data)) - { - data_found = true; - _update_and_publish(); - } + data_found = true; + _update_and_publish(); } } - if (!data_found) - LOG(Gen, Error, "Could not locate user data"); + } + if (!data_found) + { + // first time + // TODO add default group + _update_and_publish(); } } AdminServiceServer::~AdminServiceServer() {} void AdminServiceServer::create_account(const api::admin::AccountCreateAPIArgument& acct_create_arg, - const api::Response<::bts::api::VoidMessage>&) + const api::Response<::bts::api::VoidMessage>&) { - if (_find_account(acct_create_arg.account_name())==nullptr){ + if (AdminServiceUtils::find_account(_state, acct_create_arg.account_name())==nullptr){ bts::api::admin::BTSAccount* new_account = _state.add_accounts(); - new_account->set_id(_find_curr_acct_id()+1); + new_account->set_id(AdminServiceUtils::find_curr_acct_id(_state)+1); new_account->set_name(acct_create_arg.account_name()); new_account->set_description(acct_create_arg.description()); new_account->set_is_active(false); @@ -67,7 +65,7 @@ void AdminServiceServer::create_account(const api::admin::AccountCreateAPIArgume void AdminServiceServer::set_account_clip_limits(const api::admin::AccountSecurityClipLimitsAPIArgument& acct_clips_arg, const api::Response<::bts::api::VoidMessage>&) { - bts::api::admin::BTSAccount* account = _find_account(acct_clips_arg.account_id()); + bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, acct_clips_arg.account_id()); if (account != nullptr) { // if(!account->has_account_data()) @@ -121,13 +119,24 @@ void AdminServiceServer::set_user_cme_md_entitlement_data(const api::admin::CMEU { } -void AdminServiceServer::set_user_cme_routing_data(const api::admin::CMEUserDataAPIArgument&, - const api::Response<::bts::api::VoidMessage>&) -{ +void AdminServiceServer::set_user_cme_routing_data(const api::admin::CMEUserDataAPIArgument& cme_user_data, + const api::Response<::bts::api::VoidMessage>&) +{ + bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, cme_user_data.user_id()); + if (user != nullptr){ + if (cme_user_data.has_complete_data()) + AdminServiceUtils::set_user_cme_data(user, cme_user_data.complete_data()); + else + AdminServiceUtils::clear_user_cme_data(user); + } + else + { + // report back + } } void AdminServiceServer::get_user_model(const bts::api::VoidMessage&, - const api::Response<::bts::api::admin::AdminData>&) + const api::Response<::bts::api::admin::AdminData>&) { } @@ -144,60 +153,4 @@ void AdminServiceServer::_update_and_publish() LOG(Gen, Error, "Could not save user data"); } -bts::api::admin::BTSAccount* AdminServiceServer::_find_account (const std::string& acct_name){ - for(int i=0; i<_state.accounts_size(); i++){ - bts::api::admin::BTSAccount* acct = _state.mutable_accounts(i); - if(acct_name==acct->name()) - return acct; - } - return nullptr; -} - -bts::api::admin::BTSAccount* AdminServiceServer::_find_account (int id){ - for(int i=0; i<_state.accounts_size(); i++){ - bts::api::admin::BTSAccount* acct = _state.mutable_accounts(i); - if(id == acct->id()) - return acct; - } - return nullptr; -} - -bts::api::admin::BTSUser* AdminServiceServer::_find_user (const std::string& user_name){ - for(int i=0; i<_state.users_size(); i++){ - bts::api::admin::BTSUser* user = _state.mutable_users(i); - if(user_name==user->name()) - return user; - } - return nullptr; -} - -bts::api::admin::BTSUser* AdminServiceServer::_find_user (const int id){ - for(int i=0; i<_state.users_size(); i++){ - bts::api::admin::BTSUser* user = _state.mutable_users(i); - if(id == user->id()) - return user; - } - return nullptr; -} - -int AdminServiceServer::_find_curr_acct_id (){ - int rv = 0; - for(int i=0; i<_state.accounts_size(); i++){ - bts::api::admin::BTSAccount* acct = _state.mutable_accounts(i); - if (acct->id() > rv) - rv = acct->id(); - } - return rv; -} - -int AdminServiceServer::_find_curr_user_id (){ - int rv = 0; - for(int i=0; i<_state.users_size(); i++){ - bts::api::admin::BTSUser* user = _state.mutable_users(i); - if (user->id() > rv) - rv = user->id(); - } - return rv; -} - }} \ No newline at end of file diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index 583b408c4..dc47d65d0 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -7,7 +7,7 @@ #include "lib/api/public/ServiceContext.h" namespace bts { -namespace account{ +namespace admin{ class AdminServiceServer : public api::admin::AdminServiceBase { @@ -58,12 +58,5 @@ public: const api::Response<::bts::api::admin::AdminData>& reply) override; private: void _update_and_publish (); - // returns nullptr if not found - api::admin::BTSAccount* _find_account (const std::string& acct_name); - api::admin::BTSAccount* _find_account (int id); - api::admin::BTSUser* _find_user (const std::string& user_name); - api::admin::BTSUser* _find_user (int id); - int _find_curr_acct_id (); - int _find_curr_user_id (); }; }} \ No newline at end of file diff --git a/src/server/sparkd/user/AdminServiceUtils.h b/src/server/sparkd/user/AdminServiceUtils.h new file mode 100644 index 000000000..5d46a0c5d --- /dev/null +++ b/src/server/sparkd/user/AdminServiceUtils.h @@ -0,0 +1,77 @@ +#pragma once + +#include +#include "lib/api/services/AdminService.server.pb.h" + +namespace bts{ +namespace admin{ + +class AdminServiceUtils{ +public: + void static foo(){} + + static bts::api::admin::BTSUser* find_user (bts::api::admin::AdminData& data, const std::string& user_name){ + for(int i=0; iname()) + return user; + } + return nullptr; + } + static bts::api::admin::BTSUser* find_user (bts::api::admin::AdminData& data, int id){ + for(int i=0; iid()) + return user; + } + return nullptr; + } + static bts::api::admin::BTSAccount* find_account (bts::api::admin::AdminData& data, const std::string& acct_name){ + for(int i=0; iname()) + return acct; + } + return nullptr; + } + static bts::api::admin::BTSAccount* find_account (bts::api::admin::AdminData& data, int id){ + for(int i=0; iid()) + return acct; + } + return nullptr; + } + static int find_curr_acct_id (bts::api::admin::AdminData& data){ + int rv = 0; + for(int i=0; iid() > rv) + rv = acct->id(); + } + return rv; + } + static int find_curr_user_id (bts::api::admin::AdminData& data){ + int rv = 0; + for(int i=0; iid() > rv) + rv = user->id(); + } + return rv; + } + static void clear_user_cme_data(bts::api::admin::BTSUser* user){ + if (user->has_user_data()) + if (user->user_data().has_exchange_user_data()) + if (user->user_data().exchange_user_data().has_cme_data()) + user->mutable_user_data()->mutable_exchange_user_data()->clear_cme_data(); + } + static void set_user_cme_data(bts::api::admin::BTSUser* user, const bts::api::admin::CMEUserData& cme_user_data){ + if (!user->has_user_data()) + user->mutable_user_data(); + if (!user->user_data().has_exchange_user_data()) + user->mutable_user_data()->mutable_exchange_user_data(); + user->mutable_user_data()->mutable_exchange_user_data()->mutable_cme_data()->CopyFrom(cme_user_data); + } +}; +}} \ No newline at end of file