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

Merge branch 'master' into bug5166

Browse Source
This commit is contained in:
Axel Uhl committed 2020-01-21 11:22:21 +01:00
2 parents 722c4a6b70 cb6ecd972d
commit dd7562be96
1 file changed
+6 -5
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CompetitorsResource.java
+6 -5
View File
@@ -38,6 +38,7 @@ import com.sap.sailing.server.gateway.serialization.impl.NationalityJsonSerializ
import com.sap.sailing.server.gateway.serialization.impl.PersonJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.TeamJsonSerializer;
import com.sap.sailing.server.interfaces.RacingEventService;
import com.sap.sailing.server.operationaltransformation.UpdateCompetitor;
import com.sap.sse.common.Util;
import com.sap.sse.filestorage.InvalidPropertiesException;
import com.sap.sse.filestorage.OperationFailedException;
@@ -187,11 +188,11 @@ public class CompetitorsResource extends AbstractSailingServerResource {
throw new WebApplicationException(Response.status(Status.INTERNAL_SERVER_ERROR)
.entity("Could not store competitor image").type(MediaType.TEXT_PLAIN).build());
}
getService().getCompetitorAndBoatStore().updateCompetitor(competitorId, competitor.getName(), competitor.getShortName(),
competitor.getColor(), competitor.getEmail(),
competitor.getTeam().getNationality(), imageUri, competitor.getFlagImage(),
/* timeOnTimeFactor */ competitor.getTimeOnTimeFactor(),
/* timeOnDistanceAllowancePerNauticalMile */ competitor.getTimeOnDistanceAllowancePerNauticalMile(), competitor.getSearchTag(), /* storePersistently */ true);
getService().apply(new UpdateCompetitor(competitorId, competitor.getName(), competitor.getShortName(),
competitor.getColor(), competitor.getEmail(), competitor.getTeam().getNationality(), imageUri,
competitor.getFlagImage(), /* timeOnTimeFactor */ competitor.getTimeOnTimeFactor(),
/* timeOnDistanceAllowancePerNauticalMile */ competitor.getTimeOnDistanceAllowancePerNauticalMile(),
competitor.getSearchTag()));
logger.log(Level.INFO, "Set team image for competitor " + competitor.getName());
JSONObject result = new JSONObject();
result.put(DeviceMappingConstants.JSON_TEAM_IMAGE_URI, imageUri.toString());