[MM-55595] Use annotated logger in search layer (#25468)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
5a4dba8809
Коммит
b2ec1ff8ae
@@ -12,6 +12,7 @@ import (
|
||||
"github.com/stretchr/testify/suite"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
"github.com/mattermost/mattermost/server/public/shared/request"
|
||||
"github.com/mattermost/mattermost/server/v8/channels/store/searchlayer"
|
||||
"github.com/mattermost/mattermost/server/v8/channels/store/searchtest"
|
||||
"github.com/mattermost/mattermost/server/v8/channels/store/sqlstore"
|
||||
@@ -29,10 +30,13 @@ type BleveEngineTestSuite struct {
|
||||
Store *searchlayer.SearchStore
|
||||
BleveEngine *BleveEngine
|
||||
IndexDir string
|
||||
Context request.CTX
|
||||
}
|
||||
|
||||
func TestBleveEngineTestSuite(t *testing.T) {
|
||||
suite.Run(t, new(BleveEngineTestSuite))
|
||||
suite.Run(t, &BleveEngineTestSuite{
|
||||
Context: request.TestContext(t),
|
||||
})
|
||||
}
|
||||
|
||||
func (s *BleveEngineTestSuite) setupIndexes() {
|
||||
@@ -51,7 +55,7 @@ func (s *BleveEngineTestSuite) setupStore() {
|
||||
s.SQLSettings = storetest.MakeSqlSettings(driverName, false)
|
||||
|
||||
var err error
|
||||
s.SQLStore, err = sqlstore.New(*s.SQLSettings, nil)
|
||||
s.SQLStore, err = sqlstore.New(*s.SQLSettings, s.Context.Logger(), nil)
|
||||
if err != nil {
|
||||
s.Require().FailNow("Cannot initialize store: %s", err.Error())
|
||||
}
|
||||
@@ -110,7 +114,7 @@ func (s *BleveEngineTestSuite) TestBleveSearchStoreTests() {
|
||||
|
||||
func (s *BleveEngineTestSuite) TestDeleteChannelPosts() {
|
||||
s.Run("Should remove all the posts that belongs to a channel", func() {
|
||||
s.BleveEngine.PurgeIndexes()
|
||||
s.BleveEngine.PurgeIndexes(s.Context)
|
||||
teamID := model.NewId()
|
||||
userID := model.NewId()
|
||||
channelID := model.NewId()
|
||||
@@ -124,7 +128,7 @@ func (s *BleveEngineTestSuite) TestDeleteChannelPosts() {
|
||||
appErr := s.SearchEngine.BleveEngine.IndexPost(postToAvoid, teamID)
|
||||
require.Nil(s.T(), appErr)
|
||||
|
||||
s.SearchEngine.BleveEngine.DeleteChannelPosts(channelID)
|
||||
s.SearchEngine.BleveEngine.DeleteChannelPosts(s.Context, channelID)
|
||||
|
||||
doc, err := s.BleveEngine.PostIndex.Document(postToAvoid.Id)
|
||||
require.NoError(s.T(), err)
|
||||
@@ -135,7 +139,7 @@ func (s *BleveEngineTestSuite) TestDeleteChannelPosts() {
|
||||
})
|
||||
|
||||
s.Run("Shouldn't do anything if there is not posts for the selected channel", func() {
|
||||
s.BleveEngine.PurgeIndexes()
|
||||
s.BleveEngine.PurgeIndexes(s.Context)
|
||||
teamID := model.NewId()
|
||||
userID := model.NewId()
|
||||
channelID := model.NewId()
|
||||
@@ -144,7 +148,7 @@ func (s *BleveEngineTestSuite) TestDeleteChannelPosts() {
|
||||
appErr := s.SearchEngine.BleveEngine.IndexPost(post, teamID)
|
||||
require.Nil(s.T(), appErr)
|
||||
|
||||
s.SearchEngine.BleveEngine.DeleteChannelPosts(channelToDeleteID)
|
||||
s.SearchEngine.BleveEngine.DeleteChannelPosts(s.Context, channelToDeleteID)
|
||||
|
||||
_, err := s.BleveEngine.PostIndex.Document(post.Id)
|
||||
require.NoError(s.T(), err)
|
||||
@@ -156,7 +160,7 @@ func (s *BleveEngineTestSuite) TestDeleteChannelPosts() {
|
||||
|
||||
func (s *BleveEngineTestSuite) TestDeleteUserPosts() {
|
||||
s.Run("Should remove all the posts that belongs to a user", func() {
|
||||
s.BleveEngine.PurgeIndexes()
|
||||
s.BleveEngine.PurgeIndexes(s.Context)
|
||||
teamID := model.NewId()
|
||||
userID := model.NewId()
|
||||
userToAvoidID := model.NewId()
|
||||
@@ -170,7 +174,7 @@ func (s *BleveEngineTestSuite) TestDeleteUserPosts() {
|
||||
appErr := s.SearchEngine.BleveEngine.IndexPost(postToAvoid, teamID)
|
||||
require.Nil(s.T(), appErr)
|
||||
|
||||
s.SearchEngine.BleveEngine.DeleteUserPosts(userID)
|
||||
s.SearchEngine.BleveEngine.DeleteUserPosts(s.Context, userID)
|
||||
|
||||
doc, err := s.BleveEngine.PostIndex.Document(postToAvoid.Id)
|
||||
require.NoError(s.T(), err)
|
||||
@@ -181,7 +185,7 @@ func (s *BleveEngineTestSuite) TestDeleteUserPosts() {
|
||||
})
|
||||
|
||||
s.Run("Shouldn't do anything if there is not posts for the selected user", func() {
|
||||
s.BleveEngine.PurgeIndexes()
|
||||
s.BleveEngine.PurgeIndexes(s.Context)
|
||||
teamID := model.NewId()
|
||||
userID := model.NewId()
|
||||
userToDeleteID := model.NewId()
|
||||
@@ -190,7 +194,7 @@ func (s *BleveEngineTestSuite) TestDeleteUserPosts() {
|
||||
appErr := s.SearchEngine.BleveEngine.IndexPost(post, teamID)
|
||||
require.Nil(s.T(), appErr)
|
||||
|
||||
s.SearchEngine.BleveEngine.DeleteUserPosts(userToDeleteID)
|
||||
s.SearchEngine.BleveEngine.DeleteUserPosts(s.Context, userToDeleteID)
|
||||
|
||||
_, err := s.BleveEngine.PostIndex.Document(post.Id)
|
||||
require.NoError(s.T(), err)
|
||||
@@ -201,7 +205,7 @@ func (s *BleveEngineTestSuite) TestDeleteUserPosts() {
|
||||
}
|
||||
|
||||
func (s *BleveEngineTestSuite) TestDeletePosts() {
|
||||
s.BleveEngine.PurgeIndexes()
|
||||
s.BleveEngine.PurgeIndexes(s.Context)
|
||||
teamID := model.NewId()
|
||||
userID := model.NewId()
|
||||
userToAvoidID := model.NewId()
|
||||
|
||||
Ссылка в новой задаче
Block a user