From 671a580d512e419bfa37bf937090fc8e65bb2a8f Mon Sep 17 00:00:00 2001 From: ross-w Date: Fri, 29 Mar 2024 23:27:03 +1100 Subject: [PATCH] Amber: fix api query (#13196) --- tariff/amber.go | 7 ++++--- tariff/amber/types.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tariff/amber.go b/tariff/amber.go index 83fbb22d4..474ea63f4 100644 --- a/tariff/amber.go +++ b/tariff/amber.go @@ -61,7 +61,7 @@ func NewAmberFromConfig(other map[string]interface{}) (api.Tariff, error) { embed: &cc.embed, log: log, Helper: request.NewHelper(log), - uri: fmt.Sprintf(amber.URI, strings.ToUpper(cc.SiteID), time.Now().AddDate(0, 0, 1).Format("2006-01-02")), + uri: fmt.Sprintf(amber.URI, strings.ToUpper(cc.SiteID)), channel: strings.ToLower(cc.Channel), data: util.NewMonitor[api.Rates](2 * time.Hour), } @@ -87,9 +87,10 @@ func (t *Amber) run(done chan error) { tick := time.NewTicker(time.Minute) for ; true; <-tick.C { var res []amber.PriceInfo - + uri := fmt.Sprintf("%s&endDate=%s", t.uri, + time.Now().AddDate(0, 0, 2).Format("2006-01-02")) if err := backoff.Retry(func() error { - return t.GetJSON(t.uri, &res) + return t.GetJSON(uri, &res) }, bo); err != nil { once.Do(func() { done <- err }) diff --git a/tariff/amber/types.go b/tariff/amber/types.go index 6ee0265a1..87e6282aa 100644 --- a/tariff/amber/types.go +++ b/tariff/amber/types.go @@ -1,6 +1,6 @@ package amber -const URI = "https://api.amber.com.au/v1/sites/%s/prices?endDate=%s&resolution=30" +const URI = "https://api.amber.com.au/v1/sites/%s/prices?resolution=30" type PriceInfo struct { Type string `json:"type"`