Merge remote-tracking branch 'timchunght/master' into resource-listing

Author: Dirk Hoekstra

client.go

@@ -213,9 +213,14 @@ func (c *Client) Message(id string) (*Message, error) {
 }
 
 // Messages retrieves all messages of the user represented as a MessageList object.
-func (c *Client) Messages() (*MessageList, error) {
+func (c *Client) Messages(msgListParams *MessageListParams) (*MessageList, error) {
 	messageList := &MessageList{}
-	if err := c.request(messageList, MessagePath, nil); err != nil {
+	params, err := paramsForMessageList(msgListParams)
+	if err != nil {
+		return messageList, err
+	}
+
+	if err := c.request(messageList, "messages?"+params.Encode(), nil); err != nil {
 		if err == ErrResponse {
 			return messageList, err
 		}

message.go

@@ -52,6 +52,13 @@ type MessageParams struct {
 	ScheduledDatetime time.Time
 }
 
+type MessageListParams struct {
+	Originator string
+	Direction  string
+	Limit      int
+	Offset     int
+}
+
 // paramsForMessage converts the specified MessageParams struct to a
 // url.Values pointer and returns it.
 func paramsForMessage(params *MessageParams) (*url.Values, error) {
@@ -96,3 +103,26 @@ func paramsForMessage(params *MessageParams) (*url.Values, error) {
 
 	return urlParams, nil
 }
+
+// paramsForMessageList converts the specified MessageListParams struct to a
+// url.Values pointer and returns it.
+func paramsForMessageList(params *MessageListParams) (*url.Values, error) {
+	urlParams := &url.Values{}
+
+	if params == nil {
+		return urlParams, nil
+	}
+
+	if params.Direction != "" {
+		urlParams.Set("direction", params.Direction)
+	}
+	if params.Originator != "" {
+		urlParams.Set("originator", params.Originator)
+	}
+	if params.Limit != 0 {
+		urlParams.Set("limit", strconv.Itoa(params.Limit))
+	}
+	urlParams.Set("offset", strconv.Itoa(params.Offset))
+
+	return urlParams, nil
+}

message_test.go

@@ -542,7 +542,7 @@ var messageListObject = []byte(`{
 func TestMessageList(t *testing.T) {
 	SetServerResponse(http.StatusOK, messageListObject)
 
-	messageList, err := mbClient.Messages()
+	messageList, err := mbClient.Messages(nil)
 	if err != nil {
 		t.Fatalf("Didn't expect an error while requesting Messages: %s", err)
 	}