storage: use ns precision in archive timestamp filtering

Signed-off-by: Miguel Ángel Ortuño <[email protected]>

pkg/storage/pgsql/archive.go

@@ -17,6 +17,8 @@ package pgsqlrepository
 import (
 	"context"
 	"database/sql"
+	"fmt"
+	"strconv"
 	"time"
 
 	sq "github.com/Masterminds/squirrel"
@@ -169,10 +171,10 @@ func filtersToPred(f *archivemodel.Filters, archiveID string) (interface{}, erro
 
 	// filtering by timestamp
 	if f.Start != nil {
-		pred = append(pred, sq.Expr("EXTRACT(epoch FROM created_at) > ?", f.Start.GetSeconds()))
+		pred = append(pred, sq.Expr("EXTRACT(epoch FROM created_at) > ?", toEpoch(f.Start)))
 	}
 	if f.End != nil {
-		pred = append(pred, sq.Expr("EXTRACT(epoch FROM created_at) < ?", f.End.GetSeconds()))
+		pred = append(pred, sq.Expr("EXTRACT(epoch FROM created_at) < ?", toEpoch(f.End)))
 	}
 	return pred, nil
 }
@@ -212,3 +214,9 @@ func scanArchiveMessage(scanner rowsScanner, archiveID string) (*archivemodel.Me
 
 	return &ret, nil
 }
+
+func toEpoch(tm *timestamppb.Timestamp) float64 {
+	str := fmt.Sprintf("%d.%d", tm.GetSeconds(), tm.GetNanos())
+	f, _ := strconv.ParseFloat(str, 64)
+	return f
+}

pkg/storage/pgsql/archive_test.go

@@ -130,17 +130,17 @@ func TestPgSQLArchive_FetchArchiveMessages(t *testing.T) {
 		},
 		"by start timestamp": {
 			filters:     &archivemodel.Filters{Start: timestamppb.New(starTm)},
-			withArgs:    []driver.Value{"ortuman", starTm.Unix()},
+			withArgs:    []driver.Value{"ortuman", toEpoch(timestamppb.New(starTm))},
 			expectQuery: `SELECT id, "from", "to", message, created_at FROM archives WHERE \(archive_id = \$1 AND EXTRACT\(epoch FROM created_at\) > \$2\) ORDER BY created_at`,
 		},
 		"by end timestamp": {
 			filters:     &archivemodel.Filters{End: timestamppb.New(endTm)},
-			withArgs:    []driver.Value{"ortuman", endTm.Unix()},
+			withArgs:    []driver.Value{"ortuman", toEpoch(timestamppb.New(endTm))},
 			expectQuery: `SELECT id, "from", "to", message, created_at FROM archives WHERE \(archive_id = \$1 AND EXTRACT\(epoch FROM created_at\) < \$2\) ORDER BY created_at`,
 		},
 		"by start and end timestamp": {
 			filters:     &archivemodel.Filters{Start: timestamppb.New(starTm), End: timestamppb.New(endTm)},
-			withArgs:    []driver.Value{"ortuman", starTm.Unix(), endTm.Unix()},
+			withArgs:    []driver.Value{"ortuman", toEpoch(timestamppb.New(starTm)), toEpoch(timestamppb.New(endTm))},
 			expectQuery: `SELECT id, "from", "to", message, created_at FROM archives WHERE \(archive_id = \$1 AND EXTRACT\(epoch FROM created_at\) > \$2 AND EXTRACT\(epoch FROM created_at\) < \$3\) ORDER BY created_at`,
 		},
 	}

pkg/util/xmpp/xmpp_test.go

@@ -116,14 +116,14 @@ func TestMakeDelayStanza(t *testing.T) {
 	msg, _ := b.BuildMessage()
 
 	// when
-	stamp, _ := time.Parse(time.RFC3339, "2021-02-15T15:00:00Z")
+	stamp, _ := time.Parse(time.RFC3339, "2021-02-15T15:00:00.250Z")
 	dMsg := MakeDelayMessage(msg, stamp, "jackal.im", "Delayed IQ")
 
 	// then
 	dChild := dMsg.Child("delay")
 	require.NotNil(t, dChild)
 	require.Equal(t, "jackal.im", dChild.Attribute(stravaganza.From))
-	require.Equal(t, "2021-02-15T15:00:00Z", dChild.Attribute("stamp"))
+	require.Equal(t, "2021-02-15T15:00:00.250Z", dChild.Attribute("stamp"))
 	require.Equal(t, "Delayed IQ", dChild.Text())
 }
 
@@ -162,15 +162,15 @@ func TestMakeForwardedElement(t *testing.T) {
 	)
 	msg, _ := b.BuildMessage()
 
-	stamp, _ := time.Parse(time.RFC3339, "2021-02-15T15:00:00Z")
+	stamp, _ := time.Parse(time.RFC3339, "2021-02-15T15:00:00.125Z")
 	forwarded := MakeForwardedStanza(msg, &stamp)
 
 	// when
 	require.Equal(t, "urn:xmpp:forward:0", forwarded.Attribute(stravaganza.Namespace))
 
 	dChild := forwarded.Child("delay")
 	require.NotNil(t, dChild)
-	require.Equal(t, "2021-02-15T15:00:00Z", dChild.Attribute("stamp"))
+	require.Equal(t, "2021-02-15T15:00:00.125Z", dChild.Attribute("stamp"))
 
 	msgEl := forwarded.Child("message")
 	require.NotNil(t, msgEl)