MM-11434 Performance improvements for post metadata (#9849)
* Remove unused error return value from PreparePostForClient * Remove unused error return value from PreparePostListForClient * MM-11434 Parallelize PreparePostListForClient * MM-11434 Skip looking reactions and files on post whenever possible * Add note about the use of deprecated fields
Этот коммит содержится в:
Harrison Healey
коммит произвёл
GitHub
GitHub
родитель
7aef759fd8
Коммит
23c8950312
@@ -18,6 +18,37 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestPreparePostListForClient(t *testing.T) {
|
||||
// Most of this logic is covered by TestPreparePostForClient, so this just tests handling of multiple posts
|
||||
|
||||
th := Setup().InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
postList := model.NewPostList()
|
||||
for i := 0; i < 5; i++ {
|
||||
postList.AddPost(th.CreatePost(th.BasicChannel))
|
||||
}
|
||||
|
||||
clientPostList := th.App.PreparePostListForClient(postList)
|
||||
|
||||
t.Run("doesn't mutate provided post list", func(t *testing.T) {
|
||||
assert.NotEqual(t, clientPostList, postList, "should've returned a new post list")
|
||||
assert.NotEqual(t, clientPostList.Posts, postList.Posts, "should've returned a new PostList.Posts")
|
||||
assert.Equal(t, clientPostList.Order, postList.Order, "should've returned the existing PostList.Order")
|
||||
|
||||
for id, originalPost := range postList.Posts {
|
||||
assert.NotEqual(t, clientPostList.Posts[id], originalPost, "should've returned new post objects")
|
||||
assert.Equal(t, clientPostList.Posts[id].Id, originalPost.Id, "should've returned the same posts")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("adds metadata to each post", func(t *testing.T) {
|
||||
for _, clientPost := range clientPostList.Posts {
|
||||
assert.NotNil(t, clientPost.Metadata, "should've populated metadata for each post")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestPreparePostForClient(t *testing.T) {
|
||||
setup := func() *TestHelper {
|
||||
th := Setup().InitBasic()
|
||||
@@ -38,8 +69,7 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
post := th.CreatePost(th.BasicChannel)
|
||||
message := post.Message
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
t.Run("doesn't mutate provided post", func(t *testing.T) {
|
||||
assert.NotEqual(t, clientPost, post, "should've returned a new post")
|
||||
@@ -63,11 +93,9 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
th := setup()
|
||||
defer th.TearDown()
|
||||
|
||||
post, err := th.App.PreparePostForClient(th.CreatePost(th.BasicChannel))
|
||||
require.Nil(t, err)
|
||||
post := th.App.PreparePostForClient(th.CreatePost(th.BasicChannel))
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
assert.False(t, clientPost == post, "should've returned a new post")
|
||||
assert.Equal(t, clientPost, post, "shouldn't have changed any metadata")
|
||||
@@ -81,9 +109,9 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
reaction1 := th.AddReactionToPost(post, th.BasicUser, "smile")
|
||||
reaction2 := th.AddReactionToPost(post, th.BasicUser2, "smile")
|
||||
reaction3 := th.AddReactionToPost(post, th.BasicUser2, "ice_cream")
|
||||
post.HasReactions = true
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
assert.Len(t, clientPost.Metadata.Reactions, 3, "should've populated Reactions")
|
||||
assert.Equal(t, reaction1, clientPost.Metadata.Reactions[0], "first reaction is incorrect")
|
||||
@@ -107,8 +135,7 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
|
||||
fileInfo.PostId = post.Id
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
assert.Equal(t, []*model.FileInfo{fileInfo}, clientPost.Metadata.Files, "should've populated Files")
|
||||
})
|
||||
@@ -140,9 +167,9 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
th.AddReactionToPost(post, th.BasicUser, "smile")
|
||||
th.AddReactionToPost(post, th.BasicUser, "angry")
|
||||
th.AddReactionToPost(post, th.BasicUser2, "angry")
|
||||
post.HasReactions = true
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
t.Run("populates emojis", func(t *testing.T) {
|
||||
assert.ElementsMatch(t, []*model.Emoji{}, clientPost.Metadata.Emojis, "should've populated empty Emojis")
|
||||
@@ -185,9 +212,9 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
th.AddReactionToPost(post, th.BasicUser, emoji2.Name)
|
||||
th.AddReactionToPost(post, th.BasicUser2, emoji2.Name)
|
||||
th.AddReactionToPost(post, th.BasicUser2, "angry")
|
||||
post.HasReactions = true
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
t.Run("pupulates emojis", func(t *testing.T) {
|
||||
assert.ElementsMatch(t, []*model.Emoji{emoji1, emoji2, emoji3, emoji4}, clientPost.Metadata.Emojis, "should've populated post.Emojis")
|
||||
@@ -210,8 +237,7 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
}, th.BasicChannel, false)
|
||||
require.Nil(t, err)
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
t.Run("populates image dimensions", func(t *testing.T) {
|
||||
imageDimensions := clientPost.Metadata.Images
|
||||
@@ -253,8 +279,7 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
}, th.BasicChannel, false)
|
||||
require.Nil(t, err)
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
// Reminder that only the first link gets an embed and dimensions
|
||||
|
||||
@@ -288,8 +313,7 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
}, th.BasicChannel, false)
|
||||
require.Nil(t, err)
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
t.Run("populates embeds", func(t *testing.T) {
|
||||
assert.ElementsMatch(t, []*model.PostEmbed{
|
||||
@@ -339,8 +363,7 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
}, th.BasicChannel, false)
|
||||
require.Nil(t, err)
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
t.Run("populates embeds", func(t *testing.T) {
|
||||
assert.ElementsMatch(t, []*model.PostEmbed{
|
||||
@@ -405,10 +428,7 @@ func testProxyLinkedImage(t *testing.T, th *TestHelper, shouldProxy bool) {
|
||||
post, err = th.App.CreatePost(post, th.BasicChannel, false)
|
||||
require.Nil(t, err)
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
if err != nil && err.Id != "app.post.metadata.link.app_error" {
|
||||
t.Fatal(err)
|
||||
}
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
if shouldProxy {
|
||||
assert.Equal(t, post.Message, fmt.Sprintf(postTemplate, imageURL), "should not have mutated original post")
|
||||
@@ -426,8 +446,7 @@ func testProxyOpenGraphImage(t *testing.T, th *TestHelper, shouldProxy bool) {
|
||||
}, th.BasicChannel, false)
|
||||
require.Nil(t, err)
|
||||
|
||||
clientPost, err := th.App.PreparePostForClient(post)
|
||||
require.Nil(t, err)
|
||||
clientPost := th.App.PreparePostForClient(post)
|
||||
|
||||
image := &opengraph.Image{}
|
||||
if shouldProxy {
|
||||
|
||||
Ссылка в новой задаче
Block a user