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

Data layer restructuring (#997)

Browse Source 
* Move query builders to sqlite package
* Add transaction system
* Wrap model resolvers in transaction
* Add error return value for StringSliceToIntSlice
* Update/refactor mutation resolvers
* Convert query builders
* Remove unused join types
* Add stash id unit tests
* Use WAL journal mode
This commit is contained in:
WithoutPants
2021-01-18 12:23:20 +11:00
committed by GitHub
parent 7bae990c67
commit 1e04deb3d4
168 changed files with 12683 additions and 10863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
pkg/scene/import_test.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/stashapp/stash/pkg/manager/jsonschema"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/models/mocks"
"github.com/stashapp/stash/pkg/models/modelstest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@@ -233,7 +232,7 @@ func TestImporterPreImportWithPerformer(t *testing.T) {
performerReaderWriter.On("FindByNames", []string{existingPerformerName}, false).Return([]*models.Performer{
{
ID: existingPerformerID,
Name: modelstest.NullString(existingPerformerName),
Name: models.NullString(existingPerformerName),
},
}, nil).Once()
performerReaderWriter.On("FindByNames", []string{existingPerformerErr}, false).Return(nil, errors.New("FindByNames error")).Once()
@@ -323,7 +322,7 @@ func TestImporterPreImportWithMovie(t *testing.T) {
movieReaderWriter.On("FindByName", existingMovieName, false).Return(&models.Movie{
ID: existingMovieID,
Name: modelstest.NullString(existingMovieName),
Name: models.NullString(existingMovieName),
}, nil).Once()
movieReaderWriter.On("FindByName", existingMovieErr, false).Return(nil, errors.New("FindByName error")).Once()
@@ -493,10 +492,10 @@ func TestImporterPostImport(t *testing.T) {
coverImageData: imageBytes,
}
updateSceneImageErr := errors.New("UpdateSceneCover error")
updateSceneImageErr := errors.New("UpdateCover error")
readerWriter.On("UpdateSceneCover", sceneID, imageBytes).Return(nil).Once()
readerWriter.On("UpdateSceneCover", errImageID, imageBytes).Return(updateSceneImageErr).Once()
readerWriter.On("UpdateCover", sceneID, imageBytes).Return(nil).Once()
readerWriter.On("UpdateCover", errImageID, imageBytes).Return(updateSceneImageErr).Once()
err := i.PostImport(sceneID)
assert.Nil(t, err)
@@ -520,11 +519,11 @@ func TestImporterPostImportUpdateGallery(t *testing.T) {
updateErr := errors.New("Update error")
updateArg := *i.gallery
updateArg.SceneID = modelstest.NullInt64(sceneID)
updateArg.SceneID = models.NullInt64(sceneID)
galleryReaderWriter.On("Update", updateArg).Return(nil, nil).Once()
updateArg.SceneID = modelstest.NullInt64(errGalleryID)
updateArg.SceneID = models.NullInt64(errGalleryID)
galleryReaderWriter.On("Update", updateArg).Return(nil, updateErr).Once()
err := i.PostImport(sceneID)
@@ -537,10 +536,10 @@ func TestImporterPostImportUpdateGallery(t *testing.T) {
}
func TestImporterPostImportUpdatePerformers(t *testing.T) {
joinReaderWriter := &mocks.JoinReaderWriter{}
sceneReaderWriter := &mocks.SceneReaderWriter{}
i := Importer{
JoinWriter: joinReaderWriter,
ReaderWriter: sceneReaderWriter,
performers: []*models.Performer{
{
ID: existingPerformerID,
@@ -548,15 +547,10 @@ func TestImporterPostImportUpdatePerformers(t *testing.T) {
},
}
updateErr := errors.New("UpdatePerformersScenes error")
updateErr := errors.New("UpdatePerformers error")
joinReaderWriter.On("UpdatePerformersScenes", sceneID, []models.PerformersScenes{
{
PerformerID: existingPerformerID,
SceneID: sceneID,
},
}).Return(nil).Once()
joinReaderWriter.On("UpdatePerformersScenes", errPerformersID, mock.AnythingOfType("[]models.PerformersScenes")).Return(updateErr).Once()
sceneReaderWriter.On("UpdatePerformers", sceneID, []int{existingPerformerID}).Return(nil).Once()
sceneReaderWriter.On("UpdatePerformers", errPerformersID, mock.AnythingOfType("[]int")).Return(updateErr).Once()
err := i.PostImport(sceneID)
assert.Nil(t, err)
@@ -564,14 +558,14 @@ func TestImporterPostImportUpdatePerformers(t *testing.T) {
err = i.PostImport(errPerformersID)
assert.NotNil(t, err)
joinReaderWriter.AssertExpectations(t)
sceneReaderWriter.AssertExpectations(t)
}
func TestImporterPostImportUpdateMovies(t *testing.T) {
joinReaderWriter := &mocks.JoinReaderWriter{}
sceneReaderWriter := &mocks.SceneReaderWriter{}
i := Importer{
JoinWriter: joinReaderWriter,
ReaderWriter: sceneReaderWriter,
movies: []models.MoviesScenes{
{
MovieID: existingMovieID,
@@ -579,15 +573,15 @@ func TestImporterPostImportUpdateMovies(t *testing.T) {
},
}
updateErr := errors.New("UpdateMoviesScenes error")
updateErr := errors.New("UpdateMovies error")
joinReaderWriter.On("UpdateMoviesScenes", sceneID, []models.MoviesScenes{
sceneReaderWriter.On("UpdateMovies", sceneID, []models.MoviesScenes{
{
MovieID: existingMovieID,
SceneID: sceneID,
},
}).Return(nil).Once()
joinReaderWriter.On("UpdateMoviesScenes", errMoviesID, mock.AnythingOfType("[]models.MoviesScenes")).Return(updateErr).Once()
sceneReaderWriter.On("UpdateMovies", errMoviesID, mock.AnythingOfType("[]models.MoviesScenes")).Return(updateErr).Once()
err := i.PostImport(sceneID)
assert.Nil(t, err)
@@ -595,14 +589,14 @@ func TestImporterPostImportUpdateMovies(t *testing.T) {
err = i.PostImport(errMoviesID)
assert.NotNil(t, err)
joinReaderWriter.AssertExpectations(t)
sceneReaderWriter.AssertExpectations(t)
}
func TestImporterPostImportUpdateTags(t *testing.T) {
joinReaderWriter := &mocks.JoinReaderWriter{}
sceneReaderWriter := &mocks.SceneReaderWriter{}
i := Importer{
JoinWriter: joinReaderWriter,
ReaderWriter: sceneReaderWriter,
tags: []*models.Tag{
{
ID: existingTagID,
@@ -610,15 +604,10 @@ func TestImporterPostImportUpdateTags(t *testing.T) {
},
}
updateErr := errors.New("UpdateScenesTags error")
updateErr := errors.New("UpdateTags error")
joinReaderWriter.On("UpdateScenesTags", sceneID, []models.ScenesTags{
{
TagID: existingTagID,
SceneID: sceneID,
},
}).Return(nil).Once()
joinReaderWriter.On("UpdateScenesTags", errTagsID, mock.AnythingOfType("[]models.ScenesTags")).Return(updateErr).Once()
sceneReaderWriter.On("UpdateTags", sceneID, []int{existingTagID}).Return(nil).Once()
sceneReaderWriter.On("UpdateTags", errTagsID, mock.AnythingOfType("[]int")).Return(updateErr).Once()
err := i.PostImport(sceneID)
assert.Nil(t, err)
@@ -626,7 +615,7 @@ func TestImporterPostImportUpdateTags(t *testing.T) {
err = i.PostImport(errTagsID)
assert.NotNil(t, err)
joinReaderWriter.AssertExpectations(t)
sceneReaderWriter.AssertExpectations(t)
}
func TestImporterFindExistingID(t *testing.T) {
@@ -691,11 +680,11 @@ func TestCreate(t *testing.T) {
readerWriter := &mocks.SceneReaderWriter{}
scene := models.Scene{
Title: modelstest.NullString(title),
Title: models.NullString(title),
}
sceneErr := models.Scene{
Title: modelstest.NullString(sceneNameErr),
Title: models.NullString(sceneNameErr),
}
i := Importer{
@@ -726,11 +715,11 @@ func TestUpdate(t *testing.T) {
readerWriter := &mocks.SceneReaderWriter{}
scene := models.Scene{
Title: modelstest.NullString(title),
Title: models.NullString(title),
}
sceneErr := models.Scene{
Title: modelstest.NullString(sceneNameErr),
Title: models.NullString(sceneNameErr),
}
i := Importer{