eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-02 09:09:37 +00:00
Code Activity

# Reworked placement of RaceLog to have it on RaceColumn again

Browse Source 
# All code paths needing a real RaceLog are changed to use MongoRaceLogStoreFactory
# MISSING: REPLICATION ON RACECOLUMN!!!
This commit is contained in:
Lukas Niemeier committed 2013-02-19 00:50:56 +01:00
1 parent 5df89c7e7e
commit e29e4e7806
59 files changed
+882 -683
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/AddToRaceLogJsonExportServlet.java
+69 -73
View File
@@ -14,8 +14,6 @@ import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.RaceColumn;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.racelog.RaceLogEvent;
import com.sap.sailing.domain.racelog.RaceLogIdentifier;
import com.sap.sailing.domain.racelog.impl.RaceLogIdentifierImpl;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.server.gateway.AbstractJsonHttpServlet;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
@@ -27,76 +25,74 @@ import com.sap.sailing.server.gateway.deserialization.impl.RaceLogRaceStatusEven
import com.sap.sailing.server.gateway.deserialization.impl.RaceLogStartTimeEventDeserializer;
public class AddToRaceLogJsonExportServlet extends AbstractJsonHttpServlet {
private static final long serialVersionUID = 7704668926551060433L;
public static final String PARAMS_LEADERBOARD_NAME = "leaderboard";
public static final String PARAMS_RACE_COLUMN_NAME = "raceColumn";
public static final String PARAMS_RACE_FLEET_NAME = "fleet";
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
String leaderboardName = request.getParameter(PARAMS_LEADERBOARD_NAME);
if (leaderboardName == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, String.format("Missing parameter '%s'.", PARAMS_LEADERBOARD_NAME));
return;
}
String raceColumnName = request.getParameter(PARAMS_RACE_COLUMN_NAME);
if (raceColumnName == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, String.format("Missing parameter '%s'.", PARAMS_RACE_COLUMN_NAME));
return;
}
String fleetName = request.getParameter(PARAMS_RACE_FLEET_NAME);
if (fleetName == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, String.format("Missing parameter '%s'.", PARAMS_RACE_FLEET_NAME));
return;
}
RacingEventService service = getService();
Leaderboard leaderboard = service.getLeaderboardByName(leaderboardName);
if (leaderboard == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such leaderboard found.");
return;
}
RaceColumn raceColumn = leaderboard.getRaceColumnByName(raceColumnName);
if (raceColumn == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such race column found.");
return;
}
Fleet fleet = raceColumn.getFleetByName(fleetName);
if (fleet == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such fleet found.");
return;
}
RaceLogIdentifier identifier = new RaceLogIdentifierImpl(leaderboard, raceColumn, fleet);
JsonDeserializer<RaceLogEvent> deserializer =
new RaceLogEventDeserializer(
new RaceLogFlagEventDeserializer(),
new RaceLogStartTimeEventDeserializer(),
new RaceLogRaceStatusEventDeserializer(),
new RaceLogCourseAreaChangedEventDeserializer());
try {
Object requestBody = JSONValue.parseWithException(request.getReader());
JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody);
System.out.println(requestObject);
RaceLogEvent logEvent = deserializer.deserialize(requestObject);
service.recordRaceLogEvent(identifier, logEvent);
} catch (ParseException pe) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, String.format("Invalid JSON in request body:\n%s", pe));
return;
}
}
private static final long serialVersionUID = 7704668926551060433L;
public static final String PARAMS_LEADERBOARD_NAME = "leaderboard";
public static final String PARAMS_RACE_COLUMN_NAME = "raceColumn";
public static final String PARAMS_RACE_FLEET_NAME = "fleet";
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
IOException {
String leaderboardName = request.getParameter(PARAMS_LEADERBOARD_NAME);
if (leaderboardName == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
String.format("Missing parameter '%s'.", PARAMS_LEADERBOARD_NAME));
return;
}
String raceColumnName = request.getParameter(PARAMS_RACE_COLUMN_NAME);
if (raceColumnName == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
String.format("Missing parameter '%s'.", PARAMS_RACE_COLUMN_NAME));
return;
}
String fleetName = request.getParameter(PARAMS_RACE_FLEET_NAME);
if (fleetName == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
String.format("Missing parameter '%s'.", PARAMS_RACE_FLEET_NAME));
return;
}
RacingEventService service = getService();
Leaderboard leaderboard = service.getLeaderboardByName(leaderboardName);
if (leaderboard == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such leaderboard found.");
return;
}
RaceColumn raceColumn = leaderboard.getRaceColumnByName(raceColumnName);
if (raceColumn == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such race column found.");
return;
}
Fleet fleet = raceColumn.getFleetByName(fleetName);
if (fleet == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such fleet found.");
return;
}
JsonDeserializer<RaceLogEvent> deserializer = new RaceLogEventDeserializer(new RaceLogFlagEventDeserializer(),
new RaceLogStartTimeEventDeserializer(), new RaceLogRaceStatusEventDeserializer(),
new RaceLogCourseAreaChangedEventDeserializer());
try {
Object requestBody = JSONValue.parseWithException(request.getReader());
JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody);
RaceLogEvent logEvent = deserializer.deserialize(requestObject);
raceColumn.getRaceLog(fleet).add(logEvent);
} catch (ParseException pe) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
String.format("Invalid JSON in request body:\n%s", pe));
return;
}
}
}
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupFactory.java
+8 -16
View File
@@ -25,17 +25,9 @@ import com.sap.sailing.domain.base.impl.SeriesImpl;
import com.sap.sailing.domain.base.impl.SeriesWithRowsImpl;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.leaderboard.RegattaLeaderboard;
import com.sap.sailing.domain.racelog.RaceLogIdentifier;
import com.sap.sailing.domain.racelog.impl.RaceLogIdentifierImpl;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore;
public class RaceGroupFactory {
private RacingEventService service;
public RaceGroupFactory(RacingEventService service) {
this.service = service;
}
public RaceGroup convert(Leaderboard leaderboard) {
String name = leaderboard.getName();
@@ -62,8 +54,7 @@ public class RaceGroupFactory {
for (Fleet fleet : series.getFleets()) {
Collection<RaceCell> cells = new ArrayList<>();
for (RaceColumn raceColumn : seriesToRaceColumns.get(series)) {
RaceLogIdentifier identifier = new RaceLogIdentifierImpl(leaderboard, raceColumn, fleet);
cells.add(new RaceCellImpl(raceColumn.getName(), service.getRaceLog(identifier)));
cells.add(new RaceCellImpl(raceColumn.getName(), raceColumn.getRaceLog(fleet)));
}
rows.add(new RaceRowImpl(fleet, cells));
}
@@ -95,11 +86,12 @@ public class RaceGroupFactory {
private Series createDefaultSeries() {
Series defaultSeries;
defaultSeries = new SeriesImpl(
"Default Series",
false,
Collections.<Fleet>singleton(new FleetImpl("Default Fleet")),
Collections.<String>emptyList(),
null);
EmptyRaceLogStore.INSTANCE,
"Default Series",
false,
Collections.<Fleet>singleton(new FleetImpl("Default Fleet")),
Collections.<String>emptyList(),
null);
return defaultSeries;
}
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class RaceGroupJsonExportServlet extends AbstractJsonHttpServlet {
JsonSerializer<RaceGroup> serializer = createSerializer();
JSONArray result = new JSONArray();
RaceGroupFactory raceGroupFactory = new RaceGroupFactory(getService());
RaceGroupFactory raceGroupFactory = new RaceGroupFactory();
for (Leaderboard leaderboard : getService().getLeaderboards().values()) {
if (filterCourseArea.equals(leaderboard.getDefaultCourseArea())) {
RaceGroup raceGroup = raceGroupFactory.convert(leaderboard);