diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index e7d3c6306..f6cab614e 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -11,7 +11,6 @@ import "lib/domain_model/Security.proto"; /************************************************************************/ message NullableID{ - bool blah = 1; int32 id = 10; } @@ -312,50 +311,61 @@ message AccountCreateAPIArgument{ string account_name = 20; string description = 30; } + 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; } + message AccountProductPositionLimitsAPIArgument{ int32 account_id = 10; repeated AccountProductPositionLimit complete_data = 20; } + message AccountSecurityPositionLimitsAPIArgument{ int32 account_id = 10; repeated AccountSecurityPositionLimit complete_data = 20; } + message AccountMarginLimitAPIArgument{ int32 account_id = 10; AccountMarginLimit complete_data = 20; } + message AccountConnectionsAPIArgument{ int32 account_id = 10; AccountExchangeConnection complete_data = 20; } + message AccountExchangeDataAPIArgument{ int32 account_id = 10; ExchangeAccountData complete_data = 20; } + message UserCreateAPIArgument{ int32 parent_group_id = 20; string name = 30; string password = 40; LicenseEntitlements license_entitlements = 70; } + message UserAccountAssociationAPIArgument{ int32 user_id = 10; map complete_data = 20; } + message CMEUserMarketDataEntitlementDataAPIArgument{ int32 user_id = 10; CMEUserMarketDataEntitlementData complete_data = 20; } + message CMEUserDataAPIArgument{ int32 user_id = 10; CMEUserData complete_data = 20; } + service AdminService { option (bts.api.service_description) = "Provides a management interface to the user model"; // account diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index 88d3640aa..821dc4aa9 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -42,5 +42,4 @@ target_link_libraries( sparkd -pthread) # copy test data -file(COPY jetfix/tests/sample_fix.dat DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test_data) - +file(COPY jetfix/tests/sample_fix.dat DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test_data) \ No newline at end of file diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp new file mode 100644 index 000000000..b43e5e8b3 --- /dev/null +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -0,0 +1,203 @@ +#include "AdminServiceServer.h" + +#include "server/sparkd/persistence/SqliteStore.h" +#include "lib/logging/logging.h" +#include "lib/api/services/AccountService.pb.h" +#include "lib/utils/PBUtils.h" + +#include +#include +#include +#include +#include + +namespace bts { +namespace account{ + +AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) + : + bts::api::admin::AdminServiceBase (context), + _table_name("users"), + _unique_key("0"), + _state(), + _store(new bts::persistence::SqliteStore("user_model")) +{ + 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 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"); + } +} + +AdminServiceServer::~AdminServiceServer() {} + +void AdminServiceServer::create_account(const api::admin::AccountCreateAPIArgument& acct_create_arg, + const api::Response<::bts::api::VoidMessage>&) +{ + if (_find_account(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_name(acct_create_arg.account_name()); + new_account->set_description(acct_create_arg.description()); + new_account->set_is_active(false); + _update_and_publish(); + } +} + +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()); + if (account != nullptr) + { + // if(!account->has_account_data()) + // { + // account->mutable_account_data()->mutable_security_clip_limits()->mutable_limit()->Clear(); + // } + } + else{ + // TODO: return error + } +} + + +void AdminServiceServer::set_account_product_position_limits(const api::admin::AccountProductPositionLimitsAPIArgument&, + const api::Response<::bts::api::VoidMessage>&) +{ +} + +void AdminServiceServer::set_account_security_position_limits(const api::admin::AccountSecurityPositionLimitsAPIArgument&, + const api::Response<::bts::api::VoidMessage>&) +{ +} + +void AdminServiceServer::set_account_margin_limits(const api::admin::AccountMarginLimitAPIArgument&, + const api::Response<::bts::api::VoidMessage>&) +{ +} + +void AdminServiceServer::set_account_connections(const api::admin::AccountConnectionsAPIArgument&, + const api::Response<::bts::api::VoidMessage>&) +{ +} + +void AdminServiceServer::set_account_exchange_data(const api::admin::AccountExchangeDataAPIArgument&, + const api::Response<::bts::api::VoidMessage>&) +{ +} + +void AdminServiceServer::create_user(const api::admin::UserCreateAPIArgument&, + const api::Response<::bts::api::VoidMessage>&) +{ +} + +void AdminServiceServer::set_user_account_association(const api::admin::UserAccountAssociationAPIArgument&, + const api::Response<::bts::api::VoidMessage>&) +{ +} + +void AdminServiceServer::set_user_cme_md_entitlement_data(const api::admin::CMEUserMarketDataEntitlementDataAPIArgument&, + const api::Response<::bts::api::VoidMessage>&) +{ +} + +void AdminServiceServer::set_user_cme_routing_data(const api::admin::CMEUserDataAPIArgument&, + const api::Response<::bts::api::VoidMessage>&) +{ +} + +void AdminServiceServer::get_user_model(const bts::api::VoidMessage&, + const api::Response<::bts::api::admin::AdminData>&) +{ +} + +void AdminServiceServer::_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::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 new file mode 100644 index 000000000..583b408c4 --- /dev/null +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -0,0 +1,69 @@ +#pragma once + +#include +#include "lib/api/services/AdminService.server.pb.h" +#include "lib/utils/bts_no_copy.h" +#include "server/sparkd/persistence/IStore.h" +#include "lib/api/public/ServiceContext.h" + +namespace bts { +namespace account{ + +class AdminServiceServer : public api::admin::AdminServiceBase +{ +private: + const std::string _table_name; + const std::string _unique_key; + bts::api::admin::AdminData _state; + std::unique_ptr _store; +public: + //BTS_NO_COPY(UserModelServiceServer); + AdminServiceServer(bts::api::ServiceContext& context); + ~AdminServiceServer(); + + void create_account(const api::admin::AccountCreateAPIArgument& request, + const api::Response<::bts::api::VoidMessage>& reply) override; + + void set_account_clip_limits(const api::admin::AccountSecurityClipLimitsAPIArgument& request, + const api::Response<::bts::api::VoidMessage>& reply) override; + + void set_account_product_position_limits(const api::admin::AccountProductPositionLimitsAPIArgument& request, + const api::Response<::bts::api::VoidMessage>& reply) override; + + void set_account_security_position_limits(const api::admin::AccountSecurityPositionLimitsAPIArgument& request, + 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; + + void set_account_connections(const api::admin::AccountConnectionsAPIArgument& request, + const api::Response<::bts::api::VoidMessage>& reply) override; + + void set_account_exchange_data(const api::admin::AccountExchangeDataAPIArgument& request, + const api::Response<::bts::api::VoidMessage>& reply) override; + + void create_user(const api::admin::UserCreateAPIArgument& request, + const api::Response<::bts::api::VoidMessage>& reply) override; + + void set_user_account_association(const api::admin::UserAccountAssociationAPIArgument& request, + const api::Response<::bts::api::VoidMessage>& reply) override; + + void set_user_cme_md_entitlement_data(const api::admin::CMEUserMarketDataEntitlementDataAPIArgument& request, + const api::Response<::bts::api::VoidMessage>& reply) override; + + void set_user_cme_routing_data(const api::admin::CMEUserDataAPIArgument& request, + const api::Response<::bts::api::VoidMessage>& reply) override; + + void get_user_model(const bts::api::VoidMessage& request, + 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