More validation on trade

Author: debasishg

lib/model/trade.ml

@@ -18,32 +18,28 @@ module Trade(TaxFeeForMarket: TaxFee) : Trade_sig = struct
     buy_sell: buy_sell;
     unit_price: unit_price;
     quantity: quantity;
-    trade_date: Calendar.t;
-    value_date: Calendar.t option;
+    trade_value_date: (Calendar.t * Calendar.t option);
     tax_fees: (TaxFeeForTrade.t * money) list;
     net_amount: money option;
   } [@@deriving fields ~getters]
 
-  let build_trade account_no isin market buy_sell unit_price quantity trade_date value_date = {
+  let build_trade account_no isin market buy_sell unit_price quantity trade_value_date = {
     account_no;
     isin;
     market;
     buy_sell;
     unit_price;
     quantity;
-    trade_date;
-    value_date;
+    trade_value_date;
     tax_fees = [];
     net_amount = None;
   }
 
-  (*
   let validate_trade_value_date =
     let open Tvalidator in
     TradingValidator.date_order "Trade date must be before value date"
-  *)
 
-  let validate_trade ~account_no ~isin ~market ~buy_sell ~unit_price ~quantity ~trade_date ~value_date = 
+  let validate_trade ~account_no ~isin ~market ~buy_sell ~unit_price ~quantity ~trade_value_date = 
     let open Validator in 
     let open Tvalidator in 
     let valid = build build_trade 
@@ -53,15 +49,14 @@ module Trade(TaxFeeForMarket: TaxFee) : Trade_sig = struct
     |> keep buy_sell
     |> validate unit_price (TradingValidator.float_min 1.0 "Unit price must be > 0")
     |> validate quantity (TradingValidator.float_min 1.0 "Quantity must be > 0")
-    |> keep trade_date
-    |> keep value_date in
+    |> validate trade_value_date validate_trade_value_date in
     match valid with
     | Ok trade -> Ok trade
     | Error e  -> Error e 
 
 
-  let create_trade ~account_no ~isin ~market ~buy_sell ~unit_price ~quantity ~trade_date ~value_date = 
-    validate_trade ~account_no ~isin ~market ~buy_sell ~unit_price ~quantity ~trade_date ~value_date
+  let create_trade ~account_no ~isin ~market ~buy_sell ~unit_price ~quantity ~trade_value_date = 
+    validate_trade ~account_no ~isin ~market ~buy_sell ~unit_price ~quantity ~trade_value_date 
 
   let principal t = t.unit_price *. t.quantity
 

lib/model/trade_sig.ml

@@ -19,8 +19,8 @@ module type Trade_sig = sig
     -> buy_sell: buy_sell 
     -> unit_price: unit_price 
     -> quantity: quantity
-    -> trade_date: Calendar.t 
-    -> value_date: Calendar.t option -> (t, string) validator_result
+    -> trade_value_date: (Calendar.t * Calendar.t option) 
+    -> (t, string) validator_result
 
   (* decorate a trade with tax/fees and net amount *)
   val with_tax_fees: t -> t

lib/model/tvalidator.ml

@@ -60,6 +60,5 @@ module TradingValidator = struct
     else
       Some value
 
-      
   let float_min min = custom (float_min_check min)
 end