status filter added to sms list messages function (#73)

* status filter added to sms list messages function

* fix Recording struct field name changed issue

Author: sokalauvalery

internal/mbtest/test_server.go

@@ -1,7 +1,9 @@
 package mbtest
 
 import (
+	"crypto/tls"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -94,3 +96,18 @@ func WillReturnAccessKeyError() {
 		}
 	`), http.StatusUnauthorized)
 }
+
+// HTTPTestTransport builds http transport that allows to pass custom http handler to http server
+func HTTPTestTransport(handler http.Handler) (*http.Transport, func()) {
+	s := httptest.NewTLSServer(handler)
+
+	transport := &http.Transport{
+		DialTLS: func(network, _ string) (net.Conn, error) {
+			return tls.Dial(network, s.Listener.Addr().String(), &tls.Config{
+				InsecureSkipVerify: true,
+			})
+		},
+	}
+
+	return transport, s.Close
+}

sms/message.go

@@ -61,6 +61,7 @@ type ListParams struct {
 	Originator string
 	Direction  string
 	Type       string
+	Status     string
 	Limit      int
 	Offset     int
 }
@@ -190,6 +191,9 @@ func paramsForMessageList(params *ListParams) (*url.Values, error) {
 	if params.Originator != "" {
 		urlParams.Set("originator", params.Originator)
 	}
+	if params.Status != "" {
+		urlParams.Set("status", params.Status)
+	}
 	if params.Limit != 0 {
 		urlParams.Set("limit", strconv.Itoa(params.Limit))
 	}

sms/message_test.go

@@ -2,6 +2,7 @@ package sms
 
 import (
 	"net/http"
+	"strings"
 	"testing"
 	"time"
 
@@ -308,6 +309,35 @@ func TestList(t *testing.T) {
 	}
 }
 
+func TestListScheduled(t *testing.T) {
+	h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		expectedStatusFilter := "status=scheduled"
+		if !strings.Contains(r.URL.String(), expectedStatusFilter) {
+			t.Errorf("API call should contain filter by status (%v), but is is not %v", expectedStatusFilter, r.URL.String())
+		}
+		w.Write(mbtest.Testdata(t, "messageListScheduledObject.json"))
+	})
+	transport, teardown := mbtest.HTTPTestTransport(h)
+	defer teardown()
+
+	client := mbtest.Client(t)
+	client.HTTPClient.Transport = transport
+
+	messageList, err := List(client, &ListParams{Status: "scheduled"})
+	if err != nil {
+		t.Fatalf("Didn't expect an error while requesting Messages: %s", err)
+	}
+	if messageList.Count != 1 {
+		t.Errorf("Unexpected result for the MessageList count: %d, expected: 1", messageList.Count)
+	}
+	if messageList.TotalCount != 1 {
+		t.Errorf("Unexpected result for the MessageList total count: %d, expected: 1", messageList.TotalCount)
+	}
+	if len(messageList.Items) != 1 {
+		t.Errorf("Unexpected result for the MessageList number of items in list: %d, expected: 1", len(messageList.Items))
+	}
+}
+
 func TestRequestDataForMessage(t *testing.T) {
 	currentTime := time.Now()
 	messageParams := &Params{

sms/testdata/messageListScheduledObject.json

@@ -0,0 +1,43 @@
+{
+    "offset": 0,
+    "limit": 20,
+    "count": 1,
+    "totalCount": 1,
+    "links": {
+        "first": "https://rest.messagebird.com/messages/?offset=0",
+        "previous": null,
+        "next": null,
+        "last": "https://rest.messagebird.com/messages/?offset=0"
+    },
+    "items": [
+        {
+            "id": "6fe65f90454aa61536e6a88b88972670",
+            "href": "https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
+            "direction": "mt",
+            "type": "sms",
+            "originator": "TestName",
+            "body": "Hello World",
+            "reference": null,
+            "validity": null,
+            "gateway": 239,
+            "typeDetails": {},
+            "datacoding": "plain",
+            "mclass": 1,
+            "scheduledDatetime": null,
+            "createdDatetime": "2015-01-05T10:02:59+00:00",
+            "recipients": {
+                "totalCount": 1,
+                "totalSentCount": 1,
+                "totalDeliveredCount": 0,
+                "totalDeliveryFailedCount": 0,
+                "items": [
+                    {
+                        "recipient": 31612345678,
+                        "status": "scheduled",
+                        "statusDatetime": "2015-01-05T10:02:59+00:00"
+                    }
+                ]
+            }
+        }
+    ]
+}

voice/recording.go

@@ -95,7 +95,7 @@ func (rec *Recording) UnmarshalJSON(data []byte) error {
 
 // Transcriptions returns a paginator for retrieving all Transcription objects.
 func (rec *Recording) Transcriptions(client *messagebird.Client, callID string) *Paginator {
-	path := apiRoot+rec.links["self"]+"/transcriptions"
+	path := apiRoot + rec.Links["self"] + "/transcriptions"
 	return newPaginator(client, path, reflect.TypeOf(Transcription{}))
 }