Feature edit attachments (#29769)
* Updated patch/update post API to allow file modification (#29447) * WIP * WIP * Atatched new files ton post * WIP: deleting removed files * Deleted removed files and invalidated file metadata cache * removed file ignore logif from update post API * Added TestFindExclusives * Added tests for DeleteForPostByIds * Added app layer tests * Added tests * Added API level tests * test enhancements * Fixed a test * Edit history include file metadata (#29505) * Send file metadata in edit history metadata * Added app tests * Added store tests * Added tests for populateEditHistoryFileMetadata{ * Added cache to avoid repetitigve DB calls for edits with only message changes * Added API tests * i18m fix * removed commented code * Improved test helper * Show attachments in edit history RHS (#29519) * Send file metadata in edit history metadata * Added app tests * Added store tests * Added tests for populateEditHistoryFileMetadata{ * Added cache to avoid repetitigve DB calls for edits with only message changes * Added API tests * i18m fix * WIUP: displa files in edit * removed commented code * Displayed file in edit history * Handled file icon * Fixed closing history component on clicking on file * Simplified selector * Simplified selector * Improved test helper * Disabled action menu on edit history file * Added tests * Improved selector * Updated snapshot * review Fixes * restructured componnets * Updated test * Updated test * Restore post api (#29643) * Restore post version API WIP * Undelete files WIP * Added store tests * Created post restore API * Updated updatepost safeUpdate signature * review fixex and improvements * Fixed an app test * Added API laer tests * Added API tests and OpenAPI specs * Fixed a typo * Allow editing files when editing posts (#29709) * WIP - basic view files when editing post * Cleanup * bg color * Added text editor tests for files * WIP * WIP * removed debug log * Allowed admin to add and remove files on someone else's post * Handled drafts and scheduled posts * linter fixes * Updated snapshot * server test fix * CI * Added doc * Restore post api integration (#29719) * WIP - basic view files when editing post * Cleanup * bg color * Added text editor tests for files * WIP * WIP * removed debug log * Allowed admin to add and remove files on someone else's post * Handled drafts and scheduled posts * linter fixes * Updated snapshot * server test fix * Used new API to restore post * handled edut limit and undo * lint fix * added comments * Fixed edit post item tests * Fixed buttons * Aded snapshots * fix test * Updated snapshot * Minor fixes * fixed snapshot * Edit file dnd area (#29763) * dnd wip * DND continued * Supported multiple unbind dragster funcs * lint fixes * Got center channel file drop working when editing a post * file dnd working with center channel and rhs * file dnd working with center channel and rhs * removed unneeded stopPropogation calls * cleanup * DND overlay fix * Lint fix * Advanced text editor test updates for file upload overlay * fixed use upload hook tests * Updated some more snapshots * minor cleanup * Updated i18n * removed need of array for dragster unbind events * lint fixes * edit history cursor * Fixed bugu causing faliure to delete empty posts (#29778) * Files in restore confirmation (#29781) * Added files to restore post confirmation dialog * Fixed post restore toast colors * Fixed restore bug * Fixed restore confirmation toast tests * a11y improvement and modal width fix * Edit attachment misc fixes (#29808) * Removed single image actions in restore post confirmation dialog * Fixed file drop overlay size and position * Made edit indiator accessible * Lint fix * Added bunch of more tests * ANother test migrated from enzyme to react testing library * More test enhancements * More test enhancements * More test enhancements * lint fixes * Fixed a test * Added missing snapshots * Test fixes
Этот коммит содержится в:
Harshil Sharma
коммит произвёл
GitHub
GitHub
родитель
ecdce71fc4
Коммит
6e5a67caec
@@ -38,6 +38,9 @@ func TestFileInfoStore(t *testing.T, rctx request.CTX, ss store.Store, s SqlStor
|
||||
t.Run("GetStorageUsage", func(t *testing.T) { testFileInfoGetStorageUsage(t, rctx, ss) })
|
||||
t.Run("GetUptoNSizeFileTime", func(t *testing.T) { testGetUptoNSizeFileTime(t, rctx, ss, s) })
|
||||
t.Run("FileInfoPermanentDeleteForPost", func(t *testing.T) { testPermanentDeleteForPost(t, rctx, ss) })
|
||||
t.Run("FileInfoGetByIds", func(t *testing.T) { testGetByIds(t, rctx, ss) })
|
||||
t.Run("FileInfoDeleteForPostByIds", func(t *testing.T) { testDeleteForPostByIds(t, rctx, ss) })
|
||||
t.Run("FileInfoRestoreForPostByIds", func(t *testing.T) { testRestoreUndeleteForPostByIds(t, rctx, ss) })
|
||||
}
|
||||
|
||||
func testFileInfoSaveGet(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
@@ -967,3 +970,566 @@ func testPermanentDeleteForPost(t *testing.T, rctx request.CTX, ss store.Store)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, postInfos, 0)
|
||||
}
|
||||
|
||||
func testGetByIds(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
t.Run("Should get single file info", func(t *testing.T) {
|
||||
info, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
CreatorId: model.NewId(),
|
||||
Path: "file.txt",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotEqual(t, len(info.Id), 0)
|
||||
|
||||
defer func() {
|
||||
ss.FileInfo().PermanentDelete(rctx, info.Id)
|
||||
}()
|
||||
|
||||
fileInfos, err := ss.FileInfo().GetByIds([]string{info.Id}, false, true)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, fileInfos, 1)
|
||||
require.Equal(t, info.Id, fileInfos[0].Id)
|
||||
})
|
||||
|
||||
t.Run("Should get multiple file info", func(t *testing.T) {
|
||||
info1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
CreatorId: model.NewId(),
|
||||
Path: "file.txt",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotEqual(t, len(info1.Id), 0)
|
||||
|
||||
// waiting 1 second to add deterministic difference between the two file info's CreateAt time
|
||||
time.Sleep(1 * time.Second)
|
||||
|
||||
info2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
CreatorId: model.NewId(),
|
||||
Path: "file.txt",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotEqual(t, len(info2.Id), 0)
|
||||
|
||||
defer func() {
|
||||
ss.FileInfo().PermanentDelete(rctx, info1.Id)
|
||||
ss.FileInfo().PermanentDelete(rctx, info2.Id)
|
||||
}()
|
||||
|
||||
fileInfos, err := ss.FileInfo().GetByIds([]string{info1.Id, info2.Id}, false, true)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, fileInfos, 2)
|
||||
require.Equal(t, info1.Id, fileInfos[1].Id)
|
||||
require.Equal(t, info2.Id, fileInfos[0].Id)
|
||||
})
|
||||
|
||||
t.Run("Should get deleted file infos when specified", func(t *testing.T) {
|
||||
postId := model.NewId()
|
||||
|
||||
info1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
CreatorId: model.NewId(),
|
||||
Path: "file.txt",
|
||||
PostId: postId,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotEqual(t, len(info1.Id), 0)
|
||||
|
||||
// waiting 1 second to add deterministic difference between the two file info's CreateAt time
|
||||
time.Sleep(1 * time.Second)
|
||||
|
||||
info2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
CreatorId: model.NewId(),
|
||||
Path: "file.txt",
|
||||
PostId: postId,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotEqual(t, len(info2.Id), 0)
|
||||
|
||||
defer func() {
|
||||
ss.FileInfo().PermanentDelete(rctx, info1.Id)
|
||||
ss.FileInfo().PermanentDelete(rctx, info2.Id)
|
||||
}()
|
||||
|
||||
// we'll delete the two file infos
|
||||
_, err = ss.FileInfo().DeleteForPost(rctx, postId)
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfosIncludingDeleted, err := ss.FileInfo().GetByIds([]string{info1.Id, info2.Id}, true, true)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, fileInfosIncludingDeleted, 2)
|
||||
require.Equal(t, info2.Id, fileInfosIncludingDeleted[0].Id)
|
||||
require.Greater(t, fileInfosIncludingDeleted[0].DeleteAt, int64(0))
|
||||
require.Equal(t, info1.Id, fileInfosIncludingDeleted[1].Id)
|
||||
require.Greater(t, fileInfosIncludingDeleted[1].DeleteAt, int64(0))
|
||||
|
||||
// verifying that the file infos are not returned when IncludeDeleted is false
|
||||
fileInfosExcludingDeleted, err := ss.FileInfo().GetByIds([]string{info1.Id, info2.Id}, false, true)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, fileInfosExcludingDeleted, 0)
|
||||
})
|
||||
}
|
||||
|
||||
func testDeleteForPostByIds(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
t.Run("base case", func(t *testing.T) {
|
||||
now := model.GetMillis()
|
||||
postId := model.NewId()
|
||||
|
||||
fileInfo1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo1.Id)
|
||||
|
||||
fileInfo2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file2.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo2.Id)
|
||||
|
||||
fileInfo3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo3.Id)
|
||||
|
||||
err = ss.FileInfo().DeleteForPostByIds(rctx, postId, []string{fileInfo1.Id, fileInfo2.Id})
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfos, err := ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
if fileInfo.Id == fileInfo1.Id || fileInfo.Id == fileInfo2.Id {
|
||||
require.Greater(t, fileInfo.DeleteAt, int64(0))
|
||||
} else {
|
||||
require.Equal(t, int64(0), fileInfo.DeleteAt)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("with empty array", func(t *testing.T) {
|
||||
now := model.GetMillis()
|
||||
postId := model.NewId()
|
||||
|
||||
fileInfo1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo1.Id)
|
||||
|
||||
fileInfo2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file2.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo2.Id)
|
||||
|
||||
fileInfo3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo3.Id)
|
||||
|
||||
err = ss.FileInfo().DeleteForPostByIds(rctx, postId, []string{})
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfos, err := ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
require.Equal(t, int64(0), fileInfo.DeleteAt)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("duplicate fileInfo Ids specified", func(t *testing.T) {
|
||||
now := model.GetMillis()
|
||||
postId := model.NewId()
|
||||
|
||||
fileInfo1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo1.Id)
|
||||
|
||||
fileInfo2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file2.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo2.Id)
|
||||
|
||||
fileInfo3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo3.Id)
|
||||
|
||||
err = ss.FileInfo().DeleteForPostByIds(rctx, postId, []string{fileInfo1.Id, fileInfo2.Id, fileInfo2.Id})
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfos, err := ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
if fileInfo.Id == fileInfo1.Id || fileInfo.Id == fileInfo2.Id {
|
||||
require.Greater(t, fileInfo.DeleteAt, int64(0))
|
||||
} else {
|
||||
require.Equal(t, int64(0), fileInfo.DeleteAt)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("non existent fileInfo IDs specified", func(t *testing.T) {
|
||||
now := model.GetMillis()
|
||||
postId := model.NewId()
|
||||
|
||||
fileInfo1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo1.Id)
|
||||
|
||||
fileInfo2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file2.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo2.Id)
|
||||
|
||||
fileInfo3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo3.Id)
|
||||
|
||||
err = ss.FileInfo().DeleteForPostByIds(rctx, postId, []string{model.NewId(), model.NewId()})
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfos, err := ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
require.Equal(t, int64(0), fileInfo.DeleteAt)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("non existent postID specified", func(t *testing.T) {
|
||||
err := ss.FileInfo().DeleteForPostByIds(rctx, model.NewId(), []string{model.NewId()})
|
||||
require.NoError(t, err)
|
||||
})
|
||||
|
||||
t.Run("delete already deleted fileInfos", func(t *testing.T) {
|
||||
now := model.GetMillis()
|
||||
postId := model.NewId()
|
||||
|
||||
fileInfo1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo1.Id)
|
||||
|
||||
fileInfo2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file2.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo2.Id)
|
||||
|
||||
fileInfo3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo3.Id)
|
||||
|
||||
err = ss.FileInfo().DeleteForPostByIds(rctx, postId, []string{fileInfo1.Id, fileInfo2.Id})
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfos, err := ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
if fileInfo.Id == fileInfo1.Id || fileInfo.Id == fileInfo2.Id {
|
||||
require.Greater(t, fileInfo.DeleteAt, int64(0))
|
||||
} else {
|
||||
require.Equal(t, int64(0), fileInfo.DeleteAt)
|
||||
}
|
||||
}
|
||||
|
||||
err = ss.FileInfo().DeleteForPostByIds(rctx, postId, []string{fileInfo1.Id, fileInfo2.Id})
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfos, err = ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
if fileInfo.Id == fileInfo1.Id || fileInfo.Id == fileInfo2.Id {
|
||||
require.Greater(t, fileInfo.DeleteAt, int64(0))
|
||||
} else {
|
||||
require.Equal(t, int64(0), fileInfo.DeleteAt)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func testRestoreUndeleteForPostByIds(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
t.Run("base case", func(t *testing.T) {
|
||||
now := model.GetMillis()
|
||||
postId := model.NewId()
|
||||
|
||||
fileInfo1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo1.Id)
|
||||
|
||||
fileInfo2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file2.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo2.Id)
|
||||
|
||||
fileInfo3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo3.Id)
|
||||
|
||||
err = ss.FileInfo().DeleteForPostByIds(rctx, postId, []string{fileInfo1.Id, fileInfo2.Id})
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfos, err := ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
if fileInfo.Id == fileInfo1.Id || fileInfo.Id == fileInfo2.Id {
|
||||
require.Greater(t, fileInfo.DeleteAt, int64(0))
|
||||
} else {
|
||||
require.Equal(t, int64(0), fileInfo.DeleteAt)
|
||||
}
|
||||
}
|
||||
|
||||
// now we'll un-delete the files
|
||||
err = ss.FileInfo().RestoreForPostByIds(rctx, postId, []string{fileInfo1.Id, fileInfo2.Id})
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfos, err = ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
require.Equal(t, fileInfo.DeleteAt, int64(0))
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("with empty array it should not impact any post files", func(t *testing.T) {
|
||||
now := model.GetMillis()
|
||||
postId := model.NewId()
|
||||
|
||||
fileInfo1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo1.Id)
|
||||
|
||||
fileInfo2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file2.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo2.Id)
|
||||
|
||||
err = ss.FileInfo().RestoreForPostByIds(rctx, postId, []string{})
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfos, err := ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
require.Equal(t, int64(0), fileInfo.DeleteAt)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("duplicate fileInfo Ids specified", func(t *testing.T) {
|
||||
now := model.GetMillis()
|
||||
postId := model.NewId()
|
||||
|
||||
fileInfo1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo1.Id)
|
||||
|
||||
fileInfo2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file2.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo2.Id)
|
||||
|
||||
fileInfo3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo3.Id)
|
||||
|
||||
// delete file infos
|
||||
err = ss.FileInfo().DeleteForPostByIds(rctx, postId, []string{fileInfo1.Id, fileInfo2.Id, fileInfo3.Id})
|
||||
require.NoError(t, err)
|
||||
|
||||
// verify file infos are deleted
|
||||
fileInfos, err := ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
require.Greater(t, fileInfo.DeleteAt, int64(0))
|
||||
}
|
||||
|
||||
// undelete them specifying duplicate file info ids
|
||||
err = ss.FileInfo().RestoreForPostByIds(rctx, postId, []string{fileInfo1.Id, fileInfo2.Id, fileInfo2.Id, fileInfo2.Id})
|
||||
require.NoError(t, err)
|
||||
|
||||
// verify file infos are deleted
|
||||
fileInfos, err = ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
if fileInfo.Id == fileInfo3.Id {
|
||||
require.Greater(t, fileInfo.DeleteAt, int64(0))
|
||||
} else {
|
||||
require.Equal(t, int64(0), fileInfo.DeleteAt)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("non existent fileInfo IDs and postId specified", func(t *testing.T) {
|
||||
err := ss.FileInfo().RestoreForPostByIds(rctx, model.NewId(), []string{model.NewId(), model.NewId()})
|
||||
require.NoError(t, err)
|
||||
})
|
||||
|
||||
t.Run("undelete already undeleted fileInfos", func(t *testing.T) {
|
||||
now := model.GetMillis()
|
||||
postId := model.NewId()
|
||||
|
||||
fileInfo1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo1.Id)
|
||||
|
||||
fileInfo2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file2.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo2.Id)
|
||||
|
||||
fileInfo3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
|
||||
PostId: postId,
|
||||
CreatorId: model.NewId(),
|
||||
Size: 10,
|
||||
Path: "file1.txt",
|
||||
CreateAt: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
defer ss.FileInfo().PermanentDelete(rctx, fileInfo3.Id)
|
||||
|
||||
err = ss.FileInfo().RestoreForPostByIds(rctx, postId, []string{fileInfo1.Id, fileInfo2.Id})
|
||||
require.NoError(t, err)
|
||||
|
||||
fileInfos, err := ss.FileInfo().GetForPost(postId, true, true, false)
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, fileInfo := range fileInfos {
|
||||
require.Equal(t, int64(0), fileInfo.DeleteAt)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -94,6 +94,24 @@ func (_m *FileInfoStore) DeleteForPost(c request.CTX, postID string) (string, er
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// DeleteForPostByIds provides a mock function with given fields: rctx, postId, fileIDs
|
||||
func (_m *FileInfoStore) DeleteForPostByIds(rctx request.CTX, postId string, fileIDs []string) error {
|
||||
ret := _m.Called(rctx, postId, fileIDs)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for DeleteForPostByIds")
|
||||
}
|
||||
|
||||
var r0 error
|
||||
if rf, ok := ret.Get(0).(func(request.CTX, string, []string) error); ok {
|
||||
r0 = rf(rctx, postId, fileIDs)
|
||||
} else {
|
||||
r0 = ret.Error(0)
|
||||
}
|
||||
|
||||
return r0
|
||||
}
|
||||
|
||||
// Get provides a mock function with given fields: id
|
||||
func (_m *FileInfoStore) Get(id string) (*model.FileInfo, error) {
|
||||
ret := _m.Called(id)
|
||||
@@ -124,9 +142,9 @@ func (_m *FileInfoStore) Get(id string) (*model.FileInfo, error) {
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetByIds provides a mock function with given fields: ids
|
||||
func (_m *FileInfoStore) GetByIds(ids []string) ([]*model.FileInfo, error) {
|
||||
ret := _m.Called(ids)
|
||||
// GetByIds provides a mock function with given fields: ids, includeDeleted, allowFromCache
|
||||
func (_m *FileInfoStore) GetByIds(ids []string, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, error) {
|
||||
ret := _m.Called(ids, includeDeleted, allowFromCache)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for GetByIds")
|
||||
@@ -134,19 +152,19 @@ func (_m *FileInfoStore) GetByIds(ids []string) ([]*model.FileInfo, error) {
|
||||
|
||||
var r0 []*model.FileInfo
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(0).(func([]string) ([]*model.FileInfo, error)); ok {
|
||||
return rf(ids)
|
||||
if rf, ok := ret.Get(0).(func([]string, bool, bool) ([]*model.FileInfo, error)); ok {
|
||||
return rf(ids, includeDeleted, allowFromCache)
|
||||
}
|
||||
if rf, ok := ret.Get(0).(func([]string) []*model.FileInfo); ok {
|
||||
r0 = rf(ids)
|
||||
if rf, ok := ret.Get(0).(func([]string, bool, bool) []*model.FileInfo); ok {
|
||||
r0 = rf(ids, includeDeleted, allowFromCache)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.FileInfo)
|
||||
}
|
||||
}
|
||||
|
||||
if rf, ok := ret.Get(1).(func([]string) error); ok {
|
||||
r1 = rf(ids)
|
||||
if rf, ok := ret.Get(1).(func([]string, bool, bool) error); ok {
|
||||
r1 = rf(ids, includeDeleted, allowFromCache)
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
@@ -487,6 +505,24 @@ func (_m *FileInfoStore) PermanentDeleteForPost(rctx request.CTX, postID string)
|
||||
return r0
|
||||
}
|
||||
|
||||
// RestoreForPostByIds provides a mock function with given fields: rctx, postId, fileIDs
|
||||
func (_m *FileInfoStore) RestoreForPostByIds(rctx request.CTX, postId string, fileIDs []string) error {
|
||||
ret := _m.Called(rctx, postId, fileIDs)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for RestoreForPostByIds")
|
||||
}
|
||||
|
||||
var r0 error
|
||||
if rf, ok := ret.Get(0).(func(request.CTX, string, []string) error); ok {
|
||||
r0 = rf(rctx, postId, fileIDs)
|
||||
} else {
|
||||
r0 = ret.Error(0)
|
||||
}
|
||||
|
||||
return r0
|
||||
}
|
||||
|
||||
// Save provides a mock function with given fields: ctx, info
|
||||
func (_m *FileInfoStore) Save(ctx request.CTX, info *model.FileInfo) (*model.FileInfo, error) {
|
||||
ret := _m.Called(ctx, info)
|
||||
|
||||
Ссылка в новой задаче
Block a user