Skip to content

Commit

Permalink
Context support for user (#113)
Browse files Browse the repository at this point in the history
* Fix test for context support of user

* Add context support for user

* Regenerate mock client
  • Loading branch information
nukosuke committed May 14, 2019
1 parent 13a9cff commit 00dba3b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
16 changes: 8 additions & 8 deletions zendesk/mock/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions zendesk/user.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package zendesk

import (
"context"
"encoding/json"
"time"
)
Expand Down Expand Up @@ -69,18 +70,18 @@ func UserRoleText(role int) string {

// UserAPI an interface containing all user related methods
type UserAPI interface {
GetUsers() ([]User, Page, error)
CreateUser(user User) (User, error)
GetUsers(ctx context.Context) ([]User, Page, error)
CreateUser(ctx context.Context, user User) (User, error)
}

// GetUsers fetch user list
func (z *Client) GetUsers() ([]User, Page, error) {
func (z *Client) GetUsers(ctx context.Context) ([]User, Page, error) {
var data struct {
Users []User `json:"users"`
Page
}

body, err := z.Get("/users.json")
body, err := z.get(ctx, "/users.json")
if err != nil {
return nil, Page{}, err
}
Expand All @@ -96,13 +97,13 @@ func (z *Client) GetUsers() ([]User, Page, error) {

// CreateUser creates new user
// ref: https://developer.zendesk.com/rest_api/docs/core/triggers#create-trigger
func (z *Client) CreateUser(user User) (User, error) {
func (z *Client) CreateUser(ctx context.Context, user User) (User, error) {
var data, result struct {
User User `json:"user"`
}
data.User = user

body, err := z.Post("/users.json", data)
body, err := z.post(ctx, "/users.json", data)
if err != nil {
return User{}, err
}
Expand Down
4 changes: 2 additions & 2 deletions zendesk/user_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestGetUsers(t *testing.T) {
client := newTestClient(mockAPI)
defer mockAPI.Close()

users, _, err := client.GetUsers()
users, _, err := client.GetUsers(ctx)
if err != nil {
t.Fatalf("Failed to get users: %s", err)
}
Expand All @@ -33,7 +33,7 @@ func TestCreateUser(t *testing.T) {
client := newTestClient(mockAPI)
defer mockAPI.Close()

user, err := client.CreateUser(User{
user, err := client.CreateUser(ctx, User{
Email: "test@example.com",
Name: "testuser",
})
Expand Down

0 comments on commit 00dba3b

Please sign in to comment.