Test: delete objects related methods

models/file.go

@@ -61,7 +61,6 @@ func GetChildFilesOfFolders(folders *[]Folder) ([]File, error) {
 }
 
 // GetPolicy 获取文件所属策略
-// TODO:test
 func (file *File) GetPolicy() *Policy {
 	if file.Policy.Model.ID == 0 {
 		file.Policy, _ = GetPolicyByID(file.PolicyID)
@@ -91,7 +90,7 @@ func RemoveFilesWithSoftLinks(files []File) ([]File, error) {
 	var filesWithSoftLinks []File
 	tx := DB
 	for _, value := range files {
-		tx = tx.Or("source_name = ? and policy_id = ? and id != ?", value.SourceName, value.GetPolicy().ID, value.ID)
+		tx = tx.Or("source_name = ? and policy_id = ? and id != ?", value.SourceName, value.PolicyID, value.ID)
 	}
 	result := tx.Find(&filesWithSoftLinks)
 	if result.Error != nil {
@@ -99,16 +98,22 @@ func RemoveFilesWithSoftLinks(files []File) ([]File, error) {
 	}
 
 	// 过滤具有软连接的文件
+	// TODO: 优化复杂度
 	if len(filesWithSoftLinks) == 0 {
 		filteredFiles = files
 	} else {
 		for i := 0; i < len(files); i++ {
+			finder := false
 			for _, value := range filesWithSoftLinks {
-				if value.PolicyID != files[i].PolicyID || value.SourceName != files[i].SourceName {
-					filteredFiles = append(filteredFiles, files[i])
+				if value.PolicyID == files[i].PolicyID && value.SourceName == files[i].SourceName {
+					finder = true
 					break
 				}
 			}
+			if !finder {
+				filteredFiles = append(filteredFiles, files[i])
+			}
+
 		}
 	}
 

models/file_test.go

@@ -66,3 +66,227 @@ func TestFolder_GetChildFile(t *testing.T) {
 	asserts.NoError(mock.ExpectationsWereMet())
 
 }
+
+func TestGetChildFilesOfFolders(t *testing.T) {
+	asserts := assert.New(t)
+	testFolder := []Folder{
+		Folder{
+			Model: gorm.Model{ID: 3},
+		},
+		Folder{
+			Model: gorm.Model{ID: 4},
+		}, Folder{
+			Model: gorm.Model{ID: 5},
+		},
+	}
+
+	// 出错
+	{
+		mock.ExpectQuery("SELECT(.+)folder_id").WithArgs(3, 4, 5).WillReturnError(errors.New("not found"))
+		files, err := GetChildFilesOfFolders(&testFolder)
+		asserts.Error(err)
+		asserts.Len(files, 0)
+		asserts.NoError(mock.ExpectationsWereMet())
+	}
+
+	// 找到2个
+	{
+		mock.ExpectQuery("SELECT(.+)folder_id").
+			WithArgs(3, 4, 5).
+			WillReturnRows(sqlmock.NewRows([]string{"id", "name"}).
+				AddRow(3, "3").
+				AddRow(4, "4"),
+			)
+		files, err := GetChildFilesOfFolders(&testFolder)
+		asserts.NoError(err)
+		asserts.Len(files, 2)
+		asserts.NoError(mock.ExpectationsWereMet())
+	}
+
+	// 全部找到
+	{
+		mock.ExpectQuery("SELECT(.+)folder_id").
+			WithArgs(3, 4, 5).
+			WillReturnRows(sqlmock.NewRows([]string{"id", "name"}).
+				AddRow(3, "3").
+				AddRow(4, "4").
+				AddRow(5, "5"),
+			)
+		files, err := GetChildFilesOfFolders(&testFolder)
+		asserts.NoError(err)
+		asserts.Len(files, 3)
+		asserts.NoError(mock.ExpectationsWereMet())
+	}
+}
+
+func TestFile_GetPolicy(t *testing.T) {
+	asserts := assert.New(t)
+
+	// 空策略
+	{
+		file := File{
+			PolicyID: 23,
+		}
+		mock.ExpectQuery("SELECT(.+)policies(.+)").
+			WillReturnRows(
+				sqlmock.NewRows([]string{"id", "name"}).
+					AddRow(23, "name"),
+			)
+		file.GetPolicy()
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.Equal(uint(23), file.Policy.ID)
+	}
+
+	// 非空策略
+	{
+		file := File{
+			PolicyID: 23,
+			Policy:   Policy{Model: gorm.Model{ID: 24}},
+		}
+		file.GetPolicy()
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.Equal(uint(24), file.Policy.ID)
+	}
+}
+
+func TestGetFileByPaths(t *testing.T) {
+	asserts := assert.New(t)
+	paths := []string{"/我的目录/文件.txt", "/根目录文件.txt"}
+
+	// 正常情况
+	{
+		mock.ExpectQuery("SELECT(.+)files(.+)").
+			WithArgs("/我的目录", "文件.txt", 1, "/", "根目录文件.txt", 1).
+			WillReturnRows(
+				sqlmock.NewRows([]string{"id", "name"}).
+					AddRow(1, "文件.txt").
+					AddRow(2, "根目录文件.txt"),
+			)
+		files, err := GetFileByPaths(paths, 1)
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.NoError(err)
+		asserts.Equal([]File{
+			File{
+				Model: gorm.Model{ID: 1},
+				Name:  "文件.txt",
+			},
+			File{
+				Model: gorm.Model{ID: 2},
+				Name:  "根目录文件.txt",
+			},
+		}, files)
+	}
+
+	// 出错
+	{
+		mock.ExpectQuery("SELECT(.+)files(.+)").
+			WithArgs("/我的目录", "文件.txt", 1, "/", "根目录文件.txt", 1).
+			WillReturnError(errors.New("error"))
+		files, err := GetFileByPaths(paths, 1)
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.Error(err)
+		asserts.Len(files, 0)
+	}
+}
+
+func TestRemoveFilesWithSoftLinks(t *testing.T) {
+	asserts := assert.New(t)
+	files := []File{
+		File{
+			Model:      gorm.Model{ID: 1},
+			SourceName: "1.txt",
+			PolicyID:   23,
+		},
+		File{
+			Model:      gorm.Model{ID: 2},
+			SourceName: "2.txt",
+			PolicyID:   24,
+		},
+	}
+
+	// 全都没有
+	{
+		mock.ExpectQuery("SELECT(.+)files(.+)").
+			WithArgs("1.txt", 23, 1, "2.txt", 24, 2).
+			WillReturnRows(sqlmock.NewRows([]string{"id", "policy_id", "source_name"}))
+		file, err := RemoveFilesWithSoftLinks(files)
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.NoError(err)
+		asserts.Equal(files, file)
+	}
+	// 查询出错
+	{
+		mock.ExpectQuery("SELECT(.+)files(.+)").
+			WithArgs("1.txt", 23, 1, "2.txt", 24, 2).
+			WillReturnError(errors.New("error"))
+		file, err := RemoveFilesWithSoftLinks(files)
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.Error(err)
+		asserts.Nil(file)
+	}
+	// 第二个是软链
+	{
+		mock.ExpectQuery("SELECT(.+)files(.+)").
+			WithArgs("1.txt", 23, 1, "2.txt", 24, 2).
+			WillReturnRows(
+				sqlmock.NewRows([]string{"id", "policy_id", "source_name"}).
+					AddRow(3, 24, "2.txt"),
+			)
+		file, err := RemoveFilesWithSoftLinks(files)
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.NoError(err)
+		asserts.Equal(files[:1], file)
+	}
+	// 第一个是软链
+	{
+		mock.ExpectQuery("SELECT(.+)files(.+)").
+			WithArgs("1.txt", 23, 1, "2.txt", 24, 2).
+			WillReturnRows(
+				sqlmock.NewRows([]string{"id", "policy_id", "source_name"}).
+					AddRow(3, 23, "1.txt"),
+			)
+		file, err := RemoveFilesWithSoftLinks(files)
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.NoError(err)
+		asserts.Equal(files[1:], file)
+	}
+	// 全部是软链
+	{
+		mock.ExpectQuery("SELECT(.+)files(.+)").
+			WithArgs("1.txt", 23, 1, "2.txt", 24, 2).
+			WillReturnRows(
+				sqlmock.NewRows([]string{"id", "policy_id", "source_name"}).
+					AddRow(3, 24, "2.txt").
+					AddRow(4, 23, "1.txt"),
+			)
+		file, err := RemoveFilesWithSoftLinks(files)
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.NoError(err)
+		asserts.Len(file, 0)
+	}
+}
+
+func TestDeleteFileByIDs(t *testing.T) {
+	asserts := assert.New(t)
+
+	// 出错
+	{
+		mock.ExpectBegin()
+		mock.ExpectExec("UPDATE(.+)delete(.+)").
+			WillReturnError(errors.New("error"))
+		mock.ExpectRollback()
+		err := DeleteFileByIDs([]uint{1, 2, 3})
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.Error(err)
+	}
+	// 成功
+	{
+		mock.ExpectBegin()
+		mock.ExpectExec("UPDATE(.+)delete(.+)").
+			WillReturnResult(sqlmock.NewResult(0, 3))
+		mock.ExpectCommit()
+		err := DeleteFileByIDs([]uint{1, 2, 3})
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.NoError(err)
+	}
+}

models/folder_test.go

@@ -3,6 +3,7 @@ package model
 import (
 	"errors"
 	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/HFO4/cloudreve/pkg/util"
 	"github.com/jinzhu/gorm"
 	"github.com/stretchr/testify/assert"
 	"testing"
@@ -72,3 +73,59 @@ func TestFolder_GetChildFolder(t *testing.T) {
 	asserts.Len(files, 2)
 	asserts.NoError(mock.ExpectationsWereMet())
 }
+
+func TestGetRecursiveChildFolder(t *testing.T) {
+	asserts := assert.New(t)
+	dirs := []string{"/目录1", "/目录2"}
+
+	// 正常
+	{
+		mock.ExpectQuery("SELECT(.+)folders(.+)").
+			WithArgs(1, util.BuildRegexp(dirs, "^", "/", "|"), "/目录1", "/目录2").
+			WillReturnRows(
+				sqlmock.NewRows([]string{"id", "name"}).
+					AddRow(1, "sub1").
+					AddRow(2, "sub2").
+					AddRow(3, "sub3"),
+			)
+		subs, err := GetRecursiveChildFolder(dirs, 1)
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.NoError(err)
+		asserts.Len(subs, 3)
+	}
+	// 出错
+	{
+		mock.ExpectQuery("SELECT(.+)folders(.+)").
+			WithArgs(1, util.BuildRegexp(dirs, "^", "/", "|"), "/目录1", "/目录2").
+			WillReturnError(errors.New("233"))
+		subs, err := GetRecursiveChildFolder(dirs, 1)
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.Error(err)
+		asserts.Len(subs, 0)
+	}
+}
+
+func TestDeleteFolderByIDs(t *testing.T) {
+	asserts := assert.New(t)
+
+	// 出错
+	{
+		mock.ExpectBegin()
+		mock.ExpectExec("UPDATE(.+)delete(.+)").
+			WillReturnError(errors.New("error"))
+		mock.ExpectRollback()
+		err := DeleteFolderByIDs([]uint{1, 2, 3})
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.Error(err)
+	}
+	// 成功
+	{
+		mock.ExpectBegin()
+		mock.ExpectExec("UPDATE(.+)delete(.+)").
+			WillReturnResult(sqlmock.NewResult(0, 3))
+		mock.ExpectCommit()
+		err := DeleteFolderByIDs([]uint{1, 2, 3})
+		asserts.NoError(mock.ExpectationsWereMet())
+		asserts.NoError(err)
+	}
+}

models/user.go

@@ -57,16 +57,26 @@ type UserOption struct {
 
 // DeductionStorage 减少用户已用容量
 func (user *User) DeductionStorage(size uint64) bool {
+	if size == 0 {
+		return true
+	}
 	if size <= user.Storage {
 		user.Storage -= size
 		DB.Model(user).UpdateColumn("storage", gorm.Expr("storage - ?", size))
 		return true
 	}
+	// 如果要减少的容量超出以用容量，则设为零
+	user.Storage = 0
+	DB.Model(user).UpdateColumn("storage", 0)
+
 	return false
 }
 
 // IncreaseStorage 检查并增加用户已用容量
 func (user *User) IncreaseStorage(size uint64) bool {
+	if size == 0 {
+		return true
+	}
 	if size <= user.GetRemainingCapacity() {
 		user.Storage += size
 		DB.Model(user).UpdateColumn("storage", gorm.Expr("storage + ?", size))