From 4e9b618b61a2e35577dc9414d4c8c923b01b783f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 15 Jan 2020 17:20:13 +0100 Subject: [PATCH] fix: tests & hlint --- src/Handler/Utils/ExternalExam/Users.hs | 2 +- src/Handler/Utils/Users.hs | 2 +- test/FoundationSpec.hs | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Handler/Utils/ExternalExam/Users.hs b/src/Handler/Utils/ExternalExam/Users.hs index bc207abd9..3e217429d 100644 --- a/src/Handler/Utils/ExternalExam/Users.hs +++ b/src/Handler/Utils/ExternalExam/Users.hs @@ -191,7 +191,7 @@ makeExternalExamUsersTable mode (Entity eeId ExternalExam{..}) = do E.where_ $ result E.^. ExternalExamResultExam E.==. E.val eeId - unless (isLecturer || mode == EEUMUsers) $ do + unless (isLecturer || mode == EEUMUsers) $ E.where_ $ ExternalExam.examOfficeExternalExamResultAuth (E.val uid) result return (result, user, isSynced) diff --git a/src/Handler/Utils/Users.hs b/src/Handler/Utils/Users.hs index c667fa53e..df7125023 100644 --- a/src/Handler/Utils/Users.hs +++ b/src/Handler/Utils/Users.hs @@ -50,7 +50,7 @@ guessUser (Set.toList -> criteria) = $cachedHereBinary criteria $ go False E.where_ . E.and $ map (toSql user) criteria return user users <- retrieveUsers - let users' = reverse $ sortBy closeness users + let users' = sortBy (flip closeness) users matchesMatriculation :: Entity User -> Maybe Bool matchesMatriculation = preview $ _entityVal . _userMatrikelnummer . to (\userMatr -> all ((== userMatr) . Just) $ criteria ^.. folded . _guessUserMatrikelnummer) diff --git a/test/FoundationSpec.hs b/test/FoundationSpec.hs index eddebfdfb..b9b3e2e4f 100644 --- a/test/FoundationSpec.hs +++ b/test/FoundationSpec.hs @@ -70,6 +70,10 @@ instance Arbitrary ExamOfficeR where arbitrary = genericArbitrary shrink = genericShrink +instance Arbitrary EExamR where + arbitrary = genericArbitrary + shrink = genericShrink + instance Arbitrary CourseNewsR where arbitrary = genericArbitrary shrink = genericShrink