X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fitbit%2Ffitbit.go;h=4555e2267dbb013c5364a71b841fa20414cb6931;hb=6c7b039b319152555c9529d8d5a2c2483cf65887;hp=2c0a04ac3d018b26ff191446429338da52683068;hpb=e99826bfa13306dda3897d3490969032b8aa13f5;p=kraftakt.git

diff --git a/fitbit/fitbit.go b/fitbit/fitbit.go
index 2c0a04a..4555e22 100644
--- 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(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 {
@@ -155,8 +163,11 @@ func (c *Client) ActivitySummary(t time.Time) (*ActivitySummary, error) {
 	}
 	defer res.Body.Close()
 
+	data, _ := ioutil.ReadAll(res.Body)
+	log.Debugf(ctx, "GET %s -> %s", url, data)
+
 	var summary ActivitySummary
-	if err := json.NewDecoder(res.Body).Decode(&summary); err != nil {
+	if err := json.Unmarshal(data, &summary); err != nil {
 		return nil, err
 	}