web, api: update for MarketPrice/PriceDirective change

simonmichael · Jun 13, 2019 · 6a62bd6 · 6a62bd6
1 parent ce0354d
commit 6a62bd6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/hledger-api/hledger-api.hs b/hledger-api/hledger-api.hs
@@ -152,7 +152,7 @@ hledgerApiApp staticdir j = Servant.serve api server
       where
         accountnamesH = return $ journalAccountNames j
         transactionsH = return $ jtxns j
-        pricesH       = return $ jpricedirectives j
+        pricesH       = return $ map priceDirectiveToMarketPrice $ jpricedirectives j
         commoditiesH  = return $ (M.keys . jinferredcommodities) j
         accountsH     = return $ ledgerTopAccounts $ ledgerFromJournal Hledger.Query.Any j
         accounttransactionsH (a::AccountName) = do

diff --git a/hledger-lib/Hledger/Data/Prices.hs b/hledger-lib/Hledger/Data/Prices.hs
@@ -16,6 +16,7 @@ module Hledger.Data.Prices (
   ,mixedAmountValueAtDate
   ,mixedAmountApplyValuation
   ,priceLookup
+  ,priceDirectiveToMarketPrice
   ,tests_Prices
 )
 where

diff --git a/hledger-web/Hledger/Web/Handler/MiscR.hs b/hledger-web/Hledger/Web/Handler/MiscR.hs
@@ -69,7 +69,7 @@ getPricesR = do
   VD{caps, j} <- getViewData
   when (CapView `notElem` caps) (permissionDenied "Missing the 'view' capability")
   selectRep $ do
-    provideJson $ jpricedirectives j
+    provideJson $ map priceDirectiveToMarketPrice $ jpricedirectives j
 
 getCommoditiesR :: Handler TypedContent
 getCommoditiesR = do