Merge 3df9fea into a74bed7

protocol/message.go

@@ -150,7 +150,7 @@ func (m *Message) SetFilter(key, value string) {
 // Checks are made using `Expires` field timezone
 func (m *Message) IsExpired() bool {
 	if m.Expires == nil {
-		return true
+		return false
 	}
 	return m.Expires != nil && m.Expires.Before(time.Now().In(m.Expires.Location()))
 }

protocol/message_test.go

@@ -227,3 +227,10 @@ func TestMessage_IsExpired(t *testing.T) {
 	}
 
 }
+
+func TestMessage_IsExpired_WithNilExpires(t *testing.T) {
+	a := assert.New(t)
+
+	a.Equal(false, (&Message{}).IsExpired())
+
+}

server/sms/nexmo_sms_sender.go

@@ -138,6 +138,17 @@ func (ns *NexmoSender) Send(msg *protocol.Message) error {
 		return ErrRetryFailed
 	}
 
+	if msg.IsExpired() {
+		log.WithFields(log.Fields{
+			"ID":      msg.ID,
+			"To":      nexmoSMS.To,
+			"Expires": msg.Expires.Format(time.RFC3339),
+			"Created": time.Unix(msg.Time, 0).Format(time.RFC3339),
+		}).Info("Expired message received")
+		mTotalExpiredMessages.Add(1)
+		return nil
+	}
+
 	sendSms := func() (*NexmoMessageResponse, error) {
 		return ns.sendSms(nexmoSMS)
 	}

server/sms/nexmo_sms_sender_test.go

@@ -1,6 +1,7 @@
 package sms
 
 import (
+	"net/http"
 	"testing"
 	"time"
 
@@ -35,3 +36,26 @@ func TestNexmoSender_SendWithError(t *testing.T) {
 	a.Error(err)
 	a.Equal(ErrRetryFailed, err)
 }
+
+func TestNexmoSender_SendExpiredMessage(t *testing.T) {
+	a := assert.New(t)
+
+	port := createRandomPort(7000, 8000)
+	URL = "http://127.0.0.1" + port
+
+	sender := createNexmoSender(t)
+	// no request should be made in case the sms is expired
+	go dummyNexmoEndpointWithHandlerFunc(t, nil, port, func(t *testing.T, countCh chan bool) http.HandlerFunc {
+		return func(w http.ResponseWriter, r *http.Request) {
+			a.FailNow("Nexmo call not expected.")
+		}
+	})
+
+	msg := encodeProtocolMessage(t, 0)
+	expires := time.Now().Add(-1 * time.Hour)
+	msg.Expires = &expires
+
+	err := sender.Send(&msg)
+	time.Sleep(3 * timeInterval)
+	a.NoError(err)
+}

server/sms/sms_metrics.go

@@ -1,8 +1,9 @@
 package sms
 
 import (
-	"github.com/cosminrentea/gobbler/server/metrics"
 	"time"
+
+	"github.com/cosminrentea/gobbler/server/metrics"
 )
 
 var (
@@ -11,6 +12,7 @@ var (
 	mTotalSendErrors             = ns.NewInt("total_sent_message_errors")
 	mTotalResponseErrors         = ns.NewInt("total_response_errors")
 	mTotalResponseInternalErrors = ns.NewInt("total_response_internal_errors")
+	mTotalExpiredMessages        = ns.NewInt("total_expires_messages")
 	mMinute                      = ns.NewMap("minute")
 	mHour                        = ns.NewMap("hour")
 	mDay                         = ns.NewMap("day")