From f1888694135dd360b332315356d08d602d796208 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 24 Apr 2018 11:35:27 -0400 Subject: [PATCH] SPARK-1013 in progress --- src/lib/api/services/AccountService.proto | 15 ++++++++++----- src/server/sparkd/user/UserModelServiceServer.cpp | 2 +- src/server/sparkd/user/UserModelServiceServer.h | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/lib/api/services/AccountService.proto b/src/lib/api/services/AccountService.proto index 6d21cd3b1..839967c93 100644 --- a/src/lib/api/services/AccountService.proto +++ b/src/lib/api/services/AccountService.proto @@ -15,8 +15,13 @@ message NullableID{ int32 id = 10; } +message ProductResolution{ + api.Venue exchange = 10; + api.SecurityType security_type = 20; + string security_symbol = 30; +} + message SecurityResolution{ - // TODO, exchange needs be to abstracted out better api.Venue exchange = 10; api.SecurityType security_type = 20; string security_symbol = 30; @@ -27,7 +32,7 @@ message SecurityResolution{ /*******************************Full Data********************************/ /************************************************************************/ -message BTSUserModelData{ +message AdminData{ int32 id = 1 [(bts.api.key)=true]; repeated BTSUserGroup user_groups = 10; repeated BTSUser users = 20; @@ -134,7 +139,7 @@ message BTSAccount{ } message AccountProductPositionLimit{ - SecurityResolution security = 10; + ProductResolution product = 10; uint32 long_position_limit = 20; uint32 short_position_limit = 30; uint32 net_position_limit = 40; @@ -368,8 +373,8 @@ service UserModelService { rpc set_user_cme_md_entitlement_data(CMEUserMarketDataEntitlementDataAPIArgument) returns (bts.api.VoidMessage); rpc set_user_cme_routing_data(CMEUserDataAPIArgument) returns (bts.api.VoidMessage); // subscription - rpc subscribe_user_model(bts.api.VoidMessage) returns (stream BTSUserModelData); - rpc get_user_model(bts.api.VoidMessage) returns (BTSUserModelData); + rpc subscribe_user_model(bts.api.VoidMessage) returns (stream AdminData); + rpc get_user_model(bts.api.VoidMessage) returns (AdminData); } message RiskLimit { diff --git a/src/server/sparkd/user/UserModelServiceServer.cpp b/src/server/sparkd/user/UserModelServiceServer.cpp index 6d67832c8..a1db6d57d 100644 --- a/src/server/sparkd/user/UserModelServiceServer.cpp +++ b/src/server/sparkd/user/UserModelServiceServer.cpp @@ -127,7 +127,7 @@ void UserModelServiceServer::set_user_cme_routing_data(const api::account::CMEUs } void UserModelServiceServer::get_user_model(const bts::api::VoidMessage&, - const api::Response<::bts::api::account::BTSUserModelData>&) + const api::Response<::bts::api::account::AdminData>&) { } diff --git a/src/server/sparkd/user/UserModelServiceServer.h b/src/server/sparkd/user/UserModelServiceServer.h index 51dff4cb7..0ebb39514 100644 --- a/src/server/sparkd/user/UserModelServiceServer.h +++ b/src/server/sparkd/user/UserModelServiceServer.h @@ -14,7 +14,7 @@ class UserModelServiceServer : public api::account::UserModelServiceBase private: const std::string _table_name; const std::string _unique_key; - bts::api::account::BTSUserModelData _state; + bts::api::account::AdminData _state; std::unique_ptr _store; public: //BTS_NO_COPY(UserModelServiceServer); @@ -68,7 +68,7 @@ public: void get_user_model( const bts::api::VoidMessage& request, - const api::Response<::bts::api::account::BTSUserModelData>& reply) override; + const api::Response<::bts::api::account::AdminData>& reply) override; private: void _update_and_publish (); // returns nullptr if not found