From 9a10089ea9de4cb653e72aeaf9e90c5df29b79b2 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 2 Oct 2017 21:30:44 +0000 Subject: [PATCH] Added order streams to api. --- src/server/sparkd/cmds/TestOrderman.cpp | 23 ++++++++++++++----- .../sparkd/orderman/components/FillRecorder.h | 1 + .../orderman/service/OrderServiceServer.cpp | 10 +++++++- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/server/sparkd/cmds/TestOrderman.cpp b/src/server/sparkd/cmds/TestOrderman.cpp index 1e03d9c8e..2d04d2644 100644 --- a/src/server/sparkd/cmds/TestOrderman.cpp +++ b/src/server/sparkd/cmds/TestOrderman.cpp @@ -70,8 +70,19 @@ int TestOrderman::execute(std::vector const &) OrderServiceServer server(ctx); api::orderman::OrderService client(ctx.locate ()); + client.subscribe_orders().subscribe([](const api::orderman::OrdersUpdate &update) { + for (auto const &os : update.added()) + std::cout << utils::pb::to_string(*os); + for (auto const &os : update.removed()) + std::cout << "Removed: " << os->order_key() << "\n"; + }); + while (true) { - std::cout << "create order: c sec_key b/s price quantity\nupdate order: u price quantity\ncancel order: x\nchange current order: o order_key\n"; + std::cout << + "create order: c sec_key b/s price quantity\n" + "update order: u price quantity\n" + "cancel order: x\nchange current order: o order_key\n"; + char choice; std::cin >> choice; switch (choice) { @@ -79,9 +90,9 @@ int TestOrderman::execute(std::vector const &) uint32_t sec_key;char side; double price; int quantity; std::cin >> sec_key >> side >> price >> quantity; auto resp = client.create_order(make_create_request(SecurityKey(sec_key), - side == 'b' ? api::BUY : api::SELL, - Price(price), - Quantity(quantity))); + side == 'b' ? api::BUY : api::SELL, + Price(price), + Quantity(quantity))); if (resp.success()) { current_order = OrderKey(resp.result()->order_key()); std::cout << utils::pb::to_string(*resp.result()) << "\n"; @@ -94,8 +105,8 @@ int TestOrderman::execute(std::vector const &) double price; int quantity; std::cin >> price >> quantity; auto resp = client.update_order(make_update_request(current_order, - Price(price), - Quantity(quantity))); + Price(price), + Quantity(quantity))); if (resp.success()) std::cout << utils::pb::to_string(*resp.result()) << "\n"; else diff --git a/src/server/sparkd/orderman/components/FillRecorder.h b/src/server/sparkd/orderman/components/FillRecorder.h index 963d8f1d4..2fb1da05e 100644 --- a/src/server/sparkd/orderman/components/FillRecorder.h +++ b/src/server/sparkd/orderman/components/FillRecorder.h @@ -28,3 +28,4 @@ private: }; }} + diff --git a/src/server/sparkd/orderman/service/OrderServiceServer.cpp b/src/server/sparkd/orderman/service/OrderServiceServer.cpp index 01e292410..197e427e5 100644 --- a/src/server/sparkd/orderman/service/OrderServiceServer.cpp +++ b/src/server/sparkd/orderman/service/OrderServiceServer.cpp @@ -35,6 +35,7 @@ #include "lib/api/public/ServiceContext.h" #include "server/sparkd/event_grid/events/Init.h" #include "lib/utils/PBUtils.h" +#include "lib/logging/logging.h" namespace bts { namespace orderman { @@ -181,9 +182,14 @@ struct SlowExecutor { node.observe ([this] (const auto &ev) {fill_recorder.on(ev);}); node.observe ([this] (const auto &ev) {fill_recorder.on(ev);}); - // order storage + // order storage node.observe ([this] (const auto &ev) {order_recorder.on(ev);}); node.observe ([this] (const auto &ev) {order_recorder.on(ev);}); + + // order PB publication + order_recorder.order_state_change_signal = [this] (const auto &ev) { node.send(ev);}; + // fill PB publication + fill_recorder.native_fill_signal = [this] (const auto &ev) { node.send(ev);}; } ~SlowExecutor() @@ -266,6 +272,7 @@ OrderServiceServer::OrderServiceServer (bts::api::ServiceContext& ctx) me->slow.node.observe ([&ctx,this] (auto const&os) { ctx.post([this,os] () { + LOG(OrderMan,Info,"Post Received order update for publishing"); this->on_order_updates(os); }); }); @@ -311,6 +318,7 @@ void OrderServiceServer::on_fills(event::NativeFills const&f) void OrderServiceServer::on_order_updates(event::OrderStateChange const&os) { + LOG(OrderMan,Info,"Received order update for publishing"); std::vector created; created.reserve(os.state.size()); std::vector updated;