From c320fadffe458c48c432ffd89f8aca0f4eadeaba Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 1 Sep 2024 18:11:30 +0000 Subject: [PATCH] refactor: Move a few Order types to lib_domain --- .../domain/cme/glbx_order_definition.h} | 0 .../domain/cme/glbx_order_state.h} | 0 .../domain/deribit/deribit_order_definition.h} | 0 .../domain/deribit/deribit_order_state.h} | 0 .../domain/order_definition.cpp} | 2 +- .../domain/order_definition.h} | 3 ++- .../domain/OrderKey.h => lib_domain/domain/order_key.h} | 2 ++ .../domain/OrderState.h => lib_domain/domain/order_state.h} | 6 +++--- .../OrderStatus.cpp => lib_domain/domain/order_status.cpp} | 2 +- .../OrderStatus.h => lib_domain/domain/order_status.h} | 1 + .../OrderUpdate.cpp => lib_domain/domain/order_update.cpp} | 2 +- .../OrderUpdate.h => lib_domain/domain/order_update.h} | 2 +- .../spark/domain/UserID.h => lib_domain/domain/user_id.h} | 2 ++ src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h | 2 +- src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp | 2 +- 15 files changed, 16 insertions(+), 10 deletions(-) rename src/{lib_spark/spark/domain/cme/GlbxOrderDefinition.h => lib_domain/domain/cme/glbx_order_definition.h} (100%) rename src/{lib_spark/spark/domain/cme/GlbxOrderState.h => lib_domain/domain/cme/glbx_order_state.h} (100%) rename src/{lib_spark/spark/domain/deribit/DeribitOrderDefinition.h => lib_domain/domain/deribit/deribit_order_definition.h} (100%) rename src/{lib_spark/spark/domain/deribit/DeribitOrderState.h => lib_domain/domain/deribit/deribit_order_state.h} (100%) rename src/{lib_spark/spark/domain/OrderDefinition.cpp => lib_domain/domain/order_definition.cpp} (92%) rename src/{lib_spark/spark/domain/OrderDefinition.h => lib_domain/domain/order_definition.h} (97%) rename src/{lib_spark/spark/domain/OrderKey.h => lib_domain/domain/order_key.h} (98%) rename src/{lib_spark/spark/domain/OrderState.h => lib_domain/domain/order_state.h} (75%) rename src/{lib_spark/spark/domain/OrderStatus.cpp => lib_domain/domain/order_status.cpp} (87%) rename src/{lib_spark/spark/domain/OrderStatus.h => lib_domain/domain/order_status.h} (99%) rename src/{lib_spark/spark/domain/OrderUpdate.cpp => lib_domain/domain/order_update.cpp} (90%) rename src/{lib_spark/spark/domain/OrderUpdate.h => lib_domain/domain/order_update.h} (91%) rename src/{lib_spark/spark/domain/UserID.h => lib_domain/domain/user_id.h} (98%) diff --git a/src/lib_spark/spark/domain/cme/GlbxOrderDefinition.h b/src/lib_domain/domain/cme/glbx_order_definition.h similarity index 100% rename from src/lib_spark/spark/domain/cme/GlbxOrderDefinition.h rename to src/lib_domain/domain/cme/glbx_order_definition.h diff --git a/src/lib_spark/spark/domain/cme/GlbxOrderState.h b/src/lib_domain/domain/cme/glbx_order_state.h similarity index 100% rename from src/lib_spark/spark/domain/cme/GlbxOrderState.h rename to src/lib_domain/domain/cme/glbx_order_state.h diff --git a/src/lib_spark/spark/domain/deribit/DeribitOrderDefinition.h b/src/lib_domain/domain/deribit/deribit_order_definition.h similarity index 100% rename from src/lib_spark/spark/domain/deribit/DeribitOrderDefinition.h rename to src/lib_domain/domain/deribit/deribit_order_definition.h diff --git a/src/lib_spark/spark/domain/deribit/DeribitOrderState.h b/src/lib_domain/domain/deribit/deribit_order_state.h similarity index 100% rename from src/lib_spark/spark/domain/deribit/DeribitOrderState.h rename to src/lib_domain/domain/deribit/deribit_order_state.h diff --git a/src/lib_spark/spark/domain/OrderDefinition.cpp b/src/lib_domain/domain/order_definition.cpp similarity index 92% rename from src/lib_spark/spark/domain/OrderDefinition.cpp rename to src/lib_domain/domain/order_definition.cpp index 9ffae0635..a7529bbb5 100644 --- a/src/lib_spark/spark/domain/OrderDefinition.cpp +++ b/src/lib_domain/domain/order_definition.cpp @@ -1,4 +1,4 @@ -#include "OrderDefinition.h" +#include "order_definition.h" namespace bts::domain { diff --git a/src/lib_spark/spark/domain/OrderDefinition.h b/src/lib_domain/domain/order_definition.h similarity index 97% rename from src/lib_spark/spark/domain/OrderDefinition.h rename to src/lib_domain/domain/order_definition.h index 78ad6249c..ae306152a 100644 --- a/src/lib_spark/spark/domain/OrderDefinition.h +++ b/src/lib_domain/domain/order_definition.h @@ -1,6 +1,5 @@ #pragma once -#include "UserID.h" #include "domain/account_id.h" #include "domain/cme/glbx_order_definition.h" #include "domain/deribit/deribit_order_definition.h" @@ -9,6 +8,8 @@ #include "domain/security_id.h" #include "domain/side.h" #include "domain/time_in_force.h" +#include "domain/user_id.h" + #include #include diff --git a/src/lib_spark/spark/domain/OrderKey.h b/src/lib_domain/domain/order_key.h similarity index 98% rename from src/lib_spark/spark/domain/OrderKey.h rename to src/lib_domain/domain/order_key.h index d432975fc..713047337 100644 --- a/src/lib_spark/spark/domain/OrderKey.h +++ b/src/lib_domain/domain/order_key.h @@ -1,5 +1,7 @@ #pragma once + #include "system/value_wrapper.h" + #include namespace bts::domain { diff --git a/src/lib_spark/spark/domain/OrderState.h b/src/lib_domain/domain/order_state.h similarity index 75% rename from src/lib_spark/spark/domain/OrderState.h rename to src/lib_domain/domain/order_state.h index 2385176fd..0227c2b19 100644 --- a/src/lib_spark/spark/domain/OrderState.h +++ b/src/lib_domain/domain/order_state.h @@ -1,10 +1,10 @@ #pragma once -#include "OrderStatus.h" +#include "domain/cme/glbx_order_state.h" +#include "domain/deribit/deribit_order_state.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/domain/cme/GlbxOrderState.h" -#include "spark/domain/deribit/DeribitOrderState.h" +#include "order_status.h" #include diff --git a/src/lib_spark/spark/domain/OrderStatus.cpp b/src/lib_domain/domain/order_status.cpp similarity index 87% rename from src/lib_spark/spark/domain/OrderStatus.cpp rename to src/lib_domain/domain/order_status.cpp index 35b3bce16..3916f0454 100644 --- a/src/lib_spark/spark/domain/OrderStatus.cpp +++ b/src/lib_domain/domain/order_status.cpp @@ -1,4 +1,4 @@ -#include "OrderStatus.h" +#include "order_status.h" namespace bts::domain { diff --git a/src/lib_spark/spark/domain/OrderStatus.h b/src/lib_domain/domain/order_status.h similarity index 99% rename from src/lib_spark/spark/domain/OrderStatus.h rename to src/lib_domain/domain/order_status.h index 37ee83fe6..45c7bb77a 100644 --- a/src/lib_spark/spark/domain/OrderStatus.h +++ b/src/lib_domain/domain/order_status.h @@ -1,4 +1,5 @@ #pragma once + #include namespace bts::domain { diff --git a/src/lib_spark/spark/domain/OrderUpdate.cpp b/src/lib_domain/domain/order_update.cpp similarity index 90% rename from src/lib_spark/spark/domain/OrderUpdate.cpp rename to src/lib_domain/domain/order_update.cpp index 84721b66b..0a669d49a 100644 --- a/src/lib_spark/spark/domain/OrderUpdate.cpp +++ b/src/lib_domain/domain/order_update.cpp @@ -1,4 +1,4 @@ -#include "OrderUpdate.h" +#include "order_update.h" namespace bts::domain { diff --git a/src/lib_spark/spark/domain/OrderUpdate.h b/src/lib_domain/domain/order_update.h similarity index 91% rename from src/lib_spark/spark/domain/OrderUpdate.h rename to src/lib_domain/domain/order_update.h index 25e5f7553..0928412e7 100644 --- a/src/lib_spark/spark/domain/OrderUpdate.h +++ b/src/lib_domain/domain/order_update.h @@ -1,8 +1,8 @@ #pragma once +#include "domain/order_key.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/domain/OrderKey.h" namespace bts::domain { diff --git a/src/lib_spark/spark/domain/UserID.h b/src/lib_domain/domain/user_id.h similarity index 98% rename from src/lib_spark/spark/domain/UserID.h rename to src/lib_domain/domain/user_id.h index ccf4819ce..086e88736 100644 --- a/src/lib_spark/spark/domain/UserID.h +++ b/src/lib_domain/domain/user_id.h @@ -1,5 +1,7 @@ #pragma once + #include "system/value_wrapper.h" + #include namespace bts::domain { diff --git a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h index 900da275f..41f5e33ed 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h @@ -1,8 +1,8 @@ #pragma once #include "CCAPIOrderCallbackMsgs.h" +#include "domain/order_status.h" #include "spark/api/services/OrderService.pb.h" #include "spark/core/FMT_IMPL.h" -#include "spark/domain/OrderStatus.h" #include "spark/domain_model/Security.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/SecurityKey.h" diff --git a/src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp b/src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp index f26e6ea3a..5665ce494 100644 --- a/src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp @@ -1,9 +1,9 @@ #include "EMNativeOrder.h" +#include "domain/order_status.h" #include "spark/api/services/OrderService.pb.h" #include "spark/config/config.h" #include "spark/config/protos/orderman_cfg.pb.h" #include "spark/config/protos/toggles.pb.h" -#include "spark/domain/OrderStatus.h" #include "spark/domain_model/Security.h" #include "spark/domain_model/common.h" #include "spark/jetfix/codec/FIXFragment.h"