From 245b48cb0ab5a653c307d1e8ee0267ddd11a71c7 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 25 Apr 2018 18:54:33 -0400 Subject: [PATCH] SPARK-1013 implementing more API functions --- src/lib/api/services/AdminService.proto | 21 ++++--- src/server/sparkd/user/AdminServiceServer.cpp | 59 ++++++++++++------- src/server/sparkd/user/AdminServiceServer.h | 12 ++-- src/server/sparkd/user/AdminServiceUtils.h | 48 +++++++++++++++ 4 files changed, 105 insertions(+), 35 deletions(-) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index c5dc5b73b..e64c4aa05 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -356,14 +356,19 @@ message UserAccountAssociationAPIArgument{ map complete_data = 20; } -message CMEUserMarketDataEntitlementDataAPIArgument{ +message ExchangeUserMarketDataEntitlementDataAPIArgument{ int32 user_id = 10; - CMEUserMarketDataEntitlementData complete_data = 20; + ExchangeUserMarketDataEntitlementData complete_data = 20; } -message CMEUserDataAPIArgument{ +message ExchangeUserDataAPIArgument{ int32 user_id = 10; - CMEUserData complete_data = 20; + ExchangeUserData complete_data = 20; +} + +message PersistRequestResult{ + bool is_success = 10; + string error_text = 20; } service AdminService { @@ -375,12 +380,12 @@ service AdminService { rpc set_account_security_position_limits(AccountSecurityPositionLimitsAPIArgument) returns (bts.api.VoidMessage); rpc set_account_margin_limits(AccountMarginLimitAPIArgument) returns (bts.api.VoidMessage); rpc set_account_connections(AccountConnectionsAPIArgument) returns (bts.api.VoidMessage); - rpc set_account_exchange_data(AccountExchangeDataAPIArgument) returns (bts.api.VoidMessage); + rpc set_account_exchange_data(AccountExchangeDataAPIArgument) returns (PersistRequestResult); // users rpc create_user(UserCreateAPIArgument) returns (bts.api.VoidMessage); - rpc set_user_account_association(UserAccountAssociationAPIArgument) returns (bts.api.VoidMessage); - rpc set_user_cme_md_entitlement_data(CMEUserMarketDataEntitlementDataAPIArgument) returns (bts.api.VoidMessage); - rpc set_user_cme_routing_data(CMEUserDataAPIArgument) returns (bts.api.VoidMessage); + rpc set_user_account_association(UserAccountAssociationAPIArgument) returns (bts.api.VoidMessage); + rpc set_user_exchange_routing_data(ExchangeUserDataAPIArgument) returns (PersistRequestResult); + rpc set_user_md_entitlement_data(ExchangeUserMarketDataEntitlementDataAPIArgument) returns (PersistRequestResult); // subscription rpc subscribe_user_model(bts.api.VoidMessage) returns (stream AdminData); rpc get_user_model(bts.api.VoidMessage) returns (AdminData); diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 182d5c81d..3800dd5f3 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -99,45 +99,62 @@ void AdminServiceServer::set_account_connections(const api::admin::AccountConnec { } -void AdminServiceServer::set_account_exchange_data(const api::admin::AccountExchangeDataAPIArgument&, - const api::Response<::bts::api::VoidMessage>&) +void AdminServiceServer::set_account_exchange_data(const api::admin::AccountExchangeDataAPIArgument& account_exchange_data, + const api::Response<::bts::api::admin::PersistRequestResult>& reply) { + bts::api::admin::PersistRequestResult result; result.set_is_success(true); + bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, account_exchange_data.account_id()); + if(account != nullptr) + account->mutable_exchange_account_data()->CopyFrom(account_exchange_data.complete_data()); + else{ + result.set_is_success(false); + result.set_error_text("Could not find account"); + } + reply(result); } void AdminServiceServer::create_user(const api::admin::UserCreateAPIArgument&, - const api::Response<::bts::api::VoidMessage>&) + const api::Response<::bts::api::VoidMessage>&) { } void AdminServiceServer::set_user_account_association(const api::admin::UserAccountAssociationAPIArgument&, - const api::Response<::bts::api::VoidMessage>&) + 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& cme_user_data, - const api::Response<::bts::api::VoidMessage>&) -{ - bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, cme_user_data.user_id()); +void AdminServiceServer::set_user_exchange_routing_data(const api::admin::ExchangeUserDataAPIArgument& user_exchange_routing_data, + const api::Response<::bts::api::admin::PersistRequestResult>& reply){ + bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, user_exchange_routing_data.user_id()); + bts::api::admin::PersistRequestResult result; result.set_is_success(true); 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); + AdminServiceUtils::set_user_exchange_data(user, user_exchange_routing_data.complete_data()); } - else - { - // report back + else{ + result.set_is_success(false); + result.set_error_text("Could not find user"); } + reply(result); +} + +void AdminServiceServer::set_user_md_entitlement_data(const bts::api::admin::ExchangeUserMarketDataEntitlementDataAPIArgument& user_md_entitlement_data, + const bts::api::Response<::bts::api::admin::PersistRequestResult>& reply){ + bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, user_md_entitlement_data.user_id()); + bts::api::admin::PersistRequestResult result; result.set_is_success(true); + if (user != nullptr){ + AdminServiceUtils::set_user_md_entitlement_data(user, user_md_entitlement_data.complete_data()); + } + else{ + result.set_is_success(false); + result.set_error_text("Could not find user"); + } + reply(result); } void AdminServiceServer::get_user_model(const bts::api::VoidMessage&, - const api::Response<::bts::api::admin::AdminData>&) + const api::Response<::bts::api::admin::AdminData>& reply) { + reply(_state); } void AdminServiceServer::_update_and_publish() diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index dc47d65d0..52cb543ae 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -40,7 +40,7 @@ public: 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; + const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void create_user(const api::admin::UserCreateAPIArgument& request, const api::Response<::bts::api::VoidMessage>& reply) override; @@ -48,11 +48,11 @@ public: 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 set_user_exchange_routing_data(const api::admin::ExchangeUserDataAPIArgument& request, + const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; + + void set_user_md_entitlement_data(const api::admin::ExchangeUserMarketDataEntitlementDataAPIArgument& request, + const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void get_user_model(const bts::api::VoidMessage& request, const api::Response<::bts::api::admin::AdminData>& reply) override; diff --git a/src/server/sparkd/user/AdminServiceUtils.h b/src/server/sparkd/user/AdminServiceUtils.h index 5d46a0c5d..b907b2eb1 100644 --- a/src/server/sparkd/user/AdminServiceUtils.h +++ b/src/server/sparkd/user/AdminServiceUtils.h @@ -60,6 +60,41 @@ public: } return rv; } + // User exchange data + static void set_user_exchange_data(bts::api::admin::BTSUser* user, const bts::api::admin::ExchangeUserData& exchange_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()->CopyFrom(exchange_user_data); + } + static void clear_user_exchange_data(bts::api::admin::BTSUser* user){ + if (user->has_user_data()) + user->mutable_user_data()->clear_exchange_user_data(); + } + // user md entitlement + static void set_user_md_entitlement_data(bts::api::admin::BTSUser* user, const bts::api::admin::ExchangeUserMarketDataEntitlementData& exchange_user_md_entitelemnt_data){ + if (!user->has_user_data()) + user->mutable_user_data(); + if (!user->user_data().has_exchange_md_entitlement_data()) + user->mutable_user_data()->mutable_exchange_md_entitlement_data()->CopyFrom(exchange_user_md_entitelemnt_data); + } + static void clear_user_md_entitlement_data(bts::api::admin::BTSUser* user){ + if (user->has_user_data()) + if (user->user_data().has_exchange_md_entitlement_data()) + user->mutable_user_data()->clear_exchange_md_entitlement_data(); + } + // account exchange data + static void clear_account_cme_data(bts::api::admin::BTSAccount* account){ + if (account->has_exchange_account_data()) + if (account->exchange_account_data().has_cme_account_data()) + account->mutable_exchange_account_data()->clear_cme_account_data(); + } + static void set_account_cme_data(bts::api::admin::BTSAccount* account, const bts::api::admin::CMEAccountData& cme_account_data){ + if (!account->has_exchange_account_data()) + account->mutable_exchange_account_data(); + account->mutable_exchange_account_data()->mutable_cme_account_data()->CopyFrom(cme_account_data); + } + // unused static void clear_user_cme_data(bts::api::admin::BTSUser* user){ if (user->has_user_data()) if (user->user_data().has_exchange_user_data()) @@ -73,5 +108,18 @@ public: user->mutable_user_data()->mutable_exchange_user_data(); user->mutable_user_data()->mutable_exchange_user_data()->mutable_cme_data()->CopyFrom(cme_user_data); } + static void clear_user_cme_md_entitlement_data(bts::api::admin::BTSUser* user){ + if (user->has_user_data()) + if (user->user_data().has_exchange_md_entitlement_data()) + if (user->user_data().exchange_md_entitlement_data().has_cme_data()) + user->mutable_user_data()->mutable_exchange_md_entitlement_data()->clear_cme_data(); + } + static void set_user_cme_md_entitlement_data(bts::api::admin::BTSUser* user, const bts::api::admin::CMEUserMarketDataEntitlementData& cme_md_entitlement_data){ + if (!user->has_user_data()) + user->mutable_user_data(); + if (!user->user_data().has_exchange_md_entitlement_data()) + user->mutable_user_data()->mutable_exchange_md_entitlement_data(); + user->mutable_user_data()->mutable_exchange_md_entitlement_data()->mutable_cme_data()->CopyFrom(cme_md_entitlement_data); + } }; }} \ No newline at end of file