1 files changed, 19 insertions, 17 deletions

diff --git a/app/Import/Ing/SavingsAccountCsv.hs b/app/Import/Ing/SavingsAccountCsv.hs
index 3f2e5e6..16b5f92 100644
--- a/app/Import/Ing/SavingsAccountCsv.hs
+++ b/app/Import/Ing/SavingsAccountCsv.hs
@@ -12,7 +12,7 @@ import Data.Maybe (isJust)
 import Data.Text qualified as T
 import Data.Time.Calendar (Day)
 import Data.Vector qualified as V
-import Import.Ing.Shared (dateCP, decimalCP, eitherToCP, ibanCP, maybeCP, scsvOptions)
+import Import.Ing.Shared (maybeCP, parseDateM, parseDecimalM, parseIbanM, scsvOptions)
 import System.IO (Handle)
 import Text.Regex.TDFA ((=~~))
 
@@ -49,7 +49,7 @@ instance MonadFail (Either String) where
 
 txBaseFromPrim :: PrimTx -> Either String TxBase
 txBaseFromPrim ptx@PrimTx {ptxCommodity = "EUR"} =
-  return $ TxBase (ptxDate ptx) (ptxAccountId ptx) (ptxAccountName ptx) (ptxAmount ptx) (ptxResBal ptx)
+  return $ TxBase <$> ptxDate <*> ptxAccountId <*> ptxAccountName <*> ptxAmount <*> ptxResBal $ ptx
 txBaseFromPrim ptx =
   Left $ "Unexpected commodity '" ++ T.unpack (ptxCommodity ptx) ++ "' (expected EUR)"
 
@@ -121,26 +121,25 @@ mutationTypeCP "Opname" = return WithdrawalMutation
 mutationTypeCP "Rente" = return InterestMutation
 mutationTypeCP t = fail ("Unknown mutation type '" ++ T.unpack t ++ "'")
 
-instance C.FromNamedRecord Tx where
+instance C.FromNamedRecord PrimTx where
   parseNamedRecord m =
-    eitherToCP . processPrimTx
-      =<< PrimTx
-        <$> (m .: "Datum" >>= dateCP "%Y-%m-%d")
-        <*> m .: "Omschrijving"
-        <*> m .: "Rekening"
-        <*> m .: "Rekening naam"
-        <*> (m .: "Tegenrekening" >>= maybeCP ibanCP)
-        <*> (m .: "Af Bij" >>= debitCreditCP)
-        <*> (m .: "Bedrag" >>= decimalCP)
-        <*> m .: "Valuta"
-        <*> (m .: "Mutatiesoort" >>= mutationTypeCP)
-        <*> m .: "Mededelingen"
-        <*> (m .: "Saldo na mutatie" >>= decimalCP)
+    PrimTx
+      <$> (m .: "Datum" >>= parseDateM "%Y-%m-%d")
+      <*> m .: "Omschrijving"
+      <*> m .: "Rekening"
+      <*> m .: "Rekening naam"
+      <*> (m .: "Tegenrekening" >>= maybeCP parseIbanM)
+      <*> (m .: "Af Bij" >>= debitCreditCP)
+      <*> (m .: "Bedrag" >>= parseDecimalM)
+      <*> m .: "Valuta"
+      <*> (m .: "Mutatiesoort" >>= mutationTypeCP)
+      <*> m .: "Mededelingen"
+      <*> (m .: "Saldo na mutatie" >>= parseDecimalM)
 
 readFile :: Handle -> IO (V.Vector Tx)
 readFile h = do
   contents <- BS.hGetContents h
-  case C.decodeByNameWith scsvOptions contents of
+  primTxs <- case C.decodeByNameWith scsvOptions contents of
     Left err -> fail err
     Right
       ( [ "Datum",
@@ -160,3 +159,6 @@ readFile h = do
         return txs
     Right _ ->
       fail "Headers do not match expected pattern"
+  case V.mapM processPrimTx primTxs of
+    Left err -> fail err
+    Right txs -> return txs