Writes the attribute 'boat' (of type boatDTO) which can be part of LeaderboardRowDTO or LeaderboardEntryDTO to the leaderboard json API

This commit is contained in:
Frank Mittag committed 2018-04-18 18:03:03 +02:00
1 parent d3db54a7e6
commit ec7e0993dd
2 files changed
+24 -1

No files matched your search

@@ -14,6 +14,7 @@ import com.sap.sailing.domain.base.Nationality;
import com.sap.sailing.domain.base.RaceColumn;
import com.sap.sailing.domain.base.Waypoint;
import com.sap.sailing.domain.common.NoWindException;
import com.sap.sailing.domain.common.dto.BoatDTO;
import com.sap.sailing.domain.common.dto.CompetitorWithBoatDTO;
import com.sap.sailing.domain.common.dto.LeaderboardDTO;
import com.sap.sailing.domain.common.dto.RaceColumnDTO;
@@ -117,11 +118,20 @@ public abstract class AbstractLeaderboardsResource extends AbstractSailingServer
final String displayName = leaderboard.getDisplayName(competitor);
jsonCompetitor.put("displayName", displayName == null ? competitor.getName() : displayName);
jsonCompetitor.put("id", competitor.getIdAsString());
jsonCompetitor.put("sailID", competitor.getSailID());
jsonCompetitor.put("sailID", competitor.getSailID()); // only for backward compatibility
jsonCompetitor.put("nationality", competitor.getThreeLetterIocCountryCode());
jsonCompetitor.put("countryCode", competitor.getTwoLetterIsoCountryCode());
}
protected void writeBoatData(JSONObject jsonBoat, BoatDTO boat) {
jsonBoat.put("name", boat.getName());
jsonBoat.put("displayName", boat.getDisplayName());
jsonBoat.put("id", boat.getIdAsString());
jsonBoat.put("sailId", boat.getSailId());
jsonBoat.put("boatClass", boat.getBoatClass().getName());
jsonBoat.put("color", boat.getColor() != null ? boat.getColor().toString() : null);
}
private void writeCommonLeaderboardData(JSONObject jsonLeaderboard, Leaderboard leaderboard,
ResultStates resultState, TimePoint resultTimePoint, Integer maxCompetitorsCount) {
jsonLeaderboard.put("name", leaderboard.getName());
@@ -31,6 +31,7 @@ import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.ManeuverType;
import com.sap.sailing.domain.common.MaxPointsReason;
import com.sap.sailing.domain.common.NoWindException;
import com.sap.sailing.domain.common.dto.BoatDTO;
import com.sap.sailing.domain.common.dto.CompetitorWithBoatDTO;
import com.sap.sailing.domain.common.dto.FleetDTO;
import com.sap.sailing.domain.common.dto.LeaderboardDTO;
@@ -136,6 +137,12 @@ public class LeaderboardsResourceV2 extends AbstractLeaderboardsResource {
}
JSONObject jsonCompetitor = new JSONObject();
writeCompetitorBaseData(jsonCompetitor, competitor, leaderboardDTO);
BoatDTO rowBoatDTO = leaderboardRowDTO.boat;
if (rowBoatDTO != null) {
JSONObject jsonBoat = new JSONObject();
writeBoatData(jsonBoat, rowBoatDTO);
jsonCompetitor.put("boat", jsonBoat);
}
jsonCompetitor.put("rank", competitorCounter);
jsonCompetitor.put("carriedPoints", leaderboardRowDTO.carriedPoints);
jsonCompetitor.put("netPoints", leaderboardRowDTO.netPoints);
@@ -147,6 +154,12 @@ public class LeaderboardsResourceV2 extends AbstractLeaderboardsResource {
JSONObject jsonEntry = new JSONObject();
jsonRaceColumns.put(raceColumnName, jsonEntry);
LeaderboardEntryDTO leaderboardEntry = leaderboardRowDTO.fieldsByRaceColumnName.get(raceColumnName);
BoatDTO entryBoatDTO = leaderboardEntry.boat;
if (entryBoatDTO != null) {
JSONObject jsonBoat = new JSONObject();
writeBoatData(jsonBoat, rowBoatDTO);
jsonCompetitor.put("boat", jsonBoat);
}
final FleetDTO fleetOfCompetitor = leaderboardEntry.fleet;
jsonEntry.put("fleet", fleetOfCompetitor == null ? "" : fleetOfCompetitor.getName());
jsonEntry.put("totalPoints", leaderboardEntry.totalPoints);