From b9de5602cd7d1ac697816f10e60c4e79b3428b42 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 22 May 2018 22:46:02 -0400 Subject: [PATCH] SPARK-1119 --- .../api/service_helpers/AdminServiceUtils.cpp | 86 +++++++++---------- .../api/service_helpers/AdminServiceUtils.h | 30 +++---- src/lib/api/services/AdminService.proto | 22 ++--- .../sparkd/orderman/limiter/LimitStore.h | 3 +- .../orderman/limiter/ProductLimitTree.cpp | 2 +- .../orderman/limiter/SecurityLimitTree.cpp | 2 +- .../orderman/limiter/tests/limit_tests.cpp | 8 +- src/server/sparkd/user/AdminServiceServer.cpp | 2 +- .../sparkd/user/tests/admin_service_tests.cpp | 37 ++++---- 9 files changed, 86 insertions(+), 106 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 53c4c795f..dd0343dec 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -99,7 +99,7 @@ const bts::api::admin::BTSAccount* AdminServiceUtils::find_account (const bts::a return nullptr; } bts::api::admin::BTSAccount* AdminServiceUtils::find_account (bts::api::admin::AdminData& data, - int id, + uint32_t id, bool include_deleted){ auto account_ptrs = accounts_mutable(data, include_deleted); for (auto account_ptr : account_ptrs) @@ -108,7 +108,7 @@ bts::api::admin::BTSAccount* AdminServiceUtils::find_account (bts::api::admin::A return nullptr; } const bts::api::admin::BTSAccount* AdminServiceUtils::find_account (const bts::api::admin::AdminData& data, - int id, + uint32_t id, bool include_deleted){ auto account_ptrs = accounts(data, include_deleted); for (auto account_ptr : account_ptrs) @@ -134,8 +134,8 @@ std::vector AdminServiceUtils::accounts_mutable (b } return rv; } -int AdminServiceUtils::find_max_acct_id (const bts::api::admin::AdminData& data){ - int rv = 0; +uint32_t AdminServiceUtils::find_max_acct_id (const bts::api::admin::AdminData& data){ + uint32_t rv = 0; for(int i=0; i rv) @@ -147,8 +147,8 @@ const bts::api::admin::CMEAccountData* AdminServiceUtils::get_account_cme_data(c const bts::api::admin::AdminData& data){ if (account.has_exchange_account_data() && account.exchange_account_data().has_cme_account_data()) return &(account.exchange_account_data().cme_account_data()); - else if (account.has_parent_account_id()){ - const bts::api::admin::BTSAccount* parent_account = find_account(data, account.parent_account_id().id()); + else if (has_id(account.parent_account_id())){ + const bts::api::admin::BTSAccount* parent_account = find_account(data, account.parent_account_id()); if (parent_account != nullptr) return get_account_cme_data (*parent_account, data); } @@ -305,8 +305,7 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt // account mutators //////////////////////// //////////////////////////////////////////// bts::api::admin::BTSAccount* AdminServiceUtils::create_account(bts::api::admin::AdminData& data, - const bts::api::admin::NullableID& parent_account_id, - bool is_set_parent_account, + uint32_t parent_account_id, const std::string& account_name, const std::string& description, bool is_active, @@ -320,20 +319,19 @@ bts::api::admin::BTSAccount* AdminServiceUtils::create_account(bts::api::admin:: result.set_error_text("Account by this name already exists"); return nullptr; } - if (is_set_parent_account){ - if (find_account(data, parent_account_id.id()) == nullptr){ + if (has_id(parent_account_id)){ + if (find_account(data, parent_account_id) == nullptr){ result.set_is_success(false); result.set_error_text("Parent group does not exist"); return nullptr; } } - int new_id = find_max_acct_id(data)+1; + uint32_t new_id = find_max_acct_id(data)+1; result.set_new_id(new_id); bts::api::admin::BTSAccount* new_account_ptr = data.add_accounts(); new_account_ptr->set_is_present(true); new_account_ptr->set_id(new_id); - if(is_set_parent_account) - new_account_ptr->mutable_parent_account_id()->CopyFrom(parent_account_id); + new_account_ptr->set_parent_account_id(parent_account_id); new_account_ptr->set_name(account_name); new_account_ptr->set_description(description); new_account_ptr->set_is_active(is_active); @@ -397,7 +395,7 @@ void AdminServiceUtils::sync_account_connections(const bts::api::admin::AdminDat //////////////////////////////////////////// bts::api::admin::BTSUserGroup* AdminServiceUtils::find_group (bts::api::admin::AdminData& data, - int id){ + uint32_t id){ for(int i=0; iid()) @@ -406,7 +404,7 @@ bts::api::admin::BTSUserGroup* AdminServiceUtils::find_group (bts::api::admin::A return nullptr; } const bts::api::admin::BTSUserGroup* const AdminServiceUtils::find_group (const bts::api::admin::AdminData& data, - int id){ + uint32_t id){ for(int i=0; i rv) @@ -436,8 +434,8 @@ const bts::api::admin::CMEUserData* AdminServiceUtils::get_group_cme_data(const const bts::api::admin::AdminData& data){ if (group.has_user_data() && group.user_data().has_exchange_user_data() && group.user_data().exchange_user_data().has_cme_data()) return &(group.user_data().exchange_user_data().cme_data()); - else if (group.has_parent_group_id()){ - const bts::api::admin::BTSUserGroup* parent_group = find_group(data, group.parent_group_id().id()); + else if (has_id(group.parent_group_id())){ + const bts::api::admin::BTSUserGroup* parent_group = find_group(data, group.parent_group_id()); if (parent_group != nullptr) return get_group_cme_data(*parent_group, data); } @@ -449,8 +447,8 @@ const bts::api::admin::UserAccountPermissions* const AdminServiceUtils::get_grou if(group != nullptr){ if (group->has_user_data() && group->user_data().has_account_permissions()) return &group->user_data().account_permissions(); - if (group->has_parent_group_id()) - return get_group_user_permissions(admin_data, group->parent_group_id().id()); + if (has_id(group->parent_group_id())) + return get_group_user_permissions(admin_data, group->parent_group_id()); } return nullptr; } @@ -459,8 +457,7 @@ const bts::api::admin::UserAccountPermissions* const AdminServiceUtils::get_grou // group mutators ////////////////////////// //////////////////////////////////////////// bts::api::admin::BTSUserGroup* AdminServiceUtils::create_group(bts::api::admin::AdminData& data, - const bts::api::admin::NullableID& parent_group_id, - bool set_parent_group_id, + uint32_t parent_group_id, const std::string& group_name, bts::api::admin::AdminServiceOperationResult& result){ // the error conditions are checked first and returned immediatly @@ -472,18 +469,17 @@ bts::api::admin::BTSUserGroup* AdminServiceUtils::create_group(bts::api::admin:: result.set_error_text("Group by this name already exists"); return nullptr; } - if (set_parent_group_id){ - if(find_group(data, parent_group_id.id()) == nullptr){ + if (has_id(parent_group_id)){ + if(find_group(data, parent_group_id) == nullptr){ result.set_is_success(false); result.set_error_text("Parent group does not exist"); return nullptr; } } - int new_id = find_max_group_id(data)+1; + uint32_t new_id = find_max_group_id(data)+1; bts::api::admin::BTSUserGroup* new_group_ptr = data.add_user_groups(); new_group_ptr->set_id(new_id); - if (set_parent_group_id) - new_group_ptr->mutable_parent_group_id()->CopyFrom(parent_group_id); + new_group_ptr->set_parent_group_id(parent_group_id); new_group_ptr->set_name(group_name); return new_group_ptr; } @@ -507,7 +503,7 @@ const bts::api::admin::BTSUser* AdminServiceUtils::find_user (const bts::api::ad return user_ptr; return nullptr; } -bts::api::admin::BTSUser* AdminServiceUtils::find_user (bts::api::admin::AdminData& data, int id, +bts::api::admin::BTSUser* AdminServiceUtils::find_user (bts::api::admin::AdminData& data, uint32_t id, bool include_deleted){ auto user_ptrs = users_mutable(data,include_deleted); for(auto user_ptr : user_ptrs){ @@ -516,7 +512,7 @@ bts::api::admin::BTSUser* AdminServiceUtils::find_user (bts::api::admin::AdminDa } return nullptr; } -const bts::api::admin::BTSUser* const AdminServiceUtils::find_user (const bts::api::admin::AdminData& data,int id, +const bts::api::admin::BTSUser* const AdminServiceUtils::find_user (const bts::api::admin::AdminData& data,uint32_t id, bool include_deleted){ auto user_ptrs = users(data,include_deleted); for (auto user_ptr : user_ptrs) @@ -542,8 +538,8 @@ std::vector AdminServiceUtils::users_mutable (bts::ap } return rv; } -int AdminServiceUtils::find_max_user_id (const bts::api::admin::AdminData& data){ - int rv = 0; +uint32_t AdminServiceUtils::find_max_user_id (const bts::api::admin::AdminData& data){ + uint32_t rv = 0; auto user_ptrs = users(data,true); for(auto user_ptr : user_ptrs) if (user_ptr->id() > rv) @@ -771,9 +767,9 @@ void AdminServiceUtils::delete_user (bts::api::admin::AdminData& admin_data, //////////////////////////////////////////// bool AdminServiceUtils::_sort_security_scopes (const bts::api::admin::SecurityScope& a, const bts::api::admin::SecurityScope& b){ - if (has_id(a)) + if (has_id(a.security_id())) return true; - if (has_id(b)) + if (has_id(b.security_id())) return false; if (a.security_symbol() != "*") return true; @@ -844,8 +840,8 @@ const bts::api::admin::AccountProductPositionLimitUnit* AdminServiceUtils::find_ } bool AdminServiceUtils::match_security_scope (const bts::api::admin::SecurityScope& scope, const bts::api::Security& security){ - if(has_id(scope)){ - if (static_cast(scope.security_id().id()) == security.id()) // fix this + if(has_id(scope.security_id())){ + if (scope.security_id() == security.id()) return true; } else if (security.exchange() == scope.exchange() && @@ -886,27 +882,22 @@ api::SecurityType AdminServiceUtils::security_type(const api::Security& security } return api::SecurityType::SECURITYTYPE_UNSET; } -bool AdminServiceUtils::has_id (const api::admin::SecurityScope& security_scope){ - return security_scope.has_security_id() && security_scope.security_id().id() != 0; -} //////////////////////////////////////////// // boostrapping //////////////////////////// //////////////////////////////////////////// void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ data.set_id(0); - bts::api::admin::NullableID parent_id; bts::api::admin::AdminServiceOperationResult result; bts::api::admin::AdminServiceCreateAccountResult account_result; bts::api::admin::AdminServiceCreateEntityResult user_result; // adding accounts - auto parent_account = create_account(data, parent_id, false, std::string("ACC A"), std::string("description"), true, account_result); - parent_id.set_id(parent_account->id()); - auto account_1 = create_account(data, parent_id, true, std::string("ACC A1"), std::string("description"), true, account_result); account_1->set_is_active(true); - auto account_2 = create_account(data, parent_id, true, std::string("ACC A2"), std::string("description"), true, account_result); account_2->set_is_active(true); - auto account_3 = create_account(data, parent_id, true, std::string("ACC A3"), std::string("description"), true, account_result); account_3->set_is_active(true); - create_account(data, parent_id, true, std::string("ACC A4"), std::string("description"), true, account_result); + auto parent_account = create_account(data, 0, std::string("ACC A"), std::string("description"), true, account_result); + auto account_1 = create_account(data, parent_account->id(), std::string("ACC A1"), std::string("description"), true, account_result); account_1->set_is_active(true); + auto account_2 = create_account(data, parent_account->id(), std::string("ACC A2"), std::string("description"), true, account_result); account_2->set_is_active(true); + auto account_3 = create_account(data, parent_account->id(), std::string("ACC A3"), std::string("description"), true, account_result); account_3->set_is_active(true); + create_account(data, parent_account->id(), std::string("ACC A4"), std::string("description"), true, account_result); // add group - auto def_group = create_group(data, parent_id, false, std::string("DEFAULT"), result); + auto def_group = create_group(data, 0, std::string("DEFAULT"), result); // adding users to the group bts::api::admin::LicenseData license_data; bts::api::admin::LicenseEntitlements license_entitlements; @@ -972,4 +963,5 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ acct_1_clip_size->mutable_security()->set_security_symbol("*"); acct_1_clip_size->set_clip_size(100); } +bool AdminServiceUtils::has_id (uint32_t id){return id>0;} }} \ No newline at end of file diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index 19942a7e2..12fef248d 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -11,7 +11,7 @@ namespace bts{ namespace admin{ class AdminServiceUtils{ -public: +public: //////////////////////////////////////////// // connection accessors //////////////////// //////////////////////////////////////////// @@ -48,15 +48,15 @@ public: static const bts::api::admin::BTSAccount* find_account (const bts::api::admin::AdminData& data, const std::string& acct_name, bool include_deleted=false); // finds the account from the id and returns // a mutable pointer to the account - static bts::api::admin::BTSAccount* find_account (bts::api::admin::AdminData& data, int id, bool include_deleted=false); + static bts::api::admin::BTSAccount* find_account (bts::api::admin::AdminData& data, uint32_t id, bool include_deleted=false); // like above but returns a const pointer - static const bts::api::admin::BTSAccount* find_account (const bts::api::admin::AdminData& data, int id, bool include_deleted=false); + static const bts::api::admin::BTSAccount* find_account (const bts::api::admin::AdminData& data, uint32_t id, bool include_deleted=false); // this function is an indirection layer for account access // so deletions are dealt in a more deliberate manner static std::vector accounts (const bts::api::admin::AdminData& data, bool include_deleted); static std::vector accounts_mutable (bts::api::admin::AdminData& data, bool include_deleted); // finds the max id amongts all the existing accounts - static int find_max_acct_id (const bts::api::admin::AdminData& data); + static uint32_t find_max_acct_id (const bts::api::admin::AdminData& data); // gets the account data for cme (and goes up the hierarchy // if needed) static const bts::api::admin::CMEAccountData* get_account_cme_data(const bts::api::admin::BTSAccount& account, @@ -93,8 +93,7 @@ public: // account mutators //////////////////////// //////////////////////////////////////////// static bts::api::admin::BTSAccount* create_account(bts::api::admin::AdminData& data, - const bts::api::admin::NullableID& parent_account_id, - bool is_set_parent_account, + uint32_t parent_account_id, const std::string& account_name, const std::string& description, bool is_active, @@ -117,13 +116,13 @@ public: // group accessors ///////////////////////// //////////////////////////////////////////// // given an id, finds the mutable pointer to a group - static bts::api::admin::BTSUserGroup* find_group (bts::api::admin::AdminData& data, int id); + static bts::api::admin::BTSUserGroup* find_group (bts::api::admin::AdminData& data, uint32_t id); // given an id, finds the const pointer to a group - static const bts::api::admin::BTSUserGroup* const find_group (const bts::api::admin::AdminData& data, int id); + static const bts::api::admin::BTSUserGroup* const find_group (const bts::api::admin::AdminData& data, uint32_t id); // given a name, finds the mutable pointer to a group static bts::api::admin::BTSUserGroup* find_group (bts::api::admin::AdminData& data, const std::string& group_name); // finds the max id out of all the groups - static int find_max_group_id (const bts::api::admin::AdminData& data); + static uint32_t find_max_group_id (const bts::api::admin::AdminData& data); // travels up the group tree until it finds a populated cme data static const bts::api::admin::CMEUserData* get_group_cme_data(const bts::api::admin::BTSUserGroup& group, const bts::api::admin::AdminData& data); @@ -133,8 +132,7 @@ public: // group mutators/ ///////////////////////// //////////////////////////////////////////// static bts::api::admin::BTSUserGroup* create_group(bts::api::admin::AdminData& data, - const bts::api::admin::NullableID& parent_group_id, - bool set_parent_group_id, + uint32_t parent_group_id, const std::string& group_name, bts::api::admin::AdminServiceOperationResult& result); //////////////////////////////////////////// @@ -142,11 +140,11 @@ public: //////////////////////////////////////////// static bts::api::admin::BTSUser* find_user (bts::api::admin::AdminData& data, const std::string& user_name, bool include_deleted=false); static const bts::api::admin::BTSUser* find_user (const bts::api::admin::AdminData& data, const std::string& user_name, bool include_deleted=false); - static bts::api::admin::BTSUser* find_user (bts::api::admin::AdminData& data, int id, bool include_deleted=false); - static const bts::api::admin::BTSUser* const find_user (const bts::api::admin::AdminData& data, int id, bool include_deleted=false); + static bts::api::admin::BTSUser* find_user (bts::api::admin::AdminData& data, uint32_t id, bool include_deleted=false); + static const bts::api::admin::BTSUser* const find_user (const bts::api::admin::AdminData& data, uint32_t id, bool include_deleted=false); static std::vector users (const bts::api::admin::AdminData& data, bool include_deleted); static std::vector users_mutable (bts::api::admin::AdminData& data, bool include_deleted); - static int find_max_user_id (const bts::api::admin::AdminData& data); + static uint32_t find_max_user_id (const bts::api::admin::AdminData& data); static const bts::api::admin::CMEUserData* get_user_cme_data(const bts::api::admin::BTSUser& user, const bts::api::admin::AdminData& data); // finds the "exchange user" (ex: "operator_id" at CME or "authorized_trader" @@ -231,10 +229,10 @@ public: static bool match_product(const api::Security& security, const api::Product& product); static bool _match_limit_rule_symbol (const std::string& symbol, const std::string& limit_symbol); static api::SecurityType security_type(const api::Security& security); - static bool has_id (const api::admin::SecurityScope& security_scope); //////////////////////////////////////////// - // boostrapping //////////////////////////// + // misc//////// //////////////////////////// //////////////////////////////////////////// + static bool has_id (uint32_t id); static void bootstrap_data (bts::api::admin::AdminData& data); }; }} \ No newline at end of file diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 378cee658..e07270e81 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -11,10 +11,6 @@ import "lib/api/services/OrderService.proto"; /********************************Gen (temp)******************************/ /************************************************************************/ -message NullableID{ - int32 id = 10; -} - message ProductScope{ api.Venue exchange = 10; api.SecurityType security_type = 20; @@ -25,7 +21,7 @@ message SecurityScope{ api.Venue exchange = 10; api.SecurityType security_type = 20; string security_symbol = 30; - NullableID security_id = 40; + uint32 security_id = 40; } /************************************************************************/ @@ -45,17 +41,17 @@ message AdminData{ /************************************************************************/ message BTSUserGroup{ - int32 id = 10; - // null for top level groups - NullableID parent_group_id = 20; + uint32 id = 10; + // 0 for top level groups + uint32 parent_group_id = 20; string name = 30; BTSUserDerivableData user_data = 40; } message BTSUser{ bool is_present = 1; - int32 id = 10; - int32 parent_group_id = 20; + uint32 id = 10; + uint32 parent_group_id = 20; string name = 30; string password = 40; bool is_active = 50; @@ -133,8 +129,8 @@ message UserSecurityTradingLimit{ message BTSAccount{ bool is_present = 1; - int32 id = 10; - NullableID parent_account_id = 20; + uint32 id = 10; + uint32 parent_account_id = 20; string name = 30; string description = 40; // is this inherited by sub-accounts ? @@ -321,7 +317,7 @@ message ICEUserMarketDataEntitlementData{ /************************************************************************/ message AccountCreateAPIArgument{ - NullableID parent_account_id = 10; + uint32 parent_account_id = 10; string account_name = 20; string description = 30; } diff --git a/src/server/sparkd/orderman/limiter/LimitStore.h b/src/server/sparkd/orderman/limiter/LimitStore.h index 0e15118d9..357596d1d 100644 --- a/src/server/sparkd/orderman/limiter/LimitStore.h +++ b/src/server/sparkd/orderman/limiter/LimitStore.h @@ -22,9 +22,8 @@ private: const bts::api::admin::BTSUser* user; std::vector accounts; const bts::api::admin::BTSAccount* find_account(AccountID account_id) const{ - int account_id_int = static_cast(account_id.value()); for (const auto& account : accounts){ - if (account->id() == account_id_int) + if (account->id() == account_id.value()) return account; } return nullptr; diff --git a/src/server/sparkd/orderman/limiter/ProductLimitTree.cpp b/src/server/sparkd/orderman/limiter/ProductLimitTree.cpp index 23ecd3b71..5df844d20 100644 --- a/src/server/sparkd/orderman/limiter/ProductLimitTree.cpp +++ b/src/server/sparkd/orderman/limiter/ProductLimitTree.cpp @@ -12,7 +12,7 @@ ProductLimitTree::ProductLimitTree(const api::Product& product, for(int i=0; iset_id(sec_id); + sec_scope.set_security_id(sec_id); auto new_sec_pos_limit_ptr = account_ptr->mutable_security_position_limits()->Add(); new_sec_pos_limit_ptr->mutable_security()->CopyFrom(sec_scope); new_sec_pos_limit_ptr->set_long_position_limit(long_pos_limit); @@ -59,7 +59,7 @@ void add_account_sec_pos_limit(bts::api::admin::BTSAccount& account, bts::api::admin::SecurityScope scope; scope.set_exchange(exchange); scope.set_security_type(sec_type); scope.set_security_symbol(sec_symbol); if (sec_id_set) - scope.mutable_security_id()->set_id(sec_id); + scope.set_security_id(sec_id); auto new_limit = account.add_security_position_limits(); new_limit->mutable_security()->CopyFrom(scope); new_limit->set_long_position_limit(long_pos_limit); @@ -72,7 +72,7 @@ void add_account_sec_clip_size(bts::api::admin::BTSAccount& account, bts::api::admin::SecurityScope scope; scope.set_exchange(exchange); scope.set_security_type(sec_type); scope.set_security_symbol(sec_symbol); if (sec_id_set) - scope.mutable_security_id()->set_id(sec_id); + scope.set_security_id(sec_id); auto new_limit = account.mutable_security_clip_limits()->add_limit(); new_limit->mutable_security()->CopyFrom(scope); new_limit->set_clip_size(clip_size); @@ -293,7 +293,7 @@ TEST_CASE ("Limit Rule Res", "[limiter]"){ // add multiple rules and check sorting bts::api::admin::AdminData admin_data; bts::api::admin::AdminServiceCreateAccountResult result; - bts::admin::AdminServiceUtils::create_account(admin_data, bts::api::admin::NullableID(), false, "ACC A1", "desc", true, result); + bts::admin::AdminServiceUtils::create_account(admin_data, 0, "ACC A1", "desc", true, result); auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, "ACC A1"); add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "*", 0, false, 10, 21); add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", 1000, true, 1000, 2001); diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 42d7d87dd..f4c368578 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -54,7 +54,7 @@ AdminServiceServer::~AdminServiceServer() {} void AdminServiceServer::create_account(const api::admin::AccountCreateAPIArgument& request, const api::Response<::bts::api::admin::AdminServiceCreateAccountResult>& reply){ bts::api::admin::AdminServiceCreateAccountResult result; - AdminServiceUtils::create_account(_state, request.parent_account_id(), request.has_parent_account_id() && request.parent_account_id().id() != 0, request.account_name(), request.description(), false, result); + AdminServiceUtils::create_account(_state, request.parent_account_id(), request.account_name(), request.description(), false, result); _update_and_publish(false); reply(result); } diff --git a/src/server/sparkd/user/tests/admin_service_tests.cpp b/src/server/sparkd/user/tests/admin_service_tests.cpp index f7c2ab939..848642cff 100644 --- a/src/server/sparkd/user/tests/admin_service_tests.cpp +++ b/src/server/sparkd/user/tests/admin_service_tests.cpp @@ -17,31 +17,29 @@ TEST_CASE ("Groups", "[admin_service]") bts::api::admin::AdminData admin_data; bts::api::admin::AdminServiceOperationResult result; std::string group_name = "test_group"; - AdminServiceUtils::create_group(admin_data, bts::api::admin::NullableID(), false, group_name, result); + AdminServiceUtils::create_group(admin_data, 0, group_name, result); const bts::api::admin::BTSUserGroup* parent_group = AdminServiceUtils::find_group(admin_data, group_name); REQUIRE(result.is_success()); REQUIRE(admin_data.user_groups_size()==1); REQUIRE(parent_group != nullptr); REQUIRE(parent_group->id() == 1); REQUIRE(parent_group->name() == group_name); - REQUIRE(!parent_group->has_parent_group_id()); + REQUIRE(!bts::admin::AdminServiceUtils::has_id(parent_group->parent_group_id())); REQUIRE(!parent_group->has_user_data()); //create a sub group of the group above - bts::api::admin::NullableID parent_id; - parent_id.set_id(parent_group->id()); std::string sub_group_name = "test_sub_group"; - AdminServiceUtils::create_group(admin_data, parent_id, true, sub_group_name, result); + AdminServiceUtils::create_group(admin_data, parent_group->id(), sub_group_name, result); const bts::api::admin::BTSUserGroup* sub_group = AdminServiceUtils::find_group(admin_data, sub_group_name); REQUIRE(result.is_success()); REQUIRE(admin_data.user_groups_size()==2); REQUIRE(sub_group != nullptr); REQUIRE(sub_group->id() == 2); REQUIRE(sub_group->name() == sub_group_name); - REQUIRE(sub_group->has_parent_group_id()); - REQUIRE(sub_group->parent_group_id().id() == parent_group->id()); + REQUIRE(bts::admin::AdminServiceUtils::has_id(sub_group->parent_group_id())); + REQUIRE(sub_group->parent_group_id() == parent_group->id()); REQUIRE(!parent_group->has_user_data()); // deplicate groups are not allowed - AdminServiceUtils::create_group(admin_data, parent_id, true, sub_group_name, result); + AdminServiceUtils::create_group(admin_data, parent_group->id(), sub_group_name, result); REQUIRE(!result.is_success()); REQUIRE(admin_data.user_groups_size()==2); } @@ -56,7 +54,7 @@ TEST_CASE ("Users", "[admin_service]") bts::api::admin::AdminServiceCreateEntityResult user_result; // creating group first (users have be part of a group) std::string group_name = "test_group"; - AdminServiceUtils::create_group(admin_data, bts::api::admin::NullableID(), false, group_name, result); + AdminServiceUtils::create_group(admin_data, 0, group_name, result); const bts::api::admin::BTSUserGroup* parent_group = AdminServiceUtils::find_group(admin_data, group_name); REQUIRE(result.is_success()); REQUIRE(parent_group!=nullptr); @@ -88,7 +86,7 @@ TEST_CASE ("Users", "[admin_service]") bts::api::admin::IDAPIArgument id; // creating group first (users have be part of a group) std::string group_name = "test_group"; - AdminServiceUtils::create_group(admin_data, bts::api::admin::NullableID(), false, group_name, result); + AdminServiceUtils::create_group(admin_data, 0, group_name, result); const bts::api::admin::BTSUserGroup* parent_group = AdminServiceUtils::find_group(admin_data, group_name); // create 100 users int n_users = 100; @@ -150,30 +148,29 @@ TEST_CASE ("Accounts", "[admin_service]") // parent account std::string parent_account_name = "parent_account", parent_account_desc = "parent_account_desc"; - AdminServiceUtils::create_account(admin_data, bts::api::admin::NullableID(), false, parent_account_name, parent_account_desc, false, account_result); + AdminServiceUtils::create_account(admin_data, 0, parent_account_name, parent_account_desc, false, account_result); bts::api::admin::BTSAccount* parent_account = AdminServiceUtils::find_account(admin_data, parent_account_name); REQUIRE(account_result.is_success()); REQUIRE(admin_data.accounts_size()==1); REQUIRE(parent_account->id()==1); REQUIRE(parent_account->name()==parent_account_name); REQUIRE(parent_account->description()==parent_account_desc); - REQUIRE(!parent_account->has_parent_account_id()); + REQUIRE(!bts::admin::AdminServiceUtils::has_id(parent_account->parent_account_id())); REQUIRE(!parent_account->has_exchange_account_data()); // sub account std::string sub_account_name = "sub_account", sub_account_desc = "sub_account_desc"; - bts::api::admin::NullableID parent_id; parent_id.set_id(parent_account->id()); - AdminServiceUtils::create_account(admin_data, parent_id, true, sub_account_name, sub_account_desc, true, account_result); + AdminServiceUtils::create_account(admin_data, parent_account->id(), sub_account_name, sub_account_desc, true, account_result); bts::api::admin::BTSAccount* sub_account = AdminServiceUtils::find_account(admin_data, sub_account_name); REQUIRE(account_result.is_success()); REQUIRE(admin_data.accounts_size()==2); REQUIRE(sub_account->id()==2); REQUIRE(sub_account->name()==sub_account_name); REQUIRE(sub_account->description()==sub_account_desc); - REQUIRE(sub_account->has_parent_account_id()); + REQUIRE(bts::admin::AdminServiceUtils::has_id(sub_account->parent_account_id())); REQUIRE(!sub_account->has_exchange_account_data()); // deplicate accounts are not allowed - AdminServiceUtils::create_account(admin_data, parent_id, true, sub_account_name, sub_account_desc, true, account_result); + AdminServiceUtils::create_account(admin_data, parent_account->id(), sub_account_name, sub_account_desc, true, account_result); REQUIRE(!result.is_success()); REQUIRE(admin_data.accounts_size()==2); } @@ -191,7 +188,7 @@ TEST_CASE ("Accounts", "[admin_service]") for (int i=1; i<=n_accounts; i++){ std::string name = fmt::format("test_account_{}",i), description = fmt::format("description_{}",i); - AdminServiceUtils::create_account(admin_data, api::admin::NullableID(), false, name, description, true, account_result); + AdminServiceUtils::create_account(admin_data, 0, name, description, true, account_result); REQUIRE(account_result.is_success()); REQUIRE(AdminServiceUtils::accounts(admin_data,true).size()==i); auto new_account = AdminServiceUtils::find_account(admin_data,name); @@ -218,7 +215,7 @@ TEST_CASE ("Accounts", "[admin_service]") for (int i=1; i<=n_accounts; i++){ std::string name = "test_account_zombie", description = "zombie"; - AdminServiceUtils::create_account(admin_data, api::admin::NullableID(), false, name, description, true, account_result); + AdminServiceUtils::create_account(admin_data, 0, name, description, true, account_result); REQUIRE(account_result.is_success()); REQUIRE(AdminServiceUtils::accounts(admin_data,true).size()==n_accounts+i); REQUIRE(AdminServiceUtils::accounts(admin_data,false).size()==1); @@ -271,6 +268,4 @@ TEST_CASE ("Bootstrapping", "[admin_service]") REQUIRE(account.connections().exchange_connection_names_size()==2); } } - - -}} +}} \ No newline at end of file