SPARK-1078 xchange fields length restriction

This commit is contained in:
Taha Afzal committed 2018-05-17 07:19:29 -04:00
1 parent ec6d4936f1
commit e0b211d002
3 files changed
+117 -44

No files matched your search

@@ -0,0 +1,94 @@
#include "lib/api/services/AdminService.server.pb.h"
#include "lib/api/service_helpers/AdminServiceUtils.h"
namespace bts{
namespace admin{
void AdminServiceUtils::update_account(bts::api::admin::AdminData& admin_data,
const bts::api::admin::BTSAccount& updated_account,
bts::api::admin::AdminServiceOperationResult& result){
validate_account_update (admin_data, updated_account, result);
if (result.is_success()){
bts::api::admin::BTSAccount* account_ptr = find_account(admin_data, updated_account.id());
account_ptr->CopyFrom(updated_account);
}
}
void AdminServiceUtils::validate_account_update (const bts::api::admin::AdminData& admin_data,
const bts::api::admin::BTSAccount& updated_account,
bts::api::admin::AdminServiceOperationResult& result){
result.set_is_success(true);
// validate id
if(find_account(admin_data, updated_account.id()) == nullptr){
result.set_is_success(false);
result.set_error_text("Could not find account id");
return;
}
// validate that name change doesnt collide
for (auto const& account : admin_data.accounts())
if (account.id() != updated_account.id() && account.name() == updated_account.name()){
result.set_is_success(false);
result.set_error_text("Account by this name already exists");
return;
}
// validate account exchange changes
validate_account_exchange_data (updated_account, result);
}
void AdminServiceUtils::validate_account_exchange_data (const bts::api::admin::BTSAccount& account,
bts::api::admin::AdminServiceOperationResult& result){
result.set_is_success(true);
if (account.has_exchange_account_data()){
if (account.exchange_account_data().has_cme_account_data()){
const bts::api::admin::CMEAccountData& cme_account_data = account.exchange_account_data().cme_account_data();
if (cme_account_data.clearing_account().size() > 12){
result.set_is_success(false);
result.set_error_text("CME account can not be more 12 characters long");
}
}
}
}
bts::api::admin::BTSUser* AdminServiceUtils::update_user(bts::api::admin::AdminData& admin_data,
const bts::api::admin::BTSUser& updated_user,
bts::api::admin::AdminServiceOperationResult& result){
validate_user_update(admin_data, updated_user, result);
if (result.is_success()){
bts::api::admin::BTSUser* user_ptr = find_user(admin_data, updated_user.id());
user_ptr->CopyFrom(updated_user);
return user_ptr;
}
else
return nullptr;
}
void AdminServiceUtils::validate_user_update (const bts::api::admin::AdminData& admin_data,
const bts::api::admin::BTSUser& updated_user,
bts::api::admin::AdminServiceOperationResult& result){
result.set_is_success(true);
// validate id
if(find_user(admin_data, updated_user.id()) == nullptr){
result.set_is_success(false);
result.set_error_text("Could not find user id");
return;
}
// validate that name change doesnt collide
for (auto const& user : admin_data.users())
if (user.id() != updated_user.id() && user.name() == updated_user.name()){
result.set_is_success(false);
result.set_error_text("User by this name already exists");
return;
}
validate_user_exchange_data (updated_user, result);
}
void AdminServiceUtils::validate_user_exchange_data (const bts::api::admin::BTSUser& user,
bts::api::admin::AdminServiceOperationResult& result){
result.set_is_success(true);
// this is not right (should navigate to the group)
if (user.has_user_data() && user.user_data().has_exchange_user_data() && user.user_data().exchange_user_data().has_cme_data()){
const api::admin::CMEUserData& cme_user_data = user.user_data().exchange_user_data().cme_data();
if (cme_user_data.operator_id().size() > 18){
result.set_is_success(false);
result.set_error_text("CME operator id can not be more 12 characters long");
}
}
}
}}
+22 -42
View File
@@ -184,6 +184,13 @@ public:
rv.insert(std::pair<int,bool>(account.id(),account.is_active()));
return rv;
}
// validates that the update to the account is valid
static void validate_account_update (const bts::api::admin::AdminData& admin_data,
const bts::api::admin::BTSAccount& updated_account,
bts::api::admin::AdminServiceOperationResult& result);
// validates that the account exchange changes are valid
static void validate_account_exchange_data (const bts::api::admin::BTSAccount& account,
bts::api::admin::AdminServiceOperationResult& out_result);
//mutators
//////////
static bts::api::admin::BTSAccount* create_account(bts::api::admin::AdminData& data,
@@ -221,35 +228,10 @@ public:
new_account_ptr->set_is_active(is_active);
return new_account_ptr;
}
// returns true if the name of the updated account
// does not match any of the existing accounts
static bool is_updated_account_name_unique(const bts::api::admin::AdminData& data,
const bts::api::admin::BTSAccount& updated_account){
for (auto const& account : data.accounts())
if (account.id() != updated_account.id() && account.name() == updated_account.name())
return false;
return true;
}
// writes over the account data completely
static bts::api::admin::BTSAccount* update_account(bts::api::admin::AdminData& data,
const bts::api::admin::BTSAccount& updated_account,
bts::api::admin::AdminServiceOperationResult& result){
result.set_is_success(true);
bts::api::admin::BTSAccount* account_ptr = find_account(data, updated_account.id());
if(account_ptr != nullptr){
if (!is_updated_account_name_unique (data, updated_account)){
result.set_is_success(false);
result.set_error_text("Account by this name already exists");
}
else
account_ptr->CopyFrom(updated_account);
}
else{
result.set_is_success(false);
result.set_error_text("Could not find account id");
}
return account_ptr;
}
static void update_account(bts::api::admin::AdminData& data,
const bts::api::admin::BTSAccount& updated_account,
bts::api::admin::AdminServiceOperationResult& result);
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())
@@ -349,7 +331,7 @@ public:
for(auto it=cleaned_connections.begin(); it!= cleaned_connections.end(); it++)
account.mutable_connections()->add_exchange_connection_names(*it);
}
}
}
/***************************************************/
/*********************groups************************/
/***************************************************/
@@ -569,7 +551,14 @@ public:
if (account_ptr != nullptr && account_ptr->is_present())
associated_accounts.push_back(account_ptr);
}
}
}
// validates that changes in user data
static void validate_user_update (const bts::api::admin::AdminData& admin_data,
const bts::api::admin::BTSUser& updated_user,
bts::api::admin::AdminServiceOperationResult& result);
// vaidates the exchange part of user data updates
static void validate_user_exchange_data (const bts::api::admin::BTSUser& updated_user,
bts::api::admin::AdminServiceOperationResult& out_result);
// mutators
///////////
static bts::api::admin::BTSUser* create_user (bts::api::admin::AdminData& data,
@@ -607,18 +596,9 @@ public:
result.set_new_id(new_id);
return new_user_ptr;
}
static bts::api::admin::BTSUser* update_user(bts::api::admin::AdminData& admin_data, const bts::api::admin::BTSUser& updated_user,
bts::api::admin::AdminServiceOperationResult& result){
result.set_is_success(true);
bts::api::admin::BTSUser* user_ptr = find_user(admin_data, updated_user.id());
if(user_ptr != nullptr)
user_ptr->CopyFrom(updated_user);
else{
result.set_is_success(false);
result.set_error_text("Could not find user id");
}
return user_ptr;
}
static bts::api::admin::BTSUser* update_user(bts::api::admin::AdminData& admin_data,
const bts::api::admin::BTSUser& updated_user,
bts::api::admin::AdminServiceOperationResult& result);
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();
+1 -2
View File
@@ -42,5 +42,4 @@ target_link_libraries( sparkd
-pthread)
# copy test data
file(COPY jetfix/tests/sample_fix.dat DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test_data)
file(COPY jetfix/tests/sample_fix.dat DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test_data)