From 0ea72b017eafd25b16aa4bafccd6f0bd861d00e2 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 9 May 2019 10:29:54 -0400 Subject: [PATCH] Storage component of manual fills code complete. --- .../sparkd/position/PositionServiceServer.cpp | 107 +++++++++++++++--- 1 file changed, 93 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 82b88f403..8f8ea758c 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -5,6 +5,7 @@ #include "lib/logging/logging.h" #include "lib/utils/PBUtils.h" #include "lib/persistence/SqliteStore.h" +#include "lib/utils/Puid.h" #include #include @@ -19,21 +20,28 @@ namespace position{ using namespace bts::api::position; using namespace bts::api::orderman; +static auto const manual_fills_ns = "manual_fills"; + struct PositionServiceServer::PImpl { PositionServiceBase::Position_dataStatefulPublisher publisher; bts::api::orderman::OrderService order_service; std::map> state; int id; - std::unique_ptr manual_fill_store = - std::make_unique ("manual_fills"); + + // manual fills management + std::unique_ptr manual_fills_store ; + PositionServiceBase::Manual_fillsStatefulPublisher manual_fills_publisher; PImpl(bts::api::ServiceContext& context, - const PositionServiceBase::Position_dataStatefulPublisher& publisher) + const PositionServiceBase::Position_dataStatefulPublisher& publisher, + const PositionServiceBase::Manual_fillsStatefulPublisher &manual_fills_publisher) : publisher(publisher), order_service(context.locate()), state(), - id(0) + id(0), + manual_fills_store(std::make_unique ("manual_fills")), + manual_fills_publisher(manual_fills_publisher) { } }; @@ -42,7 +50,9 @@ PositionServiceServer::PositionServiceServer(bts::api::ServiceContext& context) : PositionServiceBase (context), me(new PImpl(context, - make_position_data_stateful_publisher())){ + make_position_data_stateful_publisher(), + make_manual_fills_stateful_publisher())) +{ me->order_service.subscribe_fills() | rxcpp::operators::subscribe( [this](auto const& update) { @@ -57,6 +67,20 @@ me(new PImpl(context, } me->publisher.flush(); }); + + auto all = me->manual_fills_store->retrieve_all()[manual_fills_ns]; + LOG(persist, Info, "Finished loading all {} manual fills", all.size()); + ManualFill rec; + for (auto const &kvp : all) + if (utils::pb::from_string(kvp.second, &rec)) + me->manual_fills_publisher.add_or_update(rec); + else { + LOG(OrderMan, Error, + "Could not recover manual fill {} from storage. " + "This should be investigated", + kvp.first); + } + me->manual_fills_publisher.flush(); } const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, @@ -165,18 +189,73 @@ PositionServiceServer::~PositionServiceServer(){ } void PositionServiceServer::create_manual_fill( - const ::bts::api::position::ManualFillBatch &, - const api::Response<::bts::api::position::PositionServiceResponse> &) -{} + const ManualFillBatch &batch, + const api::Response &r) +{ + PositionServiceResponse resp; + for (auto mf : batch.manual_fill()) { + auto id = utils::gen_id ("manual_fills"); + mf.set_record_id(id); + me->manual_fills_store->insert(manual_fills_ns, + std::to_string(id), + utils::pb::to_string(mf)); + resp.add_response()->set_ok(true); + me->manual_fills_publisher.add_or_update(mf); + } + r(resp); + me->manual_fills_publisher.flush(); +} void PositionServiceServer::update_manual_fill( - const ::bts::api::position::ManualFillBatch &, - const api::Response<::bts::api::position::PositionServiceResponse> &) -{} + const ManualFillBatch &batch, + const api::Response &r) +{ + PositionServiceResponse resp; + for (auto mf : batch.manual_fill()) { + auto *this_resp = resp.add_response(); + auto id = std::to_string(mf.record_id()); + + auto [found,v] = me->manual_fills_store->retrieve_one(manual_fills_ns,id); + if (!found) { + this_resp->set_ok(false); + this_resp->set_msg("Could not find record"); + } + else { + me->manual_fills_store->update(manual_fills_ns, + id, + utils::pb::to_string(mf)); + this_resp->set_ok(true); + me->manual_fills_publisher.add_or_update(mf); + } + } + r(resp); + me->manual_fills_publisher.flush(); +} void PositionServiceServer::remove_manual_fill( - const ::bts::api::position::ManualFillBatch &, - const api::Response<::bts::api::position::PositionServiceResponse> &) -{} + const ManualFillBatch &batch, + const api::Response &r) +{ + PositionServiceResponse resp; + for (auto mf : batch.manual_fill()) { + auto *this_resp = resp.add_response(); + auto id = std::to_string(mf.record_id()); + + auto [found,v] = me->manual_fills_store->retrieve_one(manual_fills_ns,id); + if (!found) { + this_resp->set_ok(false); + this_resp->set_msg("Could not find record"); + } + else { + std::set to_r ; + to_r.insert(id); + me->manual_fills_store->remove(manual_fills_ns,to_r); + this_resp->set_ok(true); + me->manual_fills_publisher.erase(mf.record_id()); + } + } + r(resp); + me->manual_fills_publisher.flush(); +} }}