diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 527810d21..cd4fd70ad 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -23,6 +23,7 @@ #include "lib/orderman/securities/MapSecurityDB.h" #include "lib/tracing/PerfLog.h" #include "lib/utils/PBUtils.h" +#include "lib/api/service_helpers/PositionUtilities.h" #include namespace bts { @@ -261,12 +262,15 @@ make_pos_event(api::position::PositionUnit const &pu, securities::MapSecurityDB const &o) { auto sec = o.resolve(SecurityKey(pu.security_id())); if (sec) { + uint32_t total_long_pos, total_short_pos; + bts::position::PositionUtilities::total_position(pu, + total_long_pos, + total_short_pos); FilledPositionEvent ev{ *sec, AccountID(pu.account_id()), - Quantity(pu.sod().long_pos() + pu.day().long_pos() + - pu.admin_sod().long_pos()), - Quantity(pu.sod().short_pos() + pu.day().short_pos() + - pu.admin_sod().short_pos())}; + Quantity(total_long_pos), + Quantity(total_short_pos) + }; return {ev}; } else return {}; diff --git a/src/server/sparkd/position/PositionMap.cpp b/src/server/sparkd/position/PositionMap.cpp index c3e516f52..060cebcb0 100644 --- a/src/server/sparkd/position/PositionMap.cpp +++ b/src/server/sparkd/position/PositionMap.cpp @@ -94,6 +94,19 @@ const PositionUnit& PositionMap::on_fill (const Fill& f, "", is_add); break; + case ManualFill::ADMIN_DAY: + PositionUtilities::apply_fill(*(pu.mutable_admin_day()), + mf.side(), + mf.price(), + mf.quantity(), + "", + is_add); + PositionUtilities::apply_fill(*(pu.mutable_raw_day()), + mf.side(), + mf.price(), + mf.quantity(), + "", + is_add); default: break; }