From 2235e644447d02b6643d5683c37190367dfeceb3 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 6 Dec 2022 22:27:26 +0100 Subject: [PATCH] refactor(users-add): shorten upsert-avs --- src/Handler/Course/ParticipantInvite.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Handler/Course/ParticipantInvite.hs b/src/Handler/Course/ParticipantInvite.hs index be819aaba..9d0222c35 100644 --- a/src/Handler/Course/ParticipantInvite.hs +++ b/src/Handler/Course/ParticipantInvite.hs @@ -75,9 +75,8 @@ postCAddUserR tid ssh csh = do registerUsers :: CourseId -> Map Text (Maybe Text) -> WriterT [Message] (YesodJobDB UniWorX) () registerUsers cid usersToRegister = do - avsUsers :: Map Text (Maybe UserId) <- fmap Map.fromList . forM (Map.keys usersToRegister) $ \userIdent -> do - mUser <- liftHandler $ upsertAvsUser userIdent -- TODO: upsertAvsUser should return whole Entity - return (userIdent, mUser) + avsUsers :: Map Text (Maybe UserId) <- flip Map.traverseWithKey usersToRegister $ \userIdent _ -> + liftHandler $ upsertAvsUser userIdent -- TODO: upsertAvsUser should return whole Entity if | null avsUsers @@ -127,6 +126,6 @@ registerUser cid uid = exceptT tell tell $ do , CourseParticipantState =. CourseParticipantActive ] lift . lift . audit $ TransactionCourseParticipantEdit cid uid - lift . lift . queueDBJob . JobQueueNotification $ NotificationCourseRegistered uid cid + lift . lift . queueDBJob . JobQueueNotification $ NotificationCourseRegistered uid cid -- TODO: send Notification at all? return $ mempty { aurRegisterSuccess = Set.singleton uid }