From 0c4d934da64e6c584600a079f353851c3c1f4daa Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 4 Oct 2017 15:08:08 +0000 Subject: [PATCH] SpreaderMan --- src/lib/api/services/OrderService.proto | 32 ++-- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/TestOrderman.cpp | 4 +- .../orderman/components/NativeOrderMan.cpp | 41 +++--- .../orderman/components/OrderServiceBridge.h | 28 ---- .../orderman/components/SpreaderOrderMan.cpp | 139 ++++++++++++++++++ .../orderman/components/SpreaderOrderMan.h | 58 ++++++++ .../orderman/events/CancelSpreaderOrder.h | 19 +++ .../orderman/events/CreateNativeOrder.h | 1 + .../orderman/events/CreateSpreaderOrder.h | 19 +++ .../events/NativeOrderStateChange.cpp | 8 +- .../events/SpreaderOrderStateChange.h | 18 +++ .../orderman/events/UpdateSpreaderOrder.h | 18 +++ .../orderman/native_orders/NativeOrder.h | 50 +++---- .../native_orders/NativeOrderHeader.h | 1 + .../orderman/service/OrderServiceServer.cpp | 7 +- .../spreader_orders/SpreaderOrder.cpp | 25 ++++ .../orderman/spreader_orders/SpreaderOrder.h | 45 ++++++ .../spreader_orders/SpreaderOrderBase.h | 97 ++++++++++++ 19 files changed, 518 insertions(+), 94 deletions(-) delete mode 100644 src/server/sparkd/orderman/components/OrderServiceBridge.h create mode 100644 src/server/sparkd/orderman/components/SpreaderOrderMan.cpp create mode 100644 src/server/sparkd/orderman/components/SpreaderOrderMan.h create mode 100644 src/server/sparkd/orderman/events/CancelSpreaderOrder.h create mode 100644 src/server/sparkd/orderman/events/CreateSpreaderOrder.h create mode 100644 src/server/sparkd/orderman/events/SpreaderOrderStateChange.h create mode 100644 src/server/sparkd/orderman/events/UpdateSpreaderOrder.h create mode 100644 src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp create mode 100644 src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h create mode 100644 src/server/sparkd/orderman/spreader_orders/SpreaderOrderBase.h diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 6fff5a2c8..46d39c780 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -30,6 +30,12 @@ enum OrderStatus OS_ORDER_NOT_FOUND = 89 ; } +enum ChildOrderKind { + COK_UNDEFINED = 0 ; + COK_SPREADER_HEDGING = 1 ; + COK_SPREADER_QUOTING = 2 ; +} + enum TimeInForce { TIF_UNDEFINED = 0 ; @@ -120,8 +126,6 @@ message NativeOrderState { OrderType order_type = 20; // Immutable once available, might not always be available - CustomerOrFirm customer_or_firm = 7; - CTICode cti_code = 8; string exchange_order_id = 10; // Mutable, always available @@ -132,17 +136,23 @@ message NativeOrderState { uint32 filled_quantity=16; double last_price = 12; double avg_price = 15; - - OrderStatus order_status= 14; } -message SpreaderOrderState {} +message SpreaderOrderState { + double target_price = 1; + uint32 target_quantity = 2 ; +} message OrderState { - uint32 order_key = 1 [(bts.api.key)=true]; - uint32 parent_order_key = 2 ; - google.protobuf.Timestamp timestamp = 3; - string reject_msg=4; + + uint32 order_key = 1 [(bts.api.key)=true] ; + uint32 parent_order_key = 2 ; + ChildOrderKind child_kind = 7 ; + google.protobuf.Timestamp timestamp = 3 ; + CustomerOrFirm customer_or_firm = 8 ; + CTICode cti_code = 9 ; + string reject_msg=4 ; + OrderStatus order_status= 10 ; oneof state { NativeOrderState native = 5; @@ -157,8 +167,6 @@ message CreateNativeOrder{ api.BuySell side = 5; orderman.TimeInForce time_in_force = 6; orderman.OrderType order_type = 7; - orderman.CustomerOrFirm customer_or_firm = 8; - orderman.CTICode cti_code = 9; orderman.ManualOrderIndicator manual_order_indicator = 11; double price = 12; uint32 quantity = 13; @@ -168,6 +176,8 @@ message CreateSpreaderOrder {} message CreateOrderRequest { google.protobuf.Timestamp timestamp = 1; + orderman.CustomerOrFirm customer_or_firm = 8; + orderman.CTICode cti_code = 9; oneof create { CreateNativeOrder native_order = 2; CreateSpreaderOrder spreader = 3; diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index a635dd0ae..e6ad6655a 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/CmdRegistry.cpp;cmds/Help.cpp;cmds/Run.cpp;cmds/Test.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SimpleSpreader.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/SpreaderBase.cpp;spreader/SpreaderTests.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file +set(sources ;cmds/CmdRegistry.cpp;cmds/Help.cpp;cmds/Run.cpp;cmds/Test.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SimpleSpreader.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/SpreaderBase.cpp;spreader/SpreaderTests.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/TestOrderman.cpp b/src/server/sparkd/cmds/TestOrderman.cpp index 2d04d2644..4cb354a37 100644 --- a/src/server/sparkd/cmds/TestOrderman.cpp +++ b/src/server/sparkd/cmds/TestOrderman.cpp @@ -27,6 +27,8 @@ api::orderman::CreateOrderRequest make_create_request(SecurityKey sec, api::BuyS { api::orderman::CreateOrderRequest result; *result.mutable_timestamp() = utils::pb::to_timestamp(datetime::now()); + result.set_customer_or_firm(api::orderman::COF_FIRM); + result.set_cti_code(api::orderman::CTI_CTI1); auto &native = *result.mutable_native_order(); native.set_account_name("BTS"); native.set_operator_id("BTS"); @@ -34,8 +36,6 @@ api::orderman::CreateOrderRequest make_create_request(SecurityKey sec, api::BuyS native.set_side(side); native.set_time_in_force(api::orderman::TIF_DAY); native.set_order_type(api::orderman::OT_LIMIT); - native.set_customer_or_firm(api::orderman::COF_FIRM); - native.set_cti_code(api::orderman::CTI_CTI1); native.set_manual_order_indicator(api::orderman::MOI_YES); native.set_price(price.value()); native.set_quantity(quantity.value()); diff --git a/src/server/sparkd/orderman/components/NativeOrderMan.cpp b/src/server/sparkd/orderman/components/NativeOrderMan.cpp index f9ddc3167..90edd1bdc 100644 --- a/src/server/sparkd/orderman/components/NativeOrderMan.cpp +++ b/src/server/sparkd/orderman/components/NativeOrderMan.cpp @@ -70,10 +70,7 @@ NativeOrderMan::NativeOrderMan (config::JetFIX::Connection const&gw_connection, const std::string *rej_msg = nullptr; if (os.reject_msg().size()) rej_msg = &os.reject_msg(); - me->order_map[OrderKey(os.order_key())] = std::make_unique (*sec, - OrderKey(os.order_key()), - OrderKey(os.parent_order_key()), - rej_msg,native_state); + me->order_map[OrderKey(os.order_key())] = std::make_unique (*sec,os); } else { LOG(OrderMan,Error, @@ -259,26 +256,30 @@ void NativeOrderMan::on(event::ExecutionReport const&er) " cannot be recovered, including fix fields CustomerOrFirm and CTI code" " and the parent order id (if any)", k.value()); - api::orderman::NativeOrderState recovered; - recovered.set_account_name(to_str(er.data->account_name)); - recovered.set_operator_id(to_str(er.data->operator_id)); - recovered.set_security_key(er.data->security->id()); - recovered.set_side(er.data->side); - recovered.set_time_in_force(er.data->time_in_force); - recovered.set_order_type(er.data->order_type); + api::orderman::OrderState recovered; + recovered.set_order_key(k.value()); + recovered.set_parent_order_key(null_order_key().value()); + recovered.set_child_kind(api::orderman::COK_UNDEFINED); recovered.set_customer_or_firm(api::orderman::CustomerOrFirm(me->jf_cfg.customer_or_firm())); recovered.set_cti_code (api::orderman::CTICode(me->jf_cfg.cti_code()[0])); - recovered.set_exchange_order_id(to_str(er.data->exchange_order_id)); - recovered.set_manual_order_indicator(er.data->manual_order_indicator); - recovered.set_last_price(er.data->last_price.value()); - recovered.set_order_quantity(er.data->order_quantity.value()); recovered.set_order_status(er.data->order_status); - recovered.set_avg_price(er.data->avg_price.value()); - recovered.set_filled_quantity(er.data->filled_quantity.value()); - const std::string *reject_msg = nullptr; if (er.data->reject_msg.size()) - reject_msg = &(er.data->reject_msg); - order_ptr = std::make_unique(*er.data->security,k,null_order_key(),reject_msg,recovered); + recovered.set_reject_msg(er.data->reject_msg); + + auto &native = *recovered.mutable_native(); + native.set_account_name(to_str(er.data->account_name)); + native.set_operator_id(to_str(er.data->operator_id)); + native.set_security_key(er.data->security->id()); + native.set_side(er.data->side); + native.set_time_in_force(er.data->time_in_force); + native.set_order_type(er.data->order_type); + native.set_exchange_order_id(to_str(er.data->exchange_order_id)); + native.set_manual_order_indicator(er.data->manual_order_indicator); + native.set_last_price(er.data->last_price.value()); + native.set_order_quantity(er.data->order_quantity.value()); + native.set_avg_price(er.data->avg_price.value()); + native.set_filled_quantity(er.data->filled_quantity.value()); + order_ptr = std::make_unique(*er.data->security,recovered); } native_order_state_change_signal( event::NativeOrderStateChange {order_ptr.get(), &order_ptr->header(),order_ptr->state()}); diff --git a/src/server/sparkd/orderman/components/OrderServiceBridge.h b/src/server/sparkd/orderman/components/OrderServiceBridge.h deleted file mode 100644 index d574258ca..000000000 --- a/src/server/sparkd/orderman/components/OrderServiceBridge.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include - -namespace bts { -namespace api {class OrderState;class NativeFill;} -namespace orderman { - -namespace event { class CreateOrder;} - -class OrderServiceBridge -{ -public: - OrderServiceBridge(securities::SecurityDB &sec_db, - std::function const& on_order_state, - std::function const& on_fills); - - - ~OrderServiceBridge(); - -// in - void on(event::CreateOrder const&); -private: - struct PImpl; - std::unique_ptr me; -}; - -}} diff --git a/src/server/sparkd/orderman/components/SpreaderOrderMan.cpp b/src/server/sparkd/orderman/components/SpreaderOrderMan.cpp new file mode 100644 index 000000000..f321a9de2 --- /dev/null +++ b/src/server/sparkd/orderman/components/SpreaderOrderMan.cpp @@ -0,0 +1,139 @@ +#include "SpreaderOrderMan.h" + +#include "server/sparkd/orderman/spreader_orders/SpreaderOrder.h" +#include "server/sparkd/orderman/events/CreateSpreaderOrder.h" +#include "server/sparkd/orderman/events/UpdateSpreaderOrder.h" +#include "server/sparkd/orderman/events/CancelSpreaderOrder.h" +#include "server/sparkd/orderman/events/GatewayStatusChange.h" +#include "server/sparkd/orderman/events/TimeChange.h" +#include "server/sparkd/orderman/native_orders/NativeOrderHeader.h" +#include "server/sparkd/orderman/persistence/gen_order_id.h" +#include "server/sparkd/orderman/events/NativeOrderStateChange.h" + +#include "lib/logging/logging.h" +#include "lib/utils/PBUtils.h" + +namespace bts { +namespace orderman { + +using SpreaderOrderPtr = std::unique_ptr; +using SpreaderOrderMap = boost::container::flat_map; + +struct SpreaderOrderMan::PImpl { + PImpl(securities::SecurityDB &db) : sec_db(db), spreader_orders(),gateway_ready(false) {} + + securities::SecurityDB &sec_db; + SpreaderOrderMap spreader_orders; + bool gateway_ready; +}; + +SpreaderOrderMan::SpreaderOrderMan (securities::SecurityDB &sec_db, + std::vector const &existing_orders) + : me(new PImpl(sec_db)) +{ + for (auto const &os : existing_orders) + if (os.has_spreader()) + me->spreader_orders[OrderKey(os.order_key()) ] = std::make_unique(sec_db,os); +} + +void SpreaderOrderMan::on(event_grid::event::Init const&) +{ + LOG(OrderMan,Diag, "SpreaderOrderMan init"); + for (auto const &kvp : me->spreader_orders) + kvp.second->init(); +} + +void SpreaderOrderMan::on(event::CreateSpreaderOrder const&cso) +{ + LOG(OrderMan,Diag, "CreateSpreaderOrder {}: {}", + cso.order_key.value(), + utils::pb::to_string(cso.create)); + + auto & order = me->spreader_orders[cso.order_key]; + bts_assert(!order); + order = std::make_unique (me->sec_db,cso.order_key,cso.create); + order->init(); + if (me->gateway_ready) + order->on_connect(); +} + +void SpreaderOrderMan::on(event::UpdateSpreaderOrder const&uso) +{ + LOG(OrderMan,Diag, "UpdateSpreaderOrder {}: {}", + uso.order_key.value(), + utils::pb::to_string(uso.update)); + + auto it = me->spreader_orders.find(uso.order_key); + if (it != me->spreader_orders.end()) { + auto &order = *it->second.get(); + order.on_update(uso.update); + } + else + LOG(OrderMan,Error, "Ignoring attempt to update unknown spreader order id {}", + uso.order_key.value()); +} + +void SpreaderOrderMan::on(event::CancelSpreaderOrder const&cancel) +{ + LOG(OrderMan,Diag, "CancelSpreaderOrder {}", + cancel.order_key.value(), + utils::pb::to_string(cancel.cancel)); + + auto it = me->spreader_orders.find(cancel.order_key); + if (it != me->spreader_orders.end()) { + auto &order = *it->second.get(); + order.on_cancel(cancel.cancel); + } + else + LOG(OrderMan,Error, "Ignoring attempt to cancel unknown spreader order id {}", + cancel.order_key.value()); +} + +void SpreaderOrderMan::on(event::BookUpdate const&book_update) +{ + for (auto const &kvp : me->spreader_orders) + kvp.second->on_book(book_update.book); +} + +void SpreaderOrderMan::on(event::GatewayStatusChange const&c) +{ + if (c.is_connected) + for (auto const &kvp : me->spreader_orders) + kvp.second->on_connect(); + else + for (auto const &kvp : me->spreader_orders) + kvp.second->on_disconnect(); +} + +void SpreaderOrderMan::on(event::TimeChange const&t) +{ + for (auto const &kvp : me->spreader_orders) + kvp.second->on_time(t.ts); +} + +void SpreaderOrderMan::on(event::NativeOrderStateChange const&ch) +{ + auto ok = ch.header->parent_order_key; + if (ok != null_order_key()) { + auto it = me->spreader_orders.find(ok); + if (it != me->spreader_orders.end()) { + auto &order = *it->second.get(); + auto const &state = ch.current_state; + order.on_child_update(ok, + state.order_status, + state.filled_quantity, + state.avg_price, + state.reject_msg); + } + else { + auto msg = fmt::format("Unknown parent order {} for child order {}. ", + ok.value(), ch.header->order_key.value()); + LOG(OrderMan,Error,"{}",msg); + for (auto const &kvp : me->spreader_orders) + kvp.second->on_external_error(msg); + } + } +} + + +}} diff --git a/src/server/sparkd/orderman/components/SpreaderOrderMan.h b/src/server/sparkd/orderman/components/SpreaderOrderMan.h new file mode 100644 index 000000000..f1a5f47ce --- /dev/null +++ b/src/server/sparkd/orderman/components/SpreaderOrderMan.h @@ -0,0 +1,58 @@ +#pragma once + +#include +#include + +#include "server/sparkd/orderman/events/BookUpdate.h" +#include "server/sparkd/orderman/utils/orderman_utils.h" +#include "lib/api/services/OrderService.pb.h" + +namespace bts { +namespace event_grid {namespace event {class Init;}} +namespace securities {class SecurityDB;} +namespace orderman { +namespace event { +class CreateSpreaderOrder; +class UpdateSpreaderOrder; +class CancelSpreaderOrder; +class GatewayStatusChange; +class TimeChange; +class NativeOrderStateChange; +class SpreaderOrderStateChange; +class CreateNativeOrder; +class UpdateNativeOrder; +class CancelNativeOrder; +class MDSubscription; +} +class SpreaderOrder; + +class SpreaderOrderMan +{ +public: + SpreaderOrderMan (securities::SecurityDB &sec_db, + std::vector const &existing_orders); + + // in + void on(event_grid::event::Init const&); + void on(event::CreateSpreaderOrder const&); + void on(event::UpdateSpreaderOrder const&); + void on(event::CancelSpreaderOrder const&); + void on(event::BookUpdate const&); + void on(event::GatewayStatusChange const&); + void on(event::TimeChange const&); + void on(event::NativeOrderStateChange const&); + + // out + std::function spreader_order_state_change_signal; + std::function create_native_order_signal; + std::function update_native_order_signal; + std::function cancel_native_order_signal; + std::function md_subscription_signal; + + ~SpreaderOrderMan(); +private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman/events/CancelSpreaderOrder.h b/src/server/sparkd/orderman/events/CancelSpreaderOrder.h new file mode 100644 index 000000000..30f74c9ac --- /dev/null +++ b/src/server/sparkd/orderman/events/CancelSpreaderOrder.h @@ -0,0 +1,19 @@ +#pragma once + +#include +#include "lib/api/services/OrderService.pb.h" +#include "server/sparkd/orderman/utils/orderman_utils.h" + +namespace bts { +namespace orderman { +namespace event { + +class CancelSpreaderOrder +{ +public: + OrderKey order_key; + api::orderman::CancelSpreaderOrder cancel; +}; + +}}} + diff --git a/src/server/sparkd/orderman/events/CreateNativeOrder.h b/src/server/sparkd/orderman/events/CreateNativeOrder.h index a3f36c9d9..032af6b5a 100644 --- a/src/server/sparkd/orderman/events/CreateNativeOrder.h +++ b/src/server/sparkd/orderman/events/CreateNativeOrder.h @@ -8,6 +8,7 @@ namespace bts { namespace orderman { +class NativeOrder; namespace event { diff --git a/src/server/sparkd/orderman/events/CreateSpreaderOrder.h b/src/server/sparkd/orderman/events/CreateSpreaderOrder.h new file mode 100644 index 000000000..93c197ca7 --- /dev/null +++ b/src/server/sparkd/orderman/events/CreateSpreaderOrder.h @@ -0,0 +1,19 @@ +#pragma once + +#include +#include "lib/api/services/OrderService.pb.h" +#include "server/sparkd/orderman/utils/orderman_utils.h" + +namespace bts { +namespace orderman { +namespace event { + +class CreateSpreaderOrder +{ +public: + OrderKey order_key; + api::orderman::CreateOrderRequest create; +}; + +}}} + diff --git a/src/server/sparkd/orderman/events/NativeOrderStateChange.cpp b/src/server/sparkd/orderman/events/NativeOrderStateChange.cpp index d8b5992e8..129759b34 100644 --- a/src/server/sparkd/orderman/events/NativeOrderStateChange.cpp +++ b/src/server/sparkd/orderman/events/NativeOrderStateChange.cpp @@ -16,6 +16,10 @@ api::orderman::OrderState to_pb(NativeOrderHeader const&header,NativeOrderState result.set_order_key(header.order_key.value()); result.set_parent_order_key(header.parent_order_key.value()); + result.set_child_kind(header.child_kind); + result.set_cti_code(header.cti_code); + result.set_customer_or_firm(header.customer_or_firm); + result.set_order_status(current_state.order_status); auto &ts = *result.mutable_timestamp(); struct timeval tv; @@ -31,9 +35,6 @@ api::orderman::OrderState to_pb(NativeOrderHeader const&header,NativeOrderState native.set_time_in_force(header.time_in_force); native.set_order_type(header.order_type); - native.set_customer_or_firm(header.customer_or_firm); - native.set_cti_code(header.cti_code); - if (current_state.exchange_order_id) { auto trim_oid = to_trim_str(current_state.exchange_order_id->value()); std::string trim(trim_oid.first,trim_oid.second); @@ -49,7 +50,6 @@ api::orderman::OrderState to_pb(NativeOrderHeader const&header,NativeOrderState native.set_avg_price(current_state.avg_price.value()); native.set_order_quantity(current_state.order_quantity.value()); native.set_filled_quantity(current_state.filled_quantity.value()); - native.set_order_status(current_state.order_status); return result; diff --git a/src/server/sparkd/orderman/events/SpreaderOrderStateChange.h b/src/server/sparkd/orderman/events/SpreaderOrderStateChange.h new file mode 100644 index 000000000..cbaddf6fc --- /dev/null +++ b/src/server/sparkd/orderman/events/SpreaderOrderStateChange.h @@ -0,0 +1,18 @@ +#pragma once + +#include +#include "lib/api/services/OrderService.pb.h" + +namespace bts { +namespace orderman { +namespace event { + +class SpreaderOrderStateChange +{ +public: + OrderKey order_key; + api::orderman::OrderStatus status; + std::string reject_msg; +}; + +}}} diff --git a/src/server/sparkd/orderman/events/UpdateSpreaderOrder.h b/src/server/sparkd/orderman/events/UpdateSpreaderOrder.h new file mode 100644 index 000000000..90ba159b3 --- /dev/null +++ b/src/server/sparkd/orderman/events/UpdateSpreaderOrder.h @@ -0,0 +1,18 @@ +#pragma once + +#include +#include "lib/api/services/OrderService.pb.h" +#include "server/sparkd/orderman/utils/orderman_utils.h" + +namespace bts { +namespace orderman { +namespace event { + +class UpdateSpreaderOrder +{ +public: + OrderKey order_key; + api::orderman::UpdateSpreaderOrder update; +}; + +}}} diff --git a/src/server/sparkd/orderman/native_orders/NativeOrder.h b/src/server/sparkd/orderman/native_orders/NativeOrder.h index bad8496d7..f89d5f55f 100644 --- a/src/server/sparkd/orderman/native_orders/NativeOrder.h +++ b/src/server/sparkd/orderman/native_orders/NativeOrder.h @@ -24,49 +24,49 @@ class NativeOrder { public: NativeOrder(api::Security const&sec, - OrderKey k, - OrderKey parent, - std::string const *reject_msg, - api::orderman::NativeOrderState const&pb) : + api::orderman::OrderState const&os) : _fix_data(), _state(), _header(), _exchange_order_id(), _keep_alive_rej() { - + bts_assert(os.has_native()); + const auto &native = os.native(); + _header = NativeOrderHeader { - k, - parent, + OrderKey(os.order_key()), + OrderKey(os.parent_order_key()), + os.child_kind(), &sec, - to(pb.account_name()), - to(pb.operator_id()), - pb.side(), - pb.time_in_force(), - pb.order_type(), - pb.manual_order_indicator(), - pb.customer_or_firm(), - pb.cti_code() + to(native.account_name()), + to(native.operator_id()), + native.side(), + native.time_in_force(), + native.order_type(), + native.manual_order_indicator(), + os.customer_or_firm(), + os.cti_code() }; _state = NativeOrderState { - Price(pb.price()), - Quantity(pb.order_quantity()), - Price(pb.last_price()), - Price(pb.avg_price()), - Quantity(pb.filled_quantity()), - pb.order_status(), + Price(native.price()), + Quantity(native.order_quantity()), + Price(native.last_price()), + Price(native.avg_price()), + Quantity(native.filled_quantity()), + os.order_status(), nullptr, nullptr }; - if (reject_msg) - set_reject_msg(*reject_msg); + if (os.reject_msg().size()) + set_reject_msg(os.reject_msg()); init_fix(); - if (pb.exchange_order_id().size()) - update_exchange_order_id(to(pb.exchange_order_id())); + if (native.exchange_order_id().size()) + update_exchange_order_id(to(native.exchange_order_id())); else _state.exchange_order_id = nullptr; } diff --git a/src/server/sparkd/orderman/native_orders/NativeOrderHeader.h b/src/server/sparkd/orderman/native_orders/NativeOrderHeader.h index 7f3237b3e..175bf0238 100644 --- a/src/server/sparkd/orderman/native_orders/NativeOrderHeader.h +++ b/src/server/sparkd/orderman/native_orders/NativeOrderHeader.h @@ -14,6 +14,7 @@ class NativeOrderHeader public: OrderKey order_key; OrderKey parent_order_key; + api::orderman::ChildOrderKind child_kind; const api::Security *security; AccountName account_name; OperatorID operator_id; diff --git a/src/server/sparkd/orderman/service/OrderServiceServer.cpp b/src/server/sparkd/orderman/service/OrderServiceServer.cpp index 197e427e5..0f64788fc 100644 --- a/src/server/sparkd/orderman/service/OrderServiceServer.cpp +++ b/src/server/sparkd/orderman/service/OrderServiceServer.cpp @@ -401,7 +401,8 @@ void OrderServiceServer::create_order(const api::orderman::CreateOrderRequest& r auto header = NativeOrderHeader { generate_order_keys(1), - null_order_key(), + null_order_key(), + api::orderman::COK_UNDEFINED, sec, to(native.account_name()), to(native.operator_id()), @@ -409,8 +410,8 @@ void OrderServiceServer::create_order(const api::orderman::CreateOrderRequest& r native.time_in_force(), native.order_type(), native.manual_order_indicator(), - native.customer_or_firm(), - native.cti_code() + req.customer_or_firm(), + req.cti_code() }; auto ev = event::CreateNativeOrder { diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp new file mode 100644 index 000000000..e1fdee7bd --- /dev/null +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp @@ -0,0 +1,25 @@ +#include "SpreaderOrder.h" + +namespace bts { +namespace orderman { + +struct SpreaderOrder::PImpl +{ + PImpl() + {} +}; + +SpreaderOrder::SpreaderOrder(securities::SecurityDB &db, + api::orderman::OrderState const&os) + : SpreaderOrderBase(db,os) , me (new PImpl()) +{} + +SpreaderOrder::SpreaderOrder(securities::SecurityDB &db, OrderKey k, + api::orderman::CreateOrderRequest const&cor) + : SpreaderOrderBase(db,k,cor) , me (new PImpl()) +{} + +SpreaderOrder::~SpreaderOrder () +{} + +}} diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h new file mode 100644 index 000000000..d7aa2e8e7 --- /dev/null +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h @@ -0,0 +1,45 @@ +#pragma once + +#include +#include "server/sparkd/orderman/utils/orderman_utils.h" +#include "lib/utils/bts_chrono.h" +#include "server/sparkd/orderman/spreader_orders/SpreaderOrderBase.h" + +namespace bts { +namespace api {namespace orderman {class OrderState; class CreateSpreaderOrder;}} +namespace securities {class SecurityDB;} +namespace orderman { +class Book; + +class SpreaderOrder : public SpreaderOrderBase +{ +public: + // old order recovered from disk + SpreaderOrder(securities::SecurityDB &, + api::orderman::OrderState const&); + + // new order created by user + SpreaderOrder(securities::SecurityDB &, OrderKey , + api::orderman::CreateOrderRequest const&); + + ~SpreaderOrder(); + + void init(){}; + void on_connect(){}; + void on_disconnect(){}; + void on_update(api::orderman::UpdateSpreaderOrder const&){}; + void on_cancel(api::orderman::CancelSpreaderOrder const&){}; + void on_book(Book const&){}; + void on_time(TimeStamp const&){}; + void on_child_update(OrderKey , + api::orderman::OrderStatus , + Quantity , + Price , + std::string const&){}; + void on_external_error(std::string const&){}; +private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrderBase.h b/src/server/sparkd/orderman/spreader_orders/SpreaderOrderBase.h new file mode 100644 index 000000000..8aa01cb4e --- /dev/null +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrderBase.h @@ -0,0 +1,97 @@ +#pragma once + +#include +#include "server/sparkd/orderman/events/MDSubscription.h" +#include "lib/api/services/OrderService.pb.h" +#include "server/sparkd/orderman/events/CreateNativeOrder.h" +#include "server/sparkd/orderman/events/UpdateNativeOrder.h" +#include "server/sparkd/orderman/events/CancelNativeOrder.h" +#include "server/sparkd/orderman/native_orders/NativeOrder.h" + +namespace bts { +namespace securities {class SecurityDB;} +namespace orderman { + +class SpreaderOrderMan; + +class SpreaderOrderBase +{ +public: + // old order recovered from disk + SpreaderOrderBase(securities::SecurityDB &, + api::orderman::OrderState const&) + {} + + // new order created by user + SpreaderOrderBase(securities::SecurityDB &, OrderKey , + api::orderman::CreateOrderRequest const&) + {} + + + // class ChildOrder { + // public: + // void create (Price price, Quantity quantity) { + // _my_native_order.release(); + // _create_native_order(event::CreateNativeOrder {price,quantity,_native_order}); + // } + + // void update (Price price, Quantity quantity) { + // bts_assert(_my_native_order.get() == nullptr); + // _update_native_order(event::UpdateNativeOrder {price,quantity,_native_order}); + // } + + // void cancel() { + // bts_assert(_my_native_order.get() == nullptr); + // _cancel_native_order(event::CancelNativeOrder {_native_order}); + // } + + // private: + // ChildOrder (NativeOrder &my_order, + // std::function &c, + // std::function &u, + // std::function &x) : + // _native_order(&my_order), + // _my_native_order(&my_order), + // _create_native_order(c), + // _update_native_order(u), + // _cancel_native_order(x) + // {} + + // NativeOrder* _native_order; + // std::unique_ptr _my_native_order; + // std::function &_create_native_order; + // std::function &_update_native_order; + // std::function &_cancel_native_order; + // }; + + // class ChildOrderFactory { + // ChildOrder& operator() { + + // } + // private: + // std::vector> _free; + // std::vector> _used; + // std::shared_ptr _order_template; + // }; + + + // ChildOrderFactory get_child_order_factory(api::Security const&, + // api::orderman::ChildOrderKind, + // AccountName const&, + // OperatorID const&, + // api::BuySell); + + // void subscribe_to_book(api::Security const&for_sec); + + +private: + friend class SpreaderOrderMan; + + // std::function spreader_order_state_change_signal; + // std::function create_native_order_signal; + // std::function update_native_order_signal; + // std::function cancel_native_order_signal; + // std::function md_subscription_signal; +}; + +}}