From 39db9b1bd78448e95f3a007c83196897f9910848 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 17 Apr 2020 18:37:05 -0400 Subject: [PATCH] Factored storage/retrieval of admin data out of service. --- src/server/sparkd/user/AdminServiceDB.cpp | 53 +++++++++++++++++ src/server/sparkd/user/AdminServiceDB.h | 22 +++++++ src/server/sparkd/user/AdminServiceServer.cpp | 58 ++++++------------- src/server/sparkd/user/AdminServiceServer.h | 9 +-- 4 files changed, 96 insertions(+), 46 deletions(-) create mode 100644 src/server/sparkd/user/AdminServiceDB.cpp create mode 100644 src/server/sparkd/user/AdminServiceDB.h diff --git a/src/server/sparkd/user/AdminServiceDB.cpp b/src/server/sparkd/user/AdminServiceDB.cpp new file mode 100644 index 000000000..c503123cd --- /dev/null +++ b/src/server/sparkd/user/AdminServiceDB.cpp @@ -0,0 +1,53 @@ +#include "server/sparkd/user/AdminServiceDB.h" + +#include "lib/persistence/SqliteStore.h" +#include "lib/api/services/AdminService.server.pb.h" +#include "lib/logging/logging.h" +#include "lib/utils/helper_macros.h" + +namespace bts { +namespace admin { + +static auto db_name = "admin"; +static auto table_name = "admin_data"; +static auto unique_key = "0"; + +struct AdminServiceDB::PImpl { + PImpl() : store(db_name) {} + persistence::SqliteStore store; +}; + +AdminServiceDB::AdminServiceDB() : me(new PImpl()) {} +AdminServiceDB::~AdminServiceDB() {} + +std::optional AdminServiceDB::retrieve() { + auto [has_table,data] = me->store.retrieve_one(table_name,unique_key); + if (!has_table) + return {}; + + api::admin::AdminData result; + if (!result.ParseFromString(data)) + return {}; + + return {result}; +} + +bool AdminServiceDB::update(api::admin::AdminData const&state) { + auto [has_table,data] = me->store.retrieve_one(table_name,unique_key); + UNUSED(data); + + std::string ser_state; + if (state.SerializeToString(&ser_state)) { + if(has_table) + me->store.update(table_name, unique_key, ser_state); + else + me->store.insert(table_name, unique_key, ser_state); + return true; + } + else + return false; +} + + +} // namespace admin +} // namespace bts diff --git a/src/server/sparkd/user/AdminServiceDB.h b/src/server/sparkd/user/AdminServiceDB.h new file mode 100644 index 000000000..35cac5a42 --- /dev/null +++ b/src/server/sparkd/user/AdminServiceDB.h @@ -0,0 +1,22 @@ +#pragma once + +#include +#include + +namespace bts{ +namespace api {namespace admin {class AdminData;}} + +namespace admin{ + +class AdminServiceDB { +public: + AdminServiceDB(); + ~AdminServiceDB(); + std::optional retrieve(); + bool update(api::admin::AdminData const&); +private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index db3a0c7ad..e6635edc8 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -8,6 +8,7 @@ #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/AuthToken.h" +#include "server/sparkd/user/AdminServiceDB.h" #include #include @@ -22,11 +23,8 @@ namespace admin{ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) : bts::api::admin::AuthenticatedAdminServiceBase (context), - _db_name("admin"), - _table_name("admin_data"), - _unique_key("0"), + _db(), _state(), - _store(new bts::persistence::SqliteStore(_db_name)), _publisher(make_admin_data_stateful_publisher()), _md_entit_publisher(make_md_entitlement_data_stateful_publisher()), _md_perm_publisher(make_md_permissions_data_stateful_publisher()), @@ -34,29 +32,15 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) _order_map() { LOG(Gen, Info, "AdminServiceServer: service started"); - map> all_data = _store->retrieve_all(); - auto table = all_data.find(_table_name); - bool data_found = false; - if (table != all_data.end()) - { - auto row = table->second.find(_unique_key); - if (row != table->second.end()) - { - std::string& ser_data = row->second; - if (_state.ParseFromString(ser_data)) - { - data_found = true; - _check_data_on_start(); - _update_and_publish(false); - } - } - } - if (!data_found) - { + auto admin = _db.retrieve(); + if (admin.has_value()) { + _check_data_on_start(); + _update_and_publish(); + } else { LOG(Gen, Info, "AdminServiceServer: data created for the first time"); AdminServiceUtils::fill_connections_from_config(_state); AdminServiceUtils::bootstrap_data(_state); - _update_and_publish(true); + _update_and_publish(); } _order_service.subscribe_orders() | rxcpp::operators::subscribe( @@ -103,7 +87,7 @@ void AdminServiceServer::create_account( AdminServiceUtils::update_user(_state, update, res); } } - _update_and_publish(false); + _update_and_publish(); reply(result); } void AdminServiceServer::update_account( @@ -112,7 +96,7 @@ void AdminServiceServer::update_account( const api::Response& reply){ bts::api::admin::AdminServiceOperationResult result; AdminServiceUtils::update_account(_state, request.complete_data(), result); - _update_and_publish(false); + _update_and_publish(); reply(result); } void AdminServiceServer::create_user( @@ -130,7 +114,7 @@ void AdminServiceServer::create_user( request.license_data(), request.license_entitlements(), result); - _update_and_publish(false); + _update_and_publish(); reply(result); } void AdminServiceServer::update_user( @@ -139,7 +123,7 @@ void AdminServiceServer::update_user( const api::Response& reply){ AdminServiceOperationResult result; AdminServiceUtils::update_user(_state, request.complete_data(), result); - _update_and_publish(false); + _update_and_publish(); reply(result); } void AdminServiceServer::get_admin_data( @@ -230,7 +214,7 @@ void AdminServiceServer::delete_user( const api::Response& reply){ AdminServiceOperationResult result; result.set_is_success(true); AdminServiceUtils::delete_user(_state, id, result); - _update_and_publish(false); + _update_and_publish(); reply(result); } void AdminServiceServer::delete_account( @@ -239,23 +223,16 @@ void AdminServiceServer::delete_account( const api::Response& reply){ AdminServiceOperationResult result; result.set_is_success(true); bts::admin::AdminServiceUtils::delete_account(_state, id, result); - _update_and_publish(false); + _update_and_publish(); reply(result); } -void AdminServiceServer::_update_and_publish(bool is_insert){ - std::string ser_state; +void AdminServiceServer::_update_and_publish(){ + LOG(Gen, Info, "Saving admin data"); auto start = utils::TimeStamp::now(); - if (_state.SerializeToString(&ser_state)) - { - LOG(Gen, Info, "Saving admin data"); - if(is_insert) - _store->insert(_table_name, _unique_key, ser_state); - else - _store->update(_table_name, _unique_key, ser_state); + if (_db.update(_state) ) { _publisher.add_or_update(_state); _publisher.flush(); _publish_md_entitlements(); - // _publish_md_permissions(); auto elapsed = (utils::TimeStamp::now() - start).milliseconds(); LOG(Gen, Info, "Saved admin data ({}ms)", elapsed); } @@ -263,6 +240,7 @@ void AdminServiceServer::_update_and_publish(bool is_insert){ LOG(Gen, Error, "Could not serialize admin data, saving failed"); } + void AdminServiceServer::get_order_summary( const api::AuthToken&, const bts::api::VoidMessage&, diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index cd19fc4b8..6285627b1 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -3,10 +3,10 @@ #include #include "lib/api/services/AdminService.server.pb.h" #include "lib/utils/bts_no_copy.h" -#include "lib/persistence/IStore.h" #include "lib/api/public/ServiceContext.h" #include "lib/api/services/OrderService.pb.h" #include "lib/api/services/OrderService.client.pb.h" +#include "server/sparkd/user/AdminServiceDB.h" namespace bts { namespace admin{ @@ -18,11 +18,8 @@ using namespace std; class AdminServiceServer : public api::admin::AuthenticatedAdminServiceBase { private: - const std::string _db_name; - const std::string _table_name; - const std::string _unique_key; + admin::AdminServiceDB _db; bts::api::admin::AdminData _state; - std::unique_ptr _store; AdminServiceBase::Admin_dataStatefulPublisher _publisher; AdminServiceBase::Md_entitlement_dataStatefulPublisher _md_entit_publisher; AdminServiceBase::Md_permissions_dataStatefulPublisher _md_perm_publisher; @@ -89,7 +86,7 @@ private: // that to here // 2. for new data fields, it initializes them here void _check_data_on_start(); - void _update_and_publish (bool is_insert); + void _update_and_publish (); void _publish_md_entitlements(); void _publish_md_permissions(); void _add_live_order(map>& agg,