From 5bfa0d9373c663ab3abc664f4e8a64056acd251e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Hessenm=C3=BCller?= <tim.hessenmueller@sap.com>
Date: Thu, 17 Oct 2019 10:40:02 +0200
Subject: [PATCH] TrackedRaceImpl uses RaceTimesCalculationUtil to determine
 result of isLive

---
 .../common/RaceTimesCalculationUtil.java      | 13 ++---
 .../domain/tracking/impl/TrackedRaceImpl.java | 53 +++++++------------
 2 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/RaceTimesCalculationUtil.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/RaceTimesCalculationUtil.java
index 73f172b3762..7375e7d2baa 100644
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/RaceTimesCalculationUtil.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/RaceTimesCalculationUtil.java
@@ -39,12 +39,13 @@ public class RaceTimesCalculationUtil {
             // We have NO blue flag up event and we have an end of race time
             max = new Date(endOfRace.getTime() + MAX_TIME_AFTER_RACE_END);
         } else {
-            // We have no end time so just keep playing until they are created
-            max = new Date(liveTimePoint.getTime() + TIME_AFTER_LIVE);
-        }
-        // If there are no end events; Events may exceed endOfTracking
-        if (endOfTracking != null && max != null) {
-            max = endOfTracking;
+            // We have no end time and are not expecting any end events
+            if (endOfTracking != null && raceFinishingTime == null) {
+                max = endOfTracking;
+            } else {
+                // No end in sight; Keep on playing
+                max = new Date(liveTimePoint.getTime() + TIME_AFTER_LIVE);
+            }
         }
 
         return new Util.Pair<Date, Date>(min, max);
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
index 1e2a31e44a3..a6f02d69dd1 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
@@ -74,6 +74,7 @@ import com.sap.sailing.domain.common.ManeuverType;
 import com.sap.sailing.domain.common.NauticalSide;
 import com.sap.sailing.domain.common.NoWindException;
 import com.sap.sailing.domain.common.Position;
+import com.sap.sailing.domain.common.RaceTimesCalculationUtil;
 import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
 import com.sap.sailing.domain.common.RegattaNameAndRaceName;
 import com.sap.sailing.domain.common.SpeedWithBearing;
@@ -1180,45 +1181,27 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
     public boolean hasStarted(TimePoint at) {
         return getStartOfRace() != null && getStartOfRace().compareTo(at) <= 0;
     }
-    
+
     @Override
     public boolean isLive(TimePoint at) {
-        final TimePoint startOfLivePeriod;
-        final TimePoint endOfLivePeriod;
-        if (!hasGPSData() || !hasWindData()) {
-            startOfLivePeriod = null;
-            endOfLivePeriod = null;
-        } else {
-            if (getStartOfRace() == null) {
-                startOfLivePeriod = getStartOfTracking();
-            } else {
-                startOfLivePeriod = getStartOfRace().minus(TimingConstants.PRE_START_PHASE_DURATION_IN_MILLIS);
-            }
-            if (getEndOfRace() == null) {
-                if (getTimePointOfNewestEvent() != null) {
-                    endOfLivePeriod = getTimePointOfNewestEvent().plus(
-                            TimingConstants.IS_LIVE_GRACE_PERIOD_IN_MILLIS).plus(getDelayToLiveInMillis());
-                } else {
-                    endOfLivePeriod = null;
-                }
-            } else {
-                endOfLivePeriod = getEndOfRace().plus(TimingConstants.IS_LIVE_GRACE_PERIOD_IN_MILLIS);
+        if (hasGPSData() && hasWindData()) {
+            Util.Pair<Date, Date> minMax = RaceTimesCalculationUtil.calculateRaceMinMax(at.asDate(),
+                    startOfTracking.asDate(), startTime.asDate(), finishingTime.asDate(), finishedTime.asDate(),
+                    endTime.asDate(), endOfTracking.asDate());
+            Date min = minMax.getA() != null
+                    ? new Date(minMax.getA().getTime() - TimingConstants.PRE_START_PHASE_DURATION_IN_MILLIS)
+                    : null;
+            Date max = minMax.getB() != null
+                    ? new Date(minMax.getB().getTime() + TimingConstants.IS_LIVE_GRACE_PERIOD_IN_MILLIS
+                            + getDelayToLiveInMillis())
+                    : null;
+
+            // We are live if at is in between min and max
+            if (min != null && max != null) {
+                return !min.after(at.asDate()) && !at.asDate().after(max);
             }
         }
-    
-        // if an empty timepoint is given then take the start of the race
-        if (at == null) {
-            at = startOfLivePeriod.plus(1);
-        }
-        
-        // whenLastTrackedRaceWasLive is null if there is no tracked race for fleet, or the tracked race hasn't started yet at the server time
-        // when this DTO was assembled, or there were no GPS or wind data
-        final boolean result =
-                startOfLivePeriod != null &&
-                endOfLivePeriod != null &&
-                !startOfLivePeriod.after(at) &&
-                !at.after(endOfLivePeriod);
-        return result;
+        return false;
     }
 
     @Override