Adding missing field in SMS API (#119)

* changed testdata messageObjectWithCreatedDatetime -> messageObjectWithScheduledDatetime * added missing fields * tests updated & added TestRead * update testdata * go version up * add read tests * add tests for Delete method * replace deprecated DialTLS with DialTLSContext * improve error_test * add GroupIds to messageRequest * add GroupIds to request and tests * remove bool in result of sms.Delete * update version to 8 * update client version
messagebird · Jun 24, 2022 · 88ad799 · 88ad799
1 parent c3c2f72
commit 88ad799
Show file tree

Hide file tree

Showing 59 changed files with 375 additions and 109 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        go-version: [ 1.16.x, 1.17.x, 1.18.x]
+        go-version: [ 1.16.x, 1.17.x, 1.18.x ]
 
     name: Go ${{ matrix.go-version }}
 

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -103,3 +103,8 @@ So all imports of `go-rest-api` are replaced as `go-rest-api/v6`.
 ## `v6.1.0` -> `v7.0.0`
 ### Verify Recipient type
 As v7 introduces support for using the Verify API with email recipients, the `Verify.Recipient` field has been changed from to a string type.
+
+## `v7.1.0` -> `v8.0.0`
+### Update SMS API
+Added [missed fields](https://github.com/messagebird/go-rest-api/pull/119/commits/f9331269238f1518dd35d798a0fbf251bb04bb62) in SMS API.
+Updated `sms.Delete` method so now in return only error or nil as result.
diff --git a/balance/balance.go b/balance/balance.go
@@ -3,7 +3,7 @@ package balance
 import (
 	"net/http"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
+	messagebird "github.com/messagebird/go-rest-api/v8"
 )
 
 // Balance describes your balance information.

diff --git a/balance/balance_test.go b/balance/balance_test.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"testing"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	messagebird "github.com/messagebird/go-rest-api/v8"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/client.go b/client.go
@@ -26,7 +26,7 @@ import (
 
 const (
 	// ClientVersion is used in User-Agent request header to provide server with API level.
-	ClientVersion = "7.1.0"
+	ClientVersion = "8.0.0"
 
 	// Endpoint points you to MessageBird REST API.
 	Endpoint = "https://rest.messagebird.com"

diff --git a/contact/contact.go b/contact/contact.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
+	messagebird "github.com/messagebird/go-rest-api/v8"
 )
 
 // Contact gets returned by the API.

diff --git a/contact/contact_test.go b/contact/contact_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 )
 
 func TestMain(m *testing.M) {

diff --git a/conversation/api.go b/conversation/api.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
+	messagebird "github.com/messagebird/go-rest-api/v8"
 )
 
 const (

diff --git a/conversation/conversation.go b/conversation/conversation.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
+	messagebird "github.com/messagebird/go-rest-api/v8"
 )
 
 // ListOptions can be used to set pagination options in List().

diff --git a/conversation/conversation_test.go b/conversation/conversation_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/conversation/message.go b/conversation/message.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
+	messagebird "github.com/messagebird/go-rest-api/v8"
 )
 
 type MessageCreateRequest struct {

diff --git a/conversation/message_test.go b/conversation/message_test.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/conversation/webhook.go b/conversation/webhook.go
@@ -3,7 +3,7 @@ package conversation
 import (
 	"net/http"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
+	messagebird "github.com/messagebird/go-rest-api/v8"
 )
 
 type WebhookCreateRequest struct {

diff --git a/conversation/webhook_test.go b/conversation/webhook_test.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/error_test.go b/error_test.go
@@ -37,3 +37,21 @@ func TestError(t *testing.T) {
 		assert.Error(t, errRes)
 	})
 }
+
+func TestErrorWithEmptyErrors(t *testing.T) {
+	errRes := ErrorResponse{}
+	assert.Error(t, errRes)
+	assert.Equal(t, "API errors: ", errRes.Error())
+}
+
+func TestErrorWithOneEmptyError(t *testing.T) {
+	errRes := ErrorResponse{Errors: []Error{
+		{
+			Code:        11,
+			Description: "",
+			Parameter:   "",
+		},
+	}}
+	assert.Error(t, errRes)
+	assert.Equal(t, "API errors: ", errRes.Error())
+}
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
-module github.com/messagebird/go-rest-api/v7
+module github.com/messagebird/go-rest-api/v8
 
-go 1.14
+go 1.16
 
 require (
 	github.com/golang-jwt/jwt v3.2.1+incompatible

diff --git a/group/group.go b/group/group.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
-	"github.com/messagebird/go-rest-api/v7/contact"
+	messagebird "github.com/messagebird/go-rest-api/v8"
+	"github.com/messagebird/go-rest-api/v8/contact"
 )
 
 // Group gets returned by the API.

diff --git a/group/group_test.go b/group/group_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/hlr/hlr.go b/hlr/hlr.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
+	messagebird "github.com/messagebird/go-rest-api/v8"
 )
 
 // HLR stands for Home Location Register. Contains information about the

diff --git a/hlr/hlr_test.go b/hlr/hlr_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/messagebird/go-rest-api/v7"
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	"github.com/messagebird/go-rest-api/v8"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/internal/mbtest/test_client.go b/internal/mbtest/test_client.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"testing"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
+	messagebird "github.com/messagebird/go-rest-api/v8"
 )
 
 // testWriter can be used to have the client write to the tests's error log.

diff --git a/internal/mbtest/test_server.go b/internal/mbtest/test_server.go
@@ -1,6 +1,7 @@
 package mbtest
 
 import (
+	"context"
 	"crypto/tls"
 	"io/ioutil"
 	"net"
@@ -72,6 +73,13 @@ func WillReturn(b []byte, s int) {
 	status = s
 }
 
+// WillReturnOnlyStatus sets the response status (s) to be returned by the
+// server for incoming requests.
+func WillReturnOnlyStatus(s int) {
+	responseBody = []byte{}
+	status = s
+}
+
 // WillReturnTestdata sets the status (s) for the test server to respond with.
 // Additionally it reads the bytes from the relativePath file and returns that
 // for requests. It fails the test if the file can not be read. The path is
@@ -102,10 +110,11 @@ 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{
+		DialTLSContext: func(ctx context.Context, network, _ string) (net.Conn, error) {
+			d := &tls.Dialer{Config: &tls.Config{
 				InsecureSkipVerify: true,
-			})
+			}}
+			return d.DialContext(ctx, network, s.Listener.Addr().String())
 		},
 	}
 

diff --git a/lookup/lookup.go b/lookup/lookup.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"net/url"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
-	"github.com/messagebird/go-rest-api/v7/hlr"
+	messagebird "github.com/messagebird/go-rest-api/v8"
+	"github.com/messagebird/go-rest-api/v8/hlr"
 )
 
 // Formats represents phone number in multiple formats.

diff --git a/lookup/lookup_test.go b/lookup/lookup_test.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/messagebird/go-rest-api/v7/hlr"
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	"github.com/messagebird/go-rest-api/v8/hlr"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/mms/message.go b/mms/message.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
+	messagebird "github.com/messagebird/go-rest-api/v8"
 )
 
 // Message represents a MMS Message.

diff --git a/mms/message_test.go b/mms/message_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	messagebird "github.com/messagebird/go-rest-api/v8"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/number/number.go b/number/number.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"strconv"
 
-	messagebird "github.com/messagebird/go-rest-api/v7"
+	messagebird "github.com/messagebird/go-rest-api/v8"
 )
 
 const (

diff --git a/number/number_test.go b/number/number_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/recipient.go b/recipient.go
@@ -4,9 +4,25 @@ import "time"
 
 // Recipient struct holds information for a single msisdn with status details.
 type Recipient struct {
-	Recipient      int64
-	Status         string
-	StatusDatetime *time.Time
+	Recipient              int64
+	Status                 string
+	StatusDatetime         *time.Time
+	RecipientCountry       *string
+	RecipientCountryPrefix *int
+	RecipientOperator      *string
+	MessageLength          *int
+	StatusErrorCode        *int
+	StatusReason           *string
+	Price                  *Price
+	Mccmnc                 *string
+	Mcc                    *string
+	Mnc                    *string
+	MessagePartCount       int
+}
+
+type Price struct {
+	Amount   int
+	Currency string
 }
 
 // Recipients holds a collection of Recepient structs along with send stats.

diff --git a/signature_jwt/signature_test.go b/signature_jwt/signature_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/messagebird/go-rest-api/v7/internal/mbtest"
+	"github.com/messagebird/go-rest-api/v8/internal/mbtest"
 	"github.com/stretchr/testify/assert"
 )