added countryCode back to serialized competitor

This commit is contained in:
Fredrik Teschke committed 2014-12-11 13:53:53 +01:00
1 parent cdccf25113
commit ee3217c7c4
2 files changed
+3

No files matched your search

@@ -31,6 +31,7 @@ public class CompetitorsJsonExportTest {
private final String boatClassName = "49er";
private final String sailID = "GER 1";
private final String nationality = "GER";
private final String countryCode = "DE";
private final @Spy CompetitorsResource competitorsResource = new CompetitorsResource();
@@ -55,6 +56,7 @@ public class CompetitorsJsonExportTest {
assertThat("boatClass is correct", json.get("boatClassName"), equalTo(boatClassName));
assertThat("sailID is correct", json.get("sailID"), equalTo(sailID));
assertThat("nationality is correct", json.get("nationality"), equalTo(nationality));
assertThat("nationality is correct", json.get("countryCode"), equalTo(countryCode));
}
}
@@ -33,6 +33,7 @@ public class CompetitorsResource extends AbstractSailingServerResource {
json.put("name", competitor.getName());
json.put("sailID", competitor.getBoat().getSailID());
json.put("nationality", competitor.getTeam().getNationality().getThreeLetterIOCAcronym());
json.put("countryCode", competitor.getTeam().getNationality().getCountryCode().getTwoLetterISOCode());
json.put("boatClassName", competitor.getBoat().getBoatClass().getName());
String jsonString = json.toJSONString();