Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 04:14:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Model refactor (#3915)

Browse Source 
* Add mockery config file
* Move basic file/folder structs to models
* Fix hack due to import loop
* Move file interfaces to models
* Move folder interfaces to models
* Move scene interfaces to models
* Move scene marker interfaces to models
* Move image interfaces to models
* Move gallery interfaces to models
* Move gallery chapter interfaces to models
* Move studio interfaces to models
* Move movie interfaces to models
* Move performer interfaces to models
* Move tag interfaces to models
* Move autotag interfaces to models
* Regenerate mocks
This commit is contained in:
DingDongSoLong4
2023-09-01 02:39:29 +02:00
committed by GitHub
parent 20520a58b4
commit c364346a59
185 changed files with 3840 additions and 2559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/sqlite/scene_test.go
View File

@@ -14,7 +14,6 @@ import (
"testing"
"time"
"github.com/stashapp/stash/pkg/file"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/sliceutil/intslice"
"github.com/stretchr/testify/assert"
@@ -165,8 +164,8 @@ func Test_sceneQueryBuilder_Create(t *testing.T) {
Organized: true,
OCounter: ocounter,
StudioID: &studioIDs[studioIdxWithScene],
Files: models.NewRelatedVideoFiles([]*file.VideoFile{
videoFile.(*file.VideoFile),
Files: models.NewRelatedVideoFiles([]*models.VideoFile{
videoFile.(*models.VideoFile),
}),
CreatedAt: createdAt,
UpdatedAt: updatedAt,
@@ -248,7 +247,7 @@ func Test_sceneQueryBuilder_Create(t *testing.T) {
runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
assert := assert.New(t)
var fileIDs []file.ID
var fileIDs []models.FileID
if tt.newObject.Files.Loaded() {
for _, f := range tt.newObject.Files.List() {
fileIDs = append(fileIDs, f.ID)
@@ -308,7 +307,7 @@ func clearSceneFileIDs(scene *models.Scene) {
}
}
func makeSceneFileWithID(i int) *file.VideoFile {
func makeSceneFileWithID(i int) *models.VideoFile {
ret := makeSceneFile(i)
ret.ID = sceneFileIDs[i]
return ret
@@ -626,7 +625,7 @@ func Test_sceneQueryBuilder_UpdatePartial(t *testing.T) {
},
models.Scene{
ID: sceneIDs[sceneIdxWithSpacedName],
Files: models.NewRelatedVideoFiles([]*file.VideoFile{
Files: models.NewRelatedVideoFiles([]*models.VideoFile{
makeSceneFile(sceneIdxWithSpacedName),
}),
Title: title,
@@ -678,7 +677,7 @@ func Test_sceneQueryBuilder_UpdatePartial(t *testing.T) {
models.Scene{
ID: sceneIDs[sceneIdxWithSpacedName],
OCounter: getOCounter(sceneIdxWithSpacedName),
Files: models.NewRelatedVideoFiles([]*file.VideoFile{
Files: models.NewRelatedVideoFiles([]*models.VideoFile{
makeSceneFile(sceneIdxWithSpacedName),
}),
GalleryIDs: models.NewRelatedIDs([]int{}),
@@ -1460,7 +1459,7 @@ func makeSceneWithID(index int) *models.Scene {
ret := makeScene(index)
ret.ID = sceneIDs[index]
ret.Files = models.NewRelatedVideoFiles([]*file.VideoFile{makeSceneFile(index)})
ret.Files = models.NewRelatedVideoFiles([]*models.VideoFile{makeSceneFile(index)})
return ret
}
@@ -1891,7 +1890,7 @@ func scenesToIDs(i []*models.Scene) []int {
func Test_sceneStore_FindByFileID(t *testing.T) {
tests := []struct {
name string
fileID file.ID
fileID models.FileID
include []int
exclude []int
}{
@@ -1940,7 +1939,7 @@ func Test_sceneStore_FindByFileID(t *testing.T) {
func Test_sceneStore_CountByFileID(t *testing.T) {
tests := []struct {
name string
fileID file.ID
fileID models.FileID
want int
}{
{
@@ -3053,8 +3052,8 @@ func queryScenes(ctx context.Context, t *testing.T, queryBuilder models.SceneRea
func createScene(ctx context.Context, width int, height int) (*models.Scene, error) {
name := fmt.Sprintf("TestSceneQueryResolutionModifiers %d %d", width, height)
sceneFile := &file.VideoFile{
BaseFile: &file.BaseFile{
sceneFile := &models.VideoFile{
BaseFile: &models.BaseFile{
Basename: name,
ParentFolderID: folderIDs[folderIdxWithSceneFiles],
},
@@ -3068,7 +3067,7 @@ func createScene(ctx context.Context, width int, height int) (*models.Scene, err
scene := &models.Scene{}
if err := db.Scene.Create(ctx, scene, []file.ID{sceneFile.ID}); err != nil {
if err := db.Scene.Create(ctx, scene, []models.FileID{sceneFile.ID}); err != nil {
return nil, err
}
@@ -4559,7 +4558,7 @@ func TestSceneStore_AssignFiles(t *testing.T) {
tests := []struct {
name string
sceneID int
fileID file.ID
fileID models.FileID
wantErr bool
}{
{
@@ -4587,7 +4586,7 @@ func TestSceneStore_AssignFiles(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
withRollbackTxn(func(ctx context.Context) error {
if err := qb.AssignFiles(ctx, tt.sceneID, []file.ID{tt.fileID}); (err != nil) != tt.wantErr {
if err := qb.AssignFiles(ctx, tt.sceneID, []models.FileID{tt.fileID}); (err != nil) != tt.wantErr {
t.Errorf("SceneStore.AssignFiles() error = %v, wantErr %v", err, tt.wantErr)
}