From d2fb9f2b7b871bc7494e9ed94ace717f4145ca63 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 23 Apr 2018 23:21:27 -0400 Subject: [PATCH] SPARK-1013 in progress --- .../sparkd/user/UserModelServiceServer.cpp | 99 ++++++++++++++++--- .../sparkd/user/UserModelServiceServer.h | 9 ++ 2 files changed, 94 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/user/UserModelServiceServer.cpp b/src/server/sparkd/user/UserModelServiceServer.cpp index 9e17049c4..cec5caa04 100644 --- a/src/server/sparkd/user/UserModelServiceServer.cpp +++ b/src/server/sparkd/user/UserModelServiceServer.cpp @@ -14,21 +14,59 @@ namespace bts { namespace account{ -// UserModelServiceServer::UserModelServiceServer(bts::api::ServiceContext& context) -// : bts::api::account::UserModelServiceBase (context) -// {} +UserModelServiceServer::UserModelServiceServer(bts::api::ServiceContext& context) + : + bts::api::account::UserModelServiceBase (context), + _table_name("users"), + _unique_key("0"), + _state(), + _store(new bts::persistence::SqliteStore("user_model")) +{ + LOG(Gen, Info, "UserModelServiceServer 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 row = table->second.find(_unique_key); + if (row != table->second.end()) + { + std::string& ser_data = row->second; + if (_state.ParseFromString(ser_data)) + { + data_found = true; + _update_and_publish(); + } + } + } + if (!data_found) + LOG(Gen, Error, "Could not locate user data"); + } +} -//UserModelServiceServer::~UserModelServiceServer() {} +UserModelServiceServer::~UserModelServiceServer() {} -void UserModelServiceServer::create_account(const api::account::AccountCreateAPIArgument&, +void UserModelServiceServer::create_account(const api::account::AccountCreateAPIArgument& acct_create_arg, const api::Response<::bts::api::VoidMessage>&) { + if (_find_account(acct_create_arg.account_name())==nullptr){ + bts::api::account::BTSAccount* new_account = _state.add_accounts(); + new_account->set_id(_find_curr_acct_id()+1); + new_account->set_name(acct_create_arg.account_name()); + new_account->set_description(acct_create_arg.description()); + new_account->set_is_active(false); + _update_and_publish(); + } } void UserModelServiceServer::set_account_clip_limits(const api::account::AccountSecurityClipLimitsAPIArgument&, const api::Response<::bts::api::VoidMessage>&) { - } @@ -45,49 +83,82 @@ void UserModelServiceServer::set_account_security_position_limits(const api::acc void UserModelServiceServer::set_account_margin_limits(const api::account::AccountMarginLimitAPIArgument&, const api::Response<::bts::api::VoidMessage>&) { - } void UserModelServiceServer::set_account_connections(const api::account::AccountConnectionsAPIArgument&, const api::Response<::bts::api::VoidMessage>&) { - } void UserModelServiceServer::set_account_exchange_data(const api::account::AccountExchangeDataAPIArgument&, const api::Response<::bts::api::VoidMessage>&) { - } void UserModelServiceServer::create_user(const api::account::UserCreateAPIArgument&, const api::Response<::bts::api::VoidMessage>&) { - } void UserModelServiceServer::set_user_account_association(const api::account::UserAccountAssociationAPIArgument&, const api::Response<::bts::api::VoidMessage>&) { - } void UserModelServiceServer::set_user_cme_md_entitlement_data(const api::account::CMEUserMarketDataEntitlementDataAPIArgument&, const api::Response<::bts::api::VoidMessage>&) { - } void UserModelServiceServer::set_user_cme_routing_data(const api::account::CMEUserDataAPIArgument&, const api::Response<::bts::api::VoidMessage>&) -{ - +{ } void UserModelServiceServer::get_user_model(const bts::api::VoidMessage&, const api::Response<::bts::api::account::BTSUserModelData>&) { +} +void UserModelServiceServer::_update_and_publish() +{ + std::string ser_state; + if (_state.SerializeToString(&ser_state)) + { + LOG(Gen, Info, "Could not save user data"); + _store->update(_table_name, _unique_key, ser_state); + // publish it + } + else + LOG(Gen, Error, "Could not save user data"); +} + +bts::api::account::BTSAccount* UserModelServiceServer::_find_account (const std::string& acct_name){ + for(int i=0; i<_state.accounts_size(); i++){ + bts::api::account::BTSAccount* acct = _state.mutable_accounts(i); + if(acct_name==acct->name()) + 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); + if(user_name==user->name()) + return user; + } + return nullptr; +} + +int UserModelServiceServer::_find_curr_acct_id (){ + int rv = 0; + for(int i=0; i<_state.users_size(); i++){ + bts::api::account::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/UserModelServiceServer.h b/src/server/sparkd/user/UserModelServiceServer.h index ae70c61d2..bf5f2a1de 100644 --- a/src/server/sparkd/user/UserModelServiceServer.h +++ b/src/server/sparkd/user/UserModelServiceServer.h @@ -12,6 +12,9 @@ namespace account{ class UserModelServiceServer : public api::account::UserModelServiceBase { private: + const std::string _table_name; + const std::string _unique_key; + bts::api::account::BTSUserModelData _state; std::unique_ptr _store; public: //BTS_NO_COPY(UserModelServiceServer); @@ -66,5 +69,11 @@ public: void get_user_model( const bts::api::VoidMessage& request, const api::Response<::bts::api::account::BTSUserModelData>& reply) override; +private: + void _update_and_publish (); + // returns nullptr if not found + bts::api::account::BTSAccount* _find_account (const std::string& acct_name); + bts::api::account::BTSUser* _find_user (const std::string& user_name); + int _find_curr_acct_id (); }; }} \ No newline at end of file