From ed147dbd20b89d32281dbcaed3a1ba7cb00c347b Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Tue, 31 Jan 2023 14:38:49 +0100 Subject: [PATCH] fix(user): check reachability by post or email did not account for department --- src/Handler/Admin.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs index e9bbde606..a0895774f 100644 --- a/src/Handler/Admin.hs +++ b/src/Handler/Admin.hs @@ -146,6 +146,7 @@ retrieveUnreachableUsers :: E.SqlQuery (E.SqlExpr (Entity User)) retrieveUnreachableUsers = do user <- E.from $ E.table @User E.where_ $ E.isNothing (user E.^. UserPostAddress) + E.&&. E.isNothing (user E.^. UserCompanyDepartment) E.&&. E.not_ ((user E.^. UserEmail) `E.like` E.val "%@%.%") return user @@ -225,4 +226,4 @@ retrieveDriversRWithoutF nowaday = do {- getAdjustLicences :: SchoolId -> QualificationShortand -> Handler Html --} \ No newline at end of file +-}