From 792e60761aa3022d1bd88edfecf5dc25e0ac7554 Mon Sep 17 00:00:00 2001 From: Bram Date: Fri, 29 Mar 2024 11:08:42 +0100 Subject: [PATCH] Add addSync to Timeline --- src/Internal/Values/Timeline.elm | 19 ++++++- tests/Test/Values/Timeline.elm | 87 ++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 1 deletion(-) diff --git a/src/Internal/Values/Timeline.elm b/src/Internal/Values/Timeline.elm index 0749529..0b8e31f 100644 --- a/src/Internal/Values/Timeline.elm +++ b/src/Internal/Values/Timeline.elm @@ -2,7 +2,7 @@ module Internal.Values.Timeline exposing ( Batch, Timeline , empty, singleton , mostRecentEvents, mostRecentEventsFrom - , insert + , insert, addSync , coder ) @@ -167,6 +167,23 @@ type Timeline type alias TokenValue = String +{-| Add a new batch as a sync +-} +addSync : Batch -> Timeline -> Timeline +addSync batch timeline = + case insertBatch batch timeline of + ( Timeline t, { start, end }) -> + let + old : ITokenPTR + old = t.mostRecentBatch + in + case Timeline { t | mostRecentBatch = end } of + tl -> + if old == start then + tl + else + connectITokenToIToken old start tl + coder : Json.Coder Timeline coder = Json.object5 diff --git a/tests/Test/Values/Timeline.elm b/tests/Test/Values/Timeline.elm index 77f204f..f55453d 100644 --- a/tests/Test/Values/Timeline.elm +++ b/tests/Test/Values/Timeline.elm @@ -254,4 +254,91 @@ suite = ] ) ] + , describe "Sync" + [ fuzz TestFilter.fuzzer "Sync fills gaps" + (\filter -> + Timeline.empty + |> Timeline.addSync + { events = [ "a", "b", "c" ] + , filter = filter + , start = Just "token_1" + , end = "token_2" + } + |> Timeline.addSync + { events = [ "f", "g", "h"] + , filter = filter + , start = Just "token_3" + , end = "token_4" + } + |> Timeline.insert + { events = [ "d", "e" ] + , filter = filter + , start = Just "token_2" + , end = "token_3" + } + |> Timeline.mostRecentEvents filter + |> Expect.equal [ [ "a", "b", "c", "d", "e", "f", "g", "h" ]] + ) + , fuzz TestFilter.fuzzer "Sync doesn't fill open gaps" + (\filter -> + Timeline.empty + |> Timeline.addSync + { events = [ "a", "b", "c" ] + , filter = filter + , start = Just "token_1" + , end = "token_2" + } + |> Timeline.addSync + { events = [ "f", "g", "h"] + , filter = filter + , start = Just "token_3" + , end = "token_4" + } + |> Timeline.mostRecentEvents filter + |> Expect.equal [ [ "f", "g", "h" ]] + ) + , fuzz3 (Fuzz.pair Fuzz.string Fuzz.string) fuzzer TestFilter.fuzzer "Getting /sync is the same as getting from the token" + (\(start, end) timeline filter -> + let + t : Timeline + t = Timeline.addSync + { events = [ "a", "b", "c" ] + , filter = filter + , start = Just start + , end = end + } + timeline + in + Expect.equal + (Timeline.mostRecentEvents filter t) + (Timeline.mostRecentEventsFrom filter end t) + ) + , fuzz TestFilter.fuzzer "Weird loops stop looping" + (\filter -> + Timeline.empty + |> Timeline.insert + { events = [ "a", "b", "c" ] + , filter = filter + , start = Just "token_1" + , end = "token_2" + } + |> Timeline.insert + { events = [ "d", "e", "f" ] + , filter = filter + , start = Just "token_2" + , end = "token_3" + } + |> Timeline.insert + { events = [ "g", "h", "i" ] + , filter = filter + , start = Just "token_3" + , end = "token_2" + } + |> Timeline.mostRecentEventsFrom filter "token_2" + |> Expect.equal + [ [ "a", "b", "c" ] + , [ "d", "e", "f", "g", "h", "i" ] + ] + ) + ] ]