expose query on history recoveries

src/Asset.hs

@@ -70,6 +70,7 @@ class Show a => Asset a where
  -- {-# MINIMAL calcCashflow #-}
 
 data IssuanceFields = IssuanceBalance
+                    | HistoryRecoveries
                     deriving (Show,Ord,Eq,Read,Generic)
 
 instance ToJSONKey IssuanceFields where

src/Cashflow.hs

@@ -238,6 +238,13 @@ tsDefaultBal (MortgageFlow2 _ _ _ _ _ _ x _ _ _) = x
 tsDefaultBal (MortgageFlow3 _ _ _ _ _ _ _ _ x _ _ _) = x
 tsDefaultBal (LoanFlow _ _ _ _ _ x _ _ _) = x
 
+mflowDefault :: TsRow -> Balance
+mflowDefault (MortgageFlow _ _ _ _ _ x _ _ _ _) = x
+mflowDefault (MortgageFlow2 _ _ _ _ _ _ x _ _ _) = x
+mflowDefault (MortgageFlow3 _ _ _ _ _ _ _ _ x _ _ _) = x
+mflowDefault (LoanFlow _ _ _ _ _ x _ _ _) = x
+mflowDefault _  = error "not supported"
+
 tsSetDate :: TsRow -> Date -> TsRow
 tsSetDate (CashFlow _ a) x  = CashFlow x a
 tsSetDate (BondFlow _ a b c) x = BondFlow x a b c
@@ -366,7 +373,7 @@ mflowRecovery (MortgageFlow _ _ _ _ _ _ x _ _ _) = x
 mflowRecovery (MortgageFlow2 _ _ _ _ _ _ _ x _ _) = x
 mflowRecovery (MortgageFlow3 _ _ _ _ _ _ _ _ _ x _ _) = x
 mflowRecovery (LoanFlow _ _ _ _ _ _ x _ _) = x
-mflowRecovery _  = -1.0
+mflowRecovery _  = error "not supported"
 
 mflowBalance :: TsRow -> Balance
 mflowBalance (MortgageFlow _ x _ _ _ _ _ _ _ _) = x

src/Deal/DealQuery.hs

@@ -219,6 +219,17 @@ queryDeal t s =
         in
           futureDefaults + currentDefaults
 
+    CumulativePoolRecoveriesBalance ->
+        let 
+          futureRecoveries = case P.futureCf (pool t) of
+                               Just (CF.CashFlowFrame _historyTxn) -> sum $ CF.mflowRecovery <$> _historyTxn
+                               Nothing -> 0.0
+          historyRecoveries = case P.issuanceStat (pool t) of
+                                Just m -> Map.findWithDefault 0.0 P.HistoryRecoveries m 
+                                Nothing -> 0.0
+        in
+          futureRecoveries + historyRecoveries
+
     CurrentBondBalanceOf bns ->
        let
           bSubMap = getBondByName t (Just bns) -- Map.filterWithKey (\bn b -> (S.member bn bnSet)) (bonds t)