From d4ab6f64e24109892b5665d154d8811420452038 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 4 Oct 2019 17:30:40 +0200 Subject: [PATCH] fix: ordinalPriorities --- src/Handler/Utils/Allocation.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/Utils/Allocation.hs b/src/Handler/Utils/Allocation.hs index a7b7114d5..bcc17c0ef 100644 --- a/src/Handler/Utils/Allocation.hs +++ b/src/Handler/Utils/Allocation.hs @@ -16,7 +16,6 @@ import qualified Data.Map.Strict as Map import qualified Database.Esqueleto as E import qualified Database.Esqueleto.Utils as E -import Control.Monad.Trans.State.Strict (evalStateT) import qualified Control.Monad.State.Class as State (get, modify') import Data.List (genericLength, elemIndex) @@ -29,6 +28,7 @@ import System.Random (mkStdGen) import Utils.Allocation import qualified Data.Conduit.List as C +import Data.Conduit.Lift (evalStateC) import Data.Generics.Product.Param @@ -45,7 +45,7 @@ allocationDone allocId = fmap (E.unValue <=< listToMaybe) . E.select . E.from $ ordinalPriorities :: Monad m => ConduitT UserMatriculation (Map UserMatriculation AllocationPriority) m () -ordinalPriorities = transPipe (flip evalStateT 0) . C.mapM $ \matr -> singletonMap matr <$> (AllocationPriorityOrdinal <$> State.get <* State.modify' succ) +ordinalPriorities = evalStateC 0 . C.mapM $ \matr -> singletonMap matr <$> (AllocationPriorityOrdinal <$> State.get <* State.modify' succ) sinkAllocationPriorities :: AllocationId -> ConduitT (Map UserMatriculation AllocationPriority) Void DB ()