From 0302c44fc0c72e433aa1eca1f541dcdd1bb7af76 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 28 Mar 2024 17:13:01 +0000 Subject: [PATCH] refactor: Split a few domain files off into their own project --- CMakeLists.txt | 2 ++ .../cmake/GetLinuxServerLinkLibraries.cmake | 1 + src/lib/domain_model/Security.h | 2 +- src/lib/domain_model/sod.cpp | 21 ------------- src/lib/domain_model/sod.h | 13 -------- src/lib/md/ISyntheticSecurityService.h | 2 +- src/lib/md/MBOProcessor.h | 2 +- src/lib/md/SecurityCache.h | 3 +- src/lib/md/SecurityDB.h | 4 +-- src/lib/md/SecurityOracle.h | 3 +- src/lib/md/SecurityPtr.h | 5 ++-- src/lib/md/SyntheticSecurityService.h | 4 ++- src/lib/md/common.h | 2 +- src/lib/orderman/CreateOrderMsg.h | 2 +- src/lib/orderman/OrderServiceServer.cpp | 5 +--- .../orderman/ccapi/CCAPIDeribitOrderMux.cpp | 5 ++-- src/lib/orderman/ccapi/CCAPIOrderState.h | 3 +- src/lib/orderman/events/CancelRejectEvent.h | 6 ++-- .../orderman/events/NewExecutionReportEvent.h | 3 +- .../gateways/CCAPIExecutionGateway.cpp | 4 +-- .../orderman/gateways/CCAPIExecutionGateway.h | 9 ++---- .../orderman/gateways/EMExecutionGateway.cpp | 12 ++++---- .../orderman/gateways/EMExecutionGateway.h | 3 +- .../gateways/FakeExecutionGateway.cpp | 2 +- .../orderman/gateways/FakeExecutionGateway.h | 1 + .../gateways/GLBXExecutionGateway.cpp | 14 +++++---- .../orderman/gateways/GLBXExecutionGateway.h | 8 +++++ .../gateways/GLBXiLink3ExecutionGateway.h | 7 +++++ .../orderman/gateways/ICEExecutionGateway.h | 3 ++ .../gateways/sim/SimExecutionGateway.cpp | 12 ++------ .../gateways/sim/SimExecutionGateway.h | 4 +-- .../sim/SimExecutionGatewayFactory.cpp | 9 +++--- .../gateways/sim/SimExecutionGatewayFactory.h | 4 +-- src/lib/orderman/ilink3/IL3SecDB.h | 2 +- src/lib/orderman/ilink3/ILink3Utils.h | 19 ++++-------- src/lib/orderman/orderman_utils/Book.h | 3 +- src/lib/orderman/orderman_utils/BookUtils.h | 6 ++-- .../orderman_utils/ExchangeOpenOrders.h | 5 ++-- .../orderman_utils/ExchangePosition.h | 5 ++-- src/lib/orderman/orderman_utils/Formatter.h | 5 ++-- .../orderman/orderman_utils/orderman_common.h | 2 +- src/lib/orderman/orders/EMNativeOrder.cpp | 13 +------- src/lib/orderman/orders/EMNativeOrder.h | 4 +-- src/lib/orderman/orders/GLBXNativeOrder.cpp | 6 +--- .../orderman/orders/algo/AlgoWrapperOrder.cpp | 5 ++-- src/lib/orderman/orders/algo/ChildTemplate.h | 6 ++-- .../orders/algo/IBeforeLaunchAlgoServices.h | 2 +- src/lib/orderman/orders/algo/PositionUpdate.h | 2 +- .../algo/algo_orders/TaskingEyeAlgo.cpp | 8 ++--- .../orders/algo/algo_orders/TaskingEyeAlgo.h | 4 +-- .../orders/algo/algo_orders/VolAlgo.cpp | 9 ++---- .../orders/algo/algo_orders/VolAlgo.h | 5 ++-- .../spreader/ISpreaderManager.h | 5 ++-- .../spreader/SpreaderFractionalQtyHelper.cpp | 9 +++--- .../spreader/SpreaderFractionalQtyHelper.h | 3 +- .../spreader/SpreaderUtils.cpp | 5 ++-- .../spreader_orders/spreader/SpreaderUtils.h | 2 +- .../SpreaderPreActivationOrderServices.h | 3 +- .../spreader_orders/tests/spreader_tests.cpp | 5 ++-- src/lib/orderman/securities/ISecurityDB.h | 4 ++- src/lib_domain/CMakeLists.txt | 17 +++++++++++ .../common.h => lib_domain/domain/domain.h} | 4 +-- .../domain/security_key.h} | 2 +- src/lib_domain/domain/sod.cpp | 30 +++++++++++++++++++ src/lib_domain/domain/sod.h | 10 +++++++ .../sparkd/md/platforms/emumba/EmMDListener.h | 3 +- 66 files changed, 205 insertions(+), 188 deletions(-) delete mode 100644 src/lib/domain_model/sod.cpp delete mode 100644 src/lib/domain_model/sod.h create mode 100644 src/lib_domain/CMakeLists.txt rename src/{lib/domain_model/common.h => lib_domain/domain/domain.h} (95%) rename src/{lib/domain_model/SecurityKey.h => lib_domain/domain/security_key.h} (76%) create mode 100644 src/lib_domain/domain/sod.cpp create mode 100644 src/lib_domain/domain/sod.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 248c95b93..2afec49f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,7 @@ if(WIN32) add_compile_definitions(APP_DATA_DIR="\$\{APPDATA\}/bts/") # subdirs add_subdirectory(src/lib_system) + add_subdirectory(src/lib_domain) add_subdirectory(src/lib) else() # make sparkd look for libspark.so in its directory @@ -112,6 +113,7 @@ else() # Always add lib_system (all builds depends on it) add_subdirectory(src/lib_system) + add_subdirectory(src/lib_domain) endif() # subdirs diff --git a/src/lib/cmake/GetLinuxServerLinkLibraries.cmake b/src/lib/cmake/GetLinuxServerLinkLibraries.cmake index 5d2fbd345..8d3b423bb 100644 --- a/src/lib/cmake/GetLinuxServerLinkLibraries.cmake +++ b/src/lib/cmake/GetLinuxServerLinkLibraries.cmake @@ -1,6 +1,7 @@ function(get_link_libraries dest) set(${dest} bts-system + bts-domain protobuf double-conversion boost_system diff --git a/src/lib/domain_model/Security.h b/src/lib/domain_model/Security.h index 8e690ec0c..d668cb095 100644 --- a/src/lib/domain_model/Security.h +++ b/src/lib/domain_model/Security.h @@ -3,7 +3,7 @@ #include "lib/domain_model/Security.pb.h" #include "lib/domain_model/Side.h" #include "lib/domain_model/Venue.h" -#include "lib/domain_model/common.h" +#include "domain/domain.h" #include "lib/utils/bts_assert.h" #include "lib/utils/datetime.h" #include "system/FMT_IMPL.h" diff --git a/src/lib/domain_model/sod.cpp b/src/lib/domain_model/sod.cpp deleted file mode 100644 index 70ab8d41f..000000000 --- a/src/lib/domain_model/sod.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "sod.h" -#include "lib/config/config.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" - -namespace bts { -namespace sod { - -datetime::PTime get_sod_for(datetime::PTime const &this_time) { - const auto &sod = config::get(); - auto sod_time = datetime::make_ptime( - this_time.date().year(), this_time.date().month().as_number(), - this_time.date().day().as_number(), sod.sod_hh(), sod.sod_mm(), 0, 0); - if (sod_time > this_time) - sod_time -= boost::gregorian::date_duration(1); - return sod_time; -} - -datetime::PTime get_current_sod() { return get_sod_for(datetime::local_now()); } - -} // namespace sod -} // namespace bts diff --git a/src/lib/domain_model/sod.h b/src/lib/domain_model/sod.h deleted file mode 100644 index b66229f0f..000000000 --- a/src/lib/domain_model/sod.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "lib/utils/datetime.h" -#include - -namespace bts { -namespace sod { - -datetime::PTime get_sod_for(datetime::PTime const &this_time); -datetime::PTime get_current_sod(); - -} // namespace sod -} // namespace bts diff --git a/src/lib/md/ISyntheticSecurityService.h b/src/lib/md/ISyntheticSecurityService.h index d982e7254..2286d0f5f 100644 --- a/src/lib/md/ISyntheticSecurityService.h +++ b/src/lib/md/ISyntheticSecurityService.h @@ -1,7 +1,7 @@ #pragma once +#include "domain/security_key.h" #include "lib/api/services/SyntheticSecurityService.pb.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/utils/Event.h" #include diff --git a/src/lib/md/MBOProcessor.h b/src/lib/md/MBOProcessor.h index 3e4d3f655..ebf2bf47c 100644 --- a/src/lib/md/MBOProcessor.h +++ b/src/lib/md/MBOProcessor.h @@ -2,8 +2,8 @@ #include "ExchangeOrderKey.h" #include "IntPrice.h" #include "MDProducerHandle.h" +#include "domain/security_key.h" #include "lib/domain_model/Security.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/utils/TimeStamp.h" #include "system/FMT_IMPL.h" diff --git a/src/lib/md/SecurityCache.h b/src/lib/md/SecurityCache.h index 075cd6b83..79d513f56 100644 --- a/src/lib/md/SecurityCache.h +++ b/src/lib/md/SecurityCache.h @@ -2,9 +2,10 @@ #include "MDConsumerHandle.h" #include "SecurityPtr.h" +#include "domain/security_key.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/md/ExchangeSecurityKey.h" + #include namespace bts { diff --git a/src/lib/md/SecurityDB.h b/src/lib/md/SecurityDB.h index 59ceafd3b..ad425fe2b 100644 --- a/src/lib/md/SecurityDB.h +++ b/src/lib/md/SecurityDB.h @@ -3,10 +3,10 @@ #include "SecurityPtr.h" #include "UserSymbol.h" #include "common.h" +#include "domain/domain.h" +#include "domain/security_key.h" #include "lib/api/services/SyntheticSecurityService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" #include "lib/md/MDProducerHandle.h" #include "lib/utils/ResultEnum.h" #include "lib/utils/datetime.h" diff --git a/src/lib/md/SecurityOracle.h b/src/lib/md/SecurityOracle.h index 8e8a3f664..416c8631c 100644 --- a/src/lib/md/SecurityOracle.h +++ b/src/lib/md/SecurityOracle.h @@ -1,8 +1,9 @@ #pragma once -#include "lib/domain_model/SecurityKey.h" +#include "domain/security_key.h" #include "lib/md/ExchangeSecurityKey.h" #include "lib/md/SecurityCache.h" + #include #include diff --git a/src/lib/md/SecurityPtr.h b/src/lib/md/SecurityPtr.h index 0debb92e2..153759978 100644 --- a/src/lib/md/SecurityPtr.h +++ b/src/lib/md/SecurityPtr.h @@ -1,6 +1,7 @@ #pragma once -#include "lib/domain_model/SecurityKey.h" +#include "domain/security_key.h" + #include namespace bts { @@ -12,4 +13,4 @@ namespace md { typedef std::shared_ptr SecurityPtr; } -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/md/SyntheticSecurityService.h b/src/lib/md/SyntheticSecurityService.h index c7e091c74..76887e4a9 100644 --- a/src/lib/md/SyntheticSecurityService.h +++ b/src/lib/md/SyntheticSecurityService.h @@ -1,9 +1,11 @@ #pragma once + #include "ISyntheticSecurityService.h" +#include "domain/security_key.h" #include "lib/api/services/SyntheticSecurityService.pb.h" #include "lib/api/services/SyntheticSecurityService.server.pb.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/md/common.h" + #include #include diff --git a/src/lib/md/common.h b/src/lib/md/common.h index 475e2939e..852dab56b 100644 --- a/src/lib/md/common.h +++ b/src/lib/md/common.h @@ -1,8 +1,8 @@ #pragma once #include "IntPrice.h" +#include "domain/security_key.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/md/protos/co2.pb.h" #include "lib/utils/datetime.h" #include "system/export.h" diff --git a/src/lib/orderman/CreateOrderMsg.h b/src/lib/orderman/CreateOrderMsg.h index fe9c23f55..e1c65b13c 100644 --- a/src/lib/orderman/CreateOrderMsg.h +++ b/src/lib/orderman/CreateOrderMsg.h @@ -1,7 +1,7 @@ #pragma once +#include "domain/domain.h" #include "lib/domain_model/Security.h" -#include "lib/domain_model/common.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/PBUtils.h" #include "system/FMT_IMPL.h" diff --git a/src/lib/orderman/OrderServiceServer.cpp b/src/lib/orderman/OrderServiceServer.cpp index c83dd20fb..613d61cb0 100644 --- a/src/lib/orderman/OrderServiceServer.cpp +++ b/src/lib/orderman/OrderServiceServer.cpp @@ -1,4 +1,5 @@ #include "OrderServiceServer.h" +#include "domain/domain.h" #include "lib/api/public/ServiceContext.h" #include "lib/api/public/StatefulPublisher.h" #include "lib/api/services/AdminService.client.pb.h" @@ -6,10 +7,8 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/api/services/PositionService.client.pb.h" #include "lib/config/config.h" -#include "lib/config/protos/jetfix.pb.h" #include "lib/config/protos/orderman_cfg.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" #include "lib/logging/logging.h" #include "lib/md/MDClient.h" #include "lib/md/MDConsumer.h" @@ -29,10 +28,8 @@ #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" #include "lib/plugin/SparkServices.h" -#include "lib/plugin/plugin.h" #include "lib/utils/PBUtils.h" #include "lib/utils/thread_manager.h" -#include "lib/utils/type_name.h" #include "system/bts_chrono.h" #include diff --git a/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp b/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp index e8dee240d..27c473379 100644 --- a/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp +++ b/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp @@ -2,9 +2,9 @@ #include "CCAPIOrderState.h" #include "CCAPISingleOrderManager.h" #include "ccapi_cpp/ccapi_session.h" +#include "domain/security_key.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/logging/logging.h" #include "lib/md/SecurityOracle.h" #include "lib/orderman/CancelOrderMsg.h" @@ -18,6 +18,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_assert.h" + #include #include #include @@ -953,4 +954,4 @@ void CCAPIDeribitOrderMux::_send_buffered_orders(uint32_t sec_id) { "n_buffered_orders: {}", me->buffered_creates.size()); } -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib/orderman/ccapi/CCAPIOrderState.h b/src/lib/orderman/ccapi/CCAPIOrderState.h index bf9b1cd6a..e711f6984 100644 --- a/src/lib/orderman/ccapi/CCAPIOrderState.h +++ b/src/lib/orderman/ccapi/CCAPIOrderState.h @@ -1,10 +1,11 @@ #pragma once + #include "CCAPIOrderCallbackMsgs.h" +#include "domain/security_key.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain/OrderStatus.h" #include "lib/domain_model/Security.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/os/os.h" #include "system/FMT_IMPL.h" diff --git a/src/lib/orderman/events/CancelRejectEvent.h b/src/lib/orderman/events/CancelRejectEvent.h index aa0e44667..4991a1950 100644 --- a/src/lib/orderman/events/CancelRejectEvent.h +++ b/src/lib/orderman/events/CancelRejectEvent.h @@ -1,14 +1,14 @@ #pragma once -#include - +#include "domain/domain.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/common.h" #include "lib/mercury/events/Event.h" #include "lib/mercury/synopsis/NoSynopsis.h" #include "lib/orderman/orderman_utils/CancelReject.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include + namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/NewExecutionReportEvent.h b/src/lib/orderman/events/NewExecutionReportEvent.h index 87fb02224..6f2572bb4 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.h +++ b/src/lib/orderman/events/NewExecutionReportEvent.h @@ -1,7 +1,7 @@ #pragma once +#include "domain/domain.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/common.h" #include "lib/mercury/common/mercury_common.h" #include "lib/mercury/events/Event.h" #include "lib/mercury/synopsis/CacheAll.h" @@ -10,7 +10,6 @@ #include "lib/tracing/PerfLog.h" #include - #include namespace bts { diff --git a/src/lib/orderman/gateways/CCAPIExecutionGateway.cpp b/src/lib/orderman/gateways/CCAPIExecutionGateway.cpp index ab23ff3c0..8460731bd 100644 --- a/src/lib/orderman/gateways/CCAPIExecutionGateway.cpp +++ b/src/lib/orderman/gateways/CCAPIExecutionGateway.cpp @@ -1,4 +1,6 @@ #include "CCAPIExecutionGateway.h" +#include "domain/domain.h" +#include "domain/security_key.h" #include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/api/services/AdminService.pb.h" #include "lib/api/services/OrderService.pb.h" @@ -6,8 +8,6 @@ #include "lib/config/protos/toggles.pb.h" #include "lib/domain_model/Security.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" #include "lib/logging/logging.h" #include "lib/md/SecurityOracle.h" #include "lib/orderman/CancelOrderMsg.h" diff --git a/src/lib/orderman/gateways/CCAPIExecutionGateway.h b/src/lib/orderman/gateways/CCAPIExecutionGateway.h index 565e52f2d..483f4b53c 100644 --- a/src/lib/orderman/gateways/CCAPIExecutionGateway.h +++ b/src/lib/orderman/gateways/CCAPIExecutionGateway.h @@ -1,18 +1,13 @@ #pragma once #include "IExecutionGateway.h" -#include "lib/api/services/AdminService.pb.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/RFQMsg.h" +#include "lib/md/SecurityOracle.h" #include "lib/orderman/ccapi/CCAPIOrderState.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" + #include -#include // CCAPIExecutionGateway is created by the ExecutionGatewayFactory. It is // contained in SessionServicesData. diff --git a/src/lib/orderman/gateways/EMExecutionGateway.cpp b/src/lib/orderman/gateways/EMExecutionGateway.cpp index a7f2dc7ed..c893876eb 100644 --- a/src/lib/orderman/gateways/EMExecutionGateway.cpp +++ b/src/lib/orderman/gateways/EMExecutionGateway.cpp @@ -1,10 +1,10 @@ #include "EMExecutionGateway.h" +#include "domain/domain.h" +#include "domain/security_key.h" #include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/api/services/AdminService.pb.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" #include "lib/logging/logging.h" #include "lib/md/SecurityOracle.h" #include "lib/orderman/CancelOrderMsg.h" @@ -25,15 +25,15 @@ #include "lib/utils/bts_assert.h" #include "lib/utils/datetime.h" //#include "lib/utils/helper_macros.h" -#include "server/sparkd/md/platforms/emumba/EmMDListener.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" - #include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/config/config.h" #include "lib/config/protos/toggles.pb.h" #include "lib/domain_model/Security.h" #include "lib/utils/PBUtils.h" #include "lib/utils/Uuid.h" +#include "server/sparkd/md/platforms/emumba/EmMDListener.h" +#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" + #include #include #include @@ -705,4 +705,4 @@ const api::Security *EMExecutionGateway::_get_security( } } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/gateways/EMExecutionGateway.h b/src/lib/orderman/gateways/EMExecutionGateway.h index 63a14a968..a36711f48 100644 --- a/src/lib/orderman/gateways/EMExecutionGateway.h +++ b/src/lib/orderman/gateways/EMExecutionGateway.h @@ -2,11 +2,12 @@ #include "IExecutionGateway.h" #include "lib/api/services/AdminService.pb.h" +#include "lib/md/SecurityOracle.h" #include "lib/orderman/CancelOrderMsg.h" #include "lib/orderman/CancelReplaceOrderMsg.h" #include "lib/orderman/CreateOrderMsg.h" #include "lib/orderman/RFQMsg.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" + #include #include diff --git a/src/lib/orderman/gateways/FakeExecutionGateway.cpp b/src/lib/orderman/gateways/FakeExecutionGateway.cpp index cad44a998..f42cc61fd 100644 --- a/src/lib/orderman/gateways/FakeExecutionGateway.cpp +++ b/src/lib/orderman/gateways/FakeExecutionGateway.cpp @@ -1,8 +1,8 @@ #include "FakeExecutionGateway.h" +#include "domain/domain.h" #include "lib/api/services/AdminService.pb.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" #include "lib/logging/logging.h" #include "lib/orderman/CancelOrderMsg.h" #include "lib/orderman/CancelReplaceOrderMsg.h" diff --git a/src/lib/orderman/gateways/FakeExecutionGateway.h b/src/lib/orderman/gateways/FakeExecutionGateway.h index 904022f71..333675501 100644 --- a/src/lib/orderman/gateways/FakeExecutionGateway.h +++ b/src/lib/orderman/gateways/FakeExecutionGateway.h @@ -1,6 +1,7 @@ #pragma once #include "IExecutionGateway.h" +#include "lib/md/SecurityOracle.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/gateways/GLBXExecutionGateway.cpp b/src/lib/orderman/gateways/GLBXExecutionGateway.cpp index 31a0337c3..3167bf521 100644 --- a/src/lib/orderman/gateways/GLBXExecutionGateway.cpp +++ b/src/lib/orderman/gateways/GLBXExecutionGateway.cpp @@ -1,18 +1,20 @@ #include "GLBXExecutionGateway.h" +#include "lib/config/protos/jetfix.pb.h" #include "lib/jetfix/codec/MessageDefinitions.h" -#include "lib/jetfix/common/OutFIX.h" +#include "lib/jetfix/common/OutFIXPtr.h" #include "lib/jetfix/gateway/JetFIXGateway.h" #include "lib/logging/logging.h" #include "lib/md/SecurityOracle.h" -#include "lib/orderman/events/CancelRejectEvent.h" -#include "lib/orderman/events/GatewayStatusChangeEvent.h" -#include "lib/orderman/events/NewExecutionReportEvent.h" +#include "lib/mercury/events/Update.h" #include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/orderman/orderman_utils/CancelReject.h" +#include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" +#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/tracing/bts_trace.h" -#include "lib/utils/TimeStamp.h" -#include "system/bts_chrono.h" +#include +#include #include namespace bts { diff --git a/src/lib/orderman/gateways/GLBXExecutionGateway.h b/src/lib/orderman/gateways/GLBXExecutionGateway.h index 3e19c78f8..fa0e21021 100644 --- a/src/lib/orderman/gateways/GLBXExecutionGateway.h +++ b/src/lib/orderman/gateways/GLBXExecutionGateway.h @@ -1,6 +1,14 @@ #pragma once #include "IExecutionGateway.h" +#include "lib/config/protos/jetfix.pb.h" +#include "lib/jetfix/codec/MessageDefinitions.h" +#include "lib/jetfix/common/OutFIXPtr.h" +#include "lib/md/SecurityOracle.h" +#include "lib/mercury/events/Update.h" +#include "lib/orderman/OrderMsg.h" + +#include namespace bts { namespace orderman { diff --git a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h index 32da66a94..f16e91885 100644 --- a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h +++ b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h @@ -1,8 +1,15 @@ #pragma once #include "IExecutionGateway.h" +#include "lib/config/protos/jetfix.pb.h" +#include "lib/jetfix/common/OutFIXPtr.h" +#include "lib/md/SecurityOracle.h" +#include "lib/mercury/events/Update.h" +#include "lib/orderman/OrderMsg.h" #include "lib/orderman/gateways/GLBXiLink3ExecutionGatewayState.h" +#include + namespace bts { namespace jetfix { struct SessionName; diff --git a/src/lib/orderman/gateways/ICEExecutionGateway.h b/src/lib/orderman/gateways/ICEExecutionGateway.h index c968c1847..6cd462553 100644 --- a/src/lib/orderman/gateways/ICEExecutionGateway.h +++ b/src/lib/orderman/gateways/ICEExecutionGateway.h @@ -1,6 +1,9 @@ #pragma once #include "IExecutionGateway.h" +#include "lib/config/protos/jetfix.pb.h" +#include "lib/jetfix/codec/MessageDefinitions.h" +#include "lib/md/SecurityOracle.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index e7d89cbf4..578e7bb72 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -1,16 +1,12 @@ #include "SimExecutionGateway.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/ApiUnitTestService.pb.h" +#include "domain/domain.h" +#include "domain/security_key.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" #include "lib/logging/logging.h" #include "lib/md/GeneralSecurityIndex.h" #include "lib/md/IntPrice.h" -#include "lib/md/MDClient.h" -#include "lib/md/MDProducer.h" #include "lib/md/PriceSize.h" #include "lib/md/Shm/MDStructure.h" #include "lib/orderman/OrderMsg.h" @@ -23,14 +19,10 @@ #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/os/os.h" #include "lib/tracing/bts_trace.h" -#include "lib/utils/Puid.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/Uuid.h" #include "lib/utils/bts_assert.h" -#include "lib/utils/helper_macros.h" #include "lib/utils/thread_manager.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" -#include "system/bts_chrono.h" #include "system/time_stamp.h" #include diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.h b/src/lib/orderman/gateways/sim/SimExecutionGateway.h index 9c372c6d4..52236d271 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.h @@ -1,8 +1,8 @@ #pragma once +#include "domain/domain.h" +#include "domain/security_key.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" #include "lib/md/GeneralSecurityIndex.h" #include "lib/md/MDClient.h" #include "lib/md/MDProducer.h" diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp index 0e90fb0bf..5dbff7005 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp @@ -1,11 +1,10 @@ #include "SimExecutionGatewayFactory.h" #include "SimExecutionGateway.h" +#include "lib/config/protos/jetfix.pb.h" #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" -#include "lib/md/common.h" -#include "lib/utils/LockBox.h" #include "lib/utils/bts_assert.h" -#include + #include #include @@ -32,7 +31,7 @@ std::shared_ptr SimExecutionGatewayFactory::get_getayeway( } std::shared_ptr rv = nullptr; gateway_map.lock( - [&, venue](std::map> + [&, venue](std::map> &data) { auto it = data.find(venue); if (it == data.end()) { @@ -72,4 +71,4 @@ bool SimExecutionGatewayFactory::is_sim_execution_on(api::Venue venue) { return false; } -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h index 8fd6e00ec..4f7d8cd73 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h @@ -1,8 +1,8 @@ #pragma once #include "lib/domain_model/Security.pb.h" -#include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/utils/LockBox.h" + #include #include @@ -13,7 +13,7 @@ class SimExecutionGateway; class SimExecutionGatewayFactory { private: bts::utils::LockBox< - std::map>> + std::map>> gateway_map; private: diff --git a/src/lib/orderman/ilink3/IL3SecDB.h b/src/lib/orderman/ilink3/IL3SecDB.h index f58ac8b48..b8bdb06e6 100644 --- a/src/lib/orderman/ilink3/IL3SecDB.h +++ b/src/lib/orderman/ilink3/IL3SecDB.h @@ -1,7 +1,7 @@ #pragma once +#include "domain/security_key.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/md/ExchangeSecurityKey.h" #include "lib/md/SecurityOracle.h" diff --git a/src/lib/orderman/ilink3/ILink3Utils.h b/src/lib/orderman/ilink3/ILink3Utils.h index 6b5fd5cd2..db4080fa2 100644 --- a/src/lib/orderman/ilink3/ILink3Utils.h +++ b/src/lib/orderman/ilink3/ILink3Utils.h @@ -1,25 +1,18 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/orderman_utils/orderman_common.h" - +#include "domain/domain.h" #include "generated/ClearingAcctType.h" #include "generated/CustOrderCapacity.h" -#include "generated/ManualOrdInd.h" #include "generated/ManualOrdIndReq.h" #include "generated/OrderType.h" #include "generated/OrderTypeReq.h" #include "generated/SMPI.h" #include "generated/SideReq.h" #include "generated/TimeInForce.h" +#include "lib/api/services/OrderService.pb.h" +#include "lib/domain_model/Security.pb.h" -#include - -namespace bts { -namespace orderman { -namespace ilink3 { +namespace bts::orderman::ilink3 { iLinkBinary::SideReq::Value map_side(api::Side side); api::Side map_side(iLinkBinary::SideReq::Value side); @@ -50,6 +43,4 @@ const char *translate_negotiation_reject(int reason); const char *translate_establish_reject(int reason); const char *translate_terminate(int reason); -} // namespace ilink3 -} // namespace orderman -} // namespace bts +} // namespace bts::orderman::ilink3 diff --git a/src/lib/orderman/orderman_utils/Book.h b/src/lib/orderman/orderman_utils/Book.h index d59f8f85b..834feb078 100644 --- a/src/lib/orderman/orderman_utils/Book.h +++ b/src/lib/orderman/orderman_utils/Book.h @@ -1,8 +1,9 @@ #pragma once +#include "domain/domain.h" #include "lib/config/protos/market_data.pb.h" -#include "lib/domain_model/common.h" #include "lib/md/PriceSize.h" + #include namespace bts { diff --git a/src/lib/orderman/orderman_utils/BookUtils.h b/src/lib/orderman/orderman_utils/BookUtils.h index d9f2735be..9207229d0 100644 --- a/src/lib/orderman/orderman_utils/BookUtils.h +++ b/src/lib/orderman/orderman_utils/BookUtils.h @@ -1,8 +1,6 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/common.h" + +#include "domain/domain.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/PriceComp.h" diff --git a/src/lib/orderman/orderman_utils/ExchangeOpenOrders.h b/src/lib/orderman/orderman_utils/ExchangeOpenOrders.h index accc2b1ae..6efb0864d 100644 --- a/src/lib/orderman/orderman_utils/ExchangeOpenOrders.h +++ b/src/lib/orderman/orderman_utils/ExchangeOpenOrders.h @@ -1,11 +1,12 @@ #pragma once +#include "domain/domain.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" #include "lib/mercury/common/mercury_common.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/overloaded.h" + #include #include #include @@ -38,4 +39,4 @@ class ExchangeOpenOrders { api::Venue exchange; std::vector all_open_orders; }; -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib/orderman/orderman_utils/ExchangePosition.h b/src/lib/orderman/orderman_utils/ExchangePosition.h index 4b977a914..a9a45436c 100644 --- a/src/lib/orderman/orderman_utils/ExchangePosition.h +++ b/src/lib/orderman/orderman_utils/ExchangePosition.h @@ -1,9 +1,10 @@ #pragma once -#include "lib/domain_model/common.h" +#include "domain/domain.h" #include "lib/mercury/common/mercury_common.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/overloaded.h" + #include #include #include @@ -26,4 +27,4 @@ class ExchangePosition { api::Venue exchange; std::vector total_exchange_positions; }; -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib/orderman/orderman_utils/Formatter.h b/src/lib/orderman/orderman_utils/Formatter.h index 5ad778c5f..ae4ccfd07 100644 --- a/src/lib/orderman/orderman_utils/Formatter.h +++ b/src/lib/orderman/orderman_utils/Formatter.h @@ -1,11 +1,12 @@ #pragma once + +#include "domain/domain.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/domain_model/common.h" #include "lib/md/PriceSize.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orders/algo/IAlgoOrder.h" #include "lib/utils/PBUtils.h" + #include #include #include diff --git a/src/lib/orderman/orderman_utils/orderman_common.h b/src/lib/orderman/orderman_utils/orderman_common.h index 4d6dbcee6..a45b07424 100644 --- a/src/lib/orderman/orderman_utils/orderman_common.h +++ b/src/lib/orderman/orderman_utils/orderman_common.h @@ -1,7 +1,7 @@ #pragma once +#include "domain/domain.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/common.h" #include "lib/utils/ValueWrapper.h" #include "lib/utils/bts_assert.h" #include "lib/utils/overloaded.h" diff --git a/src/lib/orderman/orders/EMNativeOrder.cpp b/src/lib/orderman/orders/EMNativeOrder.cpp index 43668c225..237dda2fd 100644 --- a/src/lib/orderman/orders/EMNativeOrder.cpp +++ b/src/lib/orderman/orders/EMNativeOrder.cpp @@ -1,13 +1,7 @@ #include "EMNativeOrder.h" +#include "domain/domain.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/orderman_cfg.pb.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/domain/OrderStatus.h" #include "lib/domain_model/Security.h" -#include "lib/domain_model/common.h" -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/FieldDefinitions.h" #include "lib/logging/logging.h" #include "lib/orderman/CancelOrderMsg.h" #include "lib/orderman/CancelReplaceOrderMsg.h" @@ -20,18 +14,13 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/OrderOpResult.h" #include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" #include "lib/orderman/orders/glbx/IGLBXOrderEncoder.h" -#include "lib/orderman/orders/glbx/iLink2OrderEncoder.h" -#include "lib/orderman/orders/glbx/iLink3OrderEncoder.h" #include "lib/orderman/securities/ISecurityDB.h" #include "lib/os/os.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_assert.h" #include "server/sparkd/md/platforms/emumba/EmMDListener.h" -#include "system/bts_chrono.h" -#include #include #include #include diff --git a/src/lib/orderman/orders/EMNativeOrder.h b/src/lib/orderman/orders/EMNativeOrder.h index 4564fab95..2c195b4f8 100644 --- a/src/lib/orderman/orders/EMNativeOrder.h +++ b/src/lib/orderman/orders/EMNativeOrder.h @@ -1,10 +1,10 @@ #pragma once +#include "domain/domain.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/common.h" #include "lib/orderman/CreateOrderMsg.h" #include "lib/orderman/orders/NativeOrderBase.h" -#include "lib/tracing/PerfLog.h" + #include namespace bts { diff --git a/src/lib/orderman/orders/GLBXNativeOrder.cpp b/src/lib/orderman/orders/GLBXNativeOrder.cpp index 23e4821bd..d4e250d2a 100644 --- a/src/lib/orderman/orders/GLBXNativeOrder.cpp +++ b/src/lib/orderman/orders/GLBXNativeOrder.cpp @@ -1,13 +1,10 @@ #include "GLBXNativeOrder.h" +#include "domain/domain.h" #include "lib/api/services/OrderService.pb.h" #include "lib/config/config.h" #include "lib/config/protos/orderman_cfg.pb.h" -#include "lib/config/protos/toggles.pb.h" #include "lib/domain_model/Security.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/FieldDefinitions.h" #include "lib/logging/logging.h" #include "lib/orderman/OrderRouter.h" #include "lib/orderman/OrderServices.h" @@ -21,7 +18,6 @@ #include "lib/orderman/orders/glbx/iLink3OrderEncoder.h" #include "lib/orderman/securities/ISecurityDB.h" #include "lib/utils/PBUtils.h" -#include "system/bts_chrono.h" #include #include diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index 27d45f7b6..e75573506 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -1,5 +1,5 @@ -#include "lib/orderman/orders/algo/AlgoWrapperOrder.h" -#include "lib/domain_model/common.h" +#include "AlgoWrapperOrder.h" +#include "domain/domain.h" #include "lib/logging/logging.h" #include "lib/orderman/ChildOrder.h" #include "lib/orderman/OrderBuilder.h" @@ -10,6 +10,7 @@ #include "lib/orderman/orders/algo/ChildTemplate.h" #include "lib/orderman/orders/algo/IAlgoOrder.h" #include "lib/utils/bts_assert.h" + #include #include #include diff --git a/src/lib/orderman/orders/algo/ChildTemplate.h b/src/lib/orderman/orders/algo/ChildTemplate.h index 3d913e0fa..af70f41e2 100644 --- a/src/lib/orderman/orders/algo/ChildTemplate.h +++ b/src/lib/orderman/orders/algo/ChildTemplate.h @@ -1,10 +1,12 @@ #pragma once +#include "lib/orderman/OrderBuilder.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orderman_utils/orderman_common.h" + namespace bts { namespace orderman { -class OrderBuilder; - class ChildTemplate { public: ChildTemplate(){}; diff --git a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h b/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h index 66d2cef1b..4be3cd511 100644 --- a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h +++ b/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h @@ -1,7 +1,7 @@ #pragma once +#include "domain/security_key.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "system/bts_chrono.h" diff --git a/src/lib/orderman/orders/algo/PositionUpdate.h b/src/lib/orderman/orders/algo/PositionUpdate.h index 77f7b86be..cb846506c 100644 --- a/src/lib/orderman/orders/algo/PositionUpdate.h +++ b/src/lib/orderman/orders/algo/PositionUpdate.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain_model/common.h" +#include "domain/domain.h" #include "lib/orderman/orderman_utils/orderman_common.h" namespace bts { diff --git a/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp index ec0bd75fb..a37dd83dd 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp @@ -1,14 +1,11 @@ #include "TaskingEyeAlgo.h" +#include "domain/domain.h" +#include "domain/security_key.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" #include "lib/logging/logging.h" #include "lib/md/PriceSize.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/limiter/SecurityLimitNode.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/orderman_common.h" @@ -21,6 +18,7 @@ #include "lib/os/os.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_assert.h" + #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h b/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h index 9bfbb5ff4..6cd867359 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" +#include "domain/security_key.h" +#include "domain/domain.h" #include "lib/orderman/calculations/ITheoCalculator.h" #include "lib/orderman/orders/algo/IAlgoOrder.h" #include diff --git a/src/lib/orderman/orders/algo/algo_orders/VolAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/VolAlgo.cpp index 93c2fd577..677669dc7 100644 --- a/src/lib/orderman/orders/algo/algo_orders/VolAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/VolAlgo.cpp @@ -1,14 +1,11 @@ #include "VolAlgo.h" +#include "domain/domain.h" +#include "domain/security_key.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" #include "lib/logging/logging.h" #include "lib/md/PriceSize.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/limiter/SecurityLimitNode.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/orderman_common.h" @@ -20,7 +17,7 @@ #include "lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h" #include "lib/os/os.h" #include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" + #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/VolAlgo.h b/src/lib/orderman/orders/algo/algo_orders/VolAlgo.h index 64df8b1f5..96dcca7e7 100644 --- a/src/lib/orderman/orders/algo/algo_orders/VolAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/VolAlgo.h @@ -1,9 +1,10 @@ #pragma once -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" +#include "domain/domain.h" +#include "domain/security_key.h" #include "lib/orderman/calculations/ITheoCalculator.h" #include "lib/orderman/orders/algo/IAlgoOrder.h" + #include namespace bts::orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h index 152dc3653..2125d03ef 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h @@ -1,6 +1,7 @@ #pragma once -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" + +#include "domain/domain.h" +#include "domain/security_key.h" #include "lib/orderman/ChildOrder.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orders/book_algos/PricerOrder.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp index 9a9e60461..dbd179581 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp @@ -1,16 +1,15 @@ #include "SpreaderFractionalQtyHelper.h" +#include "domain/domain.h" +#include "domain/security_key.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" #include "lib/logging/logging.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/events/OrderStateUpdateEvent.h" +#include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_assert.h" + #include -#include namespace bts::orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h index d2fffc6f2..25ea37088 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h @@ -1,9 +1,8 @@ #pragma once -#include "lib/domain_model/common.h" +#include "domain/domain.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" namespace bts::api::orderman { class OrderState; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index 1f7d8b60a..368f07169 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -1,12 +1,13 @@ #include "SpreaderUtils.h" -#include "lib/domain_model/common.h" +#include "domain/domain.h" #include "lib/md/PriceSize.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" + #include + namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index f49b52378..3408f9166 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -1,9 +1,9 @@ #pragma once +#include "domain/domain.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" #include "lib/md/IntPrice.h" #include "lib/md/PriceSize.h" #include "lib/orderman/OrderBuilder.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h index f3dd0af74..46e89db32 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h @@ -1,7 +1,8 @@ #pragma once + +#include "domain/security_key.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/orderman/orders/PreActivationOrderServices.h" namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index e0779cc96..3e2c5d54c 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,13 +1,12 @@ +#include "domain/domain.h" #include "lib/domain_model/Security.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/io/websocket/WebsocketClient.h" -#include "lib/md/IMarketDataListener.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include "lib/os/os.h" #include "lib/utils/helper_macros.h" + #include #include #include diff --git a/src/lib/orderman/securities/ISecurityDB.h b/src/lib/orderman/securities/ISecurityDB.h index b8e0280e8..e8810ebb8 100644 --- a/src/lib/orderman/securities/ISecurityDB.h +++ b/src/lib/orderman/securities/ISecurityDB.h @@ -1,8 +1,10 @@ #pragma once -#include "lib/domain_model/common.h" +#include "domain/domain.h" + #include #include +#include namespace bts { namespace api { diff --git a/src/lib_domain/CMakeLists.txt b/src/lib_domain/CMakeLists.txt new file mode 100644 index 000000000..dcd0e1777 --- /dev/null +++ b/src/lib_domain/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.23) +project(bts-domain) +include(${CMAKE_SOURCE_DIR}/cmake/InitLibrary.cmake) +init_library(domain) + +target_link_libraries(${PROJECT_NAME} PUBLIC + bts-system + double-conversion + boost_system + boost_thread + boost_filesystem + boost_regex + boost_chrono + boost_date_time + boost_atomic + debug fmtd + optimized fmt) diff --git a/src/lib/domain_model/common.h b/src/lib_domain/domain/domain.h similarity index 95% rename from src/lib/domain_model/common.h rename to src/lib_domain/domain/domain.h index 2c7c22a31..f92d3190f 100644 --- a/src/lib/domain_model/common.h +++ b/src/lib_domain/domain/domain.h @@ -7,8 +7,8 @@ #include #include -#include "lib/domain_model/SecurityKey.h" -#include "lib/utils/ValueWrapper.h" +#include "domain/security_key.h" +#include "system/value_wrapper.h" #include "system/FMT_IMPL.h" namespace bts { diff --git a/src/lib/domain_model/SecurityKey.h b/src/lib_domain/domain/security_key.h similarity index 76% rename from src/lib/domain_model/SecurityKey.h rename to src/lib_domain/domain/security_key.h index 45016e9bf..6d4a0b57d 100644 --- a/src/lib/domain_model/SecurityKey.h +++ b/src/lib_domain/domain/security_key.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include diff --git a/src/lib_domain/domain/sod.cpp b/src/lib_domain/domain/sod.cpp new file mode 100644 index 000000000..de82d642e --- /dev/null +++ b/src/lib_domain/domain/sod.cpp @@ -0,0 +1,30 @@ +#include "sod.h" +// #include "lib/config/protos/orders_fills_cleanup.pb.h" +#include "system/time_stamp.h" + +namespace bts::sod { + +using boost::posix_time::ptime; + +struct _SODTime { + constexpr int sod_hh() const { return 20; } + constexpr int sod_mm() const { return 30; } +}; + +ptime get_sod_for(ptime const &this_time) { + // const auto &sod = config::get(); + const _SODTime sod{}; + auto sod_time = bts::core::TimeStamp::ptime_from_ymdhmsm( + this_time.date().year(), this_time.date().month().as_number(), + this_time.date().day().as_number(), sod.sod_hh(), sod.sod_mm(), 0, 0); + if (sod_time > this_time) { + sod_time -= boost::gregorian::date_duration(1); + } + return sod_time; +} + +ptime get_current_sod() { + return get_sod_for(boost::posix_time::microsec_clock::local_time()); +} + +} // namespace bts::sod diff --git a/src/lib_domain/domain/sod.h b/src/lib_domain/domain/sod.h new file mode 100644 index 000000000..530ac8202 --- /dev/null +++ b/src/lib_domain/domain/sod.h @@ -0,0 +1,10 @@ +#pragma once + +#include + +namespace bts::sod { + +boost::posix_time::ptime get_sod_for(boost::posix_time::ptime const &this_time); +boost::posix_time::ptime get_current_sod(); + +} // namespace bts::sod diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.h b/src/server/sparkd/md/platforms/emumba/EmMDListener.h index 000f2b44e..abf0ea537 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.h +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.h @@ -1,11 +1,12 @@ #pragma once #include "EMTradingSession.h" #include "IEMOrderMuxer.h" +#include "domain/security_key.h" #include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" #include "lib/md/GeneralSecurityIndex.h" #include "lib/md/common.h" #include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" + #include #include #include