Optimize and refactor payments

1 files changed, 68 insertions, 15 deletions

diff --git a/client/src/View/Payment/Reducer.hs b/client/src/View/Payment/Reducer.hs
index 0c70f8a..0b6c041 100644
--- a/client/src/View/Payment/Reducer.hs
+++ b/client/src/View/Payment/Reducer.hs
@@ -2,14 +2,16 @@ module View.Payment.Reducer
   ( perPage
   , reducer
   , In(..)
+  , Params(..)
   ) where
 
 import           Data.Text    (Text)
 import qualified Data.Text    as T
+import           Data.Time    (NominalDiffTime)
 import           Reflex.Dom   (Dynamic, Event, MonadWidget)
 import qualified Reflex.Dom   as R
 
-import           Common.Model (PaymentPage)
+import           Common.Model (Frequency (..), PaymentPage)
 
 import           Loadable     (Loadable (..))
 import qualified Loadable     as Loadable
@@ -19,48 +21,99 @@ perPage :: Int
 perPage = 7
 
 data In t a b c = In
-  { _in_newPage       :: Event t Int
-  , _in_currentPage   :: Dynamic t Int
+  { _in_page          :: Event t Int
+  , _in_search        :: Event t Text
+  , _in_frequency     :: Event t Frequency
   , _in_addPayment    :: Event t a
   , _in_editPayment   :: Event t b
   , _in_deletePayment :: Event t c
   }
 
 data Action
-  = LoadPage Int
+  = LoadPage
   | GetResult (Either Text PaymentPage)
 
+data Params = Params
+  { _params_page      :: Int
+  , _params_search    :: Text
+  , _params_frequency :: Frequency
+  } deriving (Show)
+
+initParams = Params 1 "" Punctual
+
+data Msg
+  = Page Int
+  | Search Text
+  | Frequency Common.Model.Frequency
+  | ResetSearch
+  deriving Show
+
 reducer :: forall t m a b c. MonadWidget t m => In t a b c -> m (Dynamic t (Loadable PaymentPage))
 reducer input = do
 
   postBuild <- R.getPostBuild
 
-  let loadPage =
+  debouncedSearch <- R.debounce (1 :: NominalDiffTime) (_in_search input)
+
+  params <- R.foldDynMaybe
+    (\msg params -> case msg of
+      Page page     ->
+        Just $ params { _params_page = page }
+
+      Search ""     ->
+        if _params_search params == "" then
+          Nothing
+
+        else
+          Just $ initParams { _params_frequency = _params_frequency params }
+
+      Search search ->
+        Just $ params { _params_search = search, _params_page = _params_page initParams }
+
+      Frequency frequency ->
+        Just $ params { _params_frequency = frequency }
+
+      ResetSearch   ->
+        Just $ initParams { _params_frequency = _params_frequency params }
+    )
+    initParams
+    (R.leftmost
+      [ Page <$> _in_page input
+      , Search <$> debouncedSearch
+      , Frequency <$> _in_frequency input
+      , ResetSearch <$ _in_addPayment input
+      ])
+
+  let paramsEvent =
         R.leftmost
-          [ 1 <$ postBuild
-          , _in_newPage input
-          , 1 <$ _in_addPayment input
-          , R.tag (R.current $ _in_currentPage input) (_in_editPayment input)
-          , R.tag (R.current $ _in_currentPage input) (_in_deletePayment input)
+          [ initParams <$ postBuild
+          , R.updated params
+          , R.tag (R.current params) (_in_editPayment input)
+          , R.tag (R.current params) (_in_deletePayment input)
           ]
 
-  getResult <- AjaxUtil.get $ fmap pageUrl loadPage
+  getResult <- AjaxUtil.get (pageUrl <$> paramsEvent)
+
 
   R.foldDyn
     (\action _ -> case action of
-      LoadPage _                 -> Loading
+      LoadPage                   -> Loading
       GetResult (Left err)       -> Error err
       GetResult (Right payments) -> Loaded payments
     )
     Loading
     (R.leftmost
-      [ LoadPage <$> loadPage
+      [ LoadPage <$ paramsEvent
       , GetResult <$> getResult
       ])
 
   where
-    pageUrl p =
+    pageUrl (Params page search frequency) =
       "api/payments?page="
-      <> (T.pack . show $ p)
+      <> (T.pack . show $ page)
       <> "&perPage="
       <> (T.pack . show $ perPage)
+      <> "&search="
+      <> search
+      <> "&frequency="
+      <> (T.pack $ show frequency)