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

Make hierarchical criterion depth input optional (#1733)

Browse Source
This commit is contained in:
WithoutPants
2021-09-16 20:41:07 +10:00
committed by GitHub
parent e0c910d9e8
commit 501ed7c2c2
11 changed files with 33 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/sqlite/gallery_test.go
View File

@@ -627,7 +627,6 @@ func TestGalleryQueryTags(t *testing.T) {
strconv.Itoa(tagIDs[tagIdx1WithGallery]),
},
Modifier: models.CriterionModifierIncludes,
Depth: 0,
}
galleryFilter := models.GalleryFilterType{
@@ -648,7 +647,6 @@ func TestGalleryQueryTags(t *testing.T) {
strconv.Itoa(tagIDs[tagIdx2WithGallery]),
},
Modifier: models.CriterionModifierIncludesAll,
Depth: 0,
}
galleries = queryGallery(t, sqb, &galleryFilter, nil)
@@ -661,7 +659,6 @@ func TestGalleryQueryTags(t *testing.T) {
strconv.Itoa(tagIDs[tagIdx1WithGallery]),
},
Modifier: models.CriterionModifierExcludes,
Depth: 0,
}
q := getGalleryStringValue(galleryIdxWithTwoTags, titleField)
@@ -684,7 +681,6 @@ func TestGalleryQueryStudio(t *testing.T) {
strconv.Itoa(studioIDs[studioIdxWithGallery]),
},
Modifier: models.CriterionModifierIncludes,
Depth: 0,
}
galleryFilter := models.GalleryFilterType{
@@ -703,7 +699,6 @@ func TestGalleryQueryStudio(t *testing.T) {
strconv.Itoa(studioIDs[studioIdxWithGallery]),
},
Modifier: models.CriterionModifierExcludes,
Depth: 0,
}
q := getGalleryStringValue(galleryIdxWithStudio, titleField)
@@ -721,12 +716,13 @@ func TestGalleryQueryStudio(t *testing.T) {
func TestGalleryQueryStudioDepth(t *testing.T) {
withTxn(func(r models.Repository) error {
sqb := r.Gallery()
depth := 2
studioCriterion := models.HierarchicalMultiCriterionInput{
Value: []string{
strconv.Itoa(studioIDs[studioIdxWithGrandChild]),
},
Modifier: models.CriterionModifierIncludes,
Depth: 2,
Depth: &depth,
}
galleryFilter := models.GalleryFilterType{
@@ -736,7 +732,7 @@ func TestGalleryQueryStudioDepth(t *testing.T) {
galleries := queryGallery(t, sqb, &galleryFilter, nil)
assert.Len(t, galleries, 1)
studioCriterion.Depth = 1
depth = 1
galleries = queryGallery(t, sqb, &galleryFilter, nil)
assert.Len(t, galleries, 0)
@@ -748,12 +744,14 @@ func TestGalleryQueryStudioDepth(t *testing.T) {
// ensure id is correct
assert.Equal(t, galleryIDs[galleryIdxWithGrandChildStudio], galleries[0].ID)
depth = 2
studioCriterion = models.HierarchicalMultiCriterionInput{
Value: []string{
strconv.Itoa(studioIDs[studioIdxWithGrandChild]),
},
Modifier: models.CriterionModifierExcludes,
Depth: 2,
Depth: &depth,
}
q := getGalleryStringValue(galleryIdxWithGrandChildStudio, pathField)
@@ -764,7 +762,7 @@ func TestGalleryQueryStudioDepth(t *testing.T) {
galleries = queryGallery(t, sqb, &galleryFilter, &findFilter)
assert.Len(t, galleries, 0)
studioCriterion.Depth = 1
depth = 1
galleries = queryGallery(t, sqb, &galleryFilter, &findFilter)
assert.Len(t, galleries, 1)
@@ -785,7 +783,6 @@ func TestGalleryQueryPerformerTags(t *testing.T) {
strconv.Itoa(tagIDs[tagIdx1WithPerformer]),
},
Modifier: models.CriterionModifierIncludes,
Depth: 0,
}
galleryFilter := models.GalleryFilterType{
@@ -806,7 +803,6 @@ func TestGalleryQueryPerformerTags(t *testing.T) {
strconv.Itoa(tagIDs[tagIdx2WithPerformer]),
},
Modifier: models.CriterionModifierIncludesAll,
Depth: 0,
}
galleries = queryGallery(t, sqb, &galleryFilter, nil)
@@ -819,7 +815,6 @@ func TestGalleryQueryPerformerTags(t *testing.T) {
strconv.Itoa(tagIDs[tagIdx1WithPerformer]),
},
Modifier: models.CriterionModifierExcludes,
Depth: 0,
}
q := getGalleryStringValue(galleryIdxWithPerformerTwoTags, titleField)