bug5959 aftermath: don't count same RaceColumn multiple times when looking for attached TrackedRace;

Delegating leaderboards were adding to the count, although they refer to
the same RaceColumn to which the same TrackedRace is attached.
Therefore, waiting for the number of attached RaceLogs would wait
endlessly because only one race log got attached for the single
RaceColumn.

Author: axeluhl

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java

@@ -964,9 +964,10 @@ protected void load(Consumer<Double> progressConsumer, BooleanSupplier stopCallb
     }
 
     /**
-     * This is used when device mappings for an item changed so that fixes in a new {@link TimeRange} are covered. This is also used when initially loading fixes due to startOfTracking being initially set. If
-     * the mapping is a {@link Mark}, best fixes outside of the tracking {@link TimeRange} are loaded if none is
-     * available in the tracking {@link TimeRange}.
+     * This is used when device mappings for an item changed so that fixes in a new {@link TimeRange} are covered. This
+     * is also used when initially loading fixes due to startOfTracking being initially set. If the mapping is a
+     * {@link Mark}, best fixes outside of the tracking {@link TimeRange} are loaded if none is available in the
+     * tracking {@link TimeRange}.
      */
     private class LoadFixesForNewlyCoveredTimeRangesJob extends AbstractLoadingJob {
         private final WithID item;

java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/RaceLogAndTrackedRaceResolver.java

@@ -9,6 +9,7 @@
 import com.sap.sailing.domain.base.RaceColumn;
 import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
 import com.sap.sailing.domain.leaderboard.Leaderboard;
+import com.sap.sailing.domain.leaderboard.impl.DelegatingRegattaLeaderboardWithCompetitorElimination;
 import com.sap.sailing.domain.regattalike.IsRegattaLike;
 import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sse.common.Util.Triple;
@@ -31,13 +32,20 @@ public interface RaceLogAndTrackedRaceResolver extends RaceLogResolver {
     /**
      * Determines those {@link RaceColumn}/{@link Fleet} combinations ("slots") from all {@link Leaderboard}s managed by
      * this resolver that the tracked race identified by {@code trackedRaceIdentifier} shall be linked to when loaded.
-     * This information is relevant, e.g., after having created a {@link TrackedRace} that previously was attached to
-     * one or more such "slots" and shall now be re-connected to those same slots again. It is also helpful, e.g., when
-     * trying to figure out which race logs will be
+     * Duplicate {@link RaceColumn}s are ignored; such duplicates may occur, e.g., if one {@link Leaderboard} is a view
+     * of another one, as is the case for a {@link DelegatingRegattaLeaderboardWithCompetitorElimination}. In such
+     * scenarios, the leaderboard returned as the {@link Triple#getA() first} component of the resulting triple is
+     * randomly picked from those leaderboards {@link Leaderboard#getRaceColumns() listing} this column.
+     * <p>
+     * 
+     * The information returned is relevant, e.g., after having created a {@link TrackedRace} that previously was
+     * attached to one or more such "slots" and shall now be re-connected to those same slots again. It is also helpful,
+     * e.g., when trying to figure out which race logs will be
      * {@link TrackedRace#attachRegattaLog(com.sap.sailing.domain.abstractlog.regatta.RegattaLog) attached} to that
      * {@link TrackedRace} because usually each "slot" comes with its own {@link RaceLog}, so that attaching to multiple
      * slots will result in multiple race logs being attached to the tracked race.
      */
-    List<Triple<Leaderboard, RaceColumn, Fleet>> getColumnsWithRaceLogForTrackedRace(RegattaAndRaceIdentifier trackedRaceIdentifier);
+    List<Triple<Leaderboard, RaceColumn, Fleet>> getColumnsWithRaceLogForTrackedRace(
+            RegattaAndRaceIdentifier trackedRaceIdentifier);
 
 }

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java

@@ -2743,12 +2743,15 @@ private List<Triple<Leaderboard, RaceColumn, Fleet>> linkRaceToConfiguredLeaderb
     @Override
     public List<Triple<Leaderboard, RaceColumn, Fleet>> getColumnsWithRaceLogForTrackedRace(
             final RegattaAndRaceIdentifier trackedRaceIdentifier) {
+        final Set<RaceColumn> raceColumnsVisited = new HashSet<>();
         final List<Triple<Leaderboard, RaceColumn, Fleet>> trackedRaceLink = new ArrayList<>();
         for (Leaderboard leaderboard : getLeaderboards().values()) {
             for (RaceColumn column : leaderboard.getRaceColumns()) {
-                for (Fleet fleet : column.getFleets()) {
-                    if (trackedRaceIdentifier.equals(column.getRaceIdentifier(fleet))) {
-                        trackedRaceLink.add(new Triple<>(leaderboard, column, fleet));
+                if (raceColumnsVisited.add(column)) { // avoid visiting the same column multiple times in case it's shared across multiple leaderboards
+                    for (Fleet fleet : column.getFleets()) {
+                        if (trackedRaceIdentifier.equals(column.getRaceIdentifier(fleet))) {
+                            trackedRaceLink.add(new Triple<>(leaderboard, column, fleet));
+                        }
                     }
                 }
             }