Switch to private

activity.go

@@ -78,7 +78,7 @@ func (c *Client) GetActivities(ctx context.Context, start string, end string) (*
 	}
 
 	var activities *Activities
-	resp, err := c.Do(ctx, req, &activities)
+	resp, err := c.do(ctx, req, &activities)
 	if err != nil {
 		return activities, resp, err
 	}

bedtime.go

@@ -46,7 +46,7 @@ func (c *Client) GetBedtime(ctx context.Context, start string, end string) (*Ide
 	}
 
 	var bedtimes *IdealBedtimes
-	resp, err := c.Do(ctx, req, &bedtimes)
+	resp, err := c.do(ctx, req, &bedtimes)
 	if err != nil {
 		return bedtimes, resp, err
 	}

client.go

@@ -27,24 +27,6 @@ type Client struct {
 	client    *http.Client
 }
 
-// TimeSeriesData is time series data used by various other methods.
-type TimeSeriesData struct {
-	Interval  float32   `json:"interval"`
-	Items     []float32 `json:"items"`
-	Timestamp time.Time `json:"timestamp"`
-}
-
-func (e *ErrorDetail) Error() string {
-	return e.Detail
-}
-
-// ErrorDetail holds the details of an error message
-type ErrorDetail struct {
-	Status int    `json:"status,omitempty"`
-	Title  string `json:"title,omitempty"`
-	Detail string `json:"detail"`
-}
-
 // NewClient returns a new Oura API client. If a nil httpClient is
 // provided, http.DefaultClient will be used. To use API methods which require
 // authentication, provide an http.Client that will perform the authentication
@@ -101,7 +83,7 @@ func (c *Client) NewRequest(method, urlStr string, body interface{}) (*http.Requ
 // Do sends a request and returns the response. An error is returned if the request cannot
 // be sent or if the API returns an error. If a response is received, the body response body
 // is decoded and stored in the value pointed to by v.
-func (c *Client) Do(ctx context.Context, req *http.Request, v interface{}) (*http.Response, error) {
+func (c *Client) do(ctx context.Context, req *http.Request, v interface{}) (*http.Response, error) {
 	req = req.WithContext(ctx)
 	resp, err := c.client.Do(req)
 	if err != nil {
@@ -116,7 +98,7 @@ func (c *Client) Do(ctx context.Context, req *http.Request, v interface{}) (*htt
 
 	// Anything other than a HTTP 2xx response code is treated as an error.
 	if resp.StatusCode >= 300 {
-		e := ErrorDetail{}
+		e := errorDetail{}
 		err := json.Unmarshal(data, &e)
 		if err != nil {
 			return resp, err
@@ -140,6 +122,24 @@ func (c *Client) Do(ctx context.Context, req *http.Request, v interface{}) (*htt
 	return resp, err
 }
 
+// timeSeriesData is time series data used by various other methods.
+type timeSeriesData struct {
+	Interval  float32   `json:"interval"`
+	Items     []float32 `json:"items"`
+	Timestamp time.Time `json:"timestamp"`
+}
+
+func (e *errorDetail) Error() string {
+	return e.Detail
+}
+
+// errorDetail holds the details of an error message
+type errorDetail struct {
+	Status int    `json:"status,omitempty"`
+	Title  string `json:"title,omitempty"`
+	Detail string `json:"detail"`
+}
+
 // parametiseDate takes the arguments and URL encodes them into a string
 // where the dates are ISO 8601 date strings without times.
 func parametiseDate(path, start, end, next string) string {

client_test.go

@@ -84,7 +84,7 @@ func TestDo(t *testing.T) {
 		got := new(foo)
 
 		req, _ := client.NewRequest("GET", ".", nil)
-		client.Do(context.Background(), req, got) //nolint:errcheck
+		client.do(context.Background(), req, got) //nolint:errcheck
 
 		assert.ObjectsAreEqual(want, got)
 	})
@@ -99,7 +99,7 @@ func TestDo(t *testing.T) {
 		})
 
 		req, _ := client.NewRequest("GET", ".", nil)
-		resp, err := client.Do(context.Background(), req, nil)
+		resp, err := client.do(context.Background(), req, nil)
 
 		assert.Equal(tc, http.StatusInternalServerError, resp.StatusCode)
 		assert.Error(tc, err, "should return an error")
@@ -118,7 +118,7 @@ func TestDo(t *testing.T) {
 
 		req, _ := client.NewRequest("GET", ".", nil)
 		got := new(foo)
-		resp, err := client.Do(context.Background(), req, got)
+		resp, err := client.do(context.Background(), req, got)
 
 		assert.Equal(tc, http.StatusOK, resp.StatusCode)
 		assert.Nil(tc, err, "should not return an error")
@@ -152,7 +152,7 @@ func TestDo(t *testing.T) {
 
 		req, _ := client.NewRequest("GET", ".", nil)
 		got := new(foo)
-		resp, err := client.Do(context.Background(), req, got)
+		resp, err := client.do(context.Background(), req, got)
 
 		assert.Equal(tc, http.StatusOK, resp.StatusCode)
 		assert.Error(tc, err, "should return an error")
@@ -170,7 +170,7 @@ func TestDo(t *testing.T) {
 		req, _ := client.NewRequest("GET", ".", nil)
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
-		resp, err := client.Do(ctx, req, nil)
+		resp, err := client.do(ctx, req, nil)
 
 		assert.Error(tc, err, "should return an error")
 		assert.Nil(tc, resp, "should not return a response")
@@ -186,7 +186,7 @@ func TestDo(t *testing.T) {
 		})
 
 		req, _ := client.NewRequest("GET", ".", nil)
-		resp, err := client.Do(context.Background(), req, nil)
+		resp, err := client.do(context.Background(), req, nil)
 
 		assert.Equal(tc, http.StatusForbidden, resp.StatusCode)
 		assert.Error(tc, err, "should return an error")
@@ -206,7 +206,7 @@ func TestDo(t *testing.T) {
 		})
 
 		req, _ := client.NewRequest("GET", ".", nil)
-		resp, err := client.Do(context.Background(), req, nil)
+		resp, err := client.do(context.Background(), req, nil)
 
 		assert.Equal(tc, http.StatusBadRequest, resp.StatusCode)
 		assert.Error(tc, err, "should return an error")

daily_activity.go

@@ -21,7 +21,7 @@ type DailyActivity struct {
 	LowActivityTime           int            `json:"low_activity_time"`
 	MediumActivityMetMinutes  int            `json:"medium_activity_met_minutes"`
 	MediumActivityTime        int            `json:"medium_activity_time"`
-	Met                       TimeSeriesData `json:"met"`
+	Met                       timeSeriesData `json:"met"`
 	MetersToTarget            int            `json:"meters_to_target"`
 	NonWearTime               int            `json:"non_wear_time"`
 	RestingTime               int            `json:"resting_time"`
@@ -63,7 +63,7 @@ func (c *Client) DailyActivities(ctx context.Context, start_date, end_date, next
 	}
 
 	var data *DailyActivities
-	resp, err := c.Do(ctx, req, &data)
+	resp, err := c.do(ctx, req, &data)
 	if err != nil {
 		return data, resp, err
 	}

heartrate.go

@@ -31,7 +31,7 @@ func (c *Client) Heartrates(ctx context.Context, start_datetime, end_datetime, n
 	}
 
 	var data *Heartrates
-	resp, err := c.Do(ctx, req, &data)
+	resp, err := c.do(ctx, req, &data)
 	if err != nil {
 		return data, resp, err
 	}

personal_info.go

@@ -21,7 +21,7 @@ func (c *Client) PersonalInfo(ctx context.Context) (*PersonalInfo, *http.Respons
 	}
 
 	var data *PersonalInfo
-	resp, err := c.Do(ctx, req, &data)
+	resp, err := c.do(ctx, req, &data)
 	if err != nil {
 		return data, resp, err
 	}

readiness.go

@@ -52,7 +52,7 @@ func (c *Client) GetReadiness(ctx context.Context, start string, end string) (*R
 	}
 
 	var readinessSummaries *ReadinessSummaries
-	resp, err := c.Do(ctx, req, &readinessSummaries)
+	resp, err := c.do(ctx, req, &readinessSummaries)
 	if err != nil {
 		return readinessSummaries, resp, err
 	}

session.go

@@ -12,10 +12,10 @@ type Session struct {
 	StartDatetime        time.Time      `json:"start_date"`
 	EndDatetime          time.Time      `json:"end_date"`
 	Type                 string         `json:"type"`
-	Heartrate            TimeSeriesData `json:"heart_rate"`
-	HeartrateVariability TimeSeriesData `json:"heart_rate_variability"`
+	Heartrate            timeSeriesData `json:"heart_rate"`
+	HeartrateVariability timeSeriesData `json:"heart_rate_variability"`
 	Mood                 string         `json:"mood"`
-	MotionCount          TimeSeriesData `json:"motion_count"`
+	MotionCount          timeSeriesData `json:"motion_count"`
 }
 
 // Sessions represents the data returned from the Oura API for a list of sessions.
@@ -36,7 +36,7 @@ func (c *Client) Sessions(ctx context.Context, start_date, end_date, next_token
 	}
 
 	var data *Sessions
-	resp, err := c.Do(ctx, req, &data)
+	resp, err := c.do(ctx, req, &data)
 	if err != nil {
 		return data, resp, err
 	}

sleep.go

@@ -78,7 +78,7 @@ func (c *Client) GetSleep(ctx context.Context, start string, end string) (*Sleep
 	}
 
 	var sleepSummaries *Sleeps
-	resp, err := c.Do(ctx, req, &sleepSummaries)
+	resp, err := c.do(ctx, req, &sleepSummaries)
 	if err != nil {
 		return sleepSummaries, resp, err
 	}

tag.go

@@ -32,7 +32,7 @@ func (c *Client) Tags(ctx context.Context, start_date, end_date, next_token stri
 	}
 
 	var data *Tags
-	resp, err := c.Do(ctx, req, &data)
+	resp, err := c.do(ctx, req, &data)
 	if err != nil {
 		return data, resp, err
 	}

userinfo.go

@@ -22,7 +22,7 @@ func (c *Client) GetUserInfo(ctx context.Context) (*UserInfo, *http.Response, er
 	}
 
 	var userInfo *UserInfo
-	resp, err := c.Do(ctx, req, &userInfo)
+	resp, err := c.do(ctx, req, &userInfo)
 	if err != nil {
 		return userInfo, resp, err
 	}

workout.go

@@ -37,7 +37,7 @@ func (c *Client) Workouts(ctx context.Context, start_date, end_date, next_token
 	}
 
 	var data *Workouts
-	resp, err := c.Do(ctx, req, &data)
+	resp, err := c.do(ctx, req, &data)
 	if err != nil {
 		return data, resp, err
 	}