From b7d4f6913d8b1a70c1b7ef73782cf29861dc11a7 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 4 Oct 2023 08:18:46 +0000 Subject: [PATCH] fix(print): apc ident aliases did not stop at first success --- src/Jobs/Handler/Print.hs | 2 +- src/Utils.hs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Jobs/Handler/Print.hs b/src/Jobs/Handler/Print.hs index cb16a2907..630a946eb 100644 --- a/src/Jobs/Handler/Print.hs +++ b/src/Jobs/Handler/Print.hs @@ -47,7 +47,7 @@ dispatchJobPrintAck = JobHandlerException act return True _ -> return False procOneId oks Entity{entityKey=paid, entityVal=PrintAcknowledge{printAcknowledgeApcIdent=Text.strip -> apci, printAcknowledgeTimestamp=ackt}} = - andM [ackOneId ackt $ ftrans apci | ftrans <- ftransAliases] >>= \case + orM [ackOneId ackt $ ftrans apci | ftrans <- ftransAliases] >>= \case True -> delete paid >> return (succ oks) False -> update paid [PrintAcknowledgeProcessed =. True] >> return oks apcis <- selectList [PrintAcknowledgeProcessed ==. False] [Asc PrintAcknowledgeTimestamp, LimitTo jobPrintAckChunkSize] diff --git a/src/Utils.hs b/src/Utils.hs index 2cf4b1495..a40d0ad49 100644 --- a/src/Utils.hs +++ b/src/Utils.hs @@ -1161,9 +1161,7 @@ guardMOnM b x = guardM b *> x -- Some Utility Functions from Agda.Utils.Monad -- | Monadic if-then-else. ifM :: Monad m => m Bool -> m a -> m a -> m a -ifM c m m' = - do b <- c - if b then m else m' +ifM c x y = c >>= bool y x -- | @ifNotM mc = ifM (not <$> mc)@ from Agda.Utils.Monad ifNotM :: Monad m => m Bool -> m a -> m a -> m a