From 65ec23930e955204c1b6103e7d9d44443cf593c1 Mon Sep 17 00:00:00 2001 From: Ray Slakinski Date: Thu, 29 Apr 2021 11:51:57 -0400 Subject: [PATCH] data types where changed in api, now fixed --- main.go | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/main.go b/main.go index 696db9c..b924f7a 100644 --- a/main.go +++ b/main.go @@ -7,8 +7,6 @@ import ( "io/ioutil" "log" "net/http" - "strconv" - "strings" "github.com/cabify/gotoprom" "github.com/prometheus/client_golang/prometheus" @@ -38,10 +36,10 @@ type OntCovidData struct { Records []struct { ID int `json:"_id"` ReportDate string `json:"report_date"` - PreviousDayDosesAdministered string `json:"previous_day_doses_administered"` - TotalDosesAdministered string `json:"total_doses_administered"` - TotalDosesInFullyVaccinatedIndividuals string `json:"total_doses_in_fully_vaccinated_individuals"` - TotalIndividualsFullyVaccinated string `json:"total_individuals_fully_vaccinated"` + PreviousDayDosesAdministered int `json:"previous_day_doses_administered"` + TotalDosesAdministered int `json:"total_doses_administered"` + TotalDosesInFullyVaccinatedIndividuals int `json:"total_doses_in_fully_vaccinated_individuals"` + TotalIndividualsFullyVaccinated int `json:"total_individuals_fully_vaccinated"` } `json:"records"` Limit int `json:"limit"` Links struct { @@ -84,22 +82,10 @@ func updateMetrics() { return } - totalDosesAdministeredString := strings.Replace(data.Result.Records[0].TotalDosesAdministered, ",", "", -1) - totalDosesAdministered, _ := strconv.ParseInt(totalDosesAdministeredString, 0, 64) - records.TotalDosesAdministered().Set(float64(totalDosesAdministered)) - - previousDayDosesAdministeredString := strings.Replace(data.Result.Records[0].PreviousDayDosesAdministered, ",", "", -1) - previousDayDosesAdministered, _ := strconv.ParseInt(previousDayDosesAdministeredString, 0, 64) - records.PreviousDayDosesAdministered().Set(float64(previousDayDosesAdministered)) - - totalDosesInFullyVaccinatedIndividualsString := strings.Replace(data.Result.Records[0].TotalDosesInFullyVaccinatedIndividuals, ",", "", -1) - totalDosesInFullyVaccinatedIndividuals, _ := strconv.ParseInt(totalDosesInFullyVaccinatedIndividualsString, 0, 64) - records.TotalDosesInFullyVaccinatedIndividuals().Set(float64(totalDosesInFullyVaccinatedIndividuals)) - - totalIndividualsFullyVaccinatedString := strings.Replace(data.Result.Records[0].TotalIndividualsFullyVaccinated, ",", "", -1) - totalIndividualsFullyVaccinated, _ := strconv.ParseInt(totalIndividualsFullyVaccinatedString, 0, 64) - records.TotalIndividualsFullyVaccinated().Set(float64(totalIndividualsFullyVaccinated)) - + records.TotalDosesAdministered().Set(float64(data.Result.Records[0].TotalDosesAdministered)) + records.PreviousDayDosesAdministered().Set(float64(data.Result.Records[0].PreviousDayDosesAdministered)) + records.TotalDosesInFullyVaccinatedIndividuals().Set(float64(data.Result.Records[0].TotalDosesInFullyVaccinatedIndividuals)) + records.TotalIndividualsFullyVaccinated().Set(float64(data.Result.Records[0].TotalIndividualsFullyVaccinated)) records.EligiblePopulation().Set(float64(eligiblePopulation)) }