Also subscribe to the "sleep" Fitbit collection.

[kraftakt.git] / fitbit / fitbit.go

diff --git a/fitbit/fitbit.go b/fitbit/fitbit.go
index 414ea37..4555e22 100644 (file)
--- a/fitbit/fitbit.go
+++ b/fitbit/fitbit.go
@@ -22,7 +22,12 @@ var oauth2Config = &oauth2.Config{
        ClientSecret: "@FITBIT_CLIENT_SECRET@",
        Endpoint:     oauth2fitbit.Endpoint,
        RedirectURL:  "https://kraftakt.octo.it/fitbit/grant",
-       Scopes:       []string{"activity", "heartrate", "profile"},
+       Scopes: []string{
+               "activity",
+               "heartrate",
+               "profile",
+               "sleep",
+       },
 }
 
 const csrfToken = "@CSRFTOKEN@"
@@ -59,18 +64,21 @@ func CheckSignature(ctx context.Context, payload []byte, rawSig string) bool {
 }
 
 type Activity struct {
-       ActivityID       int     `json:"activityId"`
-       ActivityParentID int     `json:"activityParentId"`
-       Calories         int     `json:"calories"`
-       Description      string  `json:"description"`
-       Distance         float64 `json:"distance"`
-       Duration         int     `json:"duration"`
-       HasStartTime     bool    `json:"hasStartTime"`
-       IsFavorite       bool    `json:"isFavorite"`
-       LogID            int     `json:"logId"`
-       Name             string  `json:"name"`
-       StartTime        string  `json:"startTime"`
-       Steps            int     `json:"steps"`
+       ActivityID         int       `json:"activityId"`
+       ActivityParentID   int       `json:"activityParentId"`
+       ActivityParentName string    `json:"activityParentName"`
+       Calories           int       `json:"calories"`
+       Description        string    `json:"description"`
+       Distance           float64   `json:"distance"`
+       Duration           int       `json:"duration"`
+       HasStartTime       bool      `json:"hasStartTime"`
+       IsFavorite         bool      `json:"isFavorite"`
+       LastModified       time.Time `json:"lastModified"`
+       LogID              int       `json:"logId"`
+       Name               string    `json:"name"`
+       StartTime          string    `json:"startTime"`
+       StartDate          string    `json:"startDate"`
+       Steps              int       `json:"steps"`
 }
 
 type Distance struct {
@@ -145,9 +153,9 @@ func NewClient(ctx context.Context, fitbitUserID string, u *app.User) (*Client,
        }, nil
 }
 
-func (c *Client) ActivitySummary(ctx context.Context, t time.Time) (*ActivitySummary, error) {
+func (c *Client) ActivitySummary(ctx context.Context, date string) (*ActivitySummary, error) {
        url := fmt.Sprintf("https://api.fitbit.com/1/user/%s/activities/date/%s.json",
-               c.fitbitUserID, t.Format("2006-01-02"))
+               c.fitbitUserID, date)
 
        res, err := c.client.Get(url)
        if err != nil {