From 7e14fef5c57acf436669a7cbe637d0d019810031 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel <> Date: Mon, 17 Aug 2020 10:48:46 +0200 Subject: [PATCH] fix: hlint --- src/Handler/Exam/Users.hs | 2 +- src/Handler/ExternalExam/Correct.hs | 2 +- src/Handler/Utils/Users.hs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Handler/Exam/Users.hs b/src/Handler/Exam/Users.hs index f93cbc4e9..1912abbd0 100644 --- a/src/Handler/Exam/Users.hs +++ b/src/Handler/Exam/Users.hs @@ -973,7 +973,7 @@ postEUsersR tid ssh csh examn = do guessUser' :: ExamUserTableCsv -> DB (Bool, UserId) guessUser' ExamUserTableCsv{..} = do - let criteria = PredDNF $ Set.singleton $ impureNonNull $ Set.fromList $ (PLVariable <$>) $ catMaybes $ + let criteria = PredDNF $ Set.singleton $ impureNonNull $ Set.fromList $ (PLVariable <$>) $ catMaybes [ GuessUserMatrikelnummer <$> csvEUserMatriculation , GuessUserDisplayName <$> csvEUserName , GuessUserSurname <$> csvEUserSurname diff --git a/src/Handler/ExternalExam/Correct.hs b/src/Handler/ExternalExam/Correct.hs index 4febbc936..d91dd4590 100644 --- a/src/Handler/ExternalExam/Correct.hs +++ b/src/Handler/ExternalExam/Correct.hs @@ -81,7 +81,7 @@ postEECorrectR tid ssh coursen examn = do , GuessUserSurname (ident :: UserSurname) , GuessUserFirstName (ident :: UserFirstName) ] - in (maybe [] (either NonEmpty.toList pure)) <$> lift (guessUser pdnf $ Just $ maxCountUserMatches+1) + in maybe [] (either NonEmpty.toList pure) <$> lift (guessUser pdnf $ Just $ maxCountUserMatches+1) if | is _Nothing ciqResults, is _Nothing ciqGrade -> do diff --git a/src/Handler/Utils/Users.hs b/src/Handler/Utils/Users.hs index a0fac546d..7d95a2e15 100644 --- a/src/Handler/Utils/Users.hs +++ b/src/Handler/Utils/Users.hs @@ -156,7 +156,7 @@ guessUser (((Set.toList . toNullable) <$>) . Set.toList . dnfTerms -> criteria) convertLdapResults xs = Just $ Left $ NonEmpty.fromList xs if - | x : [] <- users' + | [x] <- users' , Just True == matchesMatriculation x || didLdap -> return $ Just $ Right x | x : x' : _ <- users'