From fb8d346213f9b50496dc10d23dbedd91f31daf2f Mon Sep 17 00:00:00 2001 From: Papick Garcia Taboada Date: Thu, 21 Sep 2017 16:34:35 +0200 Subject: [PATCH] Removed getRegattas() --- .../domain/test/mock/MockedTrackedRace.java | 4 --- .../com/sap/sailing/domain/base/Event.java | 5 ---- .../com/sap/sailing/domain/base/Regatta.java | 8 ------ .../sailing/domain/base/impl/EventImpl.java | 27 +++---------------- .../sailing/domain/base/impl/RegattaImpl.java | 14 +--------- .../ui/adminconsole/EventListComposite.java | 19 ------------- .../sailing/gwt/ui/client/SailingService.java | 2 -- .../gwt/ui/client/SailingServiceAsync.java | 2 -- .../gwt/ui/server/SailingServiceImpl.java | 21 --------------- .../sap/sailing/gwt/ui/shared/EventDTO.java | 2 -- .../test/RegattaReplicationTest.java | 25 ----------------- .../server/test/MasterDataImportTest.java | 17 +++++------- .../server/impl/RacingEventServiceImpl.java | 10 ++----- 13 files changed, 13 insertions(+), 143 deletions(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java index 7b9b907c983..e8ff8344421 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java @@ -476,10 +476,6 @@ public class MockedTrackedRace implements DynamicTrackedRace { public void removeListener(RegattaLikeListener listener) { } - @Override - public void adjustEventToRegattaAssociation(EventFetcher eventFetcher) { - } - @Override public RaceExecutionOrderProvider getRaceExecutionOrderProvider() { return null; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Event.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Event.java index aef4e907422..071b0bce01a 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Event.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Event.java @@ -13,11 +13,6 @@ import com.sap.sailing.domain.leaderboard.LeaderboardGroup; * */ public interface Event extends EventBase { - Iterable getRegattas(); - - void addRegatta(Regatta regatta); - - void removeRegatta(Regatta regatta); /** * For events, the ID is always a UUID. diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java index 279d0527a20..e03ad7197e0 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java @@ -208,14 +208,6 @@ public interface Regatta extends NamedWithID, IsRegattaLike, HasRaceColumnsAndRe */ void setUseStartTimeInference(boolean useStartTimeInference); - /** - * {@link Event} manages an association to its {@link Event#getRegattas() regattas}. When something on the - * regatta changes (in particular, the implicit link to an event through an event's {@link CourseArea} that - * is assigned as this regatta's {@link #setDefaultCourseArea(CourseArea) default course area}), the - * opposite end of the association needs to be maintained on the event's side. - */ - void adjustEventToRegattaAssociation(EventFetcher eventFetcher); - RaceExecutionOrderProvider getRaceExecutionOrderProvider(); default RankingMetrics getRankingMetricType() { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/EventImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/EventImpl.java index 723872c740f..cf7c0044f97 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/EventImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/EventImpl.java @@ -3,13 +3,10 @@ package com.sap.sailing.domain.base.impl; import java.io.IOException; import java.io.ObjectInputStream; import java.util.Collections; -import java.util.HashSet; -import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentLinkedQueue; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.Venue; import com.sap.sailing.domain.leaderboard.LeaderboardGroup; import com.sap.sse.common.TimePoint; @@ -17,24 +14,21 @@ import com.sap.sse.common.Util; public class EventImpl extends EventBaseImpl implements Event { private static final long serialVersionUID = 855135446595485715L; - - private final Set regattas; - + private ConcurrentLinkedQueue leaderboardGroups; public EventImpl(String name, TimePoint startDate, TimePoint endDate, String venueName, boolean isPublic, UUID id) { this(name, startDate, endDate, new VenueImpl(venueName), isPublic, id); } - + /** * @param venue must not be null */ public EventImpl(String name, TimePoint startDate, TimePoint endDate, Venue venue, boolean isPublic, UUID id) { super(name, startDate, endDate, venue, isPublic, id); - this.regattas = new HashSet(); this.leaderboardGroups = new ConcurrentLinkedQueue<>(); } - + private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException { ois.defaultReadObject(); if (leaderboardGroups == null) { @@ -42,21 +36,6 @@ public class EventImpl extends EventBaseImpl implements Event { } } - @Override - public Iterable getRegattas() { - return Collections.unmodifiableSet(regattas); - } - - @Override - public void addRegatta(Regatta regatta) { - regattas.add(regatta); - } - - @Override - public void removeRegatta(Regatta regatta) { - regattas.remove(regatta); - } - public String toString() { return getId() + " " + getName() + " " + getVenue().getName() + " " + isPublic(); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java index 578d94770fe..32d74e3f96b 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java @@ -740,19 +740,6 @@ public class RegattaImpl extends NamedImpl implements Regatta, RaceColumnListene return regattaLikeHelper.getTimeOnDistanceAllowancePerNauticalMile(competitor); } - public void adjustEventToRegattaAssociation(EventFetcher eventFetcher) { - CourseArea defaultCourseArea = getDefaultCourseArea(); - for (Event event : eventFetcher.getAllEvents()) { - event.removeRegatta(this); - for (CourseArea courseArea : event.getVenue().getCourseAreas()) { - if (defaultCourseArea != null && courseArea.getId().equals(defaultCourseArea.getId())) { - event.addRegatta(this); - } - } - } - - } - @Override public RaceExecutionOrderProvider getRaceExecutionOrderProvider() { return raceExecutionOrderCache; @@ -870,4 +857,5 @@ public class RegattaImpl extends NamedImpl implements Regatta, RaceColumnListene CompetitorDeregistrator deregisterer = new CompetitorDeregistrator<>(regattaLog, competitors, regattaLogEventAuthorForRegatta); deregisterer.deregister(deregisterer.analyze()); } + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java index 7daf40adf9c..956659bd3e8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java @@ -335,24 +335,6 @@ public class EventListComposite extends Composite implements EventsRefresher, Le } }; - SafeHtmlCell associatedRegattasCell = new SafeHtmlCell(); - Column associatedRegattasColumn = new Column(associatedRegattasCell) { - @Override - public SafeHtml getValue(EventDTO event) { - SafeHtmlBuilder builder = new SafeHtmlBuilder(); - int regattaCount = event.regattas.size(); - int i = 1; - for (RegattaDTO regatta : event.regattas) { - builder.appendEscaped(regatta.getName()); - if (i < regattaCount) { - builder.appendHtmlConstant("
"); - } - i++; - } - return builder.toSafeHtml(); - } - }; - ImagesBarColumn eventActionColumn = new ImagesBarColumn( new EventConfigImagesBarCell(stringMessages)); eventActionColumn.setFieldUpdater(new FieldUpdater() { @@ -384,7 +366,6 @@ public class EventListComposite extends Composite implements EventsRefresher, Le table.addColumn(leaderboardGroupsColumn, stringMessages.leaderboardGroups()); table.addColumn(imagesColumn, stringMessages.images()); table.addColumn(videosColumn, stringMessages.videos()); - table.addColumn(associatedRegattasColumn, stringMessages.regattas()); table.addColumn(eventActionColumn, stringMessages.actions()); table.setSelectionModel(eventSelectionCheckboxColumn.getSelectionModel(), eventSelectionCheckboxColumn.getSelectionManager()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java index dac74894adc..12f34d25528 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java @@ -193,8 +193,6 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS List getLeaderboards(); - List getLeaderboardsByEvent(EventDTO event); - StrippedLeaderboardDTO updateLeaderboard(String leaderboardName, String newLeaderboardName, String newLeaderboardDisplayName, int[] newDiscardingThreasholds, UUID newCourseAreaId); StrippedLeaderboardDTO createFlexibleLeaderboard(String leaderboardName, String leaderboardDisplayName, int[] discardThresholds, ScoringSchemeType scoringSchemeType, UUID courseAreaId); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java index e27f0020bad..b4ed031ba99 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java @@ -638,8 +638,6 @@ public interface SailingServiceAsync extends ServerInfoRetriever, FileStorageMan void getEventById(UUID id, boolean withStatisticalData, AsyncCallback callback); - void getLeaderboardsByEvent(EventDTO event, AsyncCallback> callback); - /** * @return {@code true} if the race was not yet denoted for race log tracking and now has successfully been denoted * so diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index dbf12049462..56e52a01488 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -2410,20 +2410,6 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S return result; } - @Override - public List getLeaderboardsByEvent(EventDTO event) { - List results = new ArrayList(); - if (event != null) { - for (RegattaDTO regatta : event.regattas) { - results.addAll(getLeaderboardsByRegatta(regatta)); - } - HashSet set = new HashSet(results); - results.clear(); - results.addAll(set); - } - return results; - } - private List getLeaderboardsByRegatta(RegattaDTO regatta) { List results = new ArrayList(); if (regatta != null && regatta.races != null) { @@ -3829,13 +3815,6 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S private EventDTO convertToEventDTO(Event event, boolean withStatisticalData) { EventDTO eventDTO = new EventDTO(event.getName()); copyEventBaseFieldsToDTO(event, eventDTO); - eventDTO.regattas = new ArrayList(); - for (Regatta regatta: event.getRegattas()) { - RegattaDTO regattaDTO = new RegattaDTO(); - regattaDTO.setName(regatta.getName()); - regattaDTO.races = convertToRaceDTOs(regatta); - eventDTO.regattas.add(regattaDTO); - } eventDTO.venue.setCourseAreas(new ArrayList()); for (CourseArea courseArea : event.getVenue().getCourseAreas()) { CourseAreaDTO courseAreaDTO = convertToCourseAreaDTO(courseArea); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/EventDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/EventDTO.java index 614513f7299..070f415a7da 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/EventDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/EventDTO.java @@ -9,7 +9,6 @@ import com.sap.sailing.domain.common.dto.AbstractLeaderboardDTO; public class EventDTO extends EventBaseDTO { private static final long serialVersionUID = -7100030301376959817L; - public List regattas; private Date currentServerTime; @@ -33,7 +32,6 @@ public class EventDTO extends EventBaseDTO { super(name, leaderboardGroups); this.leaderboardGroups = leaderboardGroups; initCurrentServerTime(); - regattas = new ArrayList(); } public boolean isFakeSeries() { diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java index 5721e8df718..4808ae62264 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java @@ -114,31 +114,6 @@ public class RegattaReplicationTest extends AbstractServerReplicationTest { assertNull(replicatedRegatta.getDefaultCourseArea()); } - @Test - public void testRegattaToEventAssociationBeingReplicated() throws InterruptedException { - final UUID tvCourseAreaId = UUID.randomUUID(); - final UUID golfCourseAreaId = UUID.randomUUID(); - final TimePoint eventStartDate = new MillisecondsTimePoint(new Date()); - final TimePoint eventEndDate = new MillisecondsTimePoint(new Date()); - Event event = master.addEvent("Event", /* eventDescription */ null, eventStartDate, eventEndDate, "Venue", /*isPublic*/true, UUID.randomUUID()); - master.addCourseAreas(event.getId(), new String[] {"TV"}, new UUID[] {tvCourseAreaId}); - master.addCourseAreas(event.getId(), new String[] {"Golf"}, new UUID[] {golfCourseAreaId}); - final String regattaName = RegattaImpl.getDefaultName("Kiel Week 2012", "49er"); - Regatta masterRegatta = master.createRegatta(regattaName, "49er", /*startDate*/ null, /*endDate*/ null, UUID.randomUUID(), Collections.emptyList(), - /* persistent */ true, DomainFactory.INSTANCE.createScoringScheme(ScoringSchemeType.LOW_POINT), tvCourseAreaId, - /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event = master.getEvent(event.getId()); - assertTrue(event.getRegattas().iterator().hasNext()); - assertEquals(regattaName, event.getRegattas().iterator().next().getName()); - Thread.sleep(1000); - Event replicatedEvent = replica.getEvent(event.getId()); - Iterator regattasInReplicatedEvent = replicatedEvent.getRegattas().iterator(); - assertTrue(regattasInReplicatedEvent.hasNext()); - assertEquals(regattaName, regattasInReplicatedEvent.next().getName()); - master.apply(new UpdateSpecificRegatta(masterRegatta.getRegattaIdentifier(), /*startDate*/ null, /*endDate*/ null, golfCourseAreaId, null, - /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false)); - } - @Test public void testUpdateSpecificRegattaReplicationForProcedureAndCourseDesignerAndConfig() throws InterruptedException { Regatta replicatedRegatta; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java index 7c85376be0c..6d186f1c3a9 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java @@ -218,7 +218,7 @@ public class MasterDataImportTest { RegattaImpl.getDefaultName(TEST_REGATTA_NAME, TEST_BOAT_CLASS_NAME), TEST_BOAT_CLASS_NAME, /* startDate */null, /* endDate */null, regattaUUID, series, true, new LowPoint(), courseAreaUUID, /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event.addRegatta(regatta); + for (String name : raceColumnNames) { series.get(0).addRaceColumn(name, sourceService); } @@ -545,7 +545,6 @@ public class MasterDataImportTest { RegattaImpl.getDefaultName(TEST_REGATTA_NAME, TEST_BOAT_CLASS_NAME), TEST_BOAT_CLASS_NAME, /* startDate */null, /* endDate */null, regattaUUID, series, true, new LowPoint(), courseAreaUUID, /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event.addRegatta(regatta); for (String name : raceColumnNames) { series.get(0).addRaceColumn(name, sourceService); } @@ -703,7 +702,6 @@ public class MasterDataImportTest { Regatta regatta = sourceService.createRegatta(RegattaImpl.getDefaultName("testRegatta", "29er"), "29er", /* startDate */null, /* endDate */null, regattaUUID, series, true, new LowPoint(), courseAreaUUID, /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event.addRegatta(regatta); for (String name : raceColumnNames) { series.get(0).addRaceColumn(name, sourceService); } @@ -867,7 +865,7 @@ public class MasterDataImportTest { RegattaImpl.getDefaultName(TEST_REGATTA_NAME, TEST_BOAT_CLASS_NAME), TEST_BOAT_CLASS_NAME, /* startDate */null, /* endDate */null, regattaUUID, series, true, new LowPoint(), courseAreaUUID, /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event.addRegatta(regatta); + for (String name : raceColumnNames) { series.get(0).addRaceColumn(name, sourceService); } @@ -1027,7 +1025,6 @@ public class MasterDataImportTest { RegattaImpl.getDefaultName(TEST_REGATTA_NAME, TEST_BOAT_CLASS_NAME), TEST_BOAT_CLASS_NAME, /* startDate */null, /* endDate */null, regattaUUID, series, true, new LowPoint(), courseAreaUUID, /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event.addRegatta(regatta); for (String name : raceColumnNames) { series.get(0).addRaceColumn(name, sourceService); } @@ -1141,7 +1138,7 @@ public class MasterDataImportTest { RegattaImpl.getDefaultName(TEST_REGATTA_NAME, TEST_BOAT_CLASS_NAME), TEST_BOAT_CLASS_NAME, /* startDate */ null, /* endDate */null, regattaUUID, seriesNotToOverride, true, new LowPoint(), courseAreaUUID, /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event.addRegatta(regattaNotToOverride); + for (String name : raceColumnNamesNotToOverride) { seriesNotToOverride.get(0).addRaceColumn(name, destService); } @@ -1229,7 +1226,7 @@ public class MasterDataImportTest { RegattaImpl.getDefaultName(TEST_REGATTA_NAME, TEST_BOAT_CLASS_NAME), TEST_BOAT_CLASS_NAME, /* startDate */null, /* endDate */null, regattaUUID, series, true, new LowPoint(), courseAreaUUID, /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event.addRegatta(regatta); + for (String name : raceColumnNames) { series.get(0).addRaceColumn(name, sourceService); } @@ -1339,7 +1336,7 @@ public class MasterDataImportTest { RegattaImpl.getDefaultName(TEST_REGATTA_NAME, TEST_BOAT_CLASS_NAME), TEST_BOAT_CLASS_NAME, /* startDate */ null, /* endDate */null, regattaUUID, seriesToOverride, true, new LowPoint(), courseAreaUUID, /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event.addRegatta(regattaToOverride); + for (String name : raceColumnNamesToOverride) { seriesToOverride.get(0).addRaceColumn(name, destService); } @@ -1665,7 +1662,7 @@ public class MasterDataImportTest { RegattaImpl.getDefaultName(TEST_REGATTA_NAME, TEST_BOAT_CLASS_NAME), TEST_BOAT_CLASS_NAME, /* startDate */null, /* endDate */null, regattaUUID, series, true, new LowPoint(), courseAreaUUID, /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event.addRegatta(regatta); + for (String name : raceColumnNames) { series.get(0).addRaceColumn(name, sourceService); } @@ -1909,7 +1906,7 @@ public class MasterDataImportTest { RegattaImpl.getDefaultName(TEST_REGATTA_NAME, TEST_BOAT_CLASS_NAME), TEST_BOAT_CLASS_NAME, /* startDate */null, /* endDate */null, regattaUUID, series, true, new LowPoint(), courseAreaUUID, /*buoyZoneRadiusInHullLengths*/2.0, /* useStartTimeInference */true, /* controlTrackingFromStartAndFinishTimes */ false, OneDesignRankingMetric::new); - event.addRegatta(regatta); + for (String name : raceColumnNames) { series.get(0).addRaceColumn(name, sourceService); } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 1a7a32b73d8..714f926f018 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -1416,13 +1416,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes if (persistent) { updateStoredRegatta(regatta); } - for (Event event : getAllEvents()) { - for (CourseArea eventCourseArea : event.getVenue().getCourseAreas()) { - if (defaultCourseAreaId != null && eventCourseArea.getId().equals(defaultCourseAreaId)) { - event.addRegatta(regatta); - } - } - } + return wasCreated; } @@ -2322,7 +2316,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes regatta.addSeries(seriesObj); } } - regatta.adjustEventToRegattaAssociation(this); + if (regatta.isPersistent()) { mongoObjectFactory.storeRegatta(regatta); }