mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-11 06:40:53 +00:00
set description when creating an event
This commit is contained in:
1 parent
683f6ab2b6
commit
00ba9172b3
14 files changed
+73
-69
No files matched your search
+4
-4
@@ -832,10 +832,10 @@ public class EventManagementPanel extends SimplePanel implements EventsRefresher
|
||||
for (CourseAreaDTO courseAreaDTO : newEvent.venue.getCourseAreas()) {
|
||||
courseAreaNames.add(courseAreaDTO.getName());
|
||||
}
|
||||
sailingService.createEvent(newEvent.getName(), newEvent.startDate, newEvent.endDate, newEvent.venue.getName(),
|
||||
newEvent.isPublic, courseAreaNames, newEvent.getImageURLs(), newEvent.getVideoURLs(),
|
||||
newEvent.getSponsorImageURLs(), newEvent.getLogoImageURL(), newEvent.getOfficialWebsiteURL(),
|
||||
new AsyncCallback<EventDTO>() {
|
||||
sailingService.createEvent(newEvent.getName(), newEvent.getDescription(), newEvent.startDate, newEvent.endDate,
|
||||
newEvent.venue.getName(), newEvent.isPublic, courseAreaNames, newEvent.getImageURLs(),
|
||||
newEvent.getVideoURLs(), newEvent.getSponsorImageURLs(), newEvent.getLogoImageURL(),
|
||||
newEvent.getOfficialWebsiteURL(), new AsyncCallback<EventDTO>() {
|
||||
@Override
|
||||
public void onFailure(Throwable t) {
|
||||
errorReporter.reportError("Error trying to create new event " + newEvent.getName() + ": " + t.getMessage());
|
||||
|
||||
+3
-3
@@ -285,9 +285,9 @@ public interface SailingService extends RemoteService {
|
||||
String logoImageURL, Iterable<String> imageURLs, Iterable<String> videoURLs,
|
||||
Iterable<String> sponsorImageURLs) throws Exception;
|
||||
|
||||
EventDTO createEvent(String eventName, Date startDate, Date endDate, String description, boolean isPublic,
|
||||
List<String> courseAreaNames, Iterable<String> imageURLs, Iterable<String> videoURLs,
|
||||
Iterable<String> sponsorImageURLs, String logoImageURL, String officialWebsiteURL) throws Exception;
|
||||
EventDTO createEvent(String eventName, String eventDescription, Date startDate, Date endDate, String venue,
|
||||
boolean isPublic, List<String> courseAreaNames, Iterable<String> imageURLs,
|
||||
Iterable<String> videoURLs, Iterable<String> sponsorImageURLs, String logoImageURL, String officialWebsiteURL) throws Exception;
|
||||
|
||||
void removeEvent(UUID eventId);
|
||||
|
||||
|
||||
+1
-1
@@ -352,7 +352,7 @@ public interface SailingServiceAsync {
|
||||
|
||||
void removeEvents(Collection<UUID> eventIds, AsyncCallback<Void> asyncCallback);
|
||||
|
||||
void createEvent(String eventName, Date startDate, Date endDate, String description, boolean isPublic,
|
||||
void createEvent(String eventName, String eventDescription, Date startDate, Date endDate, String venue, boolean isPublic,
|
||||
List<String> courseAreaNames, Iterable<String> imageURLs, Iterable<String> videoURLs,
|
||||
Iterable<String> sponsorImageURLs, String logoImageURL, String officialWebsiteURL, AsyncCallback<EventDTO> callback);
|
||||
|
||||
|
||||
+7
-7
@@ -3188,18 +3188,18 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
}
|
||||
|
||||
@Override
|
||||
public EventDTO createEvent(String eventName, Date startDate, Date endDate, String venue, boolean isPublic,
|
||||
List<String> courseAreaNames, Iterable<String> imageURLs, Iterable<String> videoURLs,
|
||||
Iterable<String> sponsorImageURLs, String logoImageURLAsString, String officialWebsiteURLAsString)
|
||||
public EventDTO createEvent(String eventName, String eventDescription, Date startDate, Date endDate, String venue,
|
||||
boolean isPublic, List<String> courseAreaNames, Iterable<String> imageURLs,
|
||||
Iterable<String> videoURLs, Iterable<String> sponsorImageURLs, String logoImageURLAsString, String officialWebsiteURLAsString)
|
||||
throws MalformedURLException {
|
||||
UUID eventUuid = UUID.randomUUID();
|
||||
TimePoint startTimePoint = startDate != null ? new MillisecondsTimePoint(startDate) : null;
|
||||
TimePoint endTimePoint = endDate != null ? new MillisecondsTimePoint(endDate) : null;
|
||||
getService().apply(
|
||||
new CreateEvent(eventName, startTimePoint, endTimePoint, venue, isPublic, eventUuid, createURLsFromStrings(imageURLs),
|
||||
createURLsFromStrings(videoURLs), createURLsFromStrings(sponsorImageURLs),
|
||||
logoImageURLAsString == null ? null : new URL(logoImageURLAsString),
|
||||
officialWebsiteURLAsString == null ? null : new URL(officialWebsiteURLAsString)));
|
||||
new CreateEvent(eventName, eventDescription, startTimePoint, endTimePoint, venue, isPublic, eventUuid,
|
||||
createURLsFromStrings(imageURLs), createURLsFromStrings(videoURLs),
|
||||
createURLsFromStrings(sponsorImageURLs),
|
||||
logoImageURLAsString == null ? null : new URL(logoImageURLAsString), officialWebsiteURLAsString == null ? null : new URL(officialWebsiteURLAsString)));
|
||||
for (String courseAreaName : courseAreaNames) {
|
||||
createCourseArea(eventUuid, courseAreaName);
|
||||
}
|
||||
|
||||
+1
-1
@@ -122,7 +122,7 @@ public class ConnectionResetAndReconnectTest extends AbstractServerReplicationTe
|
||||
List<String> regattas = new ArrayList<String>();
|
||||
regattas.add("Day1");
|
||||
regattas.add("Day2");
|
||||
return master.addEvent(eventName, eventStartDate, eventEndDate, venueName, isPublic, UUID.randomUUID());
|
||||
return master.addEvent(eventName, /* eventDescription */ null, eventStartDate, eventEndDate, venueName, isPublic, UUID.randomUUID());
|
||||
}
|
||||
|
||||
private void stopMessagingExchange() {
|
||||
|
||||
+4
-4
@@ -35,7 +35,7 @@ public class EventReplicationTest extends AbstractServerReplicationTest {
|
||||
List<String> regattas = new ArrayList<String>();
|
||||
regattas.add("Day1");
|
||||
regattas.add("Day2");
|
||||
Event masterEvent = master.addEvent(eventName, eventStartDate, eventEndDate, venueName, isPublic, UUID.randomUUID());
|
||||
Event masterEvent = master.addEvent(eventName, /* eventDescription */ null, eventStartDate, eventEndDate, venueName, isPublic, UUID.randomUUID());
|
||||
|
||||
Thread.sleep(1000);
|
||||
Event replicatedEvent = replica.getEvent(masterEvent.getId());
|
||||
@@ -54,7 +54,7 @@ public class EventReplicationTest extends AbstractServerReplicationTest {
|
||||
List<String> regattas = new ArrayList<String>();
|
||||
regattas.add("Day1");
|
||||
regattas.add("Day2");
|
||||
final Event masterEvent = master.addEvent(eventName, null, null, venueName, isPublic, UUID.randomUUID());
|
||||
final Event masterEvent = master.addEvent(eventName, /* eventDescription */ null, null, null, venueName, isPublic, UUID.randomUUID());
|
||||
final String leaderboardGroupName = "LGName";
|
||||
LeaderboardGroup lg = master.apply(new CreateLeaderboardGroup(leaderboardGroupName, "LGDescription", /* displayGroupsInReverseOrder */
|
||||
"displayName", /* leaderboardNames */
|
||||
@@ -78,7 +78,7 @@ public class EventReplicationTest extends AbstractServerReplicationTest {
|
||||
List<String> regattas = new ArrayList<String>();
|
||||
regattas.add("Day1");
|
||||
regattas.add("Day2");
|
||||
Event masterEvent = master.addEvent(eventName, null, null, venueName, isPublic, UUID.randomUUID());
|
||||
Event masterEvent = master.addEvent(eventName, /* eventDescription */ null, null, null, venueName, isPublic, UUID.randomUUID());
|
||||
|
||||
Thread.sleep(1000);
|
||||
Event replicatedEvent = replica.getEvent(masterEvent.getId());
|
||||
@@ -97,7 +97,7 @@ public class EventReplicationTest extends AbstractServerReplicationTest {
|
||||
final String courseArea = "Alpha";
|
||||
final TimePoint eventStartDate = new MillisecondsTimePoint(new Date());
|
||||
final TimePoint eventEndDate = new MillisecondsTimePoint(new Date());
|
||||
Event masterEvent = master.addEvent(eventName, eventStartDate, eventEndDate, venueName, isPublic, UUID.randomUUID());
|
||||
Event masterEvent = master.addEvent(eventName, /* eventDescription */ null, eventStartDate, eventEndDate, venueName, isPublic, UUID.randomUUID());
|
||||
CourseArea masterCourseArea = master.addCourseArea(masterEvent.getId(), courseArea, UUID.randomUUID());
|
||||
|
||||
Thread.sleep(1000);
|
||||
|
||||
+1
-1
@@ -86,7 +86,7 @@ public class InitialLoadReplicationObjectIdentityTest extends AbstractServerRepl
|
||||
final TimePoint eventStartDate = new MillisecondsTimePoint(new Date());
|
||||
final TimePoint eventEndDate = new MillisecondsTimePoint(new Date());
|
||||
|
||||
Event event = master.addEvent(eventName, eventStartDate, eventEndDate, venue, false, eventId);
|
||||
Event event = master.addEvent(eventName, /* eventDescription */ null, eventStartDate, eventEndDate, venue, false, eventId);
|
||||
assertNotNull(master.getEvent(eventId));
|
||||
assertNull(replica.getEvent(eventId));
|
||||
|
||||
|
||||
+4
-4
@@ -66,7 +66,7 @@ public class RegattaReplicationTest extends AbstractServerReplicationTest {
|
||||
final TimePoint eventStartDate = new MillisecondsTimePoint(new Date());
|
||||
final TimePoint eventEndDate = new MillisecondsTimePoint(new Date());
|
||||
|
||||
Event event = master.addEvent("Event", eventStartDate, eventEndDate, "Venue", true, UUID.randomUUID());
|
||||
Event event = master.addEvent("Event", /* eventDescription */ null, eventStartDate, eventEndDate, "Venue", true, UUID.randomUUID());
|
||||
master.addCourseArea(event.getId(), "Alpha", alphaCourseAreaId);
|
||||
master.addCourseArea(event.getId(), "TV", tvCourseAreaId);
|
||||
|
||||
@@ -112,7 +112,7 @@ public class RegattaReplicationTest extends AbstractServerReplicationTest {
|
||||
final UUID golfCourseAreaId = UUID.randomUUID();
|
||||
final TimePoint eventStartDate = new MillisecondsTimePoint(new Date());
|
||||
final TimePoint eventEndDate = new MillisecondsTimePoint(new Date());
|
||||
Event event = master.addEvent("Event", eventStartDate, eventEndDate, "Venue", /*isPublic*/true, UUID.randomUUID());
|
||||
Event event = master.addEvent("Event", /* eventDescription */ null, eventStartDate, eventEndDate, "Venue", /*isPublic*/true, UUID.randomUUID());
|
||||
master.addCourseArea(event.getId(), "TV", tvCourseAreaId);
|
||||
master.addCourseArea(event.getId(), "Golf", golfCourseAreaId);
|
||||
final String regattaName = RegattaImpl.getDefaultName("Kiel Week 2012", "49er");
|
||||
@@ -137,7 +137,7 @@ public class RegattaReplicationTest extends AbstractServerReplicationTest {
|
||||
final TimePoint eventStartDate = new MillisecondsTimePoint(new Date());
|
||||
final TimePoint eventEndDate = new MillisecondsTimePoint(new Date());
|
||||
|
||||
Event event = master.addEvent("Event", eventStartDate, eventEndDate, "Venue", true, UUID.randomUUID());
|
||||
Event event = master.addEvent("Event", /* eventDescription */ null, eventStartDate, eventEndDate, "Venue", true, UUID.randomUUID());
|
||||
master.addCourseArea(event.getId(), "Alpha", alphaCourseAreaId);
|
||||
|
||||
UUID currentCourseAreaId = null;
|
||||
@@ -295,7 +295,7 @@ public class RegattaReplicationTest extends AbstractServerReplicationTest {
|
||||
final String courseArea = "Alpha";
|
||||
final TimePoint eventStartDate = new MillisecondsTimePoint(new Date());
|
||||
final TimePoint eventEndDate = new MillisecondsTimePoint(new Date());
|
||||
Event masterEvent = master.addEvent(eventName, eventStartDate, eventEndDate, venueName, isPublic, UUID.randomUUID());
|
||||
Event masterEvent = master.addEvent(eventName, /* eventDescription */ null, eventStartDate, eventEndDate, venueName, isPublic, UUID.randomUUID());
|
||||
CourseArea masterCourseArea = master.addCourseArea(masterEvent.getId(), courseArea, UUID.randomUUID());
|
||||
|
||||
Regatta masterRegatta = master.createRegatta(RegattaImpl.getDefaultName(eventName, boatClassName), boatClassName, UUID.randomUUID(), series,
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ public class ReplicationStopTest extends AbstractServerReplicationTest {
|
||||
List<String> regattas = new ArrayList<String>();
|
||||
regattas.add("Day1");
|
||||
regattas.add("Day2");
|
||||
return master.addEvent(eventName, eventStartDate, eventEndDate, venueName, isPublic, UUID.randomUUID());
|
||||
return master.addEvent(eventName, /* eventDescription */ null, eventStartDate, eventEndDate, venueName, isPublic, UUID.randomUUID());
|
||||
}
|
||||
|
||||
|
||||
|
||||
+17
-17
@@ -162,7 +162,7 @@ public class MasterDataImportTest {
|
||||
ClassNotFoundException {
|
||||
// Setup source service
|
||||
RacingEventService sourceService = new RacingEventServiceImpl();
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */ null, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
UUID courseAreaUUID = UUID.randomUUID();
|
||||
CourseArea courseArea = new CourseAreaImpl("testArea", courseAreaUUID);
|
||||
event.getVenue().addCourseArea(courseArea);
|
||||
@@ -378,7 +378,7 @@ public class MasterDataImportTest {
|
||||
InterruptedException, ClassNotFoundException {
|
||||
// Setup source service
|
||||
RacingEventService sourceService = new RacingEventServiceImpl();
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */ null, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
UUID courseAreaUUID = UUID.randomUUID();
|
||||
CourseArea courseArea = new CourseAreaImpl("testArea", courseAreaUUID);
|
||||
event.getVenue().addCourseArea(courseArea);
|
||||
@@ -534,7 +534,7 @@ public class MasterDataImportTest {
|
||||
ClassNotFoundException {
|
||||
// Setup source service
|
||||
RacingEventService sourceService = new RacingEventServiceImpl();
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */ null, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
UUID courseAreaUUID = UUID.randomUUID();
|
||||
CourseArea courseArea = new CourseAreaImpl("testArea", courseAreaUUID);
|
||||
event.getVenue().addCourseArea(courseArea);
|
||||
@@ -676,7 +676,7 @@ public class MasterDataImportTest {
|
||||
PersistenceFactory.INSTANCE.getDomainObjectFactory(MongoDBService.INSTANCE, sourceDomainFactory),
|
||||
PersistenceFactory.INSTANCE.getMongoObjectFactory(MongoDBService.INSTANCE),
|
||||
MediaDBFactory.INSTANCE.getDefaultMediaDB(), EmptyWindStore.INSTANCE, EmptyGPSFixStore.INSTANCE);
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */ null, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
UUID courseAreaUUID = UUID.randomUUID();
|
||||
CourseArea courseArea = new CourseAreaImpl("testArea", courseAreaUUID);
|
||||
event.getVenue().addCourseArea(courseArea);
|
||||
@@ -831,7 +831,7 @@ public class MasterDataImportTest {
|
||||
InterruptedException, ClassNotFoundException {
|
||||
// Setup source service
|
||||
RacingEventService sourceService = new RacingEventServiceImpl();
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */ null, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
UUID courseAreaUUID = UUID.randomUUID();
|
||||
CourseArea courseArea = new CourseAreaImpl("testArea", courseAreaUUID);
|
||||
event.getVenue().addCourseArea(courseArea);
|
||||
@@ -945,8 +945,8 @@ public class MasterDataImportTest {
|
||||
domainFactory = destService.getBaseDomainFactory();
|
||||
// Create existing data on target
|
||||
venueNameNotToOverride = "doNotOverride";
|
||||
Event eventNotToOverride = destService.addEvent(TEST_EVENT_NAME, eventStartDate, eventEndDate, venueNameNotToOverride, false,
|
||||
eventUUID);
|
||||
Event eventNotToOverride = destService.addEvent(TEST_EVENT_NAME, /* eventDescription */ null, eventStartDate, eventEndDate, venueNameNotToOverride,
|
||||
false, eventUUID);
|
||||
courseAreaNotToOverride = new CourseAreaImpl("testAreaNotToOverride", courseAreaUUID);
|
||||
eventNotToOverride.getVenue().addCourseArea(courseAreaNotToOverride);
|
||||
|
||||
@@ -1029,7 +1029,7 @@ public class MasterDataImportTest {
|
||||
InterruptedException, ClassNotFoundException {
|
||||
// Setup source service
|
||||
RacingEventService sourceService = new RacingEventServiceImpl();
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */ null, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
UUID courseAreaUUID = UUID.randomUUID();
|
||||
CourseArea courseArea = new CourseAreaImpl("testArea", courseAreaUUID);
|
||||
event.getVenue().addCourseArea(courseArea);
|
||||
@@ -1139,7 +1139,7 @@ public class MasterDataImportTest {
|
||||
domainFactory = destService.getBaseDomainFactory();
|
||||
// Create existing data on target
|
||||
String venueNameToOverride = "Override";
|
||||
Event eventToOverride = destService.addEvent(TEST_EVENT_NAME, eventStartDate, eventEndDate, venueNameToOverride, false, eventUUID);
|
||||
Event eventToOverride = destService.addEvent(TEST_EVENT_NAME, /* eventDescription */ null, eventStartDate, eventEndDate, venueNameToOverride, false, eventUUID);
|
||||
CourseArea courseAreaToOverride = new CourseAreaImpl("testAreaToOverride", courseAreaUUID);
|
||||
eventToOverride.getVenue().addCourseArea(courseAreaToOverride);
|
||||
|
||||
@@ -1257,9 +1257,9 @@ public class MasterDataImportTest {
|
||||
Iterable<URL> imageURLs = new HashSet<>();
|
||||
Iterable<URL> videoURLs = new HashSet<>();
|
||||
Iterable<URL> sponsorImageURLs = new HashSet<>();
|
||||
Event event = sourceService.createEventWithoutReplication("Test Event", new MillisecondsTimePoint(0),
|
||||
new MillisecondsTimePoint(10), "testvenue", false, UUID.randomUUID(), imageURLs, videoURLs,
|
||||
sponsorImageURLs, /* logoImageURL */ null, /* officialWebsiteURL */ null);
|
||||
Event event = sourceService.createEventWithoutReplication("Test Event", eventDescription,
|
||||
new MillisecondsTimePoint(0), new MillisecondsTimePoint(10), "testvenue", false, UUID.randomUUID(), imageURLs,
|
||||
videoURLs, sponsorImageURLs, /* logoImageURL */ null, /* officialWebsiteURL */ null);
|
||||
CourseArea defaultCourseArea = sourceService.addCourseArea(event.getId(), "ECHO", UUID.randomUUID());
|
||||
|
||||
Regatta regatta = sourceService.createRegatta(
|
||||
@@ -1324,9 +1324,9 @@ public class MasterDataImportTest {
|
||||
Iterable<URL> imageURLs = new HashSet<>();
|
||||
Iterable<URL> videoURLs = new HashSet<>();
|
||||
Iterable<URL> sponsorImageURLs = new HashSet<>();
|
||||
Event event = sourceService.createEventWithoutReplication("Test Event", new MillisecondsTimePoint(0),
|
||||
new MillisecondsTimePoint(10), "testvenue", false, UUID.randomUUID(), imageURLs, videoURLs,
|
||||
sponsorImageURLs, /* logoImageURL */ null, /* officialWebsiteURL */ null);
|
||||
Event event = sourceService.createEventWithoutReplication("Test Event", eventDescription,
|
||||
new MillisecondsTimePoint(0), new MillisecondsTimePoint(10), "testvenue", false, UUID.randomUUID(), imageURLs,
|
||||
videoURLs, sponsorImageURLs, /* logoImageURL */ null, /* officialWebsiteURL */ null);
|
||||
CourseArea defaultCourseArea = sourceService.addCourseArea(event.getId(), "ECHO", UUID.randomUUID());
|
||||
|
||||
List<String> raceColumnNames = new ArrayList<String>();
|
||||
@@ -1455,7 +1455,7 @@ public class MasterDataImportTest {
|
||||
IOException, InterruptedException, ClassNotFoundException {
|
||||
// Setup source service
|
||||
RacingEventService sourceService = new RacingEventServiceImpl();
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */ null, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
UUID courseAreaUUID = UUID.randomUUID();
|
||||
CourseArea courseArea = new CourseAreaImpl("testArea", courseAreaUUID);
|
||||
event.getVenue().addCourseArea(courseArea);
|
||||
@@ -1661,7 +1661,7 @@ public class MasterDataImportTest {
|
||||
InterruptedException, ClassNotFoundException {
|
||||
// Setup source service
|
||||
RacingEventService sourceService = new RacingEventServiceImpl();
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */ null, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
|
||||
UUID courseAreaUUID = UUID.randomUUID();
|
||||
CourseArea courseArea = new CourseAreaImpl("testArea", courseAreaUUID);
|
||||
event.getVenue().addCourseArea(courseArea);
|
||||
|
||||
+8
-8
@@ -117,10 +117,10 @@ public class SearchServiceTest {
|
||||
final TimePoint pfingstbuschStartDate = new MillisecondsTimePoint(cal.getTime());
|
||||
cal.set(2014, 5, 8, 16, 00);
|
||||
final TimePoint pfingstbuschEndDate = new MillisecondsTimePoint(cal.getTime());
|
||||
pfingstbusch = server.apply(new CreateEvent("Pfingsbusch", pfingstbuschStartDate, pfingstbuschEndDate, "Kiel", /* isPublic */
|
||||
true, UUID.randomUUID(), Collections.<URL>emptySet(), Collections.<URL>emptySet(),
|
||||
/* sponsorImageURLs */ Collections.<URL>emptySet(),
|
||||
/* logoImageURLAsString */ null, /* officialWebsiteURLAsString */ null));
|
||||
pfingstbusch = server.apply(new CreateEvent("Pfingsbusch", eventDescription, pfingstbuschStartDate, pfingstbuschEndDate, /* isPublic */
|
||||
"Kiel", true, UUID.randomUUID(), Collections.<URL>emptySet(),
|
||||
Collections.<URL>emptySet(),
|
||||
/* sponsorImageURLs */ Collections.<URL>emptySet(), /* logoImageURLAsString */ null, /* officialWebsiteURLAsString */ null));
|
||||
kiel = pfingstbusch.getVenue();
|
||||
final CourseAreaImpl kielAlpha = new CourseAreaImpl("Alpha", UUID.randomUUID());
|
||||
kiel.addCourseArea(kielAlpha);
|
||||
@@ -150,10 +150,10 @@ public class SearchServiceTest {
|
||||
final TimePoint aalStartDate = new MillisecondsTimePoint(cal.getTime());
|
||||
cal.set(2014, 5, 8, 18, 00);
|
||||
final TimePoint aalEndDate = new MillisecondsTimePoint(cal.getTime());
|
||||
aalEvent = server.apply(new CreateEvent("Aalregatta", aalStartDate, aalEndDate, "Flensburg", /* isPublic */
|
||||
true, UUID.randomUUID(), Collections.<URL>emptySet(), Collections.<URL>emptySet(),
|
||||
/* sponsorImageURLs */ Collections.<URL>emptySet(), /* logoimageURL */ null,
|
||||
/* officialWebsiteURLAsString */ null));
|
||||
aalEvent = server.apply(new CreateEvent("Aalregatta", eventDescription, aalStartDate, aalEndDate, /* isPublic */
|
||||
"Flensburg", true, UUID.randomUUID(), Collections.<URL>emptySet(),
|
||||
Collections.<URL>emptySet(), /* sponsorImageURLs */ Collections.<URL>emptySet(),
|
||||
/* logoimageURL */ null, /* officialWebsiteURLAsString */ null));
|
||||
flensburg = aalEvent.getVenue();
|
||||
final CourseAreaImpl flensburgStandard = new CourseAreaImpl("Standard", UUID.randomUUID());
|
||||
flensburg.addCourseArea(flensburgStandard);
|
||||
|
||||
@@ -340,6 +340,7 @@ public interface RacingEventService extends TrackedRegattaRegistry, RegattaFetch
|
||||
*
|
||||
* @param eventName
|
||||
* The name of the new event
|
||||
* @param eventDescription TODO
|
||||
* @param startDate
|
||||
* The start date of the event
|
||||
* @param endDate
|
||||
@@ -352,7 +353,7 @@ public interface RacingEventService extends TrackedRegattaRegistry, RegattaFetch
|
||||
* The name of the venue of the new event
|
||||
* @return The new event
|
||||
*/
|
||||
Event addEvent(String eventName, TimePoint startDate, TimePoint endDate, String venueName, boolean isPublic, UUID id);
|
||||
Event addEvent(String eventName, String eventDescription, TimePoint startDate, TimePoint endDate, String venueName, boolean isPublic, UUID id);
|
||||
|
||||
/**
|
||||
* Updates a sailing event with the name <code>eventName</code>, the venue<code>venue</code> and the regattas with
|
||||
@@ -459,8 +460,8 @@ public interface RacingEventService extends TrackedRegattaRegistry, RegattaFetch
|
||||
*/
|
||||
ConcurrentHashMap<String, Regatta> getPersistentRegattasForRaceIDs();
|
||||
|
||||
Event createEventWithoutReplication(String eventName, TimePoint startDate, TimePoint endDate, String venue, boolean isPublic,
|
||||
UUID id, Iterable<URL> imageURLs, Iterable<URL> videoURLs, Iterable<URL> sponsorImageURLs, URL logoImageURL, URL officialWebsiteURL);
|
||||
Event createEventWithoutReplication(String eventName, String eventDescription, TimePoint startDate, TimePoint endDate, String venue,
|
||||
boolean isPublic, UUID id, Iterable<URL> imageURLs, Iterable<URL> videoURLs, Iterable<URL> sponsorImageURLs, URL logoImageURL, URL officialWebsiteURL);
|
||||
|
||||
void setRegattaForRace(Regatta regatta, String raceIdAsString);
|
||||
|
||||
|
||||
+12
-11
@@ -2294,14 +2294,14 @@ public class RacingEventServiceImpl implements RacingEventServiceWithTestSupport
|
||||
|
||||
// Used for TESTING only
|
||||
@Override
|
||||
public Event addEvent(String eventName, TimePoint startDate, TimePoint endDate, String venue, boolean isPublic, UUID id) {
|
||||
Event result = createEventWithoutReplication(eventName, startDate, endDate, venue, isPublic, id,
|
||||
/* imageURLs */ Collections.<URL>emptyList(), /* videoURLs */ Collections.<URL>emptyList(),
|
||||
/* sponsorImageURLs */ Collections.<URL>emptyList(), /* logoImageURL */ null, /* officialWebsiteURL */ null);
|
||||
replicate(new CreateEvent(eventName, startDate, endDate, venue, isPublic, id, /* imageURLs */
|
||||
Collections.<URL> emptyList(), /* videoURLs */Collections.<URL> emptyList(),
|
||||
/* sponsorImageURLs */ Collections.<URL> emptyList(), /* logoimageURL */ null,
|
||||
/* officialWebsiteURLAsString */ null));
|
||||
public Event addEvent(String eventName, String eventDescription, TimePoint startDate, TimePoint endDate, String venue, boolean isPublic, UUID id) {
|
||||
Event result = createEventWithoutReplication(eventName, eventDescription, startDate, endDate, venue, isPublic,
|
||||
id, /* imageURLs */ Collections.<URL>emptyList(),
|
||||
/* videoURLs */ Collections.<URL>emptyList(), /* sponsorImageURLs */ Collections.<URL>emptyList(), /* logoImageURL */ null, /* officialWebsiteURL */ null);
|
||||
replicate(new CreateEvent(eventName, eventDescription, startDate, endDate, venue, isPublic, /* imageURLs */
|
||||
id, Collections.<URL> emptyList(),
|
||||
/* videoURLs */Collections.<URL> emptyList(), /* sponsorImageURLs */ Collections.<URL> emptyList(),
|
||||
/* logoimageURL */ null, /* officialWebsiteURLAsString */ null));
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -2311,11 +2311,12 @@ public class RacingEventServiceImpl implements RacingEventServiceWithTestSupport
|
||||
}
|
||||
|
||||
@Override
|
||||
public Event createEventWithoutReplication(String eventName, TimePoint startDate, TimePoint endDate, String venue,
|
||||
boolean isPublic, UUID id, Iterable<URL> imageURLs, Iterable<URL> videoURLs,
|
||||
Iterable<URL> sponsorImageURLs, URL logoImageURL, URL officialWebsiteURL) {
|
||||
public Event createEventWithoutReplication(String eventName, String eventDescription, TimePoint startDate, TimePoint endDate,
|
||||
String venue, boolean isPublic, UUID id, Iterable<URL> imageURLs,
|
||||
Iterable<URL> videoURLs, Iterable<URL> sponsorImageURLs, URL logoImageURL, URL officialWebsiteURL) {
|
||||
Event result = new EventImpl(eventName, startDate, endDate, venue, isPublic, id);
|
||||
addEvent(result);
|
||||
result.setDescription(eventDescription);
|
||||
result.setImageURLs(imageURLs);
|
||||
result.setVideoURLs(videoURLs);
|
||||
result.setSponsorImageURLs(sponsorImageURLs);
|
||||
|
||||
+6
-4
@@ -22,16 +22,18 @@ public class CreateEvent extends AbstractEventOperation<Event> {
|
||||
private final TimePoint endDate;
|
||||
private final boolean isPublic;
|
||||
private final String eventName;
|
||||
private final String eventDescription;
|
||||
private final Iterable<URL> videoURLs;
|
||||
private final Iterable<URL> imageURLs;
|
||||
private final Iterable<URL> sponsorImageURLs;
|
||||
private final URL logoImageURL;
|
||||
private final URL officialWebsiteURL;
|
||||
|
||||
public CreateEvent(String eventName, TimePoint startDate, TimePoint endDate, String venue, boolean isPublic,
|
||||
UUID id, Iterable<URL> imageURLs, Iterable<URL> videoURLs, Iterable<URL> sponsorImageURLs, URL logoImageURL, URL officialWebsiteURL) {
|
||||
public CreateEvent(String eventName, String eventDescription, TimePoint startDate, TimePoint endDate, String venue,
|
||||
boolean isPublic, UUID id, Iterable<URL> imageURLs, Iterable<URL> videoURLs, Iterable<URL> sponsorImageURLs, URL logoImageURL, URL officialWebsiteURL) {
|
||||
super(id);
|
||||
this.eventName = eventName;
|
||||
this.eventDescription = eventDescription;
|
||||
this.startDate = startDate;
|
||||
this.endDate = endDate;
|
||||
this.venue = venue;
|
||||
@@ -61,8 +63,8 @@ public class CreateEvent extends AbstractEventOperation<Event> {
|
||||
|
||||
@Override
|
||||
public Event internalApplyTo(RacingEventService toState) {
|
||||
return toState.createEventWithoutReplication(getEventName(), startDate, endDate, venue, isPublic, getId(),
|
||||
imageURLs, videoURLs, sponsorImageURLs, logoImageURL, officialWebsiteURL);
|
||||
return toState.createEventWithoutReplication(getEventName(), eventDescription, startDate, endDate, venue, isPublic,
|
||||
getId(), imageURLs, videoURLs, sponsorImageURLs, logoImageURL, officialWebsiteURL);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user