rudimentary fix orders seem to work
This commit is contained in:
1 parent
95c589f594
commit
6772c77e01
15 files changed
+116
-63
No files matched your search
@@ -18,11 +18,21 @@
|
||||
|
||||
namespace bts {
|
||||
namespace fix {
|
||||
|
||||
struct DropCopySession::PImpl
|
||||
{
|
||||
rxcpp::observable<bts::api::orderman::OrdersUpdate> filtered_orders;
|
||||
rxcpp::observable<bts::api::orderman::FillsUpdate> filtered_fills;
|
||||
PImpl()
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
DropCopySession::DropCopySession(bts::api::ServiceContext& sc, IFixRouter& rt, const FIX::SessionID& id) :
|
||||
SessionBase(sc, rt, id),
|
||||
SessionBase(sc, rt, id),
|
||||
_orderservice( sc.locate<api::orderman::OrderService>() ),
|
||||
_order_cache()
|
||||
_order_cache(),
|
||||
me(new PImpl())
|
||||
{
|
||||
}
|
||||
|
||||
@@ -39,9 +49,11 @@ void DropCopySession::onLogon(const FIX::SessionID& sessionID)
|
||||
|
||||
void DropCopySession::onLogout(const FIX::SessionID& sessionID)
|
||||
{
|
||||
me->filtered_orders.finally([] () {} );
|
||||
me->filtered_fills.finally([] () {} );
|
||||
|
||||
bts_assert(sessionID == _sess);
|
||||
LOG(Fix, Info, "Logged out {}", sessionID.toString());
|
||||
|
||||
}
|
||||
|
||||
void DropCopySession::fromApp(const FIX::Message &message,const FIX::SessionID &sessionID)
|
||||
@@ -107,7 +119,7 @@ void DropCopySession::subscribe_fills_and_orders(const FIX::SessionID sessionID)
|
||||
//var on_orders = _orderservice.Value.subscribei_orders().Naggle(interval, scheduler).PermissionFilter(_adminobservable).Table().Cache();
|
||||
//var on_fills = _orderservice.Value.subscribei_fills().Naggle(interval, scheduler).PermissionFilter(_adminobservable).Table().Cache();
|
||||
|
||||
auto&& filtered_orders = _adminobservable.combine_latest(_orderservice.subscribe_orders())
|
||||
me->filtered_orders = _adminobservable.combine_latest(_orderservice.subscribe_orders())
|
||||
.map( [] (auto& tuple) -> auto
|
||||
{
|
||||
std::shared_ptr<AdminModelWrapper> admin = std::get<0>(tuple);
|
||||
@@ -131,12 +143,13 @@ void DropCopySession::subscribe_fills_and_orders(const FIX::SessionID sessionID)
|
||||
|
||||
bts::api::orderman::OrdersUpdate newupdate(all, added, changed, removed);
|
||||
return newupdate;
|
||||
}).buffer_with_time( std::chrono::milliseconds(500) );
|
||||
});
|
||||
//.buffer_with_time( std::chrono::milliseconds(500) );
|
||||
|
||||
filtered_orders.subscribe([this, &sessionID](const auto& updatevec)
|
||||
me->filtered_orders.subscribe([this, sessionID](const auto& update)
|
||||
{
|
||||
for(auto& update : updatevec)
|
||||
{
|
||||
// for(auto& update : updatevec)
|
||||
// {
|
||||
for(auto& order : update.added())
|
||||
{
|
||||
auto&& ostat = build_order_status(sessionID, *order);
|
||||
@@ -151,10 +164,10 @@ void DropCopySession::subscribe_fills_and_orders(const FIX::SessionID sessionID)
|
||||
auto&& ostat = build_order_status(sessionID, *order.current(), true);
|
||||
_router.send(ostat, sessionID);
|
||||
}
|
||||
}
|
||||
// }
|
||||
});
|
||||
|
||||
auto&& filtered_fills = _adminobservable.combine_latest(_orderservice.subscribe_fills())
|
||||
me->filtered_fills = _adminobservable.combine_latest(_orderservice.subscribe_fills())
|
||||
.map( [] (auto& tuple) -> auto
|
||||
{
|
||||
std::shared_ptr<AdminModelWrapper> admin = std::get<0>(tuple);
|
||||
@@ -178,12 +191,13 @@ void DropCopySession::subscribe_fills_and_orders(const FIX::SessionID sessionID)
|
||||
|
||||
bts::api::orderman::FillsUpdate newupdate(all, added, changed, removed);
|
||||
return newupdate;
|
||||
}).buffer_with_time( std::chrono::milliseconds(500) );
|
||||
});
|
||||
//.buffer_with_time( std::chrono::milliseconds(500) );
|
||||
|
||||
filtered_fills.subscribe([this, &sessionID](const auto& updatevec)
|
||||
me->filtered_fills.subscribe([this, sessionID](const auto& update)
|
||||
{
|
||||
for(auto& update : updatevec)
|
||||
{
|
||||
// for(auto& update : updatevec)
|
||||
// {
|
||||
for(auto& fill : update.added())
|
||||
{
|
||||
auto&& fi = build_fill(sessionID, *fill);
|
||||
@@ -194,7 +208,7 @@ void DropCopySession::subscribe_fills_and_orders(const FIX::SessionID sessionID)
|
||||
auto&& fi = build_fill(sessionID, *fill.current(), true);
|
||||
_router.send(fi, sessionID);
|
||||
}
|
||||
}
|
||||
// }
|
||||
});
|
||||
}
|
||||
|
||||
@@ -336,7 +350,8 @@ FIX44::ExecutionReport DropCopySession::build_order_status(const FIX::SessionID&
|
||||
auto ts = order.state().last_change();
|
||||
report.setField(FIX::FIELD::TransactTime, google::protobuf::util::TimeUtil::ToString(ts));
|
||||
|
||||
report.setField(FIX::FIELD::Text, FIX::Text(order.state().last_msg()));
|
||||
if(order.state().last_msg() != "")
|
||||
report.setField(FIX::FIELD::Text, FIX::Text(order.state().last_msg()));
|
||||
sec = resolve_execution_report_security(sec, report);
|
||||
if (native.exchange_order_id() != "")
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user