From 2a1cff4cd0ceaff5fdaaa7f50c3c3ef9748f27f7 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Thu, 13 Feb 2025 13:03:06 +0100 Subject: [PATCH] fix(build) --- test/Database/Fill.hs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/Database/Fill.hs b/test/Database/Fill.hs index b1066eb93..5e403fa68 100644 --- a/test/Database/Fill.hs +++ b/test/Database/Fill.hs @@ -367,7 +367,7 @@ fillDb = do , userExamOfficeGetSynced = False , userExamOfficeGetLabels = True } - _stranger1 <- insert User + stranger1 <- insert User { userIdent = "AVSID:996699" , userAuthentication = AuthLDAP , userLastAuthentication = Nothing @@ -407,7 +407,7 @@ fillDb = do , userExamOfficeGetSynced = False , userExamOfficeGetLabels = True } - _stranger2 <- insert User + stranger2 <- insert User { userIdent = "AVSID:669966" , userAuthentication = AuthLDAP , userLastAuthentication = Nothing @@ -447,7 +447,7 @@ fillDb = do , userExamOfficeGetSynced = False , userExamOfficeGetLabels = True } - _stranger3 <- insert User + stranger3 <- insert User { userIdent = "AVSID:6969" , userAuthentication = AuthLDAP , userLastAuthentication = Nothing @@ -488,6 +488,7 @@ fillDb = do , userExamOfficeGetLabels = True } let + usualSuspects = [gkleen,fhamann,jost,maxMuster,tinaTester,svaupel,sbarth,stranger1,stranger2,stranger3] -- used for specialized tests firstNames = [ "James", "John", "Robert", "Michael" , "William", "David", "Mary", "Richard" , "Joseph", "Thomas", "Charles", "Daniel" @@ -595,7 +596,7 @@ fillDb = do baseMatrikel <- getRandomR (10000 :: Int, 999999 :: Int) let matrikel = tshow <$> [baseMatrikel..] List.\\ [6969, 669966, 996699] manyUsers <- insertMany . getZipList $ manyUser <$> ZipList ((,,) <$> firstNames <*> middlenames <*> surnames) <*> ZipList matrikel - matUsers <- selectList [UserMatrikelnummer !=. Nothing] [] + matUsers <- selectList [UserMatrikelnummer !=. Nothing, UserId /<-. usualSuspects] [] insertMany_ [UserAvs (AvsPersonId n) uid n now Nothing Nothing Nothing Nothing | Entity uid User{userMatrikelnummer = fmap readMay -> Just (Just n)} <- matUsers] let tmin = -1 @@ -693,12 +694,12 @@ fillDb = do , UserSupervisor jost sbarth False (Just fraportAg) (Just "Staff") , UserSupervisor jost tinaTester True (Just fraportAg) (Just "Staff") , UserSupervisor jost jost True (Just fraportAg) (Just "Staff") - , UserSupervisor jost jost True (Just fraportAg) (Just "Staff") , UserSupervisor svaupel gkleen False (Just nice) (Just "Staff") , UserSupervisor svaupel fhamann True (Just nice) (Just "Staff") , UserSupervisor sbarth tinaTester True (Just fraportAg) (Just $ tshow SupervisorReasonAvsSuperior) , UserSupervisor gkleen fhamann False (Just fraGround) (Just "Staff") , UserSupervisor tinaTester tinaTester False Nothing (Just "Staff") + , UserSupervisor sbarth svaupel False (Just fraGround) (Just "Missing Company") ] ++ take 444 [ UserSupervisor fhamann uid True Nothing (Just $ tshow SupervisorReasonCompanyDefault) | Entity uid _ <- matUsers, uid /= jost] ++ take 123 [ UserSupervisor gkleen uid True Nothing Nothing | Entity uid _ <- drop 369 matUsers ]