Fix sorting

1 files changed, 13 insertions, 9 deletions

diff --git a/Model.hs b/Model.hs
index a345f2f..13f18b8 100644
--- a/Model.hs
+++ b/Model.hs
@@ -45,14 +45,18 @@ withType :: ( BaseBackend backend ~ SqlBackend
 withType val = (val `WithType`) . kindType <$> getType val
 
 instance Ord Item where
-  x `compare` y = mconcat
-                  [ (isNothing $ itemOpened x) `compare` (isNothing $ itemOpened y)
-                  , itemOpened x `compare` itemOpened y
-                  , (isNothing $ itemExpires x) `compare` (isNothing $ itemExpires y)
-                  , itemExpires x `compare` itemExpires x
-                  , itemKind x `compare` itemKind x
-                  , itemBought x `compare` itemBought x
-                  ]
+  x `compare` y = mconcat cmprs
+    where
+      cmprs = [ itemOpened x `compareM` itemOpened y
+              , itemExpires x `compareM` itemExpires y
+              , itemKind x `compare` itemKind y
+              , itemBought x `compare` itemBought y
+              ]
+
+      compareM (Just _) Nothing = LT
+      compareM Nothing (Just _) = GT
+      compareM (Just a) (Just b) = compare a b
+      compareM _ _ = EQ
 
 instance ToJSON Item where
   toJSON Item{..} = object $
@@ -124,7 +128,7 @@ toUpdate (ItemDiffs ds) = mconcat $ do
     DiffOpened d  -> (, []) [ ItemOpened =. d ]
 
 data WithType a = WithType { typedVal :: a, valType :: Text }
-  deriving (Eq, Ord)
+  deriving (Eq, Ord, Show)
 
 typeToJSON :: ToJSON a
            => Text -- ^ Key for value, if needed