Refactor parser for current account statement

1 files changed, 23 insertions, 26 deletions

diff --git a/app/Import/Ing/Shared.hs b/app/Import/Ing/Shared.hs
index c70f225..b5d1703 100644
--- a/app/Import/Ing/Shared.hs
+++ b/app/Import/Ing/Shared.hs
@@ -13,35 +13,32 @@ import Data.Time.Zones (TZ, localTimeToUTCTZ)
 
 data DebitCredit = Debit | Credit deriving (Show)
 
-readDecimal :: T.Text -> Either String Decimal
-readDecimal = AP.parseOnly $ do
-  decPart <- AP.decimal
-  _ <- AP.char ','
-  f1 <- AP.digit
-  f2 <- AP.digit
-  AP.endOfInput
-  let fracPart = fromIntegral $ digitToInt f1 * 10 + digitToInt f2
-  return $ normalizeDecimal (Decimal 2 (decPart * 100 + fracPart))
-
 scsvOptions :: C.DecodeOptions
 scsvOptions = C.defaultDecodeOptions {C.decDelimiter = fromIntegral (ord ';')}
 
-eitherToCP :: Either String a -> C.Parser a
-eitherToCP = either fail return
-
-decimalCP :: T.Text -> C.Parser Decimal
-decimalCP = eitherToCP . readDecimal
-
-dateCP :: String -> T.Text -> C.Parser Day
-dateCP fmt = parseTimeM False defaultTimeLocale fmt . T.unpack
-
 maybeCP :: (T.Text -> C.Parser a) -> T.Text -> C.Parser (Maybe a)
 maybeCP p t = if T.null t then return Nothing else Just <$> p t
 
-ibanCP :: T.Text -> C.Parser Iban
-ibanCP = eitherToCP . mkIban
-
-timestampCP :: String -> TZ -> T.Text -> C.Parser UTCTime
-timestampCP fmt amsTz t = do
-  localTime <- parseTimeM False defaultTimeLocale fmt (T.unpack t)
-  return $ localTimeToUTCTZ amsTz localTime
+parseDecimalM :: (MonadFail m) => T.Text -> m Decimal
+parseDecimalM =
+  either fail return
+    . AP.parseOnly
+      ( do
+          decPart <- AP.decimal
+          _ <- AP.char ','
+          f1 <- AP.digit
+          f2 <- AP.digit
+          AP.endOfInput
+          let fracPart = fromIntegral $ digitToInt f1 * 10 + digitToInt f2
+          return $ normalizeDecimal (Decimal 2 (decPart * 100 + fracPart))
+      )
+
+parseIbanM :: (MonadFail m) => T.Text -> m Iban
+parseIbanM = either fail return . mkIban
+
+parseDateM :: (MonadFail m) => String -> T.Text -> m Day
+parseDateM fmt = parseTimeM False defaultTimeLocale fmt . T.unpack
+
+parseTimestampM :: (MonadFail m) => String -> TZ -> T.Text -> m UTCTime
+parseTimestampM fmt amsTz t = do
+  localTimeToUTCTZ amsTz <$> parseTimeM False defaultTimeLocale fmt (T.unpack t)