Bugfix query params

hayashiki · Aug 24, 2020 · f8c5b69 · f8c5b69
1 parent 67d14f1
commit f8c5b69
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 21 deletions.
diff --git a/comment_test.go b/comment_test.go
@@ -28,12 +28,12 @@ func TestCommentService_Create(t *testing.T) {
 	ti, err := time.Parse(time.RFC3339, "2020-03-27T09:25:09+09:00")
 
 	want := &Comment{
-		ID:   1,
-		Body: "コメント",
+		ID:        1,
+		Body:      "コメント",
 		CreatedAt: ti,
 		SimpleUser: SimpleUser{
-			ID: 1,
-			Name: "danny",
+			ID:              1,
+			Name:            "danny",
 			ProfileImageURL: "https://image.docbase.io/uploads/aaa.gif",
 		},
 	}
@@ -95,7 +95,7 @@ func TestCommentService_Delete(t *testing.T) {
 	defer teardown()
 
 	comment := &Comment{
-		ID:   1,
+		ID: 1,
 	}
 
 	mux.HandleFunc(fmt.Sprintf("/comments/%d", comment.ID), func(w http.ResponseWriter, r *http.Request) {

diff --git a/docbase.go b/docbase.go
@@ -39,7 +39,7 @@ type Client struct {
 	Client      *http.Client
 
 	rateMu    sync.Mutex
-	rateLimit   Rate
+	rateLimit Rate
 
 	Posts       PostService
 	Users       UserService
@@ -210,7 +210,7 @@ func CheckResponse(r *http.Response) error {
 		return &RateLimitError{
 			Rate:     parseRate(r),
 			Response: errorResponse.Response,
-			Messages:  errorResponse.Messages,
+			Messages: errorResponse.Messages,
 		}
 	default:
 		return errorResponse
@@ -247,7 +247,6 @@ func parseRate(r *http.Response) Rate {
 	return rate
 }
 
-
 // checkRateLimitBeforeDo referenced from https://github.com/google/go-github/blob/master/github/github.go#L627
 func (c *Client) checkRateLimitBeforeDo(req *http.Request) *RateLimitError {
 	c.rateMu.Lock()
@@ -265,7 +264,7 @@ func (c *Client) checkRateLimitBeforeDo(req *http.Request) *RateLimitError {
 		return &RateLimitError{
 			Rate:     rate,
 			Response: resp,
-			Messages:  []string{fmt.Sprintf("API rate limit of %v still exceeded until %v, not making remote request.", rate.Limit, rate.Reset.Time)},
+			Messages: []string{fmt.Sprintf("API rate limit of %v still exceeded until %v, not making remote request.", rate.Limit, rate.Reset.Time)},
 		}
 	}
 
@@ -274,17 +273,17 @@ func (c *Client) checkRateLimitBeforeDo(req *http.Request) *RateLimitError {
 
 // Rate referenced from https://github.com/google/go-github/blob/master/github/github.go#L861
 type Rate struct {
-	Limit int `json:"limit"`
-	Remaining int `json:"remaining"`
-	Reset Timestamp `json:"reset"`
-	err error
+	Limit     int       `json:"limit"`
+	Remaining int       `json:"remaining"`
+	Reset     Timestamp `json:"reset"`
+	err       error
 }
 
 // RateLimitError referenced from https://github.com/google/go-github/blob/master/github/github.go#L687
 type RateLimitError struct {
 	Rate     Rate           // Rate specifies last known rate limit for the client
 	Response *http.Response // HTTP response that caused this error
-	Messages  []string         `json:"message"` // error message
+	Messages []string       `json:"message"` // error message
 }
 
 // Error referenced from https://github.com/google/go-github/blob/master/github/github.go#L693
@@ -310,8 +309,8 @@ func sanitizeURL(uri *url.URL) *url.URL {
 // ErrorResponse referenced from https://github.com/google/go-github/blob/master/github/github.go#L655
 type ErrorResponse struct {
 	Response *http.Response // HTTP response that caused this error
-	Messages  []string         `json:"messages"` // error message
-	ErrorStr string         `json:"error"`   // more detail about an error
+	Messages []string       `json:"messages"` // error message
+	ErrorStr string         `json:"error"`    // more detail about an error
 	err      error          // CheckResponse error
 }
 

diff --git a/docbase_test.go b/docbase_test.go
@@ -83,7 +83,7 @@ func TestClient_NewRequest(t *testing.T) {
 	outBody := `{"Foo":"Bar"}`
 
 	req, err := cli.NewRequest(method, inURL, inBody)
-	
+
 	if err != nil {
 		t.Errorf("err")
 	}

diff --git a/group.go b/group.go
@@ -65,6 +65,7 @@ func (s *GroupCli) List(opts *GroupListOptions) (*GroupListResponse, *Response,
 	q.Set("per_page", strconv.Itoa(opts.PerPage))
 	q.Set("page", strconv.Itoa(opts.Page))
 	q.Set("q", opts.Name)
+	u.RawQuery = q.Encode()
 
 	req, err := s.client.NewRequest(http.MethodGet, u.String(), nil)
 

diff --git a/group_test.go b/group_test.go
@@ -131,7 +131,7 @@ func TestGroupCli_Create(t *testing.T) {
 		PostsCount:     0,
 		LastActivityAt: ti,
 		CreatedAt:      ti,
-		Users:          []SimpleUser{
+		Users: []SimpleUser{
 			SimpleUser{
 				ID:              1,
 				Name:            "docbaseman",

diff --git a/post.go b/post.go
@@ -99,6 +99,7 @@ func (s *PostCli) List(opts *PostListOptions) (*PostListResponse, *Response, err
 	q.Set("per_page", strconv.Itoa(opts.PerPage))
 	q.Set("page", strconv.Itoa(opts.Page))
 	q.Set("q", opts.Q)
+	u.RawQuery = q.Encode()
 
 	req, err := s.client.NewRequest(http.MethodGet, u.String(), nil)
 

diff --git a/timestamp.go b/timestamp.go
@@ -7,8 +7,8 @@
 package docbase
 
 import (
-"strconv"
-"time"
+	"strconv"
+	"time"
 )
 
 // Timestamp represents a time that can be unmarshalled from a JSON string

diff --git a/user.go b/user.go
@@ -60,6 +60,7 @@ func (s *UserCli) List(opts *UserListOptions) (*UserListResponse, *Response, err
 	q.Set("page", strconv.Itoa(opts.Page))
 	q.Set("q", opts.Q)
 	q.Set("include_user_groups", opts.Q)
+	u.RawQuery = q.Encode()
 
 	req, err := s.client.NewRequest(http.MethodGet, u.String(), nil)
 

diff --git a/version.go b/version.go
@@ -1,6 +1,6 @@
 package docbase
 
 const (
-	version  = "0.1.0"
+	version  = "0.1.1"
 	revision = "HEAD"
 )