From efac4a6077d4ad6ae90f989d55b2c2283c327edb Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 5 Sep 2018 18:51:53 -0400 Subject: [PATCH] SPARK-1668 foundation --- src/lib/api/services/AdminService.proto | 27 +++++++++++++++++-- src/server/sparkd/user/AdminServiceServer.cpp | 3 +++ src/server/sparkd/user/AdminServiceServer.h | 2 ++ src/web/ui/src/Users/State.fs | 1 + 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 13771f048..6a0dd2e10 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -182,11 +182,20 @@ message AccountExchangeConnections{ /***************************Exchange Data********************************/ /************************************************************************/ +message CMEMicData{ + api.CMEMics mic=10; + bool enabled=20; + // there are other things here +} + +message ICEMicData{ + api.CMEMics mic=10; + bool enabled=20; +} + message ExchangeUserMarketDataEntitlementData{ CMEUserMarketDataEntitlementData cme_data = 10; ICEUserMarketDataEntitlementData ice_data = 20; - //repeated CMEMics allowed_cme_mics = 30; - //repeated ICEMics allowed_ice_mics = 40; } message ExchangeUserData{ @@ -278,6 +287,8 @@ message CMEUserData{ string smp_instruction = 70; string max_order_rate_per_connection = 80; string location = 90; + // add suff here + repeated CMEMicData md_permissions = 1000; } message SIMUserData { @@ -355,6 +366,16 @@ message OrderCancelRequest{ repeated string accounts = 10; repeated string users = 20; } +/////////////////////////////////////////////////////////// +// Reporting ////////////////////////////////////////////// +message MDEnitlement{ + string record_id = 1 [(bts.api.key)=true]; + string user = 10; + string exchange = 20; + string mic = 30; + bool enabled = 40; +} + /************************************************************************/ /************************************************************************/ /************************************************************************/ @@ -412,4 +433,6 @@ service AdminService { // orders rpc get_order_summary(bts.api.VoidMessage) returns (OrdersSummary); rpc cancel_orders(OrderCancelRequest) returns (bts.api.VoidMessage); + // reports + rpc md_entitlement_data(bts.api.VoidMessage) returns (stream MDEnitlement); } \ No newline at end of file diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 62afb668a..7fb6cc96c 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -25,6 +25,7 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) _state(), _store(new bts::persistence::SqliteStore(_db_name)), _publisher(make_admin_data_stateful_publisher()), + _md_entit_publisher(make_md_entitlement_data_stateful_publisher()), _order_service(context.locate()), _order_map() { @@ -204,4 +205,6 @@ void AdminServiceServer::_cancel_orders(const vector& accounts, _order_service.cancel_order(c); } } +void AdminServiceServer::_publish_md_entitlements(){ +} }} diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index e984bc8b5..3702eff7d 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -24,6 +24,7 @@ private: bts::api::admin::AdminData _state; std::unique_ptr _store; bts::api::admin::AdminServiceBase::Admin_dataStatefulPublisher _publisher; + bts::api::admin::AdminServiceBase::Md_entitlement_dataStatefulPublisher _md_entit_publisher; bts::api::orderman::OrderService _order_service; std::map> _order_map; public: @@ -60,6 +61,7 @@ public: private: void _update_and_publish (bool is_insert); + void _publish_md_entitlements(); void _add_live_order(std::map>& agg, const OrderRecord& order); void _cancel_orders(const std::vector& accounts, diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 18f708009..40db505a7 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -62,6 +62,7 @@ let defaultScratchUser = { smpInstruction = "" maxOrderRatePerConnection = "" location = "" + mdPermissions = [||] } simData = { operatorId = ""