Commit Graph
800 Commits
Author SHA1 Message Date
Axel Uhl 1cf923a027 use DynamicCompetitor and DynamicBoat where necessary
Change-Id: Id06014ac0baba5ea2315894068003c80733f1b0e
2018-04-11 17:26:20 +02:00
Axel Uhl 360f72a6a7 Merge branch 'master' into bug2822_boatcolors 2018-03-24 08:49:11 +01:00
Axel Uhl bd90f921dd added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule 2018-03-24 01:45:37 +01:00
Axel Uhl 20549542ae made mongoObjectFactory field transient in MigratableRegattaImpl to
ensure serializability

Change-Id: Idfe4d179c80feed3581493231394fc76cfe608e5
2018-03-21 11:30:34 +01:00
Axel Uhl ffb485eef6 fixed RACE_LOGS updating problem
Change-Id: I5e41a1a90aa5559b779c1d0e60ad17a906fbe686
2018-03-21 01:23:15 +01:00
Axel Uhl 2cdb6f34d0 added final where possible in DomainObjectFactoryImpl
Change-Id: I490d8f66b7156e34667d3e18347b438f27f2d61d
2018-03-21 01:11:00 +01:00
Axel Uhl a379ab1812 update RACE_LOGS collection if RaceLogRegisterCompetitorEvent has receiver boat ID; specific hack to migrate 2. Bundesliga smartphone-tracked events' competitors
Change-Id: I8ce7e4949603eb794ba5f84aa439c74c341130b2
2018-03-21 01:01:00 +01:00
Axel Uhl 41ae6c24f6 store canBoatsOfCompetitorsChangePerRace flag already in the constructor of MigratableRegattaImpl to ensure once-only migration
Change-Id: I91d3f07744e0b982c0efad93a6b0142736da5858
2018-03-20 17:55:52 +01:00
Axel Uhl 3013c4fc3a used more Iterable instead of Collection/List where possible
Change-Id: I3266cda397da6050b985a30fa3876ce2d039fc35
2018-03-19 22:15:01 +01:00
Steffen Schaefer 3752d12c3d Merge branch 'bug2822_boatcolors' into bug4416 2018-03-06 07:51:29 +01:00
Frank Mittag 611fd71e2a added a consistency check and log statement to make sure all regattas of a leaderboardGroup have the same value for 'canBoatsOfCompetitorsChangePerRace' when loading races from tractrac 2018-03-05 18:25:44 +01:00
Steffen Schaefer 2862850fad Merge branch 'bug2822_boatcolors_merged_with_eol_changes' into bug4416 2018-02-28 08:15:38 +01:00
Steffen Schaefer 1a5fa73738 Bug 4416: Added new Mapping types to map sensor tracks for boats 2018-02-27 17:42:08 +01:00
Frank Mittag 162392a435 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2018-02-27 15:17:45 +01:00
Benjamin Barth 1106d12457 bug4416 Fixed DB persistence for RegattaLogDeviceBoatMappingEvent 2018-02-27 13:29:29 +01:00
Steffen Schaefer 698683216f Bug 4416: Initially added new mapping event for Boat 2018-02-26 14:47:16 +01:00
Kai Boernert f505b10d50 removed RaceLogCourseAreaChangedEvent 2018-02-23 17:06:14 +01:00
Axel Uhl dcb43721e6 don't use "instanceof CompetitorWithBoat" because of live migration;
when a tracked race is loaded into a regatta with changing boats and the
competitor has a boat, it is migrated "in place" with its boat reference
set to null; this way it is possible to have a CompetitorWithBoat object
that returns false from hasBoat(). Therefore, hasBoat() must be
preferred over a type check

Change-Id: Ic74441bfb48566e66cb88391b52537303638d564
2018-01-16 12:43:30 +01:00
Axel Uhl 6a31b5fb76 added wind finder reviewed spot collections IDs to Event;
including persistence and DTO, but not yet Admin UI

Change-Id: I1433ca1f183872fc02c72adc986bfe19c86198c3
2018-01-04 18:07:34 +01:00
Axel Uhl 652d16b9fd removed unused method, avoiding warning 2017-12-28 20:03:28 +01:00
Axel Uhl b0ec4f7215 when loading a RegattaLogRegisterCompetitorEvent don't insist on CompetitorWithBoat 2017-12-28 20:01:51 +01:00
Axel Uhl 3397169c8a Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
Change-Id: I217ebf26a7c0b92b27efc06de5ac80cf7fcc6d8f
2017-12-21 13:35:18 +01:00
Frank Mittag 8b7170fcf7 Added some logging for the competitor/boat DB migration. All log infos have the prefix: 'Bug2822 DB-Migration:' 2017-12-20 16:24:15 +01:00
Axel Uhl 3cdcbb15b3 use same logic to strip off "random" parameter from TracTrac paramsURL when computing restore key
Change-Id: I6cf45ec159830af0b5e2d273a12cfadccdbe955d
2017-12-20 00:55:01 +01:00
Axel Uhl de70631ede using TrackedRegattaRegistry.removeRace to ensure consistent duplicate race removal
Change-Id: I245828fbd6d49f36e0f1f7d240471e5ea709a481
2017-12-20 00:45:18 +01:00
Axel Uhl 7bcd6f8aa9 added storing of MigratableRegatta after migration
Change-Id: Ifa6d368b127924a1cb31455628c7f009ddea47a5
2017-12-11 18:23:12 +01:00
Axel Uhl ec3969c869 ensure competitor uniqueness by dropping those with duplicate IDs
Change-Id: I6cd09d2c94aed56499fc4c157950d5a3c310bddc
2017-12-11 16:59:34 +01:00
Frank Mittag 62438c83d6 Merged RaceLogRegisterCompetitorEvent and RaceLogRegisterCompetitorAndBoatEvent into just RaceLogRegisterCompetitorEvent to make it easier to handle regattas with changing boats and non changing boats 2017-12-07 16:31:06 +01:00
Frank Mittag 812fef2f22 Removed not needed RegattaLogRegisterAndBoatEvent after discussion with Axel.
All registration on regatta level will be of type RegattaLogRegisterCompetitorEvent where the passed competitor is either of type Competitor or CompetitorWithBoat depending on the regatta type
2017-12-04 14:38:59 +01:00
Frank Mittag ce5d710d65 Fixed condition for the migration of the COMPETITORS collection 2017-12-01 15:27:47 +01:00
Frank Mittag b144ae9b19 - Changed the way a regatta is migrated from a 'without changing boats' regatta to 'with changing boats' regatta by removing the public setter and using a special derived MigratableRegattaImpl type which provides the actual migration function
- Change COMPETITOR collection migration by renaming the old COMPETITOR collection to COMPETITOR_BAK and creating all migrated competitors in the now empty COMPETITORS collection
2017-11-30 15:07:55 +01:00
Frank Mittag d45de24610 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
#	java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPlace.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsFactory.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorRegistrationsPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogImportSensorDataAndAddMappingsDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiRaceLeaderboardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
#	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-11-22 15:39:00 +01:00
Axel Uhl 021ac5e80e Merge branch 'master' into bug4356 2017-11-13 11:33:54 +01:00
Frank Mittag 9489a2dc72 some cleanup of the CompetitorDTO/BoatDTO creation methods 2017-11-08 14:38:50 +01:00
Axel Uhl 612e9b76d5 when adding a device mapping for EXPEDITION_SENSOR, use the correct log event type
Change-Id: I6358ff0120224082532ad25d40265b49e2c02142
2017-11-08 14:20:38 +01:00
Axel Uhl 6924ea32b8 bug 4356: included MergeState enum and field in CompetitorResult
Change-Id: I974bb5904c7e71efc142ac19e84b03a91b7ad045
2017-10-27 10:42:32 +02:00
Axel Uhl 5d2bbfe526 fixed storing of Bravo fixes with null components
Change-Id: I339bea66da5bdd71aeab33a10bad0172dfd00345
2017-10-27 08:55:27 +02:00
Axel Uhl c53c67f797 made DoubleVectorFix null-aware
Change-Id: I59cc0f5b44c78609e2fdf65dcdb6998c2050862b
2017-10-26 18:32:28 +02:00
Axel Uhl e84ca20756 a compileable but untested and most likely non-functional first version of an Expedition sensor data importer
Change-Id: I07d1bf330d60c20f9760c1f9e6baf9f6ec5f2227
2017-10-16 14:50:51 +02:00
Steffen Schaefer ab887f462c Bug 4316: Added persistence for BravoExtendedFix mapping 2017-10-04 17:42:44 +02:00
Frank Mittag 85f3ec4723 Implemented migration of COMPETITORS collection to COMPETITORS_WITH_BOAT_REFERENCES and BOATS collections (old COMPETITORS collection is not deleted for easier development and debugging)
TracTrac connector uses now boat metadata AND leaderboardGroup to create boatIds and lookup boats from the boat store.
2017-09-29 16:09:30 +02:00
Steffen Schaefer 595c8ce982 Bug 4227: JavaDoc improvements 2017-09-22 08:20:57 +02:00
Frank Mittag 524deab6cc moved logic to distinguish the storing/loading of competitors with or without boats to the Mongo/DomainObjectFactory 2017-09-20 18:21:17 +02:00
Benjamin Barth 80acbd8416 bug4227 Fixed storing of DetailedRaceInfo regarding anniversary races 2017-09-13 15:32:57 +02:00
Steffen Schaefer fa05a36c01 Bug 4227: Consistent naming of eventType field in DB 2017-09-12 08:55:17 +02:00
Steffen Schaefer dadb741935 Bug 4227: Consistent naming of eventType field 2017-09-12 08:52:53 +02:00
Steffen Schaefer 7ac22edc59 Bug 4227: Renamed enum for better reusability 2017-09-12 08:05:34 +02:00
Kai Boernert 7f03a972b0 added anniversary type enum 2017-09-11 17:12:13 +02:00
Kai Boernert 02b93657cb added eventName and leaderboardDisplayName 2017-09-11 14:24:04 +02:00
Benjamin Barth 45c2013c08 Merge branch 'master' into bug4227 2017-09-06 13:10:07 +02:00