mirror of
https://github.com/stashapp/stash.git
synced 2025-12-06 08:26:00 +01:00
* Fix joined hierarchical filtering * Fix scene performer tag filter * Generalise performer tag handler * Add unit tests * Add equals handling * Make performer tags equals/not equals unsupported * Make tags not equals unsupported * Make not equals unsupported for performers criterion * Support equals/not equals for studio criterion * Fix marker scene tags equals filter * Fix scene performer tag filter * Make equals/not equals unsupported for hierarchical criterion * Use existing studio handler in movie * Hide unsupported tag modifier options * Use existing performer tags logic where possible * Restore old parent/child filter logic * Disable sub-tags in equals modifier for tags criterion
323 lines
7.8 KiB
Go
323 lines
7.8 KiB
Go
//go:build integration
|
|
// +build integration
|
|
|
|
package sqlite_test
|
|
|
|
import (
|
|
"context"
|
|
"strconv"
|
|
"testing"
|
|
|
|
"github.com/stashapp/stash/pkg/models"
|
|
"github.com/stashapp/stash/pkg/sliceutil/intslice"
|
|
"github.com/stashapp/stash/pkg/sliceutil/stringslice"
|
|
"github.com/stashapp/stash/pkg/sqlite"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestMarkerFindBySceneID(t *testing.T) {
|
|
withTxn(func(ctx context.Context) error {
|
|
mqb := sqlite.SceneMarkerReaderWriter
|
|
|
|
sceneID := sceneIDs[sceneIdxWithMarkers]
|
|
markers, err := mqb.FindBySceneID(ctx, sceneID)
|
|
|
|
if err != nil {
|
|
t.Errorf("Error finding markers: %s", err.Error())
|
|
}
|
|
|
|
assert.Greater(t, len(markers), 0)
|
|
for _, marker := range markers {
|
|
assert.Equal(t, sceneIDs[sceneIdxWithMarkers], int(marker.SceneID.Int64))
|
|
}
|
|
|
|
markers, err = mqb.FindBySceneID(ctx, 0)
|
|
|
|
if err != nil {
|
|
t.Errorf("Error finding marker: %s", err.Error())
|
|
}
|
|
|
|
assert.Len(t, markers, 0)
|
|
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func TestMarkerCountByTagID(t *testing.T) {
|
|
withTxn(func(ctx context.Context) error {
|
|
mqb := sqlite.SceneMarkerReaderWriter
|
|
|
|
markerCount, err := mqb.CountByTagID(ctx, tagIDs[tagIdxWithPrimaryMarkers])
|
|
|
|
if err != nil {
|
|
t.Errorf("error calling CountByTagID: %s", err.Error())
|
|
}
|
|
|
|
assert.Equal(t, 4, markerCount)
|
|
|
|
markerCount, err = mqb.CountByTagID(ctx, tagIDs[tagIdxWithMarkers])
|
|
|
|
if err != nil {
|
|
t.Errorf("error calling CountByTagID: %s", err.Error())
|
|
}
|
|
|
|
assert.Equal(t, 1, markerCount)
|
|
|
|
markerCount, err = mqb.CountByTagID(ctx, 0)
|
|
|
|
if err != nil {
|
|
t.Errorf("error calling CountByTagID: %s", err.Error())
|
|
}
|
|
|
|
assert.Equal(t, 0, markerCount)
|
|
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func TestMarkerQuerySortBySceneUpdated(t *testing.T) {
|
|
withTxn(func(ctx context.Context) error {
|
|
sort := "scenes_updated_at"
|
|
_, _, err := sqlite.SceneMarkerReaderWriter.Query(ctx, nil, &models.FindFilterType{
|
|
Sort: &sort,
|
|
})
|
|
|
|
if err != nil {
|
|
t.Errorf("Error querying scene markers: %s", err.Error())
|
|
}
|
|
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func TestMarkerQueryTags(t *testing.T) {
|
|
type test struct {
|
|
name string
|
|
markerFilter *models.SceneMarkerFilterType
|
|
findFilter *models.FindFilterType
|
|
}
|
|
|
|
withTxn(func(ctx context.Context) error {
|
|
testTags := func(m *models.SceneMarker, markerFilter *models.SceneMarkerFilterType) {
|
|
tagIDs, err := sqlite.SceneMarkerReaderWriter.GetTagIDs(ctx, m.ID)
|
|
if err != nil {
|
|
t.Errorf("error getting marker tag ids: %v", err)
|
|
}
|
|
if markerFilter.Tags.Modifier == models.CriterionModifierIsNull && len(tagIDs) > 0 {
|
|
t.Errorf("expected marker %d to have no tags - found %d", m.ID, len(tagIDs))
|
|
}
|
|
if markerFilter.Tags.Modifier == models.CriterionModifierNotNull && len(tagIDs) == 0 {
|
|
t.Errorf("expected marker %d to have tags - found 0", m.ID)
|
|
}
|
|
}
|
|
|
|
cases := []test{
|
|
{
|
|
"is null",
|
|
&models.SceneMarkerFilterType{
|
|
Tags: &models.HierarchicalMultiCriterionInput{
|
|
Modifier: models.CriterionModifierIsNull,
|
|
},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
"not null",
|
|
&models.SceneMarkerFilterType{
|
|
Tags: &models.HierarchicalMultiCriterionInput{
|
|
Modifier: models.CriterionModifierNotNull,
|
|
},
|
|
},
|
|
nil,
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
markers := queryMarkers(ctx, t, sqlite.SceneMarkerReaderWriter, tc.markerFilter, tc.findFilter)
|
|
assert.Greater(t, len(markers), 0)
|
|
for _, m := range markers {
|
|
testTags(m, tc.markerFilter)
|
|
}
|
|
})
|
|
}
|
|
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func TestMarkerQuerySceneTags(t *testing.T) {
|
|
type test struct {
|
|
name string
|
|
markerFilter *models.SceneMarkerFilterType
|
|
findFilter *models.FindFilterType
|
|
}
|
|
|
|
withTxn(func(ctx context.Context) error {
|
|
testTags := func(t *testing.T, m *models.SceneMarker, markerFilter *models.SceneMarkerFilterType) {
|
|
s, err := db.Scene.Find(ctx, int(m.SceneID.Int64))
|
|
if err != nil {
|
|
t.Errorf("error getting marker tag ids: %v", err)
|
|
return
|
|
}
|
|
|
|
if err := s.LoadTagIDs(ctx, db.Scene); err != nil {
|
|
t.Errorf("error getting marker tag ids: %v", err)
|
|
return
|
|
}
|
|
|
|
tagIDs := s.TagIDs.List()
|
|
values, _ := stringslice.StringSliceToIntSlice(markerFilter.SceneTags.Value)
|
|
switch markerFilter.SceneTags.Modifier {
|
|
case models.CriterionModifierIsNull:
|
|
if len(tagIDs) > 0 {
|
|
t.Errorf("expected marker %d to have no scene tags - found %d", m.ID, len(tagIDs))
|
|
}
|
|
case models.CriterionModifierNotNull:
|
|
if len(tagIDs) == 0 {
|
|
t.Errorf("expected marker %d to have scene tags - found 0", m.ID)
|
|
}
|
|
case models.CriterionModifierIncludes:
|
|
for _, v := range values {
|
|
assert.Contains(t, tagIDs, v)
|
|
}
|
|
case models.CriterionModifierExcludes:
|
|
for _, v := range values {
|
|
assert.NotContains(t, tagIDs, v)
|
|
}
|
|
case models.CriterionModifierEquals:
|
|
for _, v := range values {
|
|
assert.Contains(t, tagIDs, v)
|
|
}
|
|
assert.Len(t, tagIDs, len(values))
|
|
case models.CriterionModifierNotEquals:
|
|
foundAll := true
|
|
for _, v := range values {
|
|
if !intslice.IntInclude(tagIDs, v) {
|
|
foundAll = false
|
|
break
|
|
}
|
|
}
|
|
if foundAll && len(tagIDs) == len(values) {
|
|
t.Errorf("expected marker %d to have scene tags not equal to %v - found %v", m.ID, values, tagIDs)
|
|
}
|
|
}
|
|
}
|
|
|
|
cases := []test{
|
|
{
|
|
"is null",
|
|
&models.SceneMarkerFilterType{
|
|
SceneTags: &models.HierarchicalMultiCriterionInput{
|
|
Modifier: models.CriterionModifierIsNull,
|
|
},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
"not null",
|
|
&models.SceneMarkerFilterType{
|
|
SceneTags: &models.HierarchicalMultiCriterionInput{
|
|
Modifier: models.CriterionModifierNotNull,
|
|
},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
"includes",
|
|
&models.SceneMarkerFilterType{
|
|
SceneTags: &models.HierarchicalMultiCriterionInput{
|
|
Modifier: models.CriterionModifierIncludes,
|
|
Value: []string{
|
|
strconv.Itoa(tagIDs[tagIdx3WithScene]),
|
|
},
|
|
},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
"includes all",
|
|
&models.SceneMarkerFilterType{
|
|
SceneTags: &models.HierarchicalMultiCriterionInput{
|
|
Modifier: models.CriterionModifierIncludesAll,
|
|
Value: []string{
|
|
strconv.Itoa(tagIDs[tagIdx2WithScene]),
|
|
strconv.Itoa(tagIDs[tagIdx3WithScene]),
|
|
},
|
|
},
|
|
},
|
|
nil,
|
|
},
|
|
{
|
|
"equals",
|
|
&models.SceneMarkerFilterType{
|
|
SceneTags: &models.HierarchicalMultiCriterionInput{
|
|
Modifier: models.CriterionModifierEquals,
|
|
Value: []string{
|
|
strconv.Itoa(tagIDs[tagIdx2WithScene]),
|
|
strconv.Itoa(tagIDs[tagIdx3WithScene]),
|
|
},
|
|
},
|
|
},
|
|
nil,
|
|
},
|
|
// not equals not supported
|
|
// {
|
|
// "not equals",
|
|
// &models.SceneMarkerFilterType{
|
|
// SceneTags: &models.HierarchicalMultiCriterionInput{
|
|
// Modifier: models.CriterionModifierNotEquals,
|
|
// Value: []string{
|
|
// strconv.Itoa(tagIDs[tagIdx2WithScene]),
|
|
// strconv.Itoa(tagIDs[tagIdx3WithScene]),
|
|
// },
|
|
// },
|
|
// },
|
|
// nil,
|
|
// },
|
|
{
|
|
"excludes",
|
|
&models.SceneMarkerFilterType{
|
|
SceneTags: &models.HierarchicalMultiCriterionInput{
|
|
Modifier: models.CriterionModifierIncludes,
|
|
Value: []string{
|
|
strconv.Itoa(tagIDs[tagIdx2WithScene]),
|
|
},
|
|
},
|
|
},
|
|
nil,
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
markers := queryMarkers(ctx, t, sqlite.SceneMarkerReaderWriter, tc.markerFilter, tc.findFilter)
|
|
assert.Greater(t, len(markers), 0)
|
|
for _, m := range markers {
|
|
testTags(t, m, tc.markerFilter)
|
|
}
|
|
})
|
|
}
|
|
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func queryMarkers(ctx context.Context, t *testing.T, sqb models.SceneMarkerReader, markerFilter *models.SceneMarkerFilterType, findFilter *models.FindFilterType) []*models.SceneMarker {
|
|
t.Helper()
|
|
result, _, err := sqb.Query(ctx, markerFilter, findFilter)
|
|
if err != nil {
|
|
t.Errorf("Error querying markers: %v", err)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// TODO Update
|
|
// TODO Destroy
|
|
// TODO Find
|
|
// TODO GetMarkerStrings
|
|
// TODO Wall
|
|
// TODO Count
|
|
// TODO All
|
|
// TODO Query
|