Merge branch 'feature/pn-310-ttl-for-messages' into feature/pn-310-sm…

…s-ttl

restclient/guble_sender.go

@@ -93,11 +93,20 @@ func (gs gubleSender) Send(topic string, body []byte, userID string, params map[
 		"userID": userID,
 		"params": params,
 	}).Debug("Sending guble message")
+
 	request, err := http.NewRequest(http.MethodPost, getURL(gs.Endpoint, topic, userID, params), bytes.NewReader(body))
 	if err != nil {
 		return err
 	}
+
+	// Correlation ID header
 	request.Header.Add(rest.XHeaderPrefix+"correlation-id", params[correlationIDLiteral])
+
+	// Expires header
+	if expires, ok := params["Expires"]; ok {
+		request.Header.Set("Expires", expires)
+	}
+
 	response, err := gs.httpClient.Do(request)
 	if err != nil {
 		return err

server/rest/rest_message_api.go

@@ -3,6 +3,7 @@ package rest
 import (
 	"errors"
 	"fmt"
+	"strconv"
 
 	"github.com/azer/snakecase"
 
@@ -102,6 +103,7 @@ func (api *RestMessageAPI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		Path:          protocol.Path(topic),
 		Body:          body,
 		UserID:        q(r, "userId"),
+		Expires:       extractExpiresHeader(r),
 		ApplicationID: xid.New().String(),
 		HeaderJSON:    headersToJSON(r.Header),
 	}
@@ -113,6 +115,19 @@ func (api *RestMessageAPI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, "OK")
 }
 
+// extractExpiresHeader will return the value of the `Expires` Header if is set or 0
+func extractExpiresHeader(r *http.Request) int64 {
+	expiresHeader := r.Header.Get("Expires")
+	if expiresHeader == "" {
+		return 0
+	}
+	v, err := strconv.ParseInt(expiresHeader, 10, 64)
+	if err != nil {
+		return 0
+	}
+	return v
+}
+
 func (api *RestMessageAPI) extractTopic(path string, requestTypeTopicPrefix string) (string, error) {
 	p := removeTrailingSlash(api.prefix) + requestTypeTopicPrefix
 	if !strings.HasPrefix(path, p) {

server/rest/rest_message_api_test.go

@@ -10,13 +10,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/cosminrentea/go-uuid"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 	"testing"
 	"time"
+
+	"github.com/cosminrentea/go-uuid"
 )
 
 var testBytes = []byte("test")
@@ -151,6 +152,30 @@ func TestHeadersToJSON(t *testing.T) {
 	a.Equal("y", header["x"])
 }
 
+func TestExtractExpires(t *testing.T) {
+	a := assert.New(t)
+	cases := []struct {
+		header   string
+		expected int64
+	}{
+		{"1420110000", 1420110000},
+		{"", 0},
+	}
+
+	for i, c := range cases {
+		r, err := http.NewRequest(http.MethodPost, "http://dummyurl/", nil)
+		a.NoError(err)
+		r.Header.Set("Expires", c.header)
+
+		a.Equal(c.expected, extractExpiresHeader(r), "Failed extractExpiresHeader for case: %d", i)
+	}
+
+	// no header case
+	r, err := http.NewRequest(http.MethodPost, "http://dummyurl/", nil)
+	a.NoError(err)
+	a.Equal(int64(0), extractExpiresHeader(r))
+}
+
 func TestRemoveTrailingSlash(t *testing.T) {
 	assert.Equal(t, "/foo", removeTrailingSlash("/foo/"))
 	assert.Equal(t, "/foo", removeTrailingSlash("/foo"))