From 7971ebe6f49e5a9a944407ef2f380d0fb405572b Mon Sep 17 00:00:00 2001 From: Umputun Date: Tue, 3 Sep 2019 16:39:14 -0500 Subject: [PATCH] ignore deleted comment for activity sorting --- backend/app/store/service/tree.go | 4 ++-- backend/app/store/service/tree_test.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/app/store/service/tree.go b/backend/app/store/service/tree.go index 29faaf57..fead012e 100644 --- a/backend/app/store/service/tree.go +++ b/backend/app/store/service/tree.go @@ -87,10 +87,10 @@ func (t *Tree) proc(comments []store.Comment, node *Node, rd *recurData, parentI repComments := t.filter(comments, func(comment store.Comment) bool { return comment.ParentID == parentID }) for _, rc := range repComments { - if !rc.Timestamp.IsZero() && rc.Timestamp.After(rd.tsModified) { + if !rc.Timestamp.IsZero() && rc.Timestamp.After(rd.tsModified) && !rc.Deleted { rd.tsModified = rc.Timestamp } - if !rc.Timestamp.IsZero() && rc.Timestamp.Before(rd.tsCreated) { + if !rc.Timestamp.IsZero() && rc.Timestamp.Before(rd.tsCreated) && !rc.Deleted { rd.tsCreated = rc.Timestamp } if !rc.Deleted { diff --git a/backend/app/store/service/tree_test.go b/backend/app/store/service/tree_test.go index 32504b76..9df9c9b7 100644 --- a/backend/app/store/service/tree_test.go +++ b/backend/app/store/service/tree_test.go @@ -105,6 +105,7 @@ func TestTreeSortNodes(t *testing.T) { {ID: "21", ParentID: "2", Timestamp: time.Date(2017, 12, 25, 19, 47, 21, 0, time.UTC)}, {ID: "22", ParentID: "2", Timestamp: time.Date(2017, 12, 25, 19, 47, 22, 0, time.UTC)}, {ID: "4", Timestamp: time.Date(2017, 12, 25, 19, 47, 22, 0, time.UTC), Score: -2, Controversy: 7}, + {ID: "19", ParentID: "4", Timestamp: time.Date(2019, 12, 25, 19, 46, 14, 0, time.UTC), Deleted: true}, {ID: "3", Timestamp: time.Date(2017, 12, 25, 19, 47, 22, 100, time.UTC)}, {ID: "6", Timestamp: time.Date(2017, 12, 25, 19, 47, 22, 200, time.UTC)}, {ID: "5", Deleted: true, Timestamp: time.Date(2017, 12, 25, 19, 47, 22, 150, time.UTC)},