From ab3b59e63d0da5b854568582a971c47e3b893c60 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Sun, 19 Apr 2020 10:09:16 +0800 Subject: [PATCH] Feat: add option to force delete file record in database --- pkg/filesystem/manage.go | 11 +++++-- pkg/filesystem/manage_test.go | 57 +++++++++++++++++++++++++++++++++-- pkg/webdav/webdav.go | 4 +-- service/admin/file.go | 2 +- service/admin/user.go | 2 +- service/explorer/objects.go | 2 +- 6 files changed, 68 insertions(+), 10 deletions(-) diff --git a/pkg/filesystem/manage.go b/pkg/filesystem/manage.go index c300ce7..018f036 100644 --- a/pkg/filesystem/manage.go +++ b/pkg/filesystem/manage.go @@ -131,8 +131,8 @@ func (fs *FileSystem) Move(ctx context.Context, dirs, files []uint, src, dst str return err } -// Delete 递归删除对象 -func (fs *FileSystem) Delete(ctx context.Context, dirs, files []uint) error { +// Delete 递归删除对象, force 为 true 时强制删除文件记录，忽略物理删除是否成功 +func (fs *FileSystem) Delete(ctx context.Context, dirs, files []uint, force bool) error { // 已删除的总容量,map用于去重 var deletedStorage = make(map[uint]uint64) var totalStorage = make(map[uint]uint64) @@ -182,7 +182,12 @@ func (fs *FileSystem) Delete(ctx context.Context, dirs, files []uint) error { totalStorage[fs.FileTarget[i].ID] = fs.FileTarget[i].Size allFileIDs = append(allFileIDs, fs.FileTarget[i].ID) } - // TODO 用户自主选择是否强制删除 + + // 如果强制删除，则将全部文件视为删除成功 + if force { + deletedFileIDs = allFileIDs + deletedStorage = totalStorage + } // 删除文件记录 err = model.DeleteFileByIDs(deletedFileIDs) diff --git a/pkg/filesystem/manage_test.go b/pkg/filesystem/manage_test.go index 29871b1..53e18a4 100644 --- a/pkg/filesystem/manage_test.go +++ b/pkg/filesystem/manage_test.go @@ -342,12 +342,65 @@ func TestFileSystem_Delete(t *testing.T) { WillReturnResult(sqlmock.NewResult(0, 3)) mock.ExpectCommit() - err := fs.Delete(ctx, []uint{1}, []uint{1}) + err := fs.Delete(ctx, []uint{1}, []uint{1}, false) asserts.Error(err) asserts.Equal(203, err.(serializer.AppError).Code) asserts.Equal(uint64(3), fs.User.Storage) asserts.NoError(mock.ExpectationsWereMet()) } + //全部未成功，强制 + { + fs.CleanTargets() + mock.ExpectQuery("SELECT(.+)"). + WillReturnRows( + sqlmock.NewRows([]string{"id"}). + AddRow(1). + AddRow(2). + AddRow(3), + ) + mock.ExpectQuery("SELECT(.+)"). + WithArgs(1, 2, 3). + WillReturnRows( + sqlmock.NewRows([]string{"id", "name", "source_name", "policy_id", "size"}). + AddRow(4, "1.txt", "1.txt", 365, 1), + ) + mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "name", "source_name", "policy_id", "size"}).AddRow(1, "2.txt", "2.txt", 365, 2)) + mock.ExpectQuery("SELECT(.+)files(.+)"). + WillReturnRows(sqlmock.NewRows([]string{"id", "policy_id", "source_name"})) + // 查询上传策略 + mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "type"}).AddRow(365, "local")) + // 删除文件记录 + mock.ExpectBegin() + mock.ExpectExec("DELETE(.+)"). + WillReturnResult(sqlmock.NewResult(0, 3)) + mock.ExpectCommit() + // 删除对应分享 + mock.ExpectBegin() + mock.ExpectExec("UPDATE(.+)shares"). + WillReturnResult(sqlmock.NewResult(0, 3)) + mock.ExpectCommit() + // 归还容量 + mock.ExpectBegin() + mock.ExpectExec("UPDATE(.+)"). + WillReturnResult(sqlmock.NewResult(0, 3)) + mock.ExpectCommit() + // 删除目录 + mock.ExpectBegin() + mock.ExpectExec("DELETE(.+)"). + WillReturnResult(sqlmock.NewResult(0, 3)) + mock.ExpectCommit() + // 删除对应分享 + mock.ExpectBegin() + mock.ExpectExec("UPDATE(.+)shares"). + WillReturnResult(sqlmock.NewResult(0, 3)) + mock.ExpectCommit() + + fs.FileTarget = []model.File{} + fs.DirTarget = []model.Folder{} + err := fs.Delete(ctx, []uint{1}, []uint{1}, true) + asserts.NoError(err) + asserts.Equal(uint64(0), fs.User.Storage) + } //全部成功 { fs.CleanTargets() @@ -402,7 +455,7 @@ func TestFileSystem_Delete(t *testing.T) { fs.FileTarget = []model.File{} fs.DirTarget = []model.Folder{} - err = fs.Delete(ctx, []uint{1}, []uint{1}) + err = fs.Delete(ctx, []uint{1}, []uint{1}, false) asserts.NoError(err) asserts.Equal(uint64(0), fs.User.Storage) } diff --git a/pkg/webdav/webdav.go b/pkg/webdav/webdav.go index ef6fbd7..b5a1151 100644 --- a/pkg/webdav/webdav.go +++ b/pkg/webdav/webdav.go @@ -281,7 +281,7 @@ func (h *Handler) handleDelete(w http.ResponseWriter, r *http.Request, fs *files // 尝试作为文件删除 if ok, file := fs.IsFileExist(reqPath); ok { - if err := fs.Delete(ctx, []uint{}, []uint{file.ID}); err != nil { + if err := fs.Delete(ctx, []uint{}, []uint{file.ID}, false); err != nil { return http.StatusMethodNotAllowed, err } return http.StatusNoContent, nil @@ -289,7 +289,7 @@ func (h *Handler) handleDelete(w http.ResponseWriter, r *http.Request, fs *files // 尝试作为目录删除 if ok, folder := fs.IsPathExist(reqPath); ok { - if err := fs.Delete(ctx, []uint{folder.ID}, []uint{}); err != nil { + if err := fs.Delete(ctx, []uint{folder.ID}, []uint{}, false); err != nil { return http.StatusMethodNotAllowed, err } return http.StatusNoContent, nil diff --git a/service/admin/file.go b/service/admin/file.go index ca45618..bf8719e 100644 --- a/service/admin/file.go +++ b/service/admin/file.go @@ -58,7 +58,7 @@ func (service *FileBatchService) Delete(c *gin.Context) serializer.Response { } // 执行删除 - fs.Delete(context.Background(), []uint{}, ids) + fs.Delete(context.Background(), []uint{}, ids, false) fs.Recycle() } }(userFile) diff --git a/service/admin/user.go b/service/admin/user.go index ac753e1..124ba79 100644 --- a/service/admin/user.go +++ b/service/admin/user.go @@ -65,7 +65,7 @@ func (service *UserBatchService) Delete() serializer.Response { if err != nil { return serializer.Err(serializer.CodeNotFound, "无法找到用户根目录", err) } - fs.Delete(context.Background(), []uint{root.ID}, []uint{}) + fs.Delete(context.Background(), []uint{root.ID}, []uint{}, false) // 删除相关任务 model.DB.Where("user_id = ?", uid).Delete(&model.Download{}) diff --git a/service/explorer/objects.go b/service/explorer/objects.go index df6360b..4944551 100644 --- a/service/explorer/objects.go +++ b/service/explorer/objects.go @@ -264,7 +264,7 @@ func (service *ItemIDService) Delete(ctx context.Context, c *gin.Context) serial // 删除对象 items := service.Raw() - err = fs.Delete(ctx, items.Dirs, items.Items) + err = fs.Delete(ctx, items.Dirs, items.Items, false) if err != nil { return serializer.Err(serializer.CodeNotSet, err.Error(), err) }