msb-public
/
cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Code Issues Projects Releases Wiki Activity

Test: modified folder methods

Browse Source
pull/247/head
HFO4 5 years ago
parent 56b1ae9f31
commit 05c802e0fa
4 changed files with 319 additions and 523 deletions
Show Stats Download Patch File Download Diff File

1
models/file.go
Unescape View File

@ -17,7 +17,6 @@ type File struct {
PicInfo string PicInfo string
FolderID uint `gorm:"index:folder_id;unique_index:idx_only_one"` FolderID uint `gorm:"index:folder_id;unique_index:idx_only_one"`
PolicyID uint PolicyID uint
Dir string `gorm:"size:65536"`
// 关联模型 // 关联模型
Policy Policy `gorm:"PRELOAD:false,association_autoupdate:false"` Policy Policy `gorm:"PRELOAD:false,association_autoupdate:false"`

8
models/folder.go
Unescape View File

@ -11,11 +11,9 @@ import (
type Folder struct { type Folder struct {
// 表字段 // 表字段
gorm.Model gorm.Model
Name string `gorm:"unique_index:idx_only_one_name"` Name string `gorm:"unique_index:idx_only_one_name"`
ParentID uint `gorm:"index:parent_id;unique_index:idx_only_one_name"` ParentID uint `gorm:"index:parent_id;unique_index:idx_only_one_name"`
Position string `gorm:"size:65536"` OwnerID uint `gorm:"index:owner_id"`
OwnerID uint `gorm:"index:owner_id"`
PositionAbsolute string `gorm:"size:65536"`
// 数据库忽略字段 // 数据库忽略字段
PositionTemp string `gorm:"-"` PositionTemp string `gorm:"-"`

832
models/folder_test.go
Unescape View File

@ -187,519 +187,319 @@ func TestGetFoldersByIDs(t *testing.T) {
} }
} }
//func TestFolder_MoveOrCopyFileTo(t *testing.T) { func TestFolder_MoveOrCopyFileTo(t *testing.T) {
// asserts := assert.New(t) asserts := assert.New(t)
// // 当前目录 // 当前目录
// folder := Folder{ folder := Folder{
// OwnerID: 1, Model: gorm.Model{ID: 1},
// PositionAbsolute: "/test", OwnerID: 1,
// } Name: "test",
// // 目标目录 }
// dstFolder := Folder{ // 目标目录
// Model: gorm.Model{ID: 10}, dstFolder := Folder{
// PositionAbsolute: "/dst", Model: gorm.Model{ID: 10},
// } Name: "dst",
// }
// // 复制文件
// { // 复制文件
// mock.ExpectQuery("SELECT(.+)"). {
// WithArgs( mock.ExpectQuery("SELECT(.+)").
// "1.txt", WithArgs(
// "2.txt", 1,
// 1, 2,
// "/test", 1,
// ).WillReturnRows( 1,
// sqlmock.NewRows([]string{"id", "size"}). ).WillReturnRows(
// AddRow(1, 10). sqlmock.NewRows([]string{"id", "size"}).
// AddRow(2, 20), AddRow(1, 10).
// ) AddRow(2, 20),
// mock.ExpectBegin() )
// mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(1, 1)) mock.ExpectBegin()
// mock.ExpectCommit() mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(1, 1))
// mock.ExpectBegin() mock.ExpectCommit()
// mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(1, 1)) mock.ExpectBegin()
// mock.ExpectCommit() mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(1, 1))
// storage, err := folder.MoveOrCopyFileTo( mock.ExpectCommit()
// []string{"1.txt", "2.txt"}, storage, err := folder.MoveOrCopyFileTo(
// &dstFolder, []uint{1, 2},
// true, &dstFolder,
// ) true,
// asserts.NoError(err) )
// asserts.NoError(mock.ExpectationsWereMet()) asserts.NoError(err)
// asserts.Equal(uint64(30), storage) asserts.NoError(mock.ExpectationsWereMet())
// } asserts.Equal(uint64(30), storage)
// }
// // 复制文件, 检索文件出错
// { // 复制文件, 检索文件出错
// mock.ExpectQuery("SELECT(.+)"). {
// WithArgs( mock.ExpectQuery("SELECT(.+)").
// "1.txt", WithArgs(
// "2.txt", 1,
// 1, 2,
// "/test", 1,
// ).WillReturnError(errors.New("error")) 1,
// ).WillReturnError(errors.New("error"))
// storage, err := folder.MoveOrCopyFileTo(
// []string{"1.txt", "2.txt"}, storage, err := folder.MoveOrCopyFileTo(
// &dstFolder, []uint{1, 2},
// true, &dstFolder,
// ) true,
// asserts.Error(err) )
// asserts.NoError(mock.ExpectationsWereMet()) asserts.Error(err)
// asserts.Equal(uint64(0), storage) asserts.NoError(mock.ExpectationsWereMet())
// } asserts.Equal(uint64(0), storage)
// }
// // 复制文件,第二个文件插入出错
// { // 复制文件,第二个文件插入出错
// mock.ExpectQuery("SELECT(.+)"). {
// WithArgs( mock.ExpectQuery("SELECT(.+)").
// "1.txt", WithArgs(
// "2.txt", 1,
// 1, 2,
// "/test", 1,
// ).WillReturnRows( 1,
// sqlmock.NewRows([]string{"id", "size"}). ).WillReturnRows(
// AddRow(1, 10). sqlmock.NewRows([]string{"id", "size"}).
// AddRow(2, 20), AddRow(1, 10).
// ) AddRow(2, 20),
// mock.ExpectBegin() )
// mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(1, 1)) mock.ExpectBegin()
// mock.ExpectCommit() mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(1, 1))
// mock.ExpectBegin() mock.ExpectCommit()
// mock.ExpectExec("INSERT(.+)").WillReturnError(errors.New("error")) mock.ExpectBegin()
// mock.ExpectRollback() mock.ExpectExec("INSERT(.+)").WillReturnError(errors.New("error"))
// storage, err := folder.MoveOrCopyFileTo( mock.ExpectRollback()
// []string{"1.txt", "2.txt"}, storage, err := folder.MoveOrCopyFileTo(
// &dstFolder, []uint{1, 2},
// true, &dstFolder,
// ) true,
// asserts.Error(err) )
// asserts.NoError(mock.ExpectationsWereMet()) asserts.Error(err)
// asserts.Equal(uint64(10), storage) asserts.NoError(mock.ExpectationsWereMet())
// } asserts.Equal(uint64(10), storage)
// }
// // 移动文件 成功
// { // 移动文件 成功
// mock.ExpectBegin() {
// mock.ExpectExec("UPDATE(.+)"). mock.ExpectBegin()
// WithArgs("/dst", 10, sqlmock.AnyArg(), "1.txt", "2.txt", 1, "/test"). mock.ExpectExec("UPDATE(.+)").
// WillReturnResult(sqlmock.NewResult(1, 2)) WithArgs(10, sqlmock.AnyArg(), 1, 2, 1, 1).
// mock.ExpectCommit() WillReturnResult(sqlmock.NewResult(1, 2))
// storage, err := folder.MoveOrCopyFileTo( mock.ExpectCommit()
// []string{"1.txt", "2.txt"}, storage, err := folder.MoveOrCopyFileTo(
// &dstFolder, []uint{1, 2},
// false, &dstFolder,
// ) false,
// asserts.NoError(mock.ExpectationsWereMet()) )
// asserts.NoError(err) asserts.NoError(mock.ExpectationsWereMet())
// asserts.Equal(uint64(0), storage) asserts.NoError(err)
// } asserts.Equal(uint64(0), storage)
// }
// // 移动文件 出错
// { // 移动文件 出错
// mock.ExpectBegin() {
// mock.ExpectExec("UPDATE(.+)"). mock.ExpectBegin()
// WithArgs("/dst", 10, sqlmock.AnyArg(), "1.txt", "2.txt", 1, "/test"). mock.ExpectExec("UPDATE(.+)").
// WillReturnError(errors.New("error")) WithArgs(10, sqlmock.AnyArg(), 1, 2, 1, 1).
// mock.ExpectRollback() WillReturnError(errors.New("error"))
// storage, err := folder.MoveOrCopyFileTo( mock.ExpectRollback()
// []string{"1.txt", "2.txt"}, storage, err := folder.MoveOrCopyFileTo(
// &dstFolder, []uint{1, 2},
// false, &dstFolder,
// ) false,
// asserts.NoError(mock.ExpectationsWereMet()) )
// asserts.Error(err) asserts.NoError(mock.ExpectationsWereMet())
// asserts.Equal(uint64(0), storage) asserts.Error(err)
// } asserts.Equal(uint64(0), storage)
//} }
// }
//func TestFolder_MoveOrCopyFolderTo_Copy(t *testing.T) {
// conf.DatabaseConfig.Type = "mysql" func TestFolder_CopyFolderTo(t *testing.T) {
// asserts := assert.New(t) conf.DatabaseConfig.Type = "mysql"
// // 父目录 asserts := assert.New(t)
// parFolder := Folder{ // 父目录
// OwnerID: 1, parFolder := Folder{
// PositionAbsolute: "/", Model: gorm.Model{ID: 9},
// } OwnerID: 1,
// // 目标目录 }
// dstFolder := Folder{ // 目标目录
// Model: gorm.Model{ID: 10}, dstFolder := Folder{
// PositionAbsolute: "/dst", Model: gorm.Model{ID: 10},
// } }
//
// // 测试复制目录结构 // 测试复制目录结构
// // test(2) // test(2)(5)
// // 1(3) 2.txt // 1(3)(6) 2.txt
// // 3(4) 4.txt // 3(4)(7) 4.txt
//
// // 正常情况 成功 // 正常情况 成功
// { {
// // 查找所有递归子目录，包括自身 // GetRecursiveChildFolder
// mock.ExpectQuery("SELECT(.+)"). mock.ExpectQuery("SELECT(.+)").WithArgs(1, 2).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(2, 9))
// WithArgs(1, sqlmock.AnyArg(), 1, "/test"). mock.ExpectQuery("SELECT(.+)").WithArgs(1, 2).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(3, 2))
// WillReturnRows( mock.ExpectQuery("SELECT(.+)").WithArgs(1, 3).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(4, 3))
// sqlmock.NewRows([]string{"id", "parent_id", "name", "position", "position_absolute"}). mock.ExpectQuery("SELECT(.+)").WithArgs(1, 4).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}))
// AddRow(3, 2, "1", "/test", "/test/1").
// AddRow(2, 1, "test", "/", "/test"). // 复制目录
// AddRow(4, 3, "3", "/test/1", "/test/1/3"), mock.ExpectBegin()
// ) mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(5, 1))
// // 查找顶级待复制目录 mock.ExpectCommit()
// mock.ExpectQuery("SELECT(.+)"). mock.ExpectBegin()
// WithArgs("/test", 1). mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(6, 1))
// WillReturnRows( mock.ExpectCommit()
// sqlmock.NewRows( mock.ExpectBegin()
// []string{"id", "parent_id", "name", "position", "position_absolute"}). mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(7, 1))
// AddRow(2, 1, "test", "/", "/test"), mock.ExpectCommit()
// )
// // 查找子文件
// // 更新顶级目录 mock.ExpectQuery("SELECT(.+)").
// mock.ExpectBegin() WithArgs(1, 2, 3, 4).
// mock.ExpectExec("INSERT(.+)"). WillReturnRows(
// WillReturnResult(sqlmock.NewResult(5, 1)) sqlmock.NewRows([]string{"id", "name", "folder_id", "size"}).
// mock.ExpectCommit() AddRow(1, "2.txt", 2, 10).
// // 更新子目录 AddRow(2, "3.txt", 3, 20),
// mock.ExpectBegin() )
// mock.ExpectExec("INSERT(.+)").
// WillReturnResult(sqlmock.NewResult(6, 1)) // 复制子文件
// mock.ExpectCommit() mock.ExpectBegin()
// mock.ExpectBegin() mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(5, 1))
// mock.ExpectExec("INSERT(.+)"). mock.ExpectCommit()
// WillReturnResult(sqlmock.NewResult(7, 1)) mock.ExpectBegin()
// mock.ExpectCommit() mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(6, 1))
// mock.ExpectCommit()
// // 获取子目录下的所有子文件
// mock.ExpectQuery("SELECT(.+)"). size, err := parFolder.CopyFolderTo(2, &dstFolder)
// WithArgs(1, 3, 2, 4). asserts.NoError(mock.ExpectationsWereMet())
// WillReturnRows( asserts.NoError(err)
// sqlmock.NewRows([]string{"id", "folder_id", "dir", "size"}). asserts.Equal(uint64(30), size)
// AddRow(1, 2, "/test", 10). }
// AddRow(2, 3, "/test/1", 20),
// ) // 递归查询失败
// {
// // 更新子文件记录 // GetRecursiveChildFolder
// mock.ExpectBegin() mock.ExpectQuery("SELECT(.+)").WithArgs(1, 2).WillReturnError(errors.New("error"))
// mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(1, 1))
// mock.ExpectCommit() size, err := parFolder.CopyFolderTo(2, &dstFolder)
// mock.ExpectBegin() asserts.NoError(mock.ExpectationsWereMet())
// mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(1, 1)) asserts.Error(err)
// mock.ExpectCommit() asserts.Equal(uint64(0), size)
// }
// storage, err := parFolder.MoveFolderTo([]string{"/test"}, &dstFolder, true)
// asserts.NoError(mock.ExpectationsWereMet()) // 父目录ID不存在
// asserts.NoError(err) {
// asserts.Equal(uint64(30), storage) // GetRecursiveChildFolder
// mock.ExpectQuery("SELECT(.+)").WithArgs(1, 2).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(2, 9))
// } mock.ExpectQuery("SELECT(.+)").WithArgs(1, 2).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(3, 99))
// mock.ExpectQuery("SELECT(.+)").WithArgs(1, 3).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(4, 3))
// // 处理子目录时死循环避免 mock.ExpectQuery("SELECT(.+)").WithArgs(1, 4).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}))
// {
// // 查找所有递归子目录，包括自身 // 复制目录
// mock.ExpectQuery("SELECT(.+)"). mock.ExpectBegin()
// WithArgs(1, sqlmock.AnyArg(), 1, "/test"). mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(5, 1))
// WillReturnRows( mock.ExpectCommit()
// sqlmock.NewRows([]string{"id", "parent_id", "name", "position", "position_absolute"}).
// AddRow(3, 2, "1", "/test", "/test/1"). size, err := parFolder.CopyFolderTo(2, &dstFolder)
// AddRow(2, 1, "test", "/", "/1"). asserts.NoError(mock.ExpectationsWereMet())
// AddRow(4, 3, "3", "/test/1", "/test/1/3"), asserts.Error(err)
// ) asserts.Equal(uint64(0), size)
// // 查找顶级待复制目录 }
// mock.ExpectQuery("SELECT(.+)").
// WithArgs("/test", 1). // 查询子文件失败
// WillReturnRows( {
// sqlmock.NewRows( // GetRecursiveChildFolder
// []string{"id", "parent_id", "name", "position", "position_absolute"}). mock.ExpectQuery("SELECT(.+)").WithArgs(1, 2).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(2, 9))
// AddRow(2, 1, "test", "/", "/test"), mock.ExpectQuery("SELECT(.+)").WithArgs(1, 2).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(3, 2))
// ) mock.ExpectQuery("SELECT(.+)").WithArgs(1, 3).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(4, 3))
// mock.ExpectQuery("SELECT(.+)").WithArgs(1, 4).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}))
// // 更新顶级目录
// mock.ExpectBegin() // 复制目录
// mock.ExpectExec("INSERT(.+)"). mock.ExpectBegin()
// WillReturnResult(sqlmock.NewResult(5, 1)) mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(5, 1))
// mock.ExpectCommit() mock.ExpectCommit()
// // 更新子目录 mock.ExpectBegin()
// mock.ExpectBegin() mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(6, 1))
// mock.ExpectExec("INSERT(.+)"). mock.ExpectCommit()
// WillReturnResult(sqlmock.NewResult(6, 1)) mock.ExpectBegin()
// mock.ExpectCommit() mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(7, 1))
// mock.ExpectBegin() mock.ExpectCommit()
// mock.ExpectExec("INSERT(.+)").
// WillReturnResult(sqlmock.NewResult(6, 1)) // 查找子文件
// mock.ExpectCommit() mock.ExpectQuery("SELECT(.+)").
// WithArgs(1, 2, 3, 4).
// storage, err := parFolder.MoveFolderTo([]string{"/test"}, &dstFolder, true) WillReturnError(errors.New("error"))
// asserts.NoError(mock.ExpectationsWereMet())
// asserts.Error(err) size, err := parFolder.CopyFolderTo(2, &dstFolder)
// asserts.Equal(uint64(0), storage) asserts.NoError(mock.ExpectationsWereMet())
// asserts.Error(err)
// } asserts.Equal(uint64(0), size)
// }
// // 检索子目录出错
// { // 复制文件 一个失败
// // 查找所有递归子目录，包括自身 {
// mock.ExpectQuery("SELECT(.+)"). // GetRecursiveChildFolder
// WithArgs(1, sqlmock.AnyArg(), 1, "/test"). mock.ExpectQuery("SELECT(.+)").WithArgs(1, 2).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(2, 9))
// WillReturnError(errors.New("error")) mock.ExpectQuery("SELECT(.+)").WithArgs(1, 2).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(3, 2))
// mock.ExpectQuery("SELECT(.+)").WithArgs(1, 3).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}).AddRow(4, 3))
// storage, err := parFolder.MoveFolderTo([]string{"/test"}, &dstFolder, true) mock.ExpectQuery("SELECT(.+)").WithArgs(1, 4).WillReturnRows(sqlmock.NewRows([]string{"id", "parent_id"}))
// asserts.NoError(mock.ExpectationsWereMet())
// asserts.Error(err) // 复制目录
// asserts.Equal(uint64(0), storage) mock.ExpectBegin()
// mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(5, 1))
// } mock.ExpectCommit()
// mock.ExpectBegin()
// // 寻找原始目录出错 mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(6, 1))
// { mock.ExpectCommit()
// // 查找所有递归子目录，包括自身 mock.ExpectBegin()
// mock.ExpectQuery("SELECT(.+)"). mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(7, 1))
// WithArgs(1, sqlmock.AnyArg(), 1, "/test"). mock.ExpectCommit()
// WillReturnRows(
// sqlmock.NewRows([]string{"id", "parent_id", "name", "position", "position_absolute"}). // 查找子文件
// AddRow(3, 2, "1", "/test", "/test/1"). mock.ExpectQuery("SELECT(.+)").
// AddRow(2, 1, "test", "/", "/test"). WithArgs(1, 2, 3, 4).
// AddRow(4, 3, "3", "/test/1", "/test/1/3"), WillReturnRows(
// ) sqlmock.NewRows([]string{"id", "name", "folder_id", "size"}).
// // 查找顶级待复制目录 AddRow(1, "2.txt", 2, 10).
// mock.ExpectQuery("SELECT(.+)"). AddRow(2, "3.txt", 3, 20),
// WithArgs("/test", 1). )
// WillReturnError(errors.New("error"))
// // 复制子文件
// storage, err := parFolder.MoveFolderTo([]string{"/test"}, &dstFolder, true) mock.ExpectBegin()
// asserts.NoError(mock.ExpectationsWereMet()) mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(5, 1))
// asserts.Error(err) mock.ExpectCommit()
// asserts.Equal(uint64(0), storage) mock.ExpectBegin()
// mock.ExpectExec("INSERT(.+)").WillReturnError(errors.New("error"))
// } mock.ExpectRollback()
//
// // 更新顶级目录出错 size, err := parFolder.CopyFolderTo(2, &dstFolder)
// { asserts.NoError(mock.ExpectationsWereMet())
// // 查找所有递归子目录，包括自身 asserts.Error(err)
// mock.ExpectQuery("SELECT(.+)"). asserts.Equal(uint64(10), size)
// WithArgs(1, sqlmock.AnyArg(), 1, "/test"). }
// WillReturnRows(
// sqlmock.NewRows([]string{"id", "parent_id", "name", "position", "position_absolute"}). }
// AddRow(3, 2, "1", "/test", "/test/1").
// AddRow(2, 1, "test", "/", "/test"). func TestFolder_MoveOrCopyFolderTo_Move(t *testing.T) {
// AddRow(4, 3, "3", "/test/1", "/test/1/3"), conf.DatabaseConfig.Type = "mysql"
// ) asserts := assert.New(t)
// // 查找顶级待复制目录 // 父目录
// mock.ExpectQuery("SELECT(.+)"). parFolder := Folder{
// WithArgs("/test", 1). Model: gorm.Model{ID: 9},
// WillReturnRows( OwnerID: 1,
// sqlmock.NewRows( }
// []string{"id", "parent_id", "name", "position", "position_absolute"}). // 目标目录
// AddRow(2, 1, "test", "/", "/test"), dstFolder := Folder{
// ) Model: gorm.Model{ID: 10},
// }
// // 更新顶级目录
// mock.ExpectBegin() // 成功
// mock.ExpectExec("INSERT(.+)"). {
// WillReturnError(errors.New("error")) mock.ExpectBegin()
// mock.ExpectRollback() mock.ExpectExec("UPDATE(.+)").
// WithArgs(10, sqlmock.AnyArg(), 1, 2, 1, 9).
// storage, err := parFolder.MoveFolderTo([]string{"/test"}, &dstFolder, true) WillReturnResult(sqlmock.NewResult(1, 1))
// asserts.NoError(mock.ExpectationsWereMet()) mock.ExpectCommit()
// asserts.Error(err) err := parFolder.MoveFolderTo([]uint{1, 2}, &dstFolder)
// asserts.Equal(uint64(0), storage) asserts.NoError(mock.ExpectationsWereMet())
// asserts.NoError(err)
// } }
// }
// // 复制子目录，一个成功一个失败
// {
// // 查找所有递归子目录，包括自身
// mock.ExpectQuery("SELECT(.+)").
// WithArgs(1, sqlmock.AnyArg(), 1, "/test").
// WillReturnRows(
// sqlmock.NewRows([]string{"id", "parent_id", "name", "position", "position_absolute"}).
// AddRow(3, 2, "1", "/test", "/test/1").
// AddRow(2, 1, "test", "/", "/test").
// AddRow(4, 3, "3", "/test/1", "/test/1/3"),
// )
// // 查找顶级待复制目录
// mock.ExpectQuery("SELECT(.+)").
// WithArgs("/test", 1).
// WillReturnRows(
// sqlmock.NewRows(
// []string{"id", "parent_id", "name", "position", "position_absolute"}).
// AddRow(2, 1, "test", "/", "/test"),
// )
//
// // 更新顶级目录
// mock.ExpectBegin()
// mock.ExpectExec("INSERT(.+)").
// WillReturnResult(sqlmock.NewResult(5, 1))
// mock.ExpectCommit()
// // 更新子目录
// mock.ExpectBegin()
// mock.ExpectExec("INSERT(.+)").
// WillReturnResult(sqlmock.NewResult(6, 1))
// mock.ExpectCommit()
// mock.ExpectBegin()
// mock.ExpectExec("INSERT(.+)").
// WillReturnError(errors.New("error"))
// mock.ExpectRollback()
//
// storage, err := parFolder.MoveFolderTo([]string{"/test"}, &dstFolder, true)
// asserts.NoError(mock.ExpectationsWereMet())
// asserts.Error(err)
// asserts.Equal(uint64(0), storage)
//
// }
//
// // 复制文件，一个成功一个失败
// {
// // 查找所有递归子目录，包括自身
// mock.ExpectQuery("SELECT(.+)").
// WithArgs(1, sqlmock.AnyArg(), 1, "/test").
// WillReturnRows(
// sqlmock.NewRows([]string{"id", "parent_id", "name", "position", "position_absolute"}).
// AddRow(3, 2, "1", "/test", "/test/1").
// AddRow(2, 1, "test", "/", "/test").
// AddRow(4, 3, "3", "/test/1", "/test/1/3"),
// )
// // 查找顶级待复制目录
// mock.ExpectQuery("SELECT(.+)").
// WithArgs("/test", 1).
// WillReturnRows(
// sqlmock.NewRows(
// []string{"id", "parent_id", "name", "position", "position_absolute"}).
// AddRow(2, 1, "test", "/", "/test"),
// )
//
// // 更新顶级目录
// mock.ExpectBegin()
// mock.ExpectExec("INSERT(.+)").
// WillReturnResult(sqlmock.NewResult(5, 1))
// mock.ExpectCommit()
// // 更新子目录
// mock.ExpectBegin()
// mock.ExpectExec("INSERT(.+)").
// WillReturnResult(sqlmock.NewResult(6, 1))
// mock.ExpectCommit()
// mock.ExpectBegin()
// mock.ExpectExec("INSERT(.+)").
// WillReturnResult(sqlmock.NewResult(7, 1))
// mock.ExpectCommit()
//
// // 获取子目录下的所有子文件
// mock.ExpectQuery("SELECT(.+)").
// WithArgs(1, 3, 2, 4).
// WillReturnRows(
// sqlmock.NewRows([]string{"id", "folder_id", "dir", "size"}).
// AddRow(1, 2, "/test", 10).
// AddRow(2, 3, "/test/1", 20),
// )
//
// // 更新子文件记录
// mock.ExpectBegin()
// mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(1, 1))
// mock.ExpectCommit()
// mock.ExpectBegin()
// mock.ExpectExec("INSERT(.+)").WillReturnError(errors.New("error"))
// mock.ExpectRollback()
//
// storage, err := parFolder.MoveFolderTo([]string{"/test"}, &dstFolder, true)
// asserts.NoError(mock.ExpectationsWereMet())
// asserts.NoError(err)
// asserts.Equal(uint64(10), storage)
//
// }
//
//}
//func TestFolder_MoveOrCopyFolderTo_Move(t *testing.T) {
// conf.DatabaseConfig.Type = "mysql"
// asserts := assert.New(t)
// // 父目录
// parFolder := Folder{
// OwnerID: 1,
// PositionAbsolute: "/",
// }
// // 目标目录
// dstFolder := Folder{
// Model: gorm.Model{ID: 10},
// PositionAbsolute: "/dst",
// }
//
// // 测试复制目录结构
// // test(2)
// // 1(3) 2.txt
// // 3(4) 4.txt
//
// // 正常情况 成功
// {
// // 查找所有递归子目录，包括自身
// mock.ExpectQuery("SELECT(.+)").
// WithArgs(1, sqlmock.AnyArg(), 1, "/test").
// WillReturnRows(
// sqlmock.NewRows([]string{"id", "parent_id", "name", "position", "position_absolute"}).
// AddRow(3, 2, "1", "/test", "/test/1").
// AddRow(2, 1, "test", "/", "/test").
// AddRow(4, 3, "3", "/test/1", "/test/1/3"),
// )
// // 更改顶级要移动目录的父目录指向
// mock.ExpectBegin()
// mock.ExpectExec("UPDATE(.+)").
// WithArgs(10, "/dst", "/dst/", sqlmock.AnyArg(), "/test", 1).
// WillReturnResult(sqlmock.NewResult(1, 1))
// mock.ExpectCommit()
// // 移动子目录
// mock.ExpectBegin()
// mock.ExpectExec("UPDATE(.+)").
// WithArgs("/dst/test", "/dst/test/1", sqlmock.AnyArg(), 3).
// WillReturnResult(sqlmock.NewResult(1, 1))
// mock.ExpectCommit()
// mock.ExpectBegin()
// mock.ExpectExec("UPDATE(.+)").
// WithArgs("/dst/test/1", "/dst/test/1/3", sqlmock.AnyArg(), 4).
// WillReturnResult(sqlmock.NewResult(1, 1))
// mock.ExpectCommit()
// // 获取子文件
// mock.ExpectQuery("SELECT(.+)").
// WithArgs(1, 3, 2, 4).
// WillReturnRows(
// sqlmock.NewRows([]string{"id", "folder_id", "dir", "size"}).
// AddRow(1, 2, "/test", 10).
// AddRow(2, 3, "/test/1", 20),
// )
// // 移动子文件
// mock.ExpectBegin()
// mock.ExpectExec("UPDATE(.+)").
// WithArgs("/dst/test", sqlmock.AnyArg(), 1).
// WillReturnResult(sqlmock.NewResult(1, 1))
// mock.ExpectCommit()
// mock.ExpectBegin()
// mock.ExpectExec("UPDATE(.+)").
// WithArgs("/dst/test/1", sqlmock.AnyArg(), 2).
// WillReturnResult(sqlmock.NewResult(1, 1))
// mock.ExpectCommit()
//
// storage, err := parFolder.MoveFolderTo([]string{"/test"}, &dstFolder, false)
// asserts.NoError(mock.ExpectationsWereMet())
// asserts.NoError(err)
// asserts.Equal(uint64(0), storage)
// }
//
// // 无法移动顶层目录
// {
// // 查找所有递归子目录，包括自身
// mock.ExpectQuery("SELECT(.+)").
// WithArgs(1, sqlmock.AnyArg(), 1, "/test").
// WillReturnRows(
// sqlmock.NewRows([]string{"id", "parent_id", "name", "position", "position_absolute"}).
// AddRow(3, 2, "1", "/test", "/test/1").
// AddRow(2, 1, "test", "/", "/test").
// AddRow(4, 3, "3", "/test/1", "/test/1/3"),
// )
// // 更改顶级要移动目录的父目录指向
// mock.ExpectBegin()
// mock.ExpectExec("UPDATE(.+)").
// WithArgs(10, "/dst", "/dst/", sqlmock.AnyArg(), "/test", 1).
// WillReturnError(errors.New("error"))
// mock.ExpectRollback()
//
// storage, err := parFolder.MoveFolderTo([]string{"/test"}, &dstFolder, false)
// asserts.NoError(mock.ExpectationsWereMet())
// asserts.Error(err)
// asserts.Equal(uint64(0), storage)
// }
//}

1
pkg/filesystem/file.go
Unescape View File

@ -42,7 +42,6 @@ func (fs *FileSystem) AddFile(ctx context.Context, parent *model.Folder) (*model
Size: file.GetSize(), Size: file.GetSize(),
FolderID: parent.ID, FolderID: parent.ID,
PolicyID: fs.User.Policy.ID, PolicyID: fs.User.Policy.ID,
Dir: parent.PositionAbsolute,
} }
_, err := newFile.Create() _, err := newFile.Create()

Write Preview
Loading…
Cancel
Save