[#1571] Update GETNotifications endpoint to use repo.APITime

OpenBazaar · May 22, 2019 · 536b37a · 536b37a
1 parent 3a2b854
commit 536b37a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/api/jsonapi_test.go b/api/jsonapi_test.go
@@ -796,7 +796,7 @@ func TestNotificationsAreReturnedInExpectedOrder(t *testing.T) {
 		createdAt = time.Unix(837645345, 0)
 		notif1    = &repo.Notification{
 			ID:           "notif1",
-			CreatedAt:    createdAt,
+			CreatedAt:    repo.NewAPITime(createdAt),
 			NotifierType: repo.NotifierTypeFollowNotification,
 			NotifierData: &repo.FollowNotification{
 				ID:     "notif1",
@@ -806,7 +806,7 @@ func TestNotificationsAreReturnedInExpectedOrder(t *testing.T) {
 		}
 		notif2 = &repo.Notification{
 			ID:           "notif2",
-			CreatedAt:    createdAt,
+			CreatedAt:    repo.NewAPITime(createdAt),
 			NotifierType: repo.NotifierTypeFollowNotification,
 			NotifierData: &repo.FollowNotification{
 				ID:     "notif2",
@@ -816,7 +816,7 @@ func TestNotificationsAreReturnedInExpectedOrder(t *testing.T) {
 		}
 		notif3 = &repo.Notification{
 			ID:           "notif3",
-			CreatedAt:    createdAt,
+			CreatedAt:    repo.NewAPITime(createdAt),
 			NotifierType: repo.NotifierTypeFollowNotification,
 			NotifierData: &repo.FollowNotification{
 				ID:     "notif3",

diff --git a/repo/db/notifications.go b/repo/db/notifications.go
@@ -117,7 +117,7 @@ func (n *NotficationsDB) GetAll(offsetId string, limit int, typeFilter []string)
 			read = true
 		}
 		notification.IsRead = read
-		notification.CreatedAt = time.Unix(int64(timestampInt), 0).UTC()
+		notification.CreatedAt = repo.NewAPITime(time.Unix(int64(timestampInt), 0).UTC())
 		// END
 
 		ret = append(ret, notification)

diff --git a/repo/notification.go b/repo/notification.go
@@ -39,7 +39,7 @@ type Notifier interface {
 func NewNotification(n Notifier, createdAt time.Time, isRead bool) *Notification {
 	return &Notification{
 		ID:           n.GetID(),
-		CreatedAt:    createdAt.UTC(),
+		CreatedAt:    NewAPITime(createdAt.UTC()),
 		IsRead:       isRead,
 		NotifierData: n,
 		NotifierType: n.GetType(),
@@ -55,7 +55,7 @@ func NewNotification(n Notifier, createdAt time.Time, isRead bool) *Notification
 // serializations to match in the Notifications Datastore
 type Notification struct {
 	ID           string           `json:"-"`
-	CreatedAt    time.Time        `json:"timestamp"`
+	CreatedAt    *APITime         `json:"timestamp"`
 	IsRead       bool             `json:"read"`
 	NotifierData Notifier         `json:"notification"`
 	NotifierType NotificationType `json:"-"`
@@ -77,7 +77,7 @@ func (n *Notification) Data() ([]byte, error)          { return json.MarshalInde
 func (n *Notification) WebsocketData() ([]byte, error) { return n.Data() }
 
 type notificationTransporter struct {
-	CreatedAt    time.Time        `json:"timestamp"`
+	CreatedAt    *APITime         `json:"timestamp"`
 	IsRead       bool             `json:"read"`
 	NotifierData json.RawMessage  `json:"notification"`
 	NotifierType NotificationType `json:"type"`