eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-15 14:56:41 +00:00
Code Activity

Bug5085: on setting deviceUuid or fixed positioning on mark properties

Browse Source 
reset the other one to allow only deviceUuid or fixed positioning and
added some validation to mark properties resource
This commit is contained in:
Thomas Wiese committed 2019-10-17 14:09:51 +02:00
1 parent d7b5e59f02
commit 58568e7067
3 files changed
+44 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkPropertiesTest.java
+35 -3
View File
@@ -4,7 +4,9 @@ import static com.sap.sailing.selenium.api.core.ApiContext.SERVER_CONTEXT;
import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext;
import static java.util.UUID.randomUUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
@@ -52,9 +54,10 @@ public class MarkPropertiesTest extends AbstractSeleniumTest {
final UUID deviceUuid = randomUUID();
MarkProperties markProperties = markPropertiesApi.createMarkProperties(ctx, MARK_PROPERTIES_NAME,
MARK_PROPERTIES_SHORTNAME, deviceUuid.toString(), MARK_PROPERTIES_COLOR, "shape", "pattern",
MARK_PROPERTIES_TYPE, MARK_PROPERTIES_TAGS, MARK_PROPERTIES_LATDEG, MARK_PROPERTIES_LONDEG);
MARK_PROPERTIES_TYPE, MARK_PROPERTIES_TAGS, null, null);
assertNotNull("read: no MarkProperties returnded", markProperties);
assertDefaultValues(markProperties);
assertTrue(markProperties.hasDevice());
}
@Test
@@ -68,6 +71,8 @@ public class MarkPropertiesTest extends AbstractSeleniumTest {
MarkProperties foundMarkProperties = markPropertiesApi.getMarkProperties(ctx, createdMarkProperties.getId());
assertDefaultValues(foundMarkProperties);
assertEquals("read: MarkProperties.latDeg is different", MARK_PROPERTIES_LATDEG, foundMarkProperties.getLatDeg());
assertEquals("read: MarkProperties.lonDeg is different", MARK_PROPERTIES_LONDEG, foundMarkProperties.getLonDeg());
}
@Test
@@ -111,8 +116,6 @@ public class MarkPropertiesTest extends AbstractSeleniumTest {
assertEquals("read: MarkProperties.pattern is different", MARK_PROPERTIES_PATTERN, markProperties.getPattern());
assertEquals("read: MarkProperties.type is different", MARK_PROPERTIES_TYPE,
markProperties.getMarkType().name());
assertEquals("read: MarkProperties.latDeg is different", MARK_PROPERTIES_LATDEG, markProperties.getLatDeg());
assertEquals("read: MarkProperties.lonDeg is different", MARK_PROPERTIES_LONDEG, markProperties.getLonDeg());
}
@Test(expected = HttpException.NotFound.class)
@@ -127,4 +130,33 @@ public class MarkPropertiesTest extends AbstractSeleniumTest {
markPropertiesApi.deleteMarkProperties(ctx, createdMarkProperties.getId());
markPropertiesApi.getMarkProperties(ctx, createdMarkProperties.getId());
}
@Test
public void testExclusionOfDeviceUuidAndFixedPositioning() {
final ApiContext ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT);
MarkProperties createdMarkProperties = markPropertiesApi.createMarkProperties(ctx, MARK_PROPERTIES_NAME,
MARK_PROPERTIES_SHORTNAME, null, MARK_PROPERTIES_COLOR, MARK_PROPERTIES_SHAPE, MARK_PROPERTIES_PATTERN,
MARK_PROPERTIES_TYPE, MARK_PROPERTIES_TAGS, MARK_PROPERTIES_LATDEG, MARK_PROPERTIES_LONDEG);
assertEquals(MARK_PROPERTIES_LATDEG, createdMarkProperties.getLatDeg());
assertEquals(MARK_PROPERTIES_LONDEG, createdMarkProperties.getLonDeg());
assertFalse(createdMarkProperties.hasDevice());
final UUID deviceUuid = UUID.randomUUID();
MarkProperties updatedMarkProperties = markPropertiesApi.updateMarkProperties(ctx,
createdMarkProperties.getId(), MARK_PROPERTIES_NAME, MARK_PROPERTIES_SHORTNAME, deviceUuid.toString(),
MARK_PROPERTIES_COLOR, MARK_PROPERTIES_SHAPE, MARK_PROPERTIES_PATTERN, MARK_PROPERTIES_TYPE,
MARK_PROPERTIES_TAGS, null, null);
assertNull(updatedMarkProperties.getLatDeg());
assertNull(updatedMarkProperties.getLonDeg());
assertTrue(updatedMarkProperties.hasDevice());
}
@Test(expected = HttpException.class)
public void testOverlapOfDeviceUuidAndFixedPositioning() {
final ApiContext ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT);
final UUID deviceUuid = UUID.randomUUID();
markPropertiesApi.createMarkProperties(ctx, MARK_PROPERTIES_NAME,
MARK_PROPERTIES_SHORTNAME, deviceUuid.toString(), MARK_PROPERTIES_COLOR, MARK_PROPERTIES_SHAPE, MARK_PROPERTIES_PATTERN,
MARK_PROPERTIES_TYPE, MARK_PROPERTIES_TAGS, MARK_PROPERTIES_LATDEG, MARK_PROPERTIES_LONDEG);
}
}
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkPropertiesResource.java
+7 -1
View File
@@ -105,6 +105,12 @@ public class MarkPropertiesResource extends AbstractSailingServerResource {
if (markType != null && markType.length() > 0) {
type = MarkType.valueOf(markType);
}
if (deviceUuid != null && deviceUuid.length() > 0 && (latDeg != null || lonDeg != null)) {
return getBadMarkPropertiesValidationErrorResponse("deviceUuid and fixed positioning cannot be used together");
}
if (latDeg != null && lonDeg == null || latDeg == null && lonDeg != null) {
return getBadMarkPropertiesValidationErrorResponse("incomplete positioning");
}
final MarkPropertiesBuilder markPropertiesBuilder = new MarkPropertiesBuilder(/* id */ null, name, effectiveShortName,
color, shape, pattern, type);
final MarkProperties createdMarkProperties = getSharedSailingData()
@@ -112,7 +118,7 @@ public class MarkPropertiesResource extends AbstractSailingServerResource {
if (deviceUuid != null && deviceUuid.length() > 0) {
final DeviceIdentifier device = new SmartphoneUUIDIdentifierImpl(UUID.fromString(deviceUuid));
getSharedSailingData().setTrackingDeviceIdentifierForMarkProperties(createdMarkProperties, device);
}
}
if (latDeg != null && lonDeg != null) {
final Position fixedPosition = new DegreePosition(latDeg, lonDeg);
getSharedSailingData().setFixedPositionForMarkProperties(createdMarkProperties, fixedPosition);
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/SharedSailingDataImpl.java
+2
View File
@@ -204,6 +204,7 @@ public class SharedSailingDataImpl implements ReplicatingSharedSailingData, Clea
@Override
public Void internalSetFixedPositionForMarkProperties(UUID markPropertiesId, Position position) {
final MarkProperties markProperties = markPropertiesById.get(markPropertiesId);
markProperties.setTrackingDeviceIdentifier(null);
markProperties.setFixedPosition(position);
mongoObjectFactory.storeMarkProperties(deviceIdentifierServiceFinder, markProperties);
return null;
@@ -232,6 +233,7 @@ public class SharedSailingDataImpl implements ReplicatingSharedSailingData, Clea
public Void internalSetTrackingDeviceIdentifierForMarkProperties(UUID markPropertiesId,
DeviceIdentifier deviceIdentifier) {
final MarkProperties markProperties = markPropertiesById.get(markPropertiesId);
markProperties.setFixedPosition(null);
markProperties.setTrackingDeviceIdentifier(deviceIdentifier);
mongoObjectFactory.storeMarkProperties(deviceIdentifierServiceFinder, markProperties);
return null;