fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(avs): background avs synch yielding undefined due to wrong monad

Browse Source
This commit is contained in:
Steffen Jost 2023-07-12 11:19:21 +00:00
parent a8df40d9f8
commit 2e59d3c2ea
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Jobs/Handler/SynchroniseAvs.hs
View File

@ -47,23 +47,20 @@ dispatchJobSynchroniseAvs numIterations epoch iteration pause
dispatchJobSynchroniseAvsId :: AvsPersonId -> Maybe Day -> JobHandler UniWorX dispatchJobSynchroniseAvsId :: AvsPersonId -> Maybe Day -> JobHandler UniWorX
dispatchJobSynchroniseAvsId apid pause = JobHandlerException $ do dispatchJobSynchroniseAvsId apid pause = JobHandlerException $ do
ok <- runDBJobs $ ok <- runDB $
getBy (UniqueUserAvsId apid) >>= \case getBy (UniqueUserAvsId apid) >>= \case
(Just Entity{entityVal=UserAvs{userAvsUser=uid}}) -> do -- known user (Just Entity{entityVal=UserAvs{userAvsUser=uid}}) -> do -- known user
workJobSychronizeAvs uid pause workJobSychronizeAvs uid pause
return True return True
Nothing -> -- unknown avsPersonId, attempt to create user _ -> -- unknown avsPersonId, attempt to create user
return False return False
-- flip (maybeM $ return False) (getBy $ UniqueUserAvsId apid) $ \Entity{entityVal=UserAvs{userAvsUser=uid}} -> do -- known user
-- workJobSychronizeAvs uid pause
-- return True
unless ok $ void $ maybeCatchAll $ upsertAvsUserById apid unless ok $ void $ maybeCatchAll $ upsertAvsUserById apid
dispatchJobSynchroniseAvsUser :: UserId -> Maybe Day -> JobHandler UniWorX dispatchJobSynchroniseAvsUser :: UserId -> Maybe Day -> JobHandler UniWorX
dispatchJobSynchroniseAvsUser uid pause = JobHandlerException $ runDBJobs $ workJobSychronizeAvs uid pause dispatchJobSynchroniseAvsUser uid pause = JobHandlerException $ runDB $ workJobSychronizeAvs uid pause
workJobSychronizeAvs :: UserId -> Maybe Day -> JobDB () workJobSychronizeAvs :: UserId -> Maybe Day -> DB ()
workJobSychronizeAvs uid pause = do workJobSychronizeAvs uid pause = do
now <- liftIO getCurrentTime now <- liftIO getCurrentTime
void $ E.upsert void $ E.upsert
@ -72,7 +69,7 @@ workJobSychronizeAvs uid pause = do
, avsSyncPause = pause , avsSyncPause = pause
} }
[ \oldSync -> (AvsSyncPause E.=. E.greatest (E.val pause) (oldSync E.^. AvsSyncPause)) oldSync ] [ \oldSync -> (AvsSyncPause E.=. E.greatest (E.val pause) (oldSync E.^. AvsSyncPause)) oldSync ]
queueDBJob JobSynchroniseAvsQueue queueJob' JobSynchroniseAvsQueue
dispatchJobSynchroniseAvsQueue :: JobHandler UniWorX dispatchJobSynchroniseAvsQueue :: JobHandler UniWorX
dispatchJobSynchroniseAvsQueue = JobHandlerException $ do dispatchJobSynchroniseAvsQueue = JobHandlerException $ do