From 9a0e8988fab38fd49e3ebb1cec11038ff305c1e9 Mon Sep 17 00:00:00 2001 From: Steffen Date: Tue, 9 Jul 2024 10:39:52 +0200 Subject: [PATCH] refactor(health): avoid duplicate interface health check speficiations --- src/Handler/Admin.hs | 2 +- src/Handler/Health/Interface.hs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs index e69f4ec98..500053b0b 100644 --- a/src/Handler/Admin.hs +++ b/src/Handler/Admin.hs @@ -281,7 +281,7 @@ retrieveDriversRWithoutF now = do `E.on` (\(qual :& qualUsr) -> qual E.^. QualificationId E.==. qualUsr E.^. QualificationUserQualification)) E.where_ $ (qual E.^. QualificationAvsLicence E.==. E.justVal lic) -- matches licence E.&&. (qualUsr E.^. QualificationUserUser E.==. usr E.^. UserId) -- matches user - E.&&. (qualUsr & validQualification now) -- currently valid + E.&&. (qualUsr & validQualification now) -- currently valid E.where_ $ E.exists (hasValidQual AvsLicenceRollfeld) E.&&. E.notExists (hasValidQual AvsLicenceVorfeld) return usr diff --git a/src/Handler/Health/Interface.hs b/src/Handler/Health/Interface.hs index ba21cf14f..00de8e004 100644 --- a/src/Handler/Health/Interface.hs +++ b/src/Handler/Health/Interface.hs @@ -117,12 +117,12 @@ mkInterfaceLogTable flagError interfs@(reqIfs, banIfs) = do E.&&. ilog E.^. InterfaceLogWrite E.=~. E.joinV (ihealth E.?. InterfaceHealthWrite ) E.&&. E.notExists (do -- a more specific match does not exist otherh <- E.from $ E.table @InterfaceHealth - E.where_ $ otherh E.^. InterfaceHealthInterface E.=?. ihealth E.?. InterfaceHealthInterface - E.&&. E.just (otherh E.^. InterfaceHealthHours) E.!=. ihealth E.?. InterfaceHealthHours - E.&&. ( (otherh E.^. InterfaceHealthSubtype E.?=. ilog E.^. InterfaceLogSubtype) E.&&. E.isNothing (E.joinV $ ihealth E.?. InterfaceHealthSubtype) - E.||. otherh E.^. InterfaceHealthSubtype E.=?. ihealth E.?. InterfaceHealthSubtype) - E.&&. ( (otherh E.^. InterfaceHealthWrite E.?=. ilog E.^. InterfaceLogWrite ) E.&&. E.isNothing (E.joinV $ ihealth E.?. InterfaceHealthWrite ) - E.||. otherh E.^. InterfaceHealthWrite E.=?. ihealth E.?. InterfaceHealthWrite ) + E.where_ $ ilog E.^. InterfaceLogInterface E.==. otherh E.^. InterfaceHealthInterface + E.&&. ilog E.^. InterfaceLogSubtype E.=~. otherh E.^. InterfaceHealthSubtype + E.&&. ilog E.^. InterfaceLogWrite E.=~. otherh E.^. InterfaceHealthWrite + E.&&. ihealth E.?. InterfaceHealthHours E.!=. E.just (otherh E.^. InterfaceHealthHours) + E.&&. (E.isNothing (E.joinV $ ihealth E.?. InterfaceHealthSubtype) + E.||. E.isNothing (E.joinV $ ihealth E.?. InterfaceHealthWrite )) ) ) let matchUIH crits = E.or