Merge 3688c63 into a74bed7

cosminrentea · Mar 21, 2017 · 2a7532a · 2a7532a
2 parents a74bed7 + 3688c63
commit 2a7532a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/server/sms/nexmo_sms.go b/server/sms/nexmo_sms.go
@@ -8,6 +8,7 @@ type NexmoSms struct {
 	To        string `json:"to"`
 	From      string `json:"from"`
 	Text      string `json:"text"`
+	ClientRef string `json:"client-ref"`
 }
 
 func (sms *NexmoSms) EncodeNexmoSms(apiKey, apiSecret string) ([]byte, error) {

diff --git a/server/sms/nexmo_sms_sender.go b/server/sms/nexmo_sms_sender.go
@@ -193,7 +193,7 @@ func (r *retryable) executeAndCheck(op func() (*NexmoMessageResponse, error)) er
 }
 
 func (ns *NexmoSender) sendSms(sms *NexmoSms) (*NexmoMessageResponse, error) {
-	logger.WithField("sms_details", sms).Info("sendSms")
+	logger.WithField("sms_details", sms).WithField("order_id", sms.ClientRef).Info("sendSms")
 
 	smsEncoded, err := sms.EncodeNexmoSms(ns.ApiKey, ns.ApiSecret)
 	if err != nil {
@@ -231,7 +231,7 @@ func (ns *NexmoSender) sendSms(sms *NexmoSms) (*NexmoMessageResponse, error) {
 		pNexmoResponseInternalErrors.Inc()
 		return nil, ErrSMSResponseDecodingFailed
 	}
-	logger.WithField("messageResponse", messageResponse).Info("Actual nexmo response")
+	logger.WithField("messageResponse", messageResponse).WithField("order_id", sms.ClientRef).Info("Actual nexmo response")
 
 	return messageResponse, nil
 }

diff --git a/server/sms/utils_test.go b/server/sms/utils_test.go
@@ -43,7 +43,7 @@ func composeNexmoMessageResponse(sms NexmoSms, code ResponseCode, messageCount i
 		Status:           code,
 		MessageID:        "msgID",
 		To:               sms.To,
-		ClientReference:  "",
+		ClientReference:  "ref",
 		RemainingBalance: "2",
 		MessagePrice:     "0.005",
 		Network:          "TELEKOM",
@@ -85,9 +85,10 @@ func createKVStore(t *testing.T, filename string) (kvstore.KVStore, string) {
 func encodeProtocolMessage(t *testing.T, ID int) protocol.Message {
 	a := assert.New(t)
 	sms := NexmoSms{
-		To:   "toNumber",
-		From: fmt.Sprintf("%d", ID),
-		Text: "body",
+		To:        "toNumber",
+		From:      fmt.Sprintf("%d", ID),
+		Text:      "body",
+		ClientRef: "ref",
 	}
 	d, err := json.Marshal(&sms)
 	if err != nil {