diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp index 29a8d5539..66c323838 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -19,7 +19,6 @@ _check_termination_period (250), // should also be a setting/config like above _active(true), _bookkeeping_data_ptr(), _order_services(nullptr), -_reported_state(), _curr_timestamp(), _last_check_termination_timestamp(), _state_worker(nullptr), @@ -283,21 +282,26 @@ void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, hedged_leg_data.leg_property_data().tick_size(), computed_hedge_price, hedge_quantity); } -void SpreaderOrder::_report_state (){ - if (_activated()){ - SpreaderBookkeepingData& bookkeeping_data = _bookkeeping_data(); +void SpreaderOrder::_report_state (){ + if (_activated()){ + SpreaderBookkeepingData& bookkeeping_data = _bookkeeping_data(); + auto& reported_state = bookkeeping_data.reported_state(); api::orderman::OrderStatus status = _get_order_status (); - Quantity filled_qty; Price avg_filled_price; - bookkeeping_data.total_fills(filled_qty, avg_filled_price); - _reported_state.set_status(status); - _reported_state.set_price(bookkeeping_data.price().value()); - _reported_state.set_quantity(bookkeeping_data.quantity().value()); - _reported_state.set_filled_quantity(filled_qty.value()); - _reported_state.set_avg_price(avg_filled_price.value()); - // TODO fill in filled_qty etc + if(bookkeeping_data.inited_new()){ + Quantity filled_qty; Price avg_filled_price; + bookkeeping_data.total_fills(filled_qty, avg_filled_price); + reported_state.set_status(status); + reported_state.set_price(bookkeeping_data.price().value()); + reported_state.set_quantity(bookkeeping_data.quantity().value()); + reported_state.set_filled_quantity(filled_qty.value()); + reported_state.set_avg_price(avg_filled_price.value()); + } + // if order is cons'ed from disc, with inited_new==false, + // we just publish what was given to us LOG(OrderMan, Info, "SpreaderOrder::_report_state key: {} status: {} price: {} qty: {} filled: {} abg_price: {}", - key(), status, _reported_state.price(), _reported_state.quantity(), _reported_state.filled_quantity(), _reported_state.avg_price()); - _order_services->report_state(_reported_state); + key(), status, reported_state.price(), reported_state.quantity(), + reported_state.filled_quantity(), reported_state.avg_price()); + _order_services->report_state(reported_state); } } bts::api::orderman::OrderStatus SpreaderOrder::_get_order_status () const{ diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h index f55764869..4699ce265 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h @@ -58,9 +58,6 @@ private: std::unique_ptr _bookkeeping_data_ptr; // pointer kept to send reports SpreaderOrderServices* _order_services; - // state thats sent out in report (its kept here amd modified - // vs creating a new one everytime) - bts::api::orderman::OrderState _reported_state; // timestamp of last the on_time call bts::TimeStamp _curr_timestamp; // spreader fires a periodic check diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 75460ede5..5d338aa7d 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -7,11 +7,14 @@ SpreaderBookkeepingData::SpreaderBookkeepingData (ISpreaderManager& spreader_man bts::orderman::OrderKey spreader_order_key, const api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& spreader_pao_services, - const std::vector& legs) + const std::vector& legs, + bool inited_new) : _is_live(spreader_pao_services.is_live()), _n_legs(legs.size()), -_order_def(order_def){ +_inited_new (inited_new), +_order_def(order_def), +_reported_state(){ LOG(OrderMan, Info, "SpreaderBookkeepingData.cons started key: {} n_legs: {}", spreader_order_key.value(), _n_legs); _leg_prop_data.reserve(_n_legs), _books.reserve(_n_legs), @@ -39,6 +42,19 @@ _order_def(order_def){ } LOG(OrderMan, Info, "SpreaderBookkeepingData.cons completed key: {} n_legs: {}", spreader_order_key.value(), _n_legs); } +SpreaderBookkeepingData::SpreaderBookkeepingData (ISpreaderManager& spreader_manager, + const bts::api::orderman::OrderRecord& order_record, + const SpreaderPreActivationOrderServices& spreader_pao_services, + const std::vector& legs) +: +SpreaderBookkeepingData(spreader_manager, + OrderKey(order_record.key()), + order_record.def(), + spreader_pao_services, + legs, + false){ + _reported_state=order_record.state(); +} void SpreaderBookkeepingData::total_fills (Quantity& out_quantity, Price& out_price) const{ double avg_price = 0.0; diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 335ba87be..57d5ef46b 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -21,6 +21,9 @@ class SpreaderBookkeepingData private: const bool _is_live; const size_t _n_legs; + // when the order is not created from the disk + // (ie created live) this is set to true + const bool _inited_new; std::vector _leg_prop_data; std::vector _books; const api::orderman::OrderDefinition _order_def; @@ -31,6 +34,9 @@ private: std::vector> _hedgers; std::vector _leg_data; boost::container::flat_map _sec_key_to_index; + // state thats sent out in report (its kept here amd modified + // vs creating a new one everytime) + bts::api::orderman::OrderState _reported_state; Price _price; Quantity _quantity; public: @@ -38,6 +44,11 @@ public: bts::orderman::OrderKey spreader_order_key, const api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& spreader_pao_services, + const std::vector& legs, + bool inited_new=true); + SpreaderBookkeepingData (ISpreaderManager& spreader_manager, + const bts::api::orderman::OrderRecord& order_record, + const SpreaderPreActivationOrderServices& spreader_pao_services, const std::vector& legs); SpreaderBookkeepingData()=delete; SpreaderBookkeepingData (const SpreaderBookkeepingData&) = delete; @@ -101,5 +112,11 @@ public: _price = price; _quantity = quantity; } + bts::api::orderman::OrderState& reported_state(){ + return _reported_state; + } + bool inited_new () const{ + return _inited_new; + } }; }} diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index e67ad9729..6b1b1e574 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -25,18 +25,26 @@ void SpreaderStartStateWorker::on_init_new(const api::orderman::OrderDefinition& _spreader->_bookkeeping_data_ptr = std::make_unique(*_spreader, _spreader->key(), order_def, spreader_pao_services, spreader_legs); else { - _spreader->_bookkeeping_data_ptr = std::make_unique(*_spreader, _spreader->key(), order_def, spreader_pao_services, std::vector()); + _spreader->_bookkeeping_data_ptr = std::make_unique(*_spreader, + _spreader->key(), + order_def, + spreader_pao_services, + std::vector()); // if securities can not be resolved, the order is terminated LOG(OrderMan, Error, "SpreaderStartStateWorker.on_init_new key: {} , could not resolve securities", _spreader->key().value()); std::string msg = "Could not resolve securities"; _spreader->_transform_to_END (&msg); } } -void SpreaderStartStateWorker::on_init_recovered(const bts::api::orderman::OrderRecord& order_record, const SpreaderPreActivationOrderServices& spreader_pao_services) +void SpreaderStartStateWorker::on_init_recovered(const bts::api::orderman::OrderRecord& order_record, + const SpreaderPreActivationOrderServices& spreader_pao_services) { bts_assert(!_spreader->_inited()); // we are not handling this yet, so lets send it directly to END - _spreader->_bookkeeping_data_ptr = std::make_unique(*_spreader, _spreader->key(), order_record.def(), spreader_pao_services, std::vector()); + _spreader->_bookkeeping_data_ptr = std::make_unique(*_spreader, + order_record, + spreader_pao_services, + std::vector()); LOG(OrderMan, Warn, "SpreaderStartStateWorker.on_init_recovered key: {} , going to END", _spreader->key().value()); std::string msg = "Recovered spreader orders and not supported"; _spreader->_transform_to_END (&msg);