mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-16 07:10:48 +00:00
fixed CompetitorImportTest which failed because the "YES - Europe" document returns an exception from the Manage2Sail server right now
Change-Id: Ief582ab57b560188025880f31b3dde7327705345
This commit is contained in:
1 parent
3f498c7a73
commit
09a6e51783
3 files changed
+39
-32
No files matched your search
+1
-2
@@ -33,7 +33,7 @@ public interface CompetitorProvider extends Named {
|
||||
Map<String, Set<String>> getHasCompetitorsForRegattasInEvent() throws IOException;
|
||||
|
||||
/**
|
||||
* Obtains competitor records from an XRR file
|
||||
* Obtains competitor records from the source of import
|
||||
*
|
||||
* @param eventName
|
||||
* an event name as obtained as a key in {@link #getHasCompetitorsForRegattasInEvent()}'s result
|
||||
@@ -41,7 +41,6 @@ public interface CompetitorProvider extends Named {
|
||||
* <code>null</code> to get the competitors for all regattas in the event specified by
|
||||
* <code>eventName</code>, or a regatta name as provided in the value set for the key
|
||||
* <code>eventName</code> as returned by {@link #getHasCompetitorsForRegattasInEvent()}.
|
||||
* @return
|
||||
*/
|
||||
Iterable<CompetitorDescriptor> getCompetitorDescriptors(String eventName, String regattaName) throws JAXBException,
|
||||
IOException;
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ public class CompetitorImportTest extends AbstractEventResultJsonServiceTest {
|
||||
assertTrue(competitorImporter.getHasCompetitorsForRegattasInEvent().get("YES - Young Europeans Sailing 2013").contains("29er"));
|
||||
final Iterable<CompetitorDescriptor> competitorDescriptors = competitorImporter.getCompetitorDescriptors("YES - Young Europeans Sailing 2013", null); // get competitors for all regattas in event
|
||||
assertNotNull(competitorDescriptors);
|
||||
assertEquals(1270, Util.size(competitorDescriptors));
|
||||
assertEquals(933, Util.size(competitorDescriptors));
|
||||
final Iterable<CompetitorDescriptor> competitorDescriptors29er = competitorImporter.getCompetitorDescriptors("YES - Young Europeans Sailing 2013", "29er"); // get competitors only for 29er regatta
|
||||
assertNotNull(competitorDescriptors29er);
|
||||
assertEquals(134, Util.size(competitorDescriptors29er));
|
||||
|
||||
+37
-29
@@ -7,6 +7,8 @@ import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.xml.bind.JAXBException;
|
||||
@@ -32,6 +34,7 @@ import com.sap.sailing.xrr.schema.Team;
|
||||
|
||||
public class CompetitorImporter extends AbstractManage2SailProvider implements CompetitorProvider {
|
||||
private static final long serialVersionUID = 7389956404604333931L;
|
||||
private static final Logger logger = Logger.getLogger(CompetitorImporter.class.getName());
|
||||
private final CompetitorDocumentProvider documentProvider;
|
||||
|
||||
public CompetitorImporter(ParserFactory parserFactory, ResultUrlRegistry resultUrlRegistry) {
|
||||
@@ -69,40 +72,45 @@ public class CompetitorImporter extends AbstractManage2SailProvider implements C
|
||||
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 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) {
|
||||
Division division = (Division) eventO;
|
||||
if (regattaName == null || regattaName.equals(division.getTitle())) {
|
||||
for (Object divisionO : division.getSeriesResultOrRaceResultOrTRResult()) {
|
||||
String raceID = null;
|
||||
Team team = null;
|
||||
if (divisionO instanceof RaceResult) {
|
||||
RaceResult raceResult = (RaceResult) divisionO;
|
||||
raceID = raceResult.getRaceID();
|
||||
team = parser.getTeam(raceResult.getTeamID());
|
||||
} else if (divisionO instanceof SeriesResult) {
|
||||
SeriesResult seriesResult = (SeriesResult) divisionO;
|
||||
team = parser.getTeam(seriesResult.getTeamID());
|
||||
}
|
||||
if (team != null) {
|
||||
final CompetitorDescriptor competitorDescriptor = createCompetitorDescriptor(
|
||||
team, parser, event, division, raceID);
|
||||
resultsByTeamID.put(team.getTeamID(), competitorDescriptor);
|
||||
result.add(competitorDescriptor);
|
||||
try {
|
||||
final RegattaResults regattaResults = parser.parse();
|
||||
for (Object o : regattaResults.getPersonOrBoatOrTeam()) {
|
||||
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) {
|
||||
Division division = (Division) eventO;
|
||||
if (regattaName == null || regattaName.equals(division.getTitle())) {
|
||||
for (Object divisionO : division.getSeriesResultOrRaceResultOrTRResult()) {
|
||||
String raceID = null;
|
||||
Team team = null;
|
||||
if (divisionO instanceof RaceResult) {
|
||||
RaceResult raceResult = (RaceResult) divisionO;
|
||||
raceID = raceResult.getRaceID();
|
||||
team = parser.getTeam(raceResult.getTeamID());
|
||||
} else if (divisionO instanceof SeriesResult) {
|
||||
SeriesResult seriesResult = (SeriesResult) divisionO;
|
||||
team = parser.getTeam(seriesResult.getTeamID());
|
||||
}
|
||||
if (team != null) {
|
||||
final CompetitorDescriptor competitorDescriptor = createCompetitorDescriptor(
|
||||
team, parser, event, division, raceID);
|
||||
resultsByTeamID.put(team.getTeamID(), competitorDescriptor);
|
||||
result.add(competitorDescriptor);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (JAXBException e) {
|
||||
logger.log(Level.WARNING, "Exception trying to read competitors for event "+resultDocDescr.getEventName()+
|
||||
", regatta "+resultDocDescr.getRegattaName()+" from document "+resultDocDescr.getDocumentName(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -135,7 +143,7 @@ public class CompetitorImporter extends AbstractManage2SailProvider implements C
|
||||
teamNationality[0] = nationality;
|
||||
}
|
||||
}
|
||||
com.sap.sailing.domain.base.Person person = new PersonImpl(name, nationality, /* date of birth */ null, /* description */ xrrPerson.getGender().name());
|
||||
com.sap.sailing.domain.base.Person person = new PersonImpl(name, nationality, /* date of birth */ null, /* description */ xrrPerson.getGender()==null?null:xrrPerson.getGender().name());
|
||||
return person;
|
||||
}).collect(Collectors.toList());
|
||||
final CompetitorDescriptor competitorDescriptor = new CompetitorDescriptor(
|
||||
|
||||
Reference in new issue
Block a user