refactoring wip

Author: functora

ghcjs/currency-converter/src/App/Types.hs

@@ -35,7 +35,7 @@ import Functora.Miso.Prelude
 import Functora.Miso.Types as X
 import Functora.Money hiding (Currency, Money, Text)
 import qualified Functora.Prelude as Prelude
-import Functora.Rates
+import qualified Functora.Rates as Rates
 import qualified Functora.Web as Web
 import qualified Material.Snackbar as Snackbar
 import qualified Paths_app as Paths
@@ -46,7 +46,7 @@ data Model = Model
     modelMenu :: OpenedOrClosed,
     modelLoading :: Bool,
     modelState :: St Unique,
-    modelMarket :: MVar Market,
+    modelMarket :: MVar Rates.Market,
     modelFavMap :: Map MisoString Fav,
     modelCurrencies :: NonEmpty CurrencyInfo,
     modelSnackbarQueue :: Snackbar.Queue Action,

ghcjs/currency-converter/src/App/Widgets/Templates.hs

@@ -7,7 +7,7 @@ import App.Types
 import qualified Functora.Aes as Aes
 import Functora.Cfg
 import Functora.Miso.Prelude
-import Functora.Rates
+import qualified Functora.Rates as Rates
 import qualified Functora.Web as Web
 import qualified Material.Snackbar as Snackbar
 
@@ -25,7 +25,7 @@ newModel webOpts mSt uri = do
   cons <- liftIO . atomically $ dupTChan prod
   market <-
     maybe
-      newMarket
+      Rates.newMarket
       pure
       (mSt ^? _Just . #modelMarket)
   defKm <-

ghcjs/currency-converter/src/Main.hs

@@ -26,7 +26,7 @@ import Functora.Miso.Prelude
 import qualified Functora.Miso.Storage as Storage
 import Functora.Money hiding (Money)
 import qualified Functora.Prelude as Prelude
-import Functora.Rates
+import qualified Functora.Rates as Rates
 import qualified Functora.Web as Web
 import Language.Javascript.JSaddle ((!), (!!))
 import qualified Language.Javascript.JSaddle as JS
@@ -287,20 +287,20 @@ evalModel raw = do
   new <-
     Syb.everywhereM
       ( Syb.mkM $ \cur ->
-          withMarket (raw ^. #modelWebOpts) (raw ^. #modelMarket)
+          Rates.withMarket (raw ^. #modelWebOpts) (raw ^. #modelMarket)
             . fmap (fromRight cur)
-            . tryMarket
-            . getCurrencyInfo (raw ^. #modelWebOpts)
+            . Rates.tryMarket
+            . Rates.getCurrencyInfo (raw ^. #modelWebOpts)
             $ currencyInfoCode cur
       )
       ( raw ^. #modelState
       )
   curs <-
-    withMarket (raw ^. #modelWebOpts) (raw ^. #modelMarket)
+    Rates.withMarket (raw ^. #modelWebOpts) (raw ^. #modelMarket)
       . fmap (fromRight $ raw ^. #modelCurrencies)
-      . tryMarket
+      . Rates.tryMarket
       . fmap (^. #currenciesList)
-      $ getCurrencies (raw ^. #modelWebOpts)
+      $ Rates.getCurrencies (raw ^. #modelWebOpts)
   km <-
     if (new ^. #stKm . #kmIkm . #unIkm == mempty)
       && (new ^. #stIkm . #fieldOutput == mempty)
@@ -335,7 +335,7 @@ evalModel raw = do
   case baseAmtResult of
     Left {} -> pure st
     Right baseAmt ->
-      withMarket (st ^. #modelWebOpts) (st ^. #modelMarket) $ do
+      Rates.withMarket (st ^. #modelWebOpts) (st ^. #modelMarket) $ do
         let funds =
               Funds
                 baseAmt
@@ -345,13 +345,13 @@ evalModel raw = do
                 . #currencyOutput
                 . #currencyInfoCode
         quote <-
-          getQuote (st ^. #modelWebOpts) funds
+          Rates.getQuote (st ^. #modelWebOpts) funds
             $ st
             ^. cloneLens quoteLens
             . #moneyCurrency
             . #currencyOutput
             . #currencyInfoCode
-        let quoteAmt = quoteMoneyAmount quote
+        let quoteAmt = quote ^. #quoteMoneyAmount
         ct <- getCurrentTime
         pure
           $ st
@@ -376,7 +376,7 @@ evalModel raw = do
           & #modelState
           . #stDoc
           . #stDocCreatedAt
-          .~ quoteCreatedAt quote
+          .~ (quote ^. #quoteCreatedAt)
           & #modelOnlineAt
           .~ ct