From f3fbc463fabb9583aff1e2f02e357bf0f15c239d Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Thu, 9 Aug 2018 12:57:40 +0200
Subject: [PATCH] consider only race log events valid at request time point

Change-Id: Ica33a29f0a3b653b8f0b803c1e7b37dd5f2b0acd
---
 .../race/analyzing/impl/RaceStatusAnalyzer.java          | 9 ++++++---
 .../race/state/impl/ReadonlyRaceStateImpl.java           | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/RaceStatusAnalyzer.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/RaceStatusAnalyzer.java
index 617fb2c4e69..5197e22dd25 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/RaceStatusAnalyzer.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/RaceStatusAnalyzer.java
@@ -62,9 +62,12 @@ public class RaceStatusAnalyzer extends RaceLogAnalyzer<Pair<RaceLogRaceStatus,
         final EventDispatcher eventDispatcher = new EventDispatcher(now, racingProcedure);
         RaceLogRaceStatus result = RaceLogRaceStatus.UNSCHEDULED;
         for (RaceLogRaceStatusEvent event : statusEvents.descendingSet()) {
-            event.accept(eventDispatcher);
-            result = eventDispatcher.nextStatus;
-            break;
+            // consider race log status events that are valid already at the time point we use as "now"
+            if (!event.getLogicalTimePoint().after(now)) {
+                event.accept(eventDispatcher);
+                result = eventDispatcher.nextStatus;
+                break;
+            }
         }
         return new Pair<>(result, now);
     }
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/ReadonlyRaceStateImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/ReadonlyRaceStateImpl.java
index 0479340334b..c6e847315d4 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/ReadonlyRaceStateImpl.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/ReadonlyRaceStateImpl.java
@@ -343,7 +343,6 @@ public class ReadonlyRaceStateImpl implements ReadonlyRaceState, RaceLogChangedL
 
     @Override
     public RaceLogRaceStatus getStatus() {
-        // TODO bug4713: check clock and invalidate/recalculate if clock passed status invalidation time point
         final TimePoint timePointForAnalysis = statusAnalyzerClock.now();
         final TimeRange timeRangeSinceLastStatusUpdate = new TimeRangeImpl(clockTimePointWhenCachedRaceStatusWasSet, timePointForAnalysis);
         if (overlapsTimePointForPotentialStatusChange(timeRangeSinceLastStatusUpdate)) {