Refactor getCursorFromResponse

Database/MongoDB/Query.hs

@@ -77,8 +77,8 @@ import Control.Monad.Reader (MonadReader, ReaderT, runReaderT, ask, asks, local)
 import Control.Monad.Trans (MonadIO, liftIO)
 import Data.Binary.Put (runPut)
 import Data.Bson (Document, Field(..), Label, Val, Value(String, Doc, Bool),
-                  Javascript, at, valueAt, lookup, look, genObjectId, merge,
+                  Javascript, at, valueAt, lookup, look, genObjectId, (=:),
-                  (=:), (=?), (!?), Val(..), ObjectId, Value(..))
+                  (=?), (!?), Val(..), ObjectId, Value(..))
 import Data.Bson.Binary (putDocument)
 import Data.Text (Text)
 import qualified Data.Text as T
@@ -1050,7 +1050,9 @@ findCommand Query{..} = do
          , "limit"     =? toMaybe (/= 0) toInt32 limit
          ]
 
-    getCursorFromResponse aColl response FindFailure
+    getCursorFromResponse aColl response
+    >>= either (liftIO . throwIO . FindFailure) return
+
     where
       toInt32 :: Integral a => a -> Int32
       toInt32 = fromIntegral
@@ -1347,22 +1349,22 @@ aggregateCursor :: (MonadIO m, MonadFail m) => Collection -> Pipeline -> Aggrega
 -- ^ Runs an aggregate and unpacks the result. See <http://docs.mongodb.org/manual/core/aggregation/> for details.
 aggregateCursor aColl agg _ = do
     response <- runCommand ["aggregate" =: aColl, "pipeline" =: agg, "cursor" =: ([] :: Document)]
-    getCursorFromResponse aColl response AggregateFailure
+    getCursorFromResponse aColl response
+    >>= either (liftIO . throwIO . AggregateFailure) return
 
 getCursorFromResponse
   :: (MonadIO m, MonadFail m)
   => Collection
   -> Document
-  -> (String -> Failure)
+  -> Action m (Either String Cursor)
-  -> Action m Cursor
+getCursorFromResponse aColl response
-getCursorFromResponse aColl response err
   | true1 "ok" response = do
       cursor     <- lookup "cursor" response
       firstBatch <- lookup "firstBatch" cursor
       cursorId   <- lookup "id" cursor
       db         <- thisDatabase
-      newCursor db aColl 0 (return $ Batch Nothing cursorId firstBatch)
+      Right <$> newCursor db aColl 0 (return $ Batch Nothing cursorId firstBatch)
-  | otherwise = liftIO . throwIO . err $ at "errmsg" response
+  | otherwise = return $ Left $ at "errmsg" response
 
 -- ** Group