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

21
pkg/sqlite/gallery_test.go
View File

@@ -10,7 +10,6 @@ import (
"testing"
"time"
"github.com/stashapp/stash/pkg/file"
"github.com/stashapp/stash/pkg/models"
"github.com/stretchr/testify/assert"
)
@@ -97,7 +96,7 @@ func Test_galleryQueryBuilder_Create(t *testing.T) {
Rating: &rating,
Organized: true,
StudioID: &studioIDs[studioIdxWithScene],
Files: models.NewRelatedFiles([]file.File{
Files: models.NewRelatedFiles([]models.File{
galleryFile,
}),
CreatedAt: createdAt,
@@ -145,9 +144,9 @@ func Test_galleryQueryBuilder_Create(t *testing.T) {
assert := assert.New(t)
s := tt.newObject
var fileIDs []file.ID
var fileIDs []models.FileID
if s.Files.Loaded() {
fileIDs = []file.ID{s.Files.List()[0].Base().ID}
fileIDs = []models.FileID{s.Files.List()[0].Base().ID}
}
if err := qb.Create(ctx, &s, fileIDs); (err != nil) != tt.wantErr {
@@ -195,7 +194,7 @@ func Test_galleryQueryBuilder_Create(t *testing.T) {
}
}
func makeGalleryFileWithID(i int) *file.BaseFile {
func makeGalleryFileWithID(i int) *models.BaseFile {
ret := makeGalleryFile(i)
ret.ID = galleryFileIDs[i]
return ret
@@ -229,7 +228,7 @@ func Test_galleryQueryBuilder_Update(t *testing.T) {
Rating: &rating,
Organized: true,
StudioID: &studioIDs[studioIdxWithScene],
Files: models.NewRelatedFiles([]file.File{
Files: models.NewRelatedFiles([]models.File{
makeGalleryFileWithID(galleryIdxWithScene),
}),
CreatedAt: createdAt,
@@ -449,7 +448,7 @@ func Test_galleryQueryBuilder_UpdatePartial(t *testing.T) {
Rating: &rating,
Organized: true,
StudioID: &studioIDs[studioIdxWithGallery],
Files: models.NewRelatedFiles([]file.File{
Files: models.NewRelatedFiles([]models.File{
makeGalleryFile(galleryIdxWithImage),
}),
CreatedAt: createdAt,
@@ -466,7 +465,7 @@ func Test_galleryQueryBuilder_UpdatePartial(t *testing.T) {
clearGalleryPartial(),
models.Gallery{
ID: galleryIDs[galleryIdxWithImage],
Files: models.NewRelatedFiles([]file.File{
Files: models.NewRelatedFiles([]models.File{
makeGalleryFile(galleryIdxWithImage),
}),
SceneIDs: models.NewRelatedIDs([]int{}),
@@ -844,7 +843,7 @@ func makeGalleryWithID(index int) *models.Gallery {
ret := makeGallery(index, includeScenes)
ret.ID = galleryIDs[index]
ret.Files = models.NewRelatedFiles([]file.File{makeGalleryFile(index)})
ret.Files = models.NewRelatedFiles([]models.File{makeGalleryFile(index)})
return ret
}
@@ -1281,7 +1280,7 @@ func galleriesToIDs(i []*models.Gallery) []int {
func Test_galleryStore_FindByFileID(t *testing.T) {
tests := []struct {
name string
fileID file.ID
fileID models.FileID
include []int
exclude []int
}{
@@ -1330,7 +1329,7 @@ func Test_galleryStore_FindByFileID(t *testing.T) {
func Test_galleryStore_FindByFolderID(t *testing.T) {
tests := []struct {
name string
folderID file.FolderID
folderID models.FolderID
include []int
exclude []int
}{