Merge pull request #37 from khrt/reportUrl

Add ReportURL to Message

Author: dstotijn

message.go

@@ -25,6 +25,7 @@ type Message struct {
 	TypeDetails       TypeDetails
 	DataCoding        string
 	MClass            int
+	ReportURL         string
 	ScheduledDatetime *time.Time
 	CreatedDatetime   *time.Time
 	Recipients        Recipients
@@ -49,6 +50,7 @@ type MessageParams struct {
 	Gateway           int
 	TypeDetails       TypeDetails
 	DataCoding        string
+	ReportURL         string
 	ScheduledDatetime time.Time
 }
 
@@ -72,6 +74,7 @@ type messageRequest struct {
 	TypeDetails       TypeDetails `json:"typeDetails,omitempty"`
 	DataCoding        string      `json:"datacoding,omitempty"`
 	MClass            int         `json:"mclass,omitempty"`
+	ReportURL         string      `json:"reportUrl,omitempty"`
 	ScheduledDatetime string      `json:"scheduledDatetime,omitempty"`
 }
 
@@ -112,6 +115,7 @@ func requestDataForMessage(originator string, recipients []string, body string,
 	request.Gateway = params.Gateway
 	request.TypeDetails = params.TypeDetails
 	request.DataCoding = params.DataCoding
+	request.ReportURL = params.ReportURL
 
 	return request, nil
 }

verify.go

@@ -25,6 +25,7 @@ type VerifyParams struct {
 	Type        string
 	Template    string
 	DataCoding  string
+	ReportURL   string
 	Voice       string
 	Language    string
 	Timeout     int
@@ -38,6 +39,7 @@ type verifyRequest struct {
 	Type        string `json:"type,omitempty"`
 	Template    string `json:"template,omitempty"`
 	DataCoding  string `json:"dataCoding,omitempty"`
+	ReportURL   string `json:"reportUrl,omitempty"`
 	Voice       string `json:"voice,omitempty"`
 	Language    string `json:"language,omitempty"`
 	Timeout     int    `json:"timeout,omitempty"`
@@ -62,6 +64,7 @@ func requestDataForVerify(recipient string, params *VerifyParams) (*verifyReques
 	request.Type = params.Type
 	request.Template = params.Template
 	request.DataCoding = params.DataCoding
+	request.ReportURL = params.ReportURL
 	request.Voice = params.Voice
 	request.Language = params.Language
 	request.Timeout = params.Timeout

verify_test.go

@@ -144,6 +144,7 @@ func TestRequestDataForVerify(t *testing.T) {
 		Type:        "sms",
 		Template:    "Your code is: %token",
 		DataCoding:  "plain",
+		ReportURL:   "http://example.com/report",
 		Voice:       "male",
 		Language:    "en-gb",
 		Timeout:     20,
@@ -170,6 +171,9 @@ func TestRequestDataForVerify(t *testing.T) {
 	if requestData.DataCoding != "plain" {
 		t.Errorf("Unexpected data coding: %s, expected: plain", requestData.DataCoding)
 	}
+	if requestData.ReportURL != "http://example.com/report" {
+		t.Errorf("Unexpected report URL: %s, expected: http://example.com/repot", requestData.ReportURL)
+	}
 	if requestData.Voice != "male" {
 		t.Errorf("Unexpected voice: %s, expected: male", requestData.Voice)
 	}