eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-20 12:45:35 +00:00
Code Activity

added test case for competitor import from XRR file with empty division

Browse Source
This commit is contained in:
Axel Uhl
2015-09-24 20:36:06 +02:00
parent 22a9288e4a
commit cf633f2d30
8 changed files with 827 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/AbstractManage2SailResultDocumentProvider.java
+4 -2
View File
@@ -43,12 +43,12 @@ public abstract class AbstractManage2SailResultDocumentProvider {
// Open boat classes (ORC) -> IFClassID="" Title="Welcome Race ORC-Club"
// -> therefore we need to take the regatta title as boat class where the IsafID is not available
String boatClass = regattaResult.getIsafId() != null && !regattaResult.getIsafId().isEmpty() ? regattaResult.getIsafId() : regattaResult.getName();
if (regattaResult.getIsFinal() != null && regattaResult.getPublishedAt() != null) {
if (acceptRegatta(regattaResult)) {
final URL resultUrl = getDocumentUrlForRegatta(regattaResult);
if (resultUrl != null) {
URLConnection regattaResultConn = resultUrl.openConnection();
result.add(new ResultDocumentDescriptorImpl((InputStream) regattaResultConn.getContent(),
resultUrl.toString(), new MillisecondsTimePoint(regattaResult.getPublishedAt()),
resultUrl.toString(), regattaResult.getPublishedAt()==null?null:new MillisecondsTimePoint(regattaResult.getPublishedAt()),
eventResult.getName(), regattaResult.getName(), boatClass, regattaResult
.getCompetitorGenderType()));
}
@@ -57,5 +57,7 @@ public abstract class AbstractManage2SailResultDocumentProvider {
}
}
abstract protected boolean acceptRegatta(RegattaResultDescriptor regattaResult);
abstract protected URL getDocumentUrlForRegatta(RegattaResultDescriptor regattaResult);
}
java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/CompetitorDocumentProvider.java
+12
View File
@@ -1,8 +1,10 @@
package com.sap.sailing.manage2sail.resultimport;
import java.io.IOException;
import java.net.URL;
import com.sap.sailing.manage2sail.RegattaResultDescriptor;
import com.sap.sailing.resultimport.ResultDocumentDescriptor;
import com.sap.sailing.resultimport.ResultUrlProvider;
public class CompetitorDocumentProvider extends AbstractManage2SailResultDocumentProvider {
@@ -10,8 +12,18 @@ public class CompetitorDocumentProvider extends AbstractManage2SailResultDocumen
super(resultUrlProvider);
}
@Override
public Iterable<ResultDocumentDescriptor> getResultDocumentDescriptors() throws IOException {
return super.getResultDocumentDescriptors();
}
@Override
protected URL getDocumentUrlForRegatta(RegattaResultDescriptor regattaResult) {
return regattaResult.getXrrEntriesUrl();
}
@Override
protected boolean acceptRegatta(RegattaResultDescriptor regattaResult) {
return true; // no further requirements; doesn't need to be final nor have an appropriate time point
}
}
java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/CompetitorImporter.java
+49 -28
View File
@@ -57,12 +57,19 @@ public class CompetitorImporter extends AbstractManage2SailProvider implements C
@Override
public Iterable<CompetitorDescriptor> getCompetitorDescriptors(String eventName, String regattaName) throws JAXBException, IOException {
final List<CompetitorDescriptor> result = new ArrayList<>();
final Map<String, CompetitorDescriptor> resultsByTeamID = new HashMap<>();
final Map<String, CompetitorDescriptor> teamsWithoutRaceAssignments = new HashMap<>();
for (ResultDocumentDescriptor resultDocDescr : documentProvider.getResultDocumentDescriptors()) {
if (resultDocDescr.getEventName().equals(eventName)) {
if (resultDocDescr.getEventName().equals(eventName) &&
(regattaName == null || regattaName.equals(resultDocDescr.getRegattaName()))) {
final Parser parser = getParserFactory().createParser(resultDocDescr.getInputStream(), resultDocDescr.getEventName());
final RegattaResults regattaResults = parser.parse();
for (Object o : regattaResults.getPersonOrBoatOrTeam()) {
if (o instanceof Event) {
if (o instanceof Team) {
final Team team = (Team) o;
teamsWithoutRaceAssignments.put(team.getTeamID(),
createCompetitorDescriptor(team, parser, /* event */ null, /* division */ null, /* raceID */ null));
} else if (o instanceof Event) {
Event event = (Event) o;
for (Object eventO : event.getRaceOrDivisionOrRegattaSeriesResult()) {
if (eventO instanceof Division) {
@@ -80,32 +87,9 @@ public class CompetitorImporter extends AbstractManage2SailProvider implements C
team = parser.getTeam(seriesResult.getTeamID());
}
if (team != null) {
final Boat boat = parser.getBoat(team.getBoatID());
final String sailNumber = boat.getSailNumber();
final Race race = parser.getRace(raceID);
final Nationality[] teamNationality = new Nationality[] {
// use that of team; if not defined for team, use first nationality of a team member that has one defined
team.getNOC() == null ? null : new NationalityImpl(team.getNOC().name())
};
List<com.sap.sailing.domain.base.Person> persons = team.getCrew().stream().sorted((c1, c2) -> -c1.getPosition().name().compareTo(c2.getPosition().name())).map((crew)->{
Person xrrPerson = parser.getPerson(crew.getPersonID());
String name = xrrPerson.getGivenName()+" "+xrrPerson.getFamilyName();
final Nationality nationality;
if (xrrPerson.getNOC() == null) {
nationality = null;
} else {
nationality = new NationalityImpl(xrrPerson.getNOC().name());
if (teamNationality[0] == null) {
teamNationality[0] = nationality;
}
}
com.sap.sailing.domain.base.Person person = new PersonImpl(name, nationality, /* date of birth */ null, /* description */ xrrPerson.getGender().name());
return person;
}).collect(Collectors.toList());
final CompetitorDescriptor competitorDescriptor = new CompetitorDescriptor(
event.getTitle(), division.getTitle() + (division.getGender() == null ? "" : division.getGender().name()),
race != null ? race.getRaceName() : null, /* fleetName */ null, sailNumber, team.getTeamName(),
teamNationality[0] == null ? null : teamNationality[0].getCountryCode(), persons);
final CompetitorDescriptor competitorDescriptor = createCompetitorDescriptor(
team, parser, event, division, raceID);
resultsByTeamID.put(team.getTeamID(), competitorDescriptor);
result.add(competitorDescriptor);
}
}
@@ -116,6 +100,43 @@ public class CompetitorImporter extends AbstractManage2SailProvider implements C
}
}
}
for (final Map.Entry<String, CompetitorDescriptor> tid : teamsWithoutRaceAssignments.entrySet()) {
if (!resultsByTeamID.containsKey(tid.getKey())) {
result.add(tid.getValue());
}
}
return result;
}
private CompetitorDescriptor createCompetitorDescriptor(Team team, final Parser parser, Event event,
Division division, String raceID) {
final Boat boat = parser.getBoat(team.getBoatID());
final String sailNumber = boat.getSailNumber();
final Race race = parser.getRace(raceID);
final Nationality[] teamNationality = new Nationality[] {
// use that of team; if not defined for team, use first nationality of a team member that has one defined
team.getNOC() == null ? null : new NationalityImpl(team.getNOC().name())
};
List<com.sap.sailing.domain.base.Person> persons = team.getCrew().stream().sorted((c1, c2) -> -c1.getPosition().name().compareTo(c2.getPosition().name())).map((crew)->{
Person xrrPerson = parser.getPerson(crew.getPersonID());
String name = xrrPerson.getGivenName()+" "+xrrPerson.getFamilyName();
final Nationality nationality;
if (xrrPerson.getNOC() == null) {
nationality = null;
} else {
nationality = new NationalityImpl(xrrPerson.getNOC().name());
if (teamNationality[0] == null) {
teamNationality[0] = nationality;
}
}
com.sap.sailing.domain.base.Person person = new PersonImpl(name, nationality, /* date of birth */ null, /* description */ xrrPerson.getGender().name());
return person;
}).collect(Collectors.toList());
final CompetitorDescriptor competitorDescriptor = new CompetitorDescriptor(
event==null?null:event.getTitle(),
division==null?null:(division.getTitle() + (division.getGender() == null ? "" : division.getGender().name())),
race != null ? race.getRaceName() : null, /* fleetName */ null, sailNumber, team.getTeamName(),
teamNationality[0] == null ? null : teamNationality[0].getCountryCode(), persons);
return competitorDescriptor;
}
}
java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/Manage2SailResultDocumentProvider.java
+6
View File
@@ -31,4 +31,10 @@ public class Manage2SailResultDocumentProvider extends AbstractManage2SailResult
}
return resultUrl;
}
@Override
protected boolean acceptRegatta(RegattaResultDescriptor regattaResult) {
return regattaResult.getIsFinal() != null && regattaResult.getPublishedAt() != null;
}
}