From 65b3d4fffa69a69def8cd44b799619953b45e97e Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 13 Mar 2019 16:58:00 -0500 Subject: [PATCH] refactoring OrderDefinition utils --- src/client/spark_test/Utils/OrderUtilities.cs | 62 +++++++------------ 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/src/client/spark_test/Utils/OrderUtilities.cs b/src/client/spark_test/Utils/OrderUtilities.cs index 6949c9c37..97566b503 100644 --- a/src/client/spark_test/Utils/OrderUtilities.cs +++ b/src/client/spark_test/Utils/OrderUtilities.cs @@ -99,12 +99,12 @@ namespace bts.tests /// We should replace with something like the OrderDataHeler from the Spark project. /// public static class OrderDefinitionUtilities { - public static OrderDefinition create_limit_order_def(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user) { + + private static OrderDefinition create_base_order(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user) { return new OrderDefinition { SecurityKey = security_id, Side = side, TimeInForce = TimeInForce.Day, - CustomDef = new CustomOrderDefinition { Limit = new LimitOrderDefinition { } }, CtiCode = CTICode.CtiCode1, CustomerOrFirm = CustomerOrFirm.Firm, ManualOrderIndicator = ManualOrderIndicator.Yes, @@ -114,52 +114,36 @@ namespace bts.tests UserId = user.id }; } + public static OrderDefinition create_limit_order_def(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user) { + var def = create_base_order(security_id, side, account, user); + def.CustomDef = new CustomOrderDefinition { Limit = new LimitOrderDefinition { } }; + return def; + } public static OrderDefinition create_iceberg_order_def(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user, double show_quantity) { - return new OrderDefinition { - SecurityKey = security_id, - Side = side, - TimeInForce = TimeInForce.Day, - CustomDef = new CustomOrderDefinition { - Iceberg = new IcebergOrderDefinition { - ShowQuantity = show_quantity, - Child = new CustomOrderDefinition { - Limit = new LimitOrderDefinition { } - } + var def = create_base_order(security_id, side, account, user); + def.CustomDef = new CustomOrderDefinition { + Iceberg = new IcebergOrderDefinition { + ShowQuantity = show_quantity, + Child = new CustomOrderDefinition { + Limit = new LimitOrderDefinition { } } - }, - CtiCode = CTICode.CtiCode1, - CustomerOrFirm = CustomerOrFirm.Firm, - ManualOrderIndicator = ManualOrderIndicator.Yes, - Account = account.name, - AccountId = account.id, - User = user.name, - UserId = user.id + } }; + return def; } public static OrderDefinition create_join_order_definition(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user, spark.QuantityMeasure join_threshold) { - return new OrderDefinition { - SecurityKey = security_id, - Side = side, - TimeInForce = TimeInForce.Day, - CustomDef = new CustomOrderDefinition { - Join = new JoinOrderDefinition { - JoinThreshold = join_threshold, - Child = new CustomOrderDefinition { - Limit = new LimitOrderDefinition { } - } + var def = create_base_order(security_id, side, account, user); + def.CustomDef = new CustomOrderDefinition { + Join = new JoinOrderDefinition { + JoinThreshold = join_threshold, + Child = new CustomOrderDefinition { + Limit = new LimitOrderDefinition { } } - }, - CtiCode = CTICode.CtiCode1, - CustomerOrFirm = CustomerOrFirm.Firm, - ManualOrderIndicator = ManualOrderIndicator.Yes, - Account = account.name, - AccountId = account.id, - User = user.name, - UserId = user.id + } }; - + return def; } }