diff --git a/src/server/sparkd/position/PositionMap.cpp b/src/server/sparkd/position/PositionMap.cpp index dc18a72da..bd9654799 100644 --- a/src/server/sparkd/position/PositionMap.cpp +++ b/src/server/sparkd/position/PositionMap.cpp @@ -41,7 +41,6 @@ const PositionUnit& PositionMap::on_fill (const Fill& f, PositionUnit &pu = _get_or_add(f.internal_account_id(), f.security_key()); auto fill_type = _fill_type(f); - // assumption : fill time is immutable switch (fill_type){ case FillType::BASE: break; @@ -69,12 +68,10 @@ const PositionUnit& PositionMap::on_fill (const Fill& f, const PositionUnit& PositionMap::on_manual_fill ( const ManualFill& mf, bool is_add){ - std::string fill_id = - std::string("manual:") + std::to_string(mf.record_id()); if(!is_add) - _manual_fill_map.erase(fill_id); + _manual_fill_map.erase(mf.record_id()); else - _manual_fill_map[fill_id] = mf; + _manual_fill_map[mf.record_id()] = mf; PositionUnit &pu =_get_or_add(mf.account_id(), mf.security_key()); switch (mf.fill_type()) { @@ -83,10 +80,10 @@ const PositionUnit& PositionMap::on_fill (const Fill& f, mf.side(), mf.price(), mf.quantity(), - fill_id, + "", is_add); break; - default: + default: break; } PositionUtilities::backwards_compat(pu); @@ -126,14 +123,15 @@ void PositionMap::get_pos (std::map& out_pos_map) cons } } } - +/////////////////////////////////////////////////////////////////////////////// +// helpers //////////////////////////////////////////////////////////////////// PositionUnit& PositionMap::_get_or_add(uint32_t account_id, uint32_t seckey){ auto &pu = _pos_map[account_id][seckey]; if (pu.record_id() == 0) { // new PU pu.set_record_id(++_pos_id); - pu.set_security_id(seckey); pu.set_account_id(account_id); + pu.set_security_id(seckey); // zeroing out all pos's _zero_out_pos_unit(pu); } @@ -152,7 +150,7 @@ void PositionMap::_reset_sod(){ // 1. // zero'ing out all pos // important : once an acct_id,sec_key entry is made - // it is never deleted, only 0's out + // it is never deleted, only 0'd out for (auto &acct_p : _pos_map) for (auto &sec_p : acct_p.second) _zero_out_pos_unit(sec_p.second); @@ -173,7 +171,7 @@ void PositionMap::_reset_sod(){ for (auto& mfill_p : _manual_fill_map) on_manual_fill(mfill_p.second,true); } - +// for backwards compatibility sake void PositionMap::_fill_account (PositionUnit& u){ if (u.account().empty()){ const auto& it = _account_id_map.find(u.account_id()); @@ -188,6 +186,10 @@ void PositionMap::_zero_out_pos_unit (bts::api::position::PositionUnit& pu){ _zero_out_pos_entry(*pu.mutable_local()); _zero_out_pos_entry(*pu.mutable_admin_day()); _zero_out_pos_entry(*pu.mutable_admin_sod()); + pu.set_sod_long_pos(0.0);pu.set_sod_long_pos(0.0); + pu.set_sod_short_pos(0.0);pu.set_sod_short_avg_price(0.0); + pu.set_day_long_pos(0.0);pu.set_day_long_avg_price(0.0); + pu.set_day_short_pos(0.0);pu.set_day_short_avg_price(0.0); } void PositionMap::_zero_out_pos_entry (bts::api::position::PositionEntry& p){ diff --git a/src/server/sparkd/position/PositionMap.h b/src/server/sparkd/position/PositionMap.h index e06851c37..1c4ad95f8 100644 --- a/src/server/sparkd/position/PositionMap.h +++ b/src/server/sparkd/position/PositionMap.h @@ -14,6 +14,8 @@ namespace bts{ namespace api { namespace admin { class AdminData;}}} namespace bts{ namespace orderman{ +// Used by the PositionService (only) for access to all +// the position data class PositionMap{ private: enum FillType{ @@ -27,9 +29,13 @@ private: // this is kept for backwards compat, to put in // the account names in PositionUnit std::map _account_id_map; + // electronic fills std::map _fill_map; - std::map _manual_fill_map; + // all the manual fills (local or admin) + std::map _manual_fill_map; + // total position state std::map> _pos_map; + // base position data google::protobuf::Timestamp _base_pos_ts; std::map> _base_pos_map; private: @@ -37,8 +43,6 @@ private: bts::api::position::PositionUnit& _get_or_add(uint32_t account_id, uint32_t seckey); void _reset_sod(); - // returns true if the account went from unpop'ed - // to populated void _fill_account (bts::api::position::PositionUnit&); void _zero_out_pos_unit (bts::api::position::PositionUnit&); void _zero_out_pos_entry (bts::api::position::PositionEntry&); diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 873eefde9..dda6736fa 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -69,11 +69,13 @@ struct PositionServiceServer::PImpl { manual_fills_publisher(manual_fills_publisher), // pnl pnl_publisher(pnl_publisher), - pnl_account_publisher(pnl_account_publisher), pnl_helper(md_client), + pnl_account_publisher(pnl_account_publisher), + pnl_helper(md_client), poll_period_ms(300), // admin admin_service(context.locate()), - admin_data(), account_map() {} + admin_data(), + account_map() {} }; PositionServiceServer::PositionServiceServer(bts::api::ServiceContext &context, @@ -103,12 +105,10 @@ PositionServiceServer::PositionServiceServer(bts::api::ServiceContext &context, me->admin_service.subscribe_admin_data() | rxcpp::operators::subscribe( [this](auto const &update) { - for (const auto &r : update.added()) { + for (const auto &r : update.added()) _set_admin_data(*r); - } - for (const auto &r : update.changed()) { + for (const auto &r : update.changed()) _set_admin_data(*r.current()); - } }); // manual fills auto all = me->manual_fills_store->retrieve_all()[manual_fills_ns];