diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index e3e10e336..59f707ea9 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -69,20 +69,15 @@ message BTSUserDerivableData{ // (for example whether a user can trade into an account // or not, or can the user administer an account) - // if account_permission_map is null, its derived - // from the parent group - map account_permission_map = 70; - // absent of internal data in this means it has to be - // resolved from the parent group + // all the values below follow this : + // a. if not set, they derive it from the parent group (which + // can also derive it from its parent) + // b. else its overridden at the user level + UserAccountPermissions account_permissions = 70; ExchangeUserData exchange_user_data = 80; ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90; } -message UserAccountPermission{ - bool is_derived = 10; - map account_permission_map = 20; -} - message LicenseData{ int64 create_date = 10; int64 renew_date = 20; @@ -96,7 +91,7 @@ message LicenseEntitlements{ } // this is the functionality permissions -message UserPermissions{ +message UserAccountPermissionUnit{ message TradingPermissions{ bool submit_market_orders = 10; bool submit_gtc_orders = 20; @@ -111,6 +106,10 @@ message UserPermissions{ } } +message UserAccountPermissions{ + map account_permissions = 10; +} + // unused now message UserSecurityTradingLimit{ SecurityScope security = 10; @@ -354,7 +353,7 @@ message UserCreateAPIArgument{ message UserAccountAssociationAPIArgument{ int32 user_id = 10; - map complete_data = 20; + UserAccountPermissions complete_data = 20; } message ExchangeUserMarketDataEntitlementDataAPIArgument{ @@ -384,7 +383,7 @@ service AdminService { rpc set_account_exchange_data(AccountExchangeDataAPIArgument) returns (PersistRequestResult); // users rpc create_user(UserCreateAPIArgument) returns (PersistRequestResult); - rpc set_user_account_association(UserAccountAssociationAPIArgument) returns (bts.api.VoidMessage); + rpc set_user_account_association(UserAccountAssociationAPIArgument) returns (PersistRequestResult); rpc set_user_exchange_routing_data(ExchangeUserDataAPIArgument) returns (PersistRequestResult); rpc set_user_md_entitlement_data(ExchangeUserMarketDataEntitlementDataAPIArgument) returns (PersistRequestResult); // subscription diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 3003f1938..25a6df2d9 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -128,8 +128,7 @@ void AdminServiceServer::set_account_exchange_data(const api::admin::AccountExch } void AdminServiceServer::create_user(const api::admin::UserCreateAPIArgument& new_user, - const api::Response<::bts::api::admin::PersistRequestResult>& reply) -{ + const api::Response<::bts::api::admin::PersistRequestResult>& reply){ bts::api::admin::PersistRequestResult result; result.set_is_success(true); if (AdminServiceUtils::find_user (_state, new_user.name())){ bts::api::admin::BTSUser* new_user_ptr = _state.add_users(); @@ -149,9 +148,22 @@ void AdminServiceServer::create_user(const api::admin::UserCreateAPIArgument& ne reply(result); } -void AdminServiceServer::set_user_account_association(const api::admin::UserAccountAssociationAPIArgument&, - const api::Response<::bts::api::VoidMessage>&) +void AdminServiceServer::set_user_account_association(const api::admin::UserAccountAssociationAPIArgument& arg, + const api::Response<::bts::api::admin::PersistRequestResult>& reply) { + bts::api::admin::PersistRequestResult result; result.set_is_success(true); + bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, arg.user_id()); + if (user != nullptr){ + if (arg.has_complete_data()) + AdminServiceUtils::set_user_accounts(user, arg.complete_data()); + else + AdminServiceUtils::clear_user_accounts(user); + } + else{ + result.set_is_success(false); + result.set_error_text("Could not find user"); + } + reply(result); } void AdminServiceServer::set_user_exchange_routing_data(const api::admin::ExchangeUserDataAPIArgument& user_exchange_routing_data, diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index 2c0ea2438..dc2b90883 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -47,7 +47,7 @@ public: const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void set_user_account_association(const api::admin::UserAccountAssociationAPIArgument& request, - const api::Response<::bts::api::VoidMessage>& reply) override; + const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void set_user_exchange_routing_data(const api::admin::ExchangeUserDataAPIArgument& request, const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; diff --git a/src/server/sparkd/user/AdminServiceUtils.h b/src/server/sparkd/user/AdminServiceUtils.h index 10d79d300..1a52a8ef4 100644 --- a/src/server/sparkd/user/AdminServiceUtils.h +++ b/src/server/sparkd/user/AdminServiceUtils.h @@ -137,6 +137,17 @@ public: if (user->user_data().has_exchange_md_entitlement_data()) user->mutable_user_data()->clear_exchange_md_entitlement_data(); } + // setting user-account persmissions data + //////////////////////////////////////// + static void clear_user_accounts (bts::api::admin::BTSUser* user){ + if(user->has_user_data() && user->user_data().has_account_permissions()) + user->mutable_user_data()->clear_account_permissions(); + } + static void set_user_accounts (bts::api::admin::BTSUser* user, const bts::api::admin::UserAccountPermissions& user_account_permissions){ + if(!user->has_user_data()) + user->mutable_user_data(); + user->mutable_user_data()->mutable_account_permissions()->CopyFrom(user_account_permissions); + } // setting account exchange data //////////////////////////////// static void clear_account_cme_data(bts::api::admin::BTSAccount* account){