mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

First part of PostStore migration (#15123)

Просмотр исходного кода 
Automatic Merge
Этот коммит содержится в:
Rodrigo Villablanca
2020-08-12 13:35:57 -04:00
коммит произвёл GitHub
родитель d9ee26a47b
Коммит 5566395032
18 изменённых файлов: 367 добавлений и 276 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
store/storetest/channel_store.go
Просмотреть файл

@@ -4311,12 +4311,12 @@ func testChannelStoreGetMemberForPost(t *testing.T, ss store.Store) {
})
require.Nil(t, err)
p1, err := ss.Post().Save(&model.Post{
p1, nErr := ss.Post().Save(&model.Post{
UserId: model.NewId(),
ChannelId: o1.Id,
Message: "test",
})
require.Nil(t, err)
require.Nil(t, nErr)
r1, err := ss.Channel().GetMemberForPost(p1.Id, m1.UserId)
require.Nil(t, err, err)

40
store/storetest/compliance_store.go
Просмотреть файл

@@ -23,8 +23,8 @@ func cleanupStoreState(t *testing.T, ss store.Store) {
require.Nil(t, err, "failed cleaning up test user %s", u.Username)
//remove all posts by this user
err = ss.Post().PermanentDeleteByUser(u.Id)
require.Nil(t, err, "failed cleaning all posts of test user %s", u.Username)
nErr := ss.Post().PermanentDeleteByUser(u.Id)
require.Nil(t, nErr, "failed cleaning all posts of test user %s", u.Username)
}
//remove existing channels
@@ -135,32 +135,32 @@ func testComplianceExport(t *testing.T, ss store.Store) {
o1.UserId = u1.Id
o1.CreateAt = model.GetMillis()
o1.Message = "zz" + model.NewId() + "b"
o1, err = ss.Post().Save(o1)
require.Nil(t, err)
o1, nErr = ss.Post().Save(o1)
require.Nil(t, nErr)
o1a := &model.Post{}
o1a.ChannelId = c1.Id
o1a.UserId = u1.Id
o1a.CreateAt = o1.CreateAt + 10
o1a.Message = "zz" + model.NewId() + "b"
_, err = ss.Post().Save(o1a)
require.Nil(t, err)
_, nErr = ss.Post().Save(o1a)
require.Nil(t, nErr)
o2 := &model.Post{}
o2.ChannelId = c1.Id
o2.UserId = u1.Id
o2.CreateAt = o1.CreateAt + 20
o2.Message = "zz" + model.NewId() + "b"
_, err = ss.Post().Save(o2)
require.Nil(t, err)
_, nErr = ss.Post().Save(o2)
require.Nil(t, nErr)
o2a := &model.Post{}
o2a.ChannelId = c1.Id
o2a.UserId = u2.Id
o2a.CreateAt = o1.CreateAt + 30
o2a.Message = "zz" + model.NewId() + "b"
o2a, err = ss.Post().Save(o2a)
require.Nil(t, err)
o2a, nErr = ss.Post().Save(o2a)
require.Nil(t, nErr)
time.Sleep(100 * time.Millisecond)
@@ -246,40 +246,40 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
o1.UserId = u1.Id
o1.CreateAt = model.GetMillis()
o1.Message = "zz" + model.NewId() + "b"
o1, err = ss.Post().Save(o1)
require.Nil(t, err)
o1, nErr = ss.Post().Save(o1)
require.Nil(t, nErr)
o1a := &model.Post{}
o1a.ChannelId = c1.Id
o1a.UserId = u1.Id
o1a.CreateAt = o1.CreateAt + 10
o1a.Message = "zz" + model.NewId() + "b"
_, err = ss.Post().Save(o1a)
require.Nil(t, err)
_, nErr = ss.Post().Save(o1a)
require.Nil(t, nErr)
o2 := &model.Post{}
o2.ChannelId = c1.Id
o2.UserId = u1.Id
o2.CreateAt = o1.CreateAt + 20
o2.Message = "zz" + model.NewId() + "b"
_, err = ss.Post().Save(o2)
require.Nil(t, err)
_, nErr = ss.Post().Save(o2)
require.Nil(t, nErr)
o2a := &model.Post{}
o2a.ChannelId = c1.Id
o2a.UserId = u2.Id
o2a.CreateAt = o1.CreateAt + 30
o2a.Message = "zz" + model.NewId() + "b"
_, err = ss.Post().Save(o2a)
require.Nil(t, err)
_, nErr = ss.Post().Save(o2a)
require.Nil(t, nErr)
o3 := &model.Post{}
o3.ChannelId = cDM.Id
o3.UserId = u1.Id
o3.CreateAt = o1.CreateAt + 40
o3.Message = "zz" + model.NewId() + "b"
o3, err = ss.Post().Save(o3)
require.Nil(t, err)
o3, nErr = ss.Post().Save(o3)
require.Nil(t, nErr)
time.Sleep(100 * time.Millisecond)

80
store/storetest/mocks/PostStore.go
Просмотреть файл

@@ -93,23 +93,21 @@ func (_m *PostStore) ClearCaches() {
}
// Delete provides a mock function with given fields: postId, time, deleteByID
func (_m *PostStore) Delete(postId string, time int64, deleteByID string) *model.AppError {
func (_m *PostStore) Delete(postId string, time int64, deleteByID string) error {
ret := _m.Called(postId, time, deleteByID)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string, int64, string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string, int64, string) error); ok {
r0 = rf(postId, time, deleteByID)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// Get provides a mock function with given fields: id, skipFetchThreads
func (_m *PostStore) Get(id string, skipFetchThreads bool) (*model.PostList, *model.AppError) {
func (_m *PostStore) Get(id string, skipFetchThreads bool) (*model.PostList, error) {
ret := _m.Called(id, skipFetchThreads)
var r0 *model.PostList
@@ -121,13 +119,11 @@ func (_m *PostStore) Get(id string, skipFetchThreads bool) (*model.PostList, *mo
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, bool) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, bool) error); ok {
r1 = rf(id, skipFetchThreads)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -606,7 +602,7 @@ func (_m *PostStore) GetRepliesForExport(parentId string) ([]*model.ReplyForExpo
}
// GetSingle provides a mock function with given fields: id
func (_m *PostStore) GetSingle(id string) (*model.Post, *model.AppError) {
func (_m *PostStore) GetSingle(id string) (*model.Post, error) {
ret := _m.Called(id)
var r0 *model.Post
@@ -618,13 +614,11 @@ func (_m *PostStore) GetSingle(id string) (*model.Post, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(id)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -716,39 +710,35 @@ func (_m *PostStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, *m
}
// PermanentDeleteByChannel provides a mock function with given fields: channelId
func (_m *PostStore) PermanentDeleteByChannel(channelId string) *model.AppError {
func (_m *PostStore) PermanentDeleteByChannel(channelId string) error {
ret := _m.Called(channelId)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(channelId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// PermanentDeleteByUser provides a mock function with given fields: userId
func (_m *PostStore) PermanentDeleteByUser(userId string) *model.AppError {
func (_m *PostStore) PermanentDeleteByUser(userId string) error {
ret := _m.Called(userId)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(userId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// Save provides a mock function with given fields: post
func (_m *PostStore) Save(post *model.Post) (*model.Post, *model.AppError) {
func (_m *PostStore) Save(post *model.Post) (*model.Post, error) {
ret := _m.Called(post)
var r0 *model.Post
@@ -760,20 +750,18 @@ func (_m *PostStore) Save(post *model.Post) (*model.Post, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(*model.Post) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(*model.Post) error); ok {
r1 = rf(post)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// SaveMultiple provides a mock function with given fields: posts
func (_m *PostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, *model.AppError) {
func (_m *PostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, error) {
ret := _m.Called(posts)
var r0 []*model.Post
@@ -792,13 +780,11 @@ func (_m *PostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, *mod
r1 = ret.Get(1).(int)
}
var r2 *model.AppError
if rf, ok := ret.Get(2).(func([]*model.Post) *model.AppError); ok {
var r2 error
if rf, ok := ret.Get(2).(func([]*model.Post) error); ok {
r2 = rf(posts)
} else {
if ret.Get(2) != nil {
r2 = ret.Get(2).(*model.AppError)
}
r2 = ret.Error(2)
}
return r0, r1, r2
@@ -855,7 +841,7 @@ func (_m *PostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams,
}
// Update provides a mock function with given fields: newPost, oldPost
func (_m *PostStore) Update(newPost *model.Post, oldPost *model.Post) (*model.Post, *model.AppError) {
func (_m *PostStore) Update(newPost *model.Post, oldPost *model.Post) (*model.Post, error) {
ret := _m.Called(newPost, oldPost)
var r0 *model.Post
@@ -867,13 +853,11 @@ func (_m *PostStore) Update(newPost *model.Post, oldPost *model.Post) (*model.Po
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(*model.Post, *model.Post) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(*model.Post, *model.Post) error); ok {
r1 = rf(newPost, oldPost)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1

88
store/storetest/post_store.go
Просмотреть файл

@@ -1543,32 +1543,32 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) {
o1.UserId = model.NewId()
o1.CreateAt = utils.MillisFromTime(utils.Yesterday())
o1.Message = "zz" + model.NewId() + "b"
o1, err = ss.Post().Save(o1)
require.Nil(t, err)
o1, nErr = ss.Post().Save(o1)
require.Nil(t, nErr)
o1a := &model.Post{}
o1a.ChannelId = c1.Id
o1a.UserId = model.NewId()
o1a.CreateAt = o1.CreateAt
o1a.Message = "zz" + model.NewId() + "b"
_, err = ss.Post().Save(o1a)
require.Nil(t, err)
_, nErr = ss.Post().Save(o1a)
require.Nil(t, nErr)
o2 := &model.Post{}
o2.ChannelId = c1.Id
o2.UserId = model.NewId()
o2.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24)
o2.Message = "zz" + model.NewId() + "b"
o2, err = ss.Post().Save(o2)
require.Nil(t, err)
o2, nErr = ss.Post().Save(o2)
require.Nil(t, nErr)
o2a := &model.Post{}
o2a.ChannelId = c1.Id
o2a.UserId = o2.UserId
o2a.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24)
o2a.Message = "zz" + model.NewId() + "b"
_, err = ss.Post().Save(o2a)
require.Nil(t, err)
_, nErr = ss.Post().Save(o2a)
require.Nil(t, nErr)
r1, err := ss.Post().AnalyticsUserCountsWithPostsByDay(t1.Id)
require.Nil(t, err)
@@ -1602,32 +1602,32 @@ func testPostCountsByDay(t *testing.T, ss store.Store) {
o1.UserId = model.NewId()
o1.CreateAt = utils.MillisFromTime(utils.Yesterday())
o1.Message = "zz" + model.NewId() + "b"
o1, err = ss.Post().Save(o1)
require.Nil(t, err)
o1, nErr = ss.Post().Save(o1)
require.Nil(t, nErr)
o1a := &model.Post{}
o1a.ChannelId = c1.Id
o1a.UserId = model.NewId()
o1a.CreateAt = o1.CreateAt
o1a.Message = "zz" + model.NewId() + "b"
_, err = ss.Post().Save(o1a)
require.Nil(t, err)
_, nErr = ss.Post().Save(o1a)
require.Nil(t, nErr)
o2 := &model.Post{}
o2.ChannelId = c1.Id
o2.UserId = model.NewId()
o2.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24 * 2)
o2.Message = "zz" + model.NewId() + "b"
o2, err = ss.Post().Save(o2)
require.Nil(t, err)
o2, nErr = ss.Post().Save(o2)
require.Nil(t, nErr)
o2a := &model.Post{}
o2a.ChannelId = c1.Id
o2a.UserId = o2.UserId
o2a.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24 * 2)
o2a.Message = "zz" + model.NewId() + "b"
_, err = ss.Post().Save(o2a)
require.Nil(t, err)
_, nErr = ss.Post().Save(o2a)
require.Nil(t, nErr)
bot1 := &model.Bot{
Username: "username",
@@ -1643,16 +1643,16 @@ func testPostCountsByDay(t *testing.T, ss store.Store) {
b1.ChannelId = c1.Id
b1.UserId = bot1.UserId
b1.CreateAt = utils.MillisFromTime(utils.Yesterday())
_, err = ss.Post().Save(b1)
require.Nil(t, err)
_, nErr = ss.Post().Save(b1)
require.Nil(t, nErr)
b1a := &model.Post{}
b1a.Message = "bot message two"
b1a.ChannelId = c1.Id
b1a.UserId = bot1.UserId
b1a.CreateAt = utils.MillisFromTime(utils.Yesterday()) - (1000 * 60 * 60 * 24 * 2)
_, err = ss.Post().Save(b1a)
require.Nil(t, err)
_, nErr = ss.Post().Save(b1a)
require.Nil(t, nErr)
time.Sleep(1 * time.Second)
@@ -2163,16 +2163,16 @@ func testPostStoreOverwriteMultiple(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, -1, errIdx)
r1, err = ss.Post().Get(o1.Id, false)
require.Nil(t, err)
r1, nErr := ss.Post().Get(o1.Id, false)
require.Nil(t, nErr)
ro1a := r1.Posts[o1.Id]
r2, err = ss.Post().Get(o1.Id, false)
require.Nil(t, err)
r2, nErr = ss.Post().Get(o1.Id, false)
require.Nil(t, nErr)
ro2a := r2.Posts[o2.Id]
r3, err = ss.Post().Get(o3.Id, false)
require.Nil(t, err)
r3, nErr = ss.Post().Get(o3.Id, false)
require.Nil(t, nErr)
ro3a := r3.Posts[o3.Id]
assert.Equal(t, ro1a.Message, o1a.Message, "Failed to overwrite/get")
@@ -2193,12 +2193,12 @@ func testPostStoreOverwriteMultiple(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, -1, errIdx)
r4, err = ss.Post().Get(o4.Id, false)
require.Nil(t, err)
r4, nErr := ss.Post().Get(o4.Id, false)
require.Nil(t, nErr)
ro4a := r4.Posts[o4.Id]
r5, err = ss.Post().Get(o5.Id, false)
require.Nil(t, err)
r5, nErr = ss.Post().Get(o5.Id, false)
require.Nil(t, nErr)
ro5a := r5.Posts[o5.Id]
require.Empty(t, ro4a.Filenames, "Failed to clear Filenames")
@@ -2522,8 +2522,8 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, ss store.Store) {
p1.UserId = u1.Id
p1.Message = "zz" + model.NewId() + "AAAAAAAAAAA"
p1.CreateAt = 1000
p1, err = ss.Post().Save(p1)
require.Nil(t, err)
p1, nErr = ss.Post().Save(p1)
require.Nil(t, nErr)
posts, err := ss.Post().GetParentsForExportAfter(10000, strings.Repeat("0", 26))
assert.Nil(t, err)
@@ -2570,8 +2570,8 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) {
p1.UserId = u1.Id
p1.Message = "zz" + model.NewId() + "AAAAAAAAAAA"
p1.CreateAt = 1000
p1, err = ss.Post().Save(p1)
require.Nil(t, err)
p1, nErr = ss.Post().Save(p1)
require.Nil(t, nErr)
p2 := &model.Post{}
p2.ChannelId = c1.Id
@@ -2580,8 +2580,8 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) {
p2.CreateAt = 1001
p2.ParentId = p1.Id
p2.RootId = p1.Id
p2, err = ss.Post().Save(p2)
require.Nil(t, err)
p2, nErr = ss.Post().Save(p2)
require.Nil(t, nErr)
r1, err := ss.Post().GetRepliesForExport(p1.Id)
assert.Nil(t, err)
@@ -2652,8 +2652,8 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, ss store.Stor
p1.UserId = u1.Id
p1.Message = "zz" + model.NewId() + "AAAAAAAAAAA"
p1.CreateAt = 1000
p1, err = ss.Post().Save(p1)
require.Nil(t, err)
p1, nErr := ss.Post().Save(p1)
require.Nil(t, nErr)
r1, err := ss.Post().GetDirectPostParentsForExportAfter(10000, strings.Repeat("0", 26))
assert.Nil(t, err)
@@ -2712,14 +2712,14 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, ss sto
p1.UserId = u1.Id
p1.Message = "zz" + model.NewId() + "BBBBBBBBBBBB"
p1.CreateAt = 1000
p1, err = ss.Post().Save(p1)
require.Nil(t, err)
p1, nErr = ss.Post().Save(p1)
require.Nil(t, nErr)
o1a := p1.Clone()
o1a.DeleteAt = 1
o1a.Message = p1.Message + "BBBBBBBBBB"
_, err = ss.Post().Update(o1a, p1)
require.Nil(t, err)
_, nErr = ss.Post().Update(o1a, p1)
require.Nil(t, nErr)
r1, err := ss.Post().GetDirectPostParentsForExportAfter(10000, strings.Repeat("0", 26))
assert.Nil(t, err)
@@ -2774,8 +2774,8 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, ss sto
p1.UserId = u1.Id
p1.Message = "zz" + model.NewId() + "AAAAAAAAAAA"
p1.CreateAt = 1000
p1, err = ss.Post().Save(p1)
require.Nil(t, err)
p1, nErr := ss.Post().Save(p1)
require.Nil(t, nErr)
postIds = append(postIds, p1.Id)
}
sort.Slice(postIds, func(i, j int) bool { return postIds[i] < postIds[j] })

12
store/storetest/user_store.go
Просмотреть файл

@@ -2042,8 +2042,8 @@ func testUserUnreadCount(t *testing.T, ss store.Store) {
p1.Message = "this is a message for @" + u2.Username
// Post one message with mention to open channel
_, err = ss.Post().Save(&p1)
require.Nil(t, err)
_, nErr = ss.Post().Save(&p1)
require.Nil(t, nErr)
err = ss.Channel().IncrementMentionCount(c1.Id, u2.Id)
require.Nil(t, err)
@@ -2053,8 +2053,8 @@ func testUserUnreadCount(t *testing.T, ss store.Store) {
p2.UserId = u1.Id
p2.Message = "first message"
_, err = ss.Post().Save(&p2)
require.Nil(t, err)
_, nErr = ss.Post().Save(&p2)
require.Nil(t, nErr)
err = ss.Channel().IncrementMentionCount(c2.Id, u2.Id)
require.Nil(t, err)
@@ -2062,8 +2062,8 @@ func testUserUnreadCount(t *testing.T, ss store.Store) {
p3.ChannelId = c2.Id
p3.UserId = u1.Id
p3.Message = "second message"
_, err = ss.Post().Save(&p3)
require.Nil(t, err)
_, nErr = ss.Post().Save(&p3)
require.Nil(t, nErr)
err = ss.Channel().IncrementMentionCount(c2.Id, u2.Id)
require.Nil(t, err)