From ae4f5795f82d41d54167991e3592d0c536f8e9d2 Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Wed, 12 Apr 2023 22:58:31 -0400
Subject: [PATCH] FIX intervals not included

---
 lib/Internal/Insert.hs |  7 +++++--
 lib/Internal/Types.hs  | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/Internal/Insert.hs b/lib/Internal/Insert.hs
index 5c9e2fe..831876c 100644
--- a/lib/Internal/Insert.hs
+++ b/lib/Internal/Insert.hs
@@ -154,7 +154,7 @@ type IntAllocations = ([BoundAllocation], [BoundAllocation], [BoundAllocation])
 -- TODO this should actually error if there is no ultimate end date
 sortAllo :: IntervalAllocation -> EitherErrs BoundAllocation
 sortAllo a@Allocation_ {alloAmts = as} = do
-  bs <- fmap reverse <$> foldBounds (Right []) $ L.sort as
+  bs <- fmap reverse <$> foldBounds (Right []) $ L.sortOn taWhen as
   return $ a {alloAmts = L.sort bs}
   where
     foldBounds acc [] = acc
@@ -241,6 +241,7 @@ data BudgetMeta = BudgetMeta
   , bmCur :: !BudgetCurrency
   , bmName :: !T.Text
   }
+  deriving (Show)
 
 data BudgetTx = BudgetTx
   { btMeta :: !BudgetMeta
@@ -250,11 +251,13 @@ data BudgetTx = BudgetTx
   , btValue :: !Rational
   , btDesc :: !T.Text
   }
+  deriving (Show)
 
 data BudgetTxType = BudgetTxType
   { bttType :: !AmountType
   , bttTx :: !BudgetTx
   }
+  deriving (Show)
 
 insertIncome
   :: MonadFinance m
@@ -308,7 +311,7 @@ selectAllos day a@Allocation_ {alloAmts = as} = case select [] as of
   where
     select acc [] = acc
     select acc (x : xs)
-      | (fst $ taWhen x) < day = select acc xs
+      | day < fst (taWhen x) = select acc xs
       | inBounds (taWhen x) day = select (taAmt x : acc) xs
       | otherwise = acc
 
diff --git a/lib/Internal/Types.hs b/lib/Internal/Types.hs
index fc6a446..3730fe0 100644
--- a/lib/Internal/Types.hs
+++ b/lib/Internal/Types.hs
@@ -192,6 +192,8 @@ deriving instance Hashable Budget
 
 deriving instance FromDhall Budget
 
+deriving instance Show TaggedAcnt
+
 deriving instance Eq TaggedAcnt
 
 deriving instance Hashable TaggedAcnt
@@ -219,16 +221,22 @@ deriving instance Hashable Income
 
 deriving instance FromDhall Income
 
+deriving instance Show Amount
+
 deriving instance Eq Amount
 
 deriving instance Ord Amount
 
 deriving instance Hashable Amount
 
+deriving instance Show Exchange
+
 deriving instance Eq Exchange
 
 deriving instance Hashable Exchange
 
+deriving instance Show BudgetCurrency
+
 deriving instance Eq BudgetCurrency
 
 deriving instance Hashable BudgetCurrency
@@ -238,6 +246,7 @@ data Allocation_ a = Allocation_
   , alloAmts :: [a]
   , alloCur :: BudgetCurrency
   }
+  deriving (Show)
 
 type Allocation = Allocation_ Amount
 
@@ -269,6 +278,8 @@ fromPersistText what (PersistText t) = case readMaybe $ T.unpack t of
 fromPersistText what x =
   Left $ T.unwords ["error when deserializing", what, "; got", T.pack (show x)]
 
+deriving instance Show AmountType
+
 deriving instance Eq AmountType
 
 deriving instance Ord AmountType
@@ -280,7 +291,7 @@ data TimeAmount a = TimeAmount
   , taAmt :: Amount
   , taAmtType :: AmountType
   }
-  deriving (Eq, Ord, Functor, Generic, FromDhall, Hashable, Foldable, Traversable)
+  deriving (Show, Eq, Ord, Functor, Generic, FromDhall, Hashable, Foldable, Traversable)
 
 type DateAmount = TimeAmount DatePat