Merge pull request #44 from phoops/master

Added 'user API' filters.

Author: mattn

user.go

@@ -3,6 +3,7 @@ package redmine
 import (
 	"encoding/json"
 	"errors"
+	"net/http"
 	"strconv"
 	"strings"
 )
@@ -27,6 +28,50 @@ type User struct {
 	CustomFields []*CustomField `json:"custom_fields,omitempty"`
 }
 
+type UsersFilter struct {
+	Filter
+}
+
+func NewUsersFilter() *UsersFilter {
+	return &UsersFilter{Filter{}}
+}
+
+const (
+	UserStatusAll        string = ""
+	UserStatusActive     string = "1"
+	UserStatusRegistered string = "2"
+	UserStatusLocked     string = "3"
+)
+
+func (usf *UsersFilter) Status(status string) {
+	usf.AddPair("status", status)
+}
+
+func (usf *UsersFilter) Name(name string) {
+	usf.AddPair("name", name)
+}
+
+func (usf *UsersFilter) GroupId(groupId int) {
+	usf.AddPair("group_id", strconv.Itoa(groupId))
+}
+
+type UserByIdFilter struct {
+	Filter
+}
+
+func NewUserByIdFilter() *UserByIdFilter {
+	return &UserByIdFilter{Filter{}}
+}
+
+const (
+	UserIncludeMemberships string = "memberships"
+	UserIncludeGroups      string = "groups"
+)
+
+func (uif *UserByIdFilter) Include(include string) {
+	uif.AddPair("include", include)
+}
+
 func (c *Client) Users() ([]User, error) {
 	res, err := c.Get(c.endpoint + "/users.json?key=" + c.apikey + c.getPaginationClause())
 	if err != nil {
@@ -51,6 +96,39 @@ func (c *Client) Users() ([]User, error) {
 	return r.Users, nil
 }
 
+func (c *Client) UsersWithFilter(filter *UsersFilter) ([]User, error) {
+	uri, err := c.URLWithFilter("/users.json", filter.Filter)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequest("GET", uri, nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("X-Redmine-API-Key", c.apikey)
+	res, err := c.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	decoder := json.NewDecoder(res.Body)
+	var r usersResult
+	if res.StatusCode != 200 {
+		var er errorsResult
+		err = decoder.Decode(&er)
+		if err == nil {
+			err = errors.New(strings.Join(er.Errors, "\n"))
+		}
+	} else {
+		err = decoder.Decode(&r)
+	}
+	if err != nil {
+		return nil, err
+	}
+	return r.Users, nil
+}
+
 func (c *Client) User(id int) (*User, error) {
 	res, err := c.Get(c.endpoint + "/users/" + strconv.Itoa(id) + ".json?key=" + c.apikey)
 	if err != nil {
@@ -74,3 +152,37 @@ func (c *Client) User(id int) (*User, error) {
 	}
 	return &r.User, nil
 }
+
+func (c *Client) UserByIdAndFilter(id int, filter *UserByIdFilter) (*User, error) {
+	uri, err := c.URLWithFilter("/users/"+strconv.Itoa(id)+".json", filter.Filter)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("GET", uri, nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("X-Redmine-API-Key", c.apikey)
+	res, err := c.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	decoder := json.NewDecoder(res.Body)
+	var r userResult
+	if res.StatusCode != 200 {
+		var er errorsResult
+		err = decoder.Decode(&er)
+		if err == nil {
+			err = errors.New(strings.Join(er.Errors, "\n"))
+		}
+	} else {
+		err = decoder.Decode(&r)
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &r.User, nil
+}