From fde97b048ab04ab59c9e3f2a2f74bb2c1e996b22 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 18 Oct 2023 14:38:02 +0000 Subject: [PATCH] fix(sap): yet another fix for finding date intervals --- src/Handler/SAP.hs | 16 ++++++++-------- test/Handler/SAPSpec.hs | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Handler/SAP.hs b/src/Handler/SAP.hs index 34b00b81b..be4ad973a 100644 --- a/src/Handler/SAP.hs +++ b/src/Handler/SAP.hs @@ -79,18 +79,18 @@ compileBlocks :: Day -> Day -> [(Day,Bool)] -> [(Day, Day)] compileBlocks dStart dEnd = go (dStart, True) where go :: (Day,Bool) -> [(Day,Bool)] -> [(Day, Day)] - go b@(d,s) ((d1,s1):r1@((d2,_s2):_r2)) - | d1 == d2 || succ d1 == d2 || s == s1 || d1 < d = go b r1 -- ignore unnecessary change - go b@(d,s) ((d1,s1):r1) - | d1 >= dEnd = go b [] -- remaining days extend validity - | s, not s1, d < d1 = (d,d1) : go (d1,s1) r1 -- valid interval found - | s == s1 = go b r1 -- no change - | otherwise = go (d1,s1) r1 -- ignore invalid interval + go (d,s) (p1@(d1,s1):r1@((d2,s2):r2)) + | s1 == s2 && d <= d1 = go (d,s) (p1:r2) -- ignore unnecessary 2nd change + | d1 == d2 || succ d1 == d2 || s == s1 || d > d1 = go (d,s) r1 -- ignore unnecessary 1st change + go (d,s) ((d1,s1):r1) + | dEnd <= d1 = go (d ,s ) [] -- remaining dates extend validity + | s, not s1, d < d1 = (d,d1) : go (d1,s1) r1 -- valid interval found + | s == s1 = go (d ,s ) r1 -- no change + | otherwise = go (d1,s1) r1 -- ignore invalid interval go (d,s) [] | s = [(d,dEnd)] | otherwise = [] - -- | Deliver all employess with a successful LDAP synch within the last 3 months getQualificationSAPDirectR :: Handler TypedContent getQualificationSAPDirectR = do diff --git a/test/Handler/SAPSpec.hs b/test/Handler/SAPSpec.hs index 3f99699cf..a7e7798a0 100644 --- a/test/Handler/SAPSpec.hs +++ b/test/Handler/SAPSpec.hs @@ -79,6 +79,7 @@ spec = do w0 = fromGregorian 2001 9 22 w1 = fromGregorian 2023 9 22 w2 = fromGregorian 2023 10 16 + wF = fromGregorian 2023 10 17 w3 = fromGregorian 2023 11 17 w4 = fromGregorian 2024 01 21 compileBlocks wA wE [] `shouldBe` [(wA,wE)] @@ -94,6 +95,10 @@ spec = do compileBlocks wA wE [(w1,False),(w1,True),(w1,False),(w1,True),(w1,False),(w2,True)] `shouldBe` [(wA,w1),(w2,wE)] compileBlocks wA wE [(w0,True),(w1,True),(w1,False),(w1,True),(w1,False),(w2,True),(w3,True)] `shouldBe` [(wA,w1),(w2,wE)] compileBlocks wA wE [(w0,False),(w1,False),(w2,True),(w3,False),(w4,True)] `shouldBe` [(wA,w1),(w2,w3),(w4,wE)] + compileBlocks wA wE [(w1,False),(w2,True),(wF,True ),(w3,False)] `shouldBe` [(wA,w1),(w2,w3)] + compileBlocks wA wE [(w1,True),(w2,False),(wF,False),(w3,True)] `shouldBe` [(wA,w2),(w3,wE)] + compileBlocks wA wE [(w2,False),(wF,False),(w3,True)] `shouldBe` [(wA,w2),(w3,wE)] + compileBlocks wA wE [(w2,False),(wF,False)] `shouldBe` [(wA,w2) ] it "handles basic intervals" $ do (d1,d2,d3) <- generate $ do