Qualifying + sprint results available before race (#178)

* Qualifying + sprint results available before race

package.json

@@ -1,6 +1,6 @@
 {
  "name": "formulaone-card",
- "version": "1.2.0",
+ "version": "1.2.1",
  "description": "Frontend card for Home Assistant to display Formula One data",
  "main": "index.js",
  "scripts": {

src/api/f1-models.ts

@@ -46,7 +46,7 @@ export interface Root {
  export interface RaceTable {
  season: string
  round?: string
- Races: Race[]
+ Races?: Race[]
  }
 
  export interface Race {

src/cards/results.ts

@@ -244,28 +244,32 @@ export default class Results extends BaseCard {
  `;
  }
 
- private setSelectedRace(ev: SelectChangeEvent) {
+ setSelectedRace(ev: SelectChangeEvent) {
  const round = parseInt(ev.target.value);
  const { properties, cardValues } = this.getParentCardValues();
 
  properties.selectedRound = round;
-
- this.client.GetResults(properties.selectedSeason as number, round).then(response => {
-
- this.client.GetQualifyingResults(parseInt(response.season), parseInt(response.round)).then(qualifyingResults => {
- const race = response.Races[0];
- race.QualifyingResults = qualifyingResults.Races[0].QualifyingResults;
-
- this.client.GetSprintResults(parseInt(response.season), parseInt(response.round)).then(sprintResults => { 
- /* istanbul ignore next */ 
- race.SprintResults = sprintResults?.Races[0]?.SprintResults;
 
- properties.selectedRace = race;
- cardValues.set('cardValues', properties);
- this.parent.properties = cardValues;
- });
+ const selectedSeason = properties.selectedSeason as number;
+
+ Promise.all([this.client.GetResults(selectedSeason, round), 
+ this.client.GetQualifyingResults(selectedSeason, round),
+ this.client.GetSprintResults(selectedSeason, round)])
+ .then(([results, qualifyingResults, sprintResults]) => {
+
+ const race = results.Races.length > 0 ? results.Races[0] : null;
+ if(race) {
+ race.QualifyingResults = qualifyingResults.Races[0].QualifyingResults;
+ /* istanbul ignore next */
+ race.SprintResults = sprintResults?.Races[0]?.SprintResults
+ console.log(`${selectedSeason} round ${round}`, sprintResults);
+ properties.selectedSeason = race.season;
+ }
+
+ properties.selectedRace = race;
+ cardValues.set('cardValues', properties);
+ this.parent.properties = cardValues;
  });
- });
  }
 
  private setRaces(ev: SelectChangeEvent) {
@@ -282,29 +286,67 @@ export default class Results extends BaseCard {
  });
  }
 
+ private getUpcomingRace(now: Date, races: Race[]) : Race {
+
+ const nextRaces = races.filter(race => {
+
+ const raceDateTime = new Date(race.date + 'T' + race.time);
+ const qualifyingDateTime = new Date(race.Qualifying.date + 'T' + race.Qualifying.time);
+ const sprintDateTime = race.Sprint ? new Date(race.Sprint.date + 'T' + race.Sprint.time) : null;
+
+ if(raceDateTime >= now && (qualifyingDateTime < now && (sprintDateTime === null || sprintDateTime < now))) {
+ return true;
+ }
+
+ return false;
+ });
+
+ return nextRaces.length > 0 ? nextRaces[0] : null;
+ }
+
  private getLastResult() {
- this.client.GetLastResult().then(response => {
 
- const { properties, cardValues } = this.getParentCardValues();
- properties.selectedSeason = response.season;
+ const now = new Date();
 
- this.client.GetQualifyingResults(parseInt(response.season), parseInt(response.round)).then(qualifyingResults => {
- const race = response;
- race.QualifyingResults = qualifyingResults.Races[0].QualifyingResults;
+ this.client.GetSchedule(now.getFullYear()).then(response => { 
 
- this.client.GetSprintResults(parseInt(response.season), parseInt(response.round)).then(sprintResults => {
- race.SprintResults = sprintResults?.Races[0]?.SprintResults;
+ const upcomingRace = this.getUpcomingRace(now, response);
+
+ let season : number = new Date().getFullYear();
+ let round : number = upcomingRace !== null ? parseInt(upcomingRace.round) : 0;
+
+ let race = { } as Race;
+ if(upcomingRace !== null) {
+ race = upcomingRace;
+ round = parseInt(race.round);
+ season = parseInt(race.season);
+ } else {
+ this.client.GetLastResult().then(response => {
+ race = response;
+ round = parseInt(response.round);
+ season = parseInt(response.season);
+ });
+ }
 
+ Promise.all([this.client.GetQualifyingResults(season, round), 
+ this.client.GetSprintResults(season, round),
+ this.client.GetSeasonRaces(season)])
+ .then(([qualifyingResults, sprintResults, seasonRaces]) => {
+
+ const { properties, cardValues } = this.getParentCardValues();
+
+ race.QualifyingResults = qualifyingResults.Races[0].QualifyingResults;
+ race.SprintResults = sprintResults?.Races[0]?.SprintResults;
+
+ properties.races = seasonRaces;
  properties.selectedRace = race;
- this.client.GetSeasonRaces(parseInt(response.season)).then(racesResponse => {
- properties.races = racesResponse;
-
- cardValues.set('cardValues', properties);
- this.parent.properties = cardValues;
- });
+ properties.selectedSeason = season.toString();
+
+ cardValues.set('cardValues', properties);
+ this.parent.properties = cardValues;
  });
- });
  });
+
  }
 
  setSelectedTabIndex(index: number) {