mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-14 16:20:57 +00:00
pull shared events and analyzers onto AbstractLog level
This commit is contained in:
1 parent
a4d941fa55
commit
9bf3d7c9c7
155 files changed
+1183
-858
No files matched your search
+4
-4
@@ -16,9 +16,7 @@ import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
|
||||
import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLog;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.PlaceHolderDeviceIdentifier;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent;
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.domain.base.DomainFactory;
|
||||
import com.sap.sailing.domain.base.impl.CompetitorImpl;
|
||||
@@ -33,6 +31,8 @@ import com.sap.sailing.domain.racelog.RaceLogIdentifier;
|
||||
import com.sap.sailing.domain.racelog.tracking.test.mock.MockEmptyServiceFinderFactory;
|
||||
import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServiceFinderFactory;
|
||||
import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier;
|
||||
import com.sap.sailing.domain.racelogtracking.DeviceIdentifier;
|
||||
import com.sap.sailing.domain.racelogtracking.PlaceHolderDeviceIdentifier;
|
||||
import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifierImpl;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
import com.sap.sse.common.Util;
|
||||
@@ -92,7 +92,7 @@ public class StoreAndLoadDeviceIdentifierTest extends AbstractMongoDBTest {
|
||||
RaceLog loadedRaceLog = loadRaceLog();
|
||||
loadedRaceLog.lockForRead();
|
||||
assertEquals(1, Util.size(loadedRaceLog.getRawFixes()));
|
||||
DeviceCompetitorMappingEvent mapping = (DeviceCompetitorMappingEvent) loadedRaceLog.getRawFixes().iterator().next();
|
||||
RaceLogDeviceCompetitorMappingEvent mapping = (RaceLogDeviceCompetitorMappingEvent) loadedRaceLog.getRawFixes().iterator().next();
|
||||
loadedRaceLog.unlockAfterRead();
|
||||
|
||||
return mapping.getDevice();
|
||||
|
||||
+19
-19
@@ -28,13 +28,12 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogPassChangeEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogRaceStatusEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent;
|
||||
import com.sap.sailing.domain.base.BoatClass;
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.domain.base.DomainFactory;
|
||||
@@ -48,6 +47,7 @@ import com.sap.sailing.domain.persistence.impl.MongoObjectFactoryImpl;
|
||||
import com.sap.sailing.domain.racelog.RaceLogIdentifier;
|
||||
import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServiceFinderFactory;
|
||||
import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier;
|
||||
import com.sap.sailing.domain.racelogtracking.DeviceIdentifier;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.common.impl.MillisecondsTimePoint;
|
||||
@@ -177,11 +177,11 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
|
||||
Competitor mappedTo = DomainFactory.INSTANCE.getOrCreateCompetitor("abc", "abc", null, null, null);
|
||||
TimePoint from = new MillisecondsTimePoint(20);
|
||||
TimePoint to = new MillisecondsTimePoint(30);
|
||||
DeviceCompetitorMappingEvent expectedEvent = eventFactory.createDeviceCompetitorMappingEvent(
|
||||
RaceLogDeviceCompetitorMappingEvent expectedEvent = eventFactory.createDeviceCompetitorMappingEvent(
|
||||
expectedEventTime, author, expectedEventTime, expectedId, device, mappedTo, expectedPassId, from, to);
|
||||
|
||||
DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent);
|
||||
DeviceCompetitorMappingEvent actualEvent = loadEvent(dbObject);
|
||||
RaceLogDeviceCompetitorMappingEvent actualEvent = loadEvent(dbObject);
|
||||
|
||||
assertBaseFields(expectedEvent, actualEvent);
|
||||
assertEquals(device, actualEvent.getDevice());
|
||||
@@ -196,11 +196,11 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
|
||||
Mark mappedTo = DomainFactory.INSTANCE.getOrCreateMark("abc", "abc");
|
||||
TimePoint from = new MillisecondsTimePoint(20);
|
||||
TimePoint to = new MillisecondsTimePoint(30);
|
||||
DeviceMarkMappingEvent expectedEvent = eventFactory.createDeviceMarkMappingEvent(
|
||||
RaceLogDeviceMarkMappingEvent expectedEvent = eventFactory.createDeviceMarkMappingEvent(
|
||||
expectedEventTime, author, expectedEventTime, expectedId, device, mappedTo, expectedPassId, from, to);
|
||||
|
||||
DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent);
|
||||
DeviceMarkMappingEvent actualEvent = loadEvent(dbObject);
|
||||
RaceLogDeviceMarkMappingEvent actualEvent = loadEvent(dbObject);
|
||||
|
||||
assertBaseFields(expectedEvent, actualEvent);
|
||||
assertEquals(device, actualEvent.getDevice());
|
||||
@@ -214,12 +214,12 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
|
||||
String raceName = "race";
|
||||
BoatClass boatClass = DomainFactory.INSTANCE.getOrCreateBoatClass("49er");
|
||||
UUID raceId = UUID.randomUUID();
|
||||
DenoteForTrackingEvent expectedEvent = eventFactory.createDenoteForTrackingEvent(
|
||||
RaceLogDenoteForTrackingEvent expectedEvent = eventFactory.createDenoteForTrackingEvent(
|
||||
expectedEventTime, author, expectedEventTime, expectedId, expectedPassId, raceName, boatClass,
|
||||
raceId);
|
||||
|
||||
DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent);
|
||||
DenoteForTrackingEvent actualEvent = loadEvent(dbObject);
|
||||
RaceLogDenoteForTrackingEvent actualEvent = loadEvent(dbObject);
|
||||
|
||||
assertBaseFields(expectedEvent, actualEvent);
|
||||
assertEquals(boatClass, actualEvent.getBoatClass());
|
||||
@@ -249,12 +249,12 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
|
||||
|
||||
@Test
|
||||
public void testStoreAndLoadRegisterCompetitorEvent() {
|
||||
RegisterCompetitorEvent expectedEvent = eventFactory.createRegisterCompetitorEvent(
|
||||
RaceLogRegisterCompetitorEvent expectedEvent = eventFactory.createRegisterCompetitorEvent(
|
||||
expectedEventTime, author, expectedEventTime, expectedId, expectedPassId,
|
||||
DomainFactory.INSTANCE.getOrCreateCompetitor("comp", "comp", null, null, null));
|
||||
|
||||
DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent);
|
||||
RegisterCompetitorEvent actualEvent = loadEvent(dbObject);
|
||||
RaceLogRegisterCompetitorEvent actualEvent = loadEvent(dbObject);
|
||||
|
||||
assertBaseFields(expectedEvent, actualEvent);
|
||||
assertEquals(expectedEvent.getCompetitor(), actualEvent.getCompetitor());
|
||||
@@ -262,12 +262,12 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
|
||||
|
||||
@Test
|
||||
public void testStoreAndLoadDefineMarkEvent() {
|
||||
DefineMarkEvent expectedEvent = eventFactory.createDefineMarkEvent(
|
||||
RaceLogDefineMarkEvent expectedEvent = eventFactory.createDefineMarkEvent(
|
||||
expectedEventTime, author, expectedEventTime, expectedId, expectedPassId,
|
||||
DomainFactory.INSTANCE.getOrCreateMark("mytestmark"));
|
||||
|
||||
DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent);
|
||||
DefineMarkEvent actualEvent = loadEvent(dbObject);
|
||||
RaceLogDefineMarkEvent actualEvent = loadEvent(dbObject);
|
||||
|
||||
assertBaseFields(expectedEvent, actualEvent);
|
||||
assertEquals(expectedEvent.getMark(), actualEvent.getMark());
|
||||
@@ -275,12 +275,12 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
|
||||
|
||||
@Test
|
||||
public void testStoreAndLoadCloseOpenDeviceMappingEvent() {
|
||||
CloseOpenEndedDeviceMappingEvent expectedEvent = eventFactory.createCloseOpenEndedDeviceMappingEvent(
|
||||
RaceLogCloseOpenEndedDeviceMappingEvent expectedEvent = eventFactory.createCloseOpenEndedDeviceMappingEvent(
|
||||
expectedEventTime, author, expectedEventTime, expectedId, expectedPassId,
|
||||
UUID.randomUUID(), new MillisecondsTimePoint(49));
|
||||
|
||||
DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent);
|
||||
CloseOpenEndedDeviceMappingEvent actualEvent = loadEvent(dbObject);
|
||||
RaceLogCloseOpenEndedDeviceMappingEvent actualEvent = loadEvent(dbObject);
|
||||
|
||||
assertBaseFields(expectedEvent, actualEvent);
|
||||
assertEquals(expectedEvent.getDeviceMappingEventId(), actualEvent.getDeviceMappingEventId());
|
||||
|
||||
+1
-1
@@ -15,7 +15,6 @@ import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLog;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
|
||||
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier;
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.domain.base.DomainFactory;
|
||||
import com.sap.sailing.domain.base.Mark;
|
||||
@@ -33,6 +32,7 @@ import com.sap.sailing.domain.persistence.racelog.tracking.impl.MongoGPSFixStore
|
||||
import com.sap.sailing.domain.racelog.tracking.GPSFixStore;
|
||||
import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServiceFinderFactory;
|
||||
import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier;
|
||||
import com.sap.sailing.domain.racelogtracking.DeviceIdentifier;
|
||||
import com.sap.sailing.domain.tracking.GPSFix;
|
||||
import com.sap.sailing.domain.tracking.GPSFixMoving;
|
||||
import com.sap.sailing.domain.tracking.impl.DynamicGPSFixMovingTrackImpl;
|
||||
|
||||
Reference in new issue
Block a user