switch to using json.Number to handle ontgov switching data types in response
This commit is contained in:
parent
1f5bef39a0
commit
d9f7835a5e
61
main.go
61
main.go
@ -34,15 +34,15 @@ type OntCovidData struct {
|
|||||||
} `json:"fields"`
|
} `json:"fields"`
|
||||||
RecordsFormat string `json:"records_format"`
|
RecordsFormat string `json:"records_format"`
|
||||||
Records []struct {
|
Records []struct {
|
||||||
ID int `json:"_id"`
|
ID int `json:"_id"`
|
||||||
ReportDate string `json:"report_date"`
|
ReportDate string `json:"report_date"`
|
||||||
PreviousDayDosesAdministered int `json:"previous_day_total_doses_administered"`
|
PreviousDayDosesAdministered json.Number `json:"previous_day_total_doses_administered"`
|
||||||
PreviousDayAtLeastOne int `json:"previous_day_at_least_one"`
|
PreviousDayAtLeastOne json.Number `json:"previous_day_at_least_one"`
|
||||||
PreviousDayFullyVaccinated int `json:"previous_day_fully_vaccinated"`
|
PreviousDayFullyVaccinated json.Number `json:"previous_day_fully_vaccinated"`
|
||||||
TotalDosesAdministered int `json:"total_doses_administered"`
|
TotalDosesAdministered json.Number `json:"total_doses_administered"`
|
||||||
TotalDosesAtLeastOne int `json:"total_individuals_at_least_one"`
|
TotalDosesAtLeastOne json.Number `json:"total_individuals_at_least_one"`
|
||||||
TotalDosesInFullyVaccinatedIndividuals int `json:"total_doses_in_fully_vaccinated_individuals"`
|
TotalDosesInFullyVaccinatedIndividuals json.Number `json:"total_doses_in_fully_vaccinated_individuals"`
|
||||||
TotalIndividualsFullyVaccinated int `json:"total_individuals_fully_vaccinated"`
|
TotalIndividualsFullyVaccinated json.Number `json:"total_individuals_fully_vaccinated"`
|
||||||
} `json:"records"`
|
} `json:"records"`
|
||||||
Limit int `json:"limit"`
|
Limit int `json:"limit"`
|
||||||
Links struct {
|
Links struct {
|
||||||
@ -88,13 +88,42 @@ func updateMetrics() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
records.PreviousDayDosesAdministered().Set(float64(data.Result.Records[0].PreviousDayDosesAdministered))
|
previousDayDosesAdministered, err := data.Result.Records[0].PreviousDayDosesAdministered.Float64()
|
||||||
records.PreviousDayAtLeastOne().Set(float64(data.Result.Records[0].PreviousDayAtLeastOne))
|
if err != nil {
|
||||||
records.PreviousDayFullyVaccinated().Set(float64(data.Result.Records[0].PreviousDayFullyVaccinated))
|
log.Println(err)
|
||||||
records.TotalDosesAdministered().Set(float64(data.Result.Records[0].TotalDosesAdministered))
|
}
|
||||||
records.TotalDosesAtLeastOne().Set(float64(data.Result.Records[0].TotalDosesAtLeastOne))
|
previousDayAtLeastOne, err := data.Result.Records[0].PreviousDayAtLeastOne.Float64()
|
||||||
records.TotalDosesInFullyVaccinatedIndividuals().Set(float64(data.Result.Records[0].TotalDosesInFullyVaccinatedIndividuals))
|
if err != nil {
|
||||||
records.TotalIndividualsFullyVaccinated().Set(float64(data.Result.Records[0].TotalIndividualsFullyVaccinated))
|
log.Println(err)
|
||||||
|
}
|
||||||
|
previousDayFullyVaccinated, err := data.Result.Records[0].PreviousDayFullyVaccinated.Float64()
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
}
|
||||||
|
totalDosesAdministered, err := data.Result.Records[0].TotalDosesAdministered.Float64()
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
}
|
||||||
|
totalDosesAtLeastOne, err := data.Result.Records[0].TotalDosesAtLeastOne.Float64()
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
}
|
||||||
|
totalDosesInFullyVaccinatedIndividuals, err := data.Result.Records[0].TotalDosesInFullyVaccinatedIndividuals.Float64()
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
}
|
||||||
|
totalIndividualsFullyVaccinated, err := data.Result.Records[0].TotalIndividualsFullyVaccinated.Float64()
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
records.PreviousDayDosesAdministered().Set(previousDayDosesAdministered)
|
||||||
|
records.PreviousDayAtLeastOne().Set(previousDayAtLeastOne)
|
||||||
|
records.PreviousDayFullyVaccinated().Set(previousDayFullyVaccinated)
|
||||||
|
records.TotalDosesAdministered().Set(totalDosesAdministered)
|
||||||
|
records.TotalDosesAtLeastOne().Set(totalDosesAtLeastOne)
|
||||||
|
records.TotalDosesInFullyVaccinatedIndividuals().Set(totalDosesInFullyVaccinatedIndividuals)
|
||||||
|
records.TotalIndividualsFullyVaccinated().Set(totalIndividualsFullyVaccinated)
|
||||||
records.EligiblePopulation().Set(float64(eligiblePopulation))
|
records.EligiblePopulation().Set(float64(eligiblePopulation))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user