diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CompetitorRegistrationType.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CompetitorRegistrationType.java index 55842c65f90..ab48c269380 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CompetitorRegistrationType.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CompetitorRegistrationType.java @@ -18,7 +18,8 @@ public enum CompetitorRegistrationType { CLOSED(false, false), /** Competitors are registering themselve, but the regatta owner has to confirm the registration. */ - OPEN_MODERATED(true, true), + // TODO Currently not supported -> implement later + // OPEN_MODERATED(true, true), /** Competitors are registering themselves without the need of confirmation. */ OPEN_UNMODERATED(true, false); @@ -103,8 +104,9 @@ public enum CompetitorRegistrationType { return stringMessages.competitorRegistrationTypeClosed(); case OPEN_UNMODERATED: return stringMessages.competitorRegistrationTypeOpenUnmoderated(); - case OPEN_MODERATED: - return stringMessages.competitorRegistrationTypeOpenModerated(); + // TODO activate when OPEN_MODERATED type is implemented +// case OPEN_MODERATED: +// return stringMessages.competitorRegistrationTypeOpenModerated(); default: return this.name(); } diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java index 69ae0a29f61..710ab9885fd 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java @@ -227,7 +227,7 @@ public class TestStoringAndLoadingEventsAndRegattas extends AbstractMongoDBTest final String regattaBaseName = "Kieler Woche"; BoatClass boatClass = DomainFactory.INSTANCE.getOrCreateBoatClass("29erXX", /* typicallyStartsUpwind */ true); Regatta regatta = createRegatta(RegattaImpl.getDefaultName(regattaBaseName, boatClass.getName()), boatClass, - /* canBoatsOfCompetitorsChangePerRace */ true, CompetitorRegistrationType.OPEN_MODERATED, regattaStartDate, regattaEndDate, /* persistent */ true, + /* canBoatsOfCompetitorsChangePerRace */ true, CompetitorRegistrationType.CLOSED, regattaStartDate, regattaEndDate, /* persistent */ true, DomainFactory.INSTANCE.createScoringScheme(ScoringSchemeType.LOW_POINT), courseArea, OneDesignRankingMetric::new); mof.storeRegatta(regatta); @@ -241,7 +241,7 @@ public class TestStoringAndLoadingEventsAndRegattas extends AbstractMongoDBTest assertEquals(loadedRegatta.getDefaultCourseArea().getName(), courseArea.getName()); assertEquals(loadedRegatta.getStartDate(), regattaStartDate); assertEquals(loadedRegatta.getEndDate(), regattaEndDate); - assertTrue(loadedRegatta.getCompetitorRegistrationType() == CompetitorRegistrationType.OPEN_MODERATED); + assertTrue(loadedRegatta.getCompetitorRegistrationType() == CompetitorRegistrationType.CLOSED); } @Test diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java index e449048b053..58b57a44164 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java @@ -104,7 +104,7 @@ public class RegattasResourceTest extends AbstractJaxRsApiTest { public Regatta call() throws Exception { return racingEventService.createRegatta(openRegattaName, boatClassName, /* canBoatsOfCompetitorsChangePerRace */ true, - CompetitorRegistrationType.OPEN_MODERATED, secret, startDate, endDate, + CompetitorRegistrationType.OPEN_UNMODERATED, secret, startDate, endDate, UUID.randomUUID(), series, /* persistent */ true, DomainFactory.INSTANCE.createScoringScheme(ScoringSchemeType.LOW_POINT), null, /* buoyZoneRadiusInHullLengths */2.0, /* useStartTimeInference */ true,