2021-09-08 05:30:15 +00:00
|
|
|
//go:build integration
|
2021-01-18 01:23:20 +00:00
|
|
|
// +build integration
|
|
|
|
|
|
|
|
package sqlite_test
|
|
|
|
|
|
|
|
import (
|
|
|
|
"database/sql"
|
|
|
|
"strconv"
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
|
|
|
|
"github.com/stashapp/stash/pkg/models"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestImageFind(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
// assume that the first image is imageWithGalleryPath
|
|
|
|
sqb := r.Image()
|
|
|
|
|
|
|
|
const imageIdx = 0
|
|
|
|
imageID := imageIDs[imageIdx]
|
|
|
|
image, err := sqb.Find(imageID)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error finding image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Equal(t, getImageStringValue(imageIdx, "Path"), image.Path)
|
|
|
|
|
|
|
|
imageID = 0
|
|
|
|
image, err = sqb.Find(imageID)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error finding image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Nil(t, image)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageFindByPath(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
|
|
|
|
const imageIdx = 1
|
|
|
|
imagePath := getImageStringValue(imageIdx, "Path")
|
|
|
|
image, err := sqb.FindByPath(imagePath)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error finding image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Equal(t, imageIDs[imageIdx], image.ID)
|
|
|
|
assert.Equal(t, imagePath, image.Path)
|
|
|
|
|
|
|
|
imagePath = "not exist"
|
|
|
|
image, err = sqb.FindByPath(imagePath)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error finding image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Nil(t, image)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-12-06 01:30:40 +00:00
|
|
|
func TestImageFindByGalleryID(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
|
|
|
|
images, err := sqb.FindByGalleryID(galleryIDs[galleryIdxWithTwoImages])
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error finding images: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, images, 2)
|
|
|
|
assert.Equal(t, imageIDs[imageIdx1WithGallery], images[0].ID)
|
|
|
|
assert.Equal(t, imageIDs[imageIdx2WithGallery], images[1].ID)
|
|
|
|
|
|
|
|
images, err = sqb.FindByGalleryID(galleryIDs[galleryIdxWithScene])
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error finding images: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
func TestImageQueryQ(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
const imageIdx = 2
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdx, titleField)
|
|
|
|
|
|
|
|
sqb := r.Image()
|
|
|
|
|
|
|
|
imageQueryQ(t, sqb, q, imageIdx)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
func queryImagesWithCount(sqb models.ImageReader, imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) ([]*models.Image, int, error) {
|
|
|
|
result, err := sqb.Query(models.ImageQueryOptions{
|
|
|
|
QueryOptions: models.QueryOptions{
|
|
|
|
FindFilter: findFilter,
|
|
|
|
Count: true,
|
|
|
|
},
|
|
|
|
ImageFilter: imageFilter,
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return nil, 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
images, err := result.Resolve()
|
|
|
|
if err != nil {
|
|
|
|
return nil, 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return images, result.Count, nil
|
|
|
|
}
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
func imageQueryQ(t *testing.T, sqb models.ImageReader, q string, expectedImageIdx int) {
|
|
|
|
filter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
2021-10-25 00:40:13 +00:00
|
|
|
images := queryImages(t, sqb, nil, &filter)
|
2021-01-18 01:23:20 +00:00
|
|
|
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
image := images[0]
|
|
|
|
assert.Equal(t, imageIDs[expectedImageIdx], image.ID)
|
|
|
|
|
2021-04-15 00:46:31 +00:00
|
|
|
count, err := sqb.QueryCount(nil, &filter)
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
assert.Equal(t, len(images), count)
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
// no Q should return all results
|
|
|
|
filter.Q = nil
|
2021-10-25 00:40:13 +00:00
|
|
|
images = queryImages(t, sqb, nil, &filter)
|
2021-01-18 01:23:20 +00:00
|
|
|
|
|
|
|
assert.Len(t, images, totalImages)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryPath(t *testing.T) {
|
|
|
|
const imageIdx = 1
|
|
|
|
imagePath := getImageStringValue(imageIdx, "Path")
|
|
|
|
|
|
|
|
pathCriterion := models.StringCriterionInput{
|
|
|
|
Value: imagePath,
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
}
|
|
|
|
|
2021-02-01 20:57:56 +00:00
|
|
|
verifyImagePath(t, pathCriterion, 1)
|
2021-01-18 01:23:20 +00:00
|
|
|
|
|
|
|
pathCriterion.Modifier = models.CriterionModifierNotEquals
|
2021-02-01 20:57:56 +00:00
|
|
|
verifyImagePath(t, pathCriterion, totalImages-1)
|
|
|
|
|
|
|
|
pathCriterion.Modifier = models.CriterionModifierMatchesRegex
|
2021-04-20 06:48:36 +00:00
|
|
|
pathCriterion.Value = "image_.*01_Path"
|
2021-02-01 20:57:56 +00:00
|
|
|
verifyImagePath(t, pathCriterion, 1) // TODO - 2 if zip path is included
|
|
|
|
|
|
|
|
pathCriterion.Modifier = models.CriterionModifierNotMatchesRegex
|
|
|
|
verifyImagePath(t, pathCriterion, totalImages-1) // TODO - -2 if zip path is included
|
2021-01-18 01:23:20 +00:00
|
|
|
}
|
|
|
|
|
2021-02-01 20:57:56 +00:00
|
|
|
func verifyImagePath(t *testing.T, pathCriterion models.StringCriterionInput, expected int) {
|
2021-01-18 01:23:20 +00:00
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
Path: &pathCriterion,
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
2021-01-18 01:23:20 +00:00
|
|
|
|
2021-02-01 20:57:56 +00:00
|
|
|
assert.Equal(t, expected, len(images), "number of returned images")
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
for _, image := range images {
|
|
|
|
verifyString(t, image.Path, pathCriterion)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-05-03 03:09:46 +00:00
|
|
|
func TestImageQueryPathOr(t *testing.T) {
|
|
|
|
const image1Idx = 1
|
|
|
|
const image2Idx = 2
|
|
|
|
|
|
|
|
image1Path := getImageStringValue(image1Idx, "Path")
|
|
|
|
image2Path := getImageStringValue(image2Idx, "Path")
|
|
|
|
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
Path: &models.StringCriterionInput{
|
|
|
|
Value: image1Path,
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
},
|
|
|
|
Or: &models.ImageFilterType{
|
|
|
|
Path: &models.StringCriterionInput{
|
|
|
|
Value: image2Path,
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
|
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
|
|
|
|
|
|
|
assert.Len(t, images, 2)
|
|
|
|
assert.Equal(t, image1Path, images[0].Path)
|
|
|
|
assert.Equal(t, image2Path, images[1].Path)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryPathAndRating(t *testing.T) {
|
|
|
|
const imageIdx = 1
|
|
|
|
imagePath := getImageStringValue(imageIdx, "Path")
|
|
|
|
imageRating := getRating(imageIdx)
|
|
|
|
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
Path: &models.StringCriterionInput{
|
|
|
|
Value: imagePath,
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
},
|
|
|
|
And: &models.ImageFilterType{
|
|
|
|
Rating: &models.IntCriterionInput{
|
|
|
|
Value: int(imageRating.Int64),
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
|
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
|
|
|
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imagePath, images[0].Path)
|
|
|
|
assert.Equal(t, imageRating.Int64, images[0].Rating.Int64)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryPathNotRating(t *testing.T) {
|
|
|
|
const imageIdx = 1
|
|
|
|
|
|
|
|
imageRating := getRating(imageIdx)
|
|
|
|
|
|
|
|
pathCriterion := models.StringCriterionInput{
|
|
|
|
Value: "image_.*1_Path",
|
|
|
|
Modifier: models.CriterionModifierMatchesRegex,
|
|
|
|
}
|
|
|
|
|
|
|
|
ratingCriterion := models.IntCriterionInput{
|
|
|
|
Value: int(imageRating.Int64),
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
}
|
|
|
|
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
Path: &pathCriterion,
|
|
|
|
Not: &models.ImageFilterType{
|
|
|
|
Rating: &ratingCriterion,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
|
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
|
|
|
|
|
|
|
for _, image := range images {
|
|
|
|
verifyString(t, image.Path, pathCriterion)
|
|
|
|
ratingCriterion.Modifier = models.CriterionModifierNotEquals
|
|
|
|
verifyInt64(t, image.Rating, ratingCriterion)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageIllegalQuery(t *testing.T) {
|
|
|
|
assert := assert.New(t)
|
|
|
|
|
|
|
|
const imageIdx = 1
|
|
|
|
subFilter := models.ImageFilterType{
|
|
|
|
Path: &models.StringCriterionInput{
|
|
|
|
Value: getImageStringValue(imageIdx, "Path"),
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
imageFilter := &models.ImageFilterType{
|
|
|
|
And: &subFilter,
|
|
|
|
Or: &subFilter,
|
|
|
|
}
|
|
|
|
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
_, _, err := queryImagesWithCount(sqb, imageFilter, nil)
|
2021-05-03 03:09:46 +00:00
|
|
|
assert.NotNil(err)
|
|
|
|
|
|
|
|
imageFilter.Or = nil
|
|
|
|
imageFilter.Not = &subFilter
|
2021-10-25 00:40:13 +00:00
|
|
|
_, _, err = queryImagesWithCount(sqb, imageFilter, nil)
|
2021-05-03 03:09:46 +00:00
|
|
|
assert.NotNil(err)
|
|
|
|
|
|
|
|
imageFilter.And = nil
|
|
|
|
imageFilter.Or = &subFilter
|
2021-10-25 00:40:13 +00:00
|
|
|
_, _, err = queryImagesWithCount(sqb, imageFilter, nil)
|
2021-05-03 03:09:46 +00:00
|
|
|
assert.NotNil(err)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
func TestImageQueryRating(t *testing.T) {
|
|
|
|
const rating = 3
|
|
|
|
ratingCriterion := models.IntCriterionInput{
|
|
|
|
Value: rating,
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
}
|
|
|
|
|
|
|
|
verifyImagesRating(t, ratingCriterion)
|
|
|
|
|
|
|
|
ratingCriterion.Modifier = models.CriterionModifierNotEquals
|
|
|
|
verifyImagesRating(t, ratingCriterion)
|
|
|
|
|
|
|
|
ratingCriterion.Modifier = models.CriterionModifierGreaterThan
|
|
|
|
verifyImagesRating(t, ratingCriterion)
|
|
|
|
|
|
|
|
ratingCriterion.Modifier = models.CriterionModifierLessThan
|
|
|
|
verifyImagesRating(t, ratingCriterion)
|
|
|
|
|
|
|
|
ratingCriterion.Modifier = models.CriterionModifierIsNull
|
|
|
|
verifyImagesRating(t, ratingCriterion)
|
|
|
|
|
|
|
|
ratingCriterion.Modifier = models.CriterionModifierNotNull
|
|
|
|
verifyImagesRating(t, ratingCriterion)
|
|
|
|
}
|
|
|
|
|
|
|
|
func verifyImagesRating(t *testing.T, ratingCriterion models.IntCriterionInput) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
Rating: &ratingCriterion,
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, &imageFilter, nil)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, image := range images {
|
|
|
|
verifyInt64(t, image.Rating, ratingCriterion)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryOCounter(t *testing.T) {
|
|
|
|
const oCounter = 1
|
|
|
|
oCounterCriterion := models.IntCriterionInput{
|
|
|
|
Value: oCounter,
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
}
|
|
|
|
|
|
|
|
verifyImagesOCounter(t, oCounterCriterion)
|
|
|
|
|
|
|
|
oCounterCriterion.Modifier = models.CriterionModifierNotEquals
|
|
|
|
verifyImagesOCounter(t, oCounterCriterion)
|
|
|
|
|
|
|
|
oCounterCriterion.Modifier = models.CriterionModifierGreaterThan
|
|
|
|
verifyImagesOCounter(t, oCounterCriterion)
|
|
|
|
|
|
|
|
oCounterCriterion.Modifier = models.CriterionModifierLessThan
|
|
|
|
verifyImagesOCounter(t, oCounterCriterion)
|
|
|
|
}
|
|
|
|
|
|
|
|
func verifyImagesOCounter(t *testing.T, oCounterCriterion models.IntCriterionInput) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
OCounter: &oCounterCriterion,
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, &imageFilter, nil)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, image := range images {
|
|
|
|
verifyInt(t, image.OCounter, oCounterCriterion)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryResolution(t *testing.T) {
|
|
|
|
verifyImagesResolution(t, models.ResolutionEnumLow)
|
|
|
|
verifyImagesResolution(t, models.ResolutionEnumStandard)
|
|
|
|
verifyImagesResolution(t, models.ResolutionEnumStandardHd)
|
|
|
|
verifyImagesResolution(t, models.ResolutionEnumFullHd)
|
|
|
|
verifyImagesResolution(t, models.ResolutionEnumFourK)
|
|
|
|
verifyImagesResolution(t, models.ResolutionEnum("unknown"))
|
|
|
|
}
|
|
|
|
|
|
|
|
func verifyImagesResolution(t *testing.T, resolution models.ResolutionEnum) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
imageFilter := models.ImageFilterType{
|
2021-08-02 03:22:39 +00:00
|
|
|
Resolution: &models.ResolutionCriterionInput{
|
|
|
|
Value: resolution,
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
},
|
2021-01-18 01:23:20 +00:00
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, &imageFilter, nil)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, image := range images {
|
|
|
|
verifyImageResolution(t, image.Height, resolution)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func verifyImageResolution(t *testing.T, height sql.NullInt64, resolution models.ResolutionEnum) {
|
|
|
|
assert := assert.New(t)
|
|
|
|
h := height.Int64
|
|
|
|
|
|
|
|
switch resolution {
|
|
|
|
case models.ResolutionEnumLow:
|
|
|
|
assert.True(h < 480)
|
|
|
|
case models.ResolutionEnumStandard:
|
|
|
|
assert.True(h >= 480 && h < 720)
|
|
|
|
case models.ResolutionEnumStandardHd:
|
|
|
|
assert.True(h >= 720 && h < 1080)
|
|
|
|
case models.ResolutionEnumFullHd:
|
|
|
|
assert.True(h >= 1080 && h < 2160)
|
|
|
|
case models.ResolutionEnumFourK:
|
|
|
|
assert.True(h >= 2160)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryIsMissingGalleries(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
isMissing := "galleries"
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
IsMissing: &isMissing,
|
|
|
|
}
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdxWithGallery, titleField)
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
findFilter.Q = nil
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err = queryImagesWithCount(sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
2021-12-15 02:56:03 +00:00
|
|
|
assert.Greater(t, len(images), 0)
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
// ensure non of the ids equal the one with gallery
|
|
|
|
for _, image := range images {
|
|
|
|
assert.NotEqual(t, imageIDs[imageIdxWithGallery], image.ID)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryIsMissingStudio(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
isMissing := "studio"
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
IsMissing: &isMissing,
|
|
|
|
}
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdxWithStudio, titleField)
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
findFilter.Q = nil
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err = queryImagesWithCount(sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
// ensure non of the ids equal the one with studio
|
|
|
|
for _, image := range images {
|
|
|
|
assert.NotEqual(t, imageIDs[imageIdxWithStudio], image.ID)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryIsMissingPerformers(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
isMissing := "performers"
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
IsMissing: &isMissing,
|
|
|
|
}
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdxWithPerformer, titleField)
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
findFilter.Q = nil
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err = queryImagesWithCount(sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.True(t, len(images) > 0)
|
|
|
|
|
|
|
|
// ensure non of the ids equal the one with movies
|
|
|
|
for _, image := range images {
|
|
|
|
assert.NotEqual(t, imageIDs[imageIdxWithPerformer], image.ID)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryIsMissingTags(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
isMissing := "tags"
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
IsMissing: &isMissing,
|
|
|
|
}
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdxWithTwoTags, titleField)
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
findFilter.Q = nil
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err = queryImagesWithCount(sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.True(t, len(images) > 0)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryIsMissingRating(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
isMissing := "rating"
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
IsMissing: &isMissing,
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, &imageFilter, nil)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.True(t, len(images) > 0)
|
|
|
|
|
|
|
|
// ensure date is null, empty or "0001-01-01"
|
|
|
|
for _, image := range images {
|
|
|
|
assert.True(t, !image.Rating.Valid)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-05-03 03:09:46 +00:00
|
|
|
func TestImageQueryGallery(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
galleryCriterion := models.MultiCriterionInput{
|
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(galleryIDs[galleryIdxWithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierIncludes,
|
|
|
|
}
|
|
|
|
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
Galleries: &galleryCriterion,
|
|
|
|
}
|
|
|
|
|
2021-12-15 02:56:03 +00:00
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
2021-05-03 03:09:46 +00:00
|
|
|
assert.Len(t, images, 1)
|
|
|
|
|
|
|
|
// ensure ids are correct
|
|
|
|
for _, image := range images {
|
|
|
|
assert.True(t, image.ID == imageIDs[imageIdxWithGallery])
|
|
|
|
}
|
|
|
|
|
|
|
|
galleryCriterion = models.MultiCriterionInput{
|
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(galleryIDs[galleryIdx1WithImage]),
|
|
|
|
strconv.Itoa(galleryIDs[galleryIdx2WithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierIncludesAll,
|
|
|
|
}
|
|
|
|
|
2021-12-15 02:56:03 +00:00
|
|
|
images = queryImages(t, sqb, &imageFilter, nil)
|
2021-05-03 03:09:46 +00:00
|
|
|
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithTwoGalleries], images[0].ID)
|
|
|
|
|
|
|
|
galleryCriterion = models.MultiCriterionInput{
|
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(performerIDs[galleryIdx1WithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierExcludes,
|
|
|
|
}
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdxWithTwoGalleries, titleField)
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
|
|
|
|
2021-12-15 02:56:03 +00:00
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
2021-05-03 03:09:46 +00:00
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
2021-12-15 02:56:03 +00:00
|
|
|
q = getImageStringValue(imageIdxWithPerformer, titleField)
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
|
2021-05-03 03:09:46 +00:00
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
func TestImageQueryPerformers(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
performerCriterion := models.MultiCriterionInput{
|
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(performerIDs[performerIdxWithImage]),
|
|
|
|
strconv.Itoa(performerIDs[performerIdx1WithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierIncludes,
|
|
|
|
}
|
|
|
|
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
Performers: &performerCriterion,
|
|
|
|
}
|
|
|
|
|
2021-11-06 22:34:33 +00:00
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
2021-01-18 01:23:20 +00:00
|
|
|
assert.Len(t, images, 2)
|
|
|
|
|
|
|
|
// ensure ids are correct
|
|
|
|
for _, image := range images {
|
|
|
|
assert.True(t, image.ID == imageIDs[imageIdxWithPerformer] || image.ID == imageIDs[imageIdxWithTwoPerformers])
|
|
|
|
}
|
|
|
|
|
|
|
|
performerCriterion = models.MultiCriterionInput{
|
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(performerIDs[performerIdx1WithImage]),
|
|
|
|
strconv.Itoa(performerIDs[performerIdx2WithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierIncludesAll,
|
|
|
|
}
|
|
|
|
|
2021-11-06 22:34:33 +00:00
|
|
|
images = queryImages(t, sqb, &imageFilter, nil)
|
2021-01-18 01:23:20 +00:00
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithTwoPerformers], images[0].ID)
|
|
|
|
|
|
|
|
performerCriterion = models.MultiCriterionInput{
|
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(performerIDs[performerIdx1WithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierExcludes,
|
|
|
|
}
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdxWithTwoPerformers, titleField)
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
|
|
|
|
2021-11-06 22:34:33 +00:00
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
performerCriterion = models.MultiCriterionInput{
|
|
|
|
Modifier: models.CriterionModifierIsNull,
|
2021-01-18 01:23:20 +00:00
|
|
|
}
|
2021-11-06 22:34:33 +00:00
|
|
|
q = getImageStringValue(imageIdxWithGallery, titleField)
|
|
|
|
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithGallery], images[0].ID)
|
|
|
|
|
|
|
|
q = getImageStringValue(imageIdxWithPerformerTag, titleField)
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
performerCriterion.Modifier = models.CriterionModifierNotNull
|
|
|
|
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithPerformerTag], images[0].ID)
|
|
|
|
|
|
|
|
q = getImageStringValue(imageIdxWithGallery, titleField)
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryTags(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
Tag hierarchy (#1519)
* Add migration script for tag relations table
* Expand hierarchical filter features
Expand the features of the hierarchical multi input filter with support
for using a relations table, which only has parent_id and child_id
columns, and support adding an additional intermediate table to join on,
for example for scenes and tags which are linked by the scenes_tags
table as well.
* Add hierarchical filtering for tags
* Add hierarchical tags support to scene markers
Refactor filtering of scene markers to filterBuilder and in the process
add support for hierarchical tags as well.
* List parent and child tags on tag details page
* Support setting parent and child tags
Add support for setting parent and child tags during tag creation and
tag updates.
* Validate no loops are created in tags hierarchy
* Update tag merging to support tag hierarcy
* Add unit tests for tags.EnsureUniqueHierarchy
* Fix applying recursive to with clause
The SQL `RECURSIVE` of a `WITH` clause only needs to be applied once,
imediately after the `WITH`. So this fixes the query building to do just
that, automatically applying the `RECURSIVE` keyword when any added with
clause is added as recursive.
* Rename hierarchical root id column
* Rewrite hierarchical filtering for performance
Completely rewrite the hierarchical filtering to optimize for
performance. Doing the recursive query in combination with a complex
query seems to break SQLite optimizing some things which means that the
recursive part might be 2,5 second slower than adding a static
`VALUES()` list. This is mostly noticable in case of the tag hierarchy
where setting an exclusion with any depth (or depth: all) being applied
has this performance impact of 2,5 second. "Include" also suffered this
issue, but some rewritten query by joining in the *_tags table in one
pass and applying a `WHERE x IS NOT NULL` filter did seem to optimize
that case. But that optimization isn't applied to the `IS NULL` filter
of "exclude". Running a simple query beforehand to get all (recursive)
items and then applying them to the query doesn't have this performance
penalty.
* Remove UI references to child studios and tags
* Add parents to tag export
* Support importing of parent relationship for tags
* Assign stable ids to parent / child badges
* Silence Apollo warning on parents/children fields on tags
Silence warning triggered by Apollo GraphQL by explicitly instructing it
to use the incoming parents/children values. By default it already does
this, but it triggers a warning as it might be unintended that it uses
the incoming values (instead of for example merging both arrays).
Setting merge to false still applies the same behaviour (use only
incoming values) but silences the warning as it's explicitly configured
to work like this.
* Rework detecting unique tag hierarchy
Completely rework the unique tag hierarchy to detect invalid hierarchies
for which a tag is "added in the middle". So when there are tags A <- B
and A <- C, you could previously edit tag B and add tag C as a sub tag
without it being noticed as parent A being applied twice (to tag C).
While afterwards saving tag C would fail as tag A was applied as parent
twice. The updated code correctly detects this scenario as well.
Furthermore the error messaging has been reworked a bit and the message
now mentions both the direct parent / sub tag as well as the tag which
would results in the error. So in aboves example it would now show the
message that tag C can't be applied because tag A already is a parent.
* Update relations on cached tags when needed
Update the relations on cached tags when a tag is created / updated /
deleted so these always reflect the correct state. Otherwise (re)opening
a tag might still show the old relations untill the page is fully
reloaded or the list is navigated. But this obviously is strange when
you for example have tag A, create or update tag B to have a relation to
tag A, and from tags B page click through to tag A and it doesn't show
that it is linked to tag B.
2021-09-09 04:58:43 +00:00
|
|
|
tagCriterion := models.HierarchicalMultiCriterionInput{
|
2021-01-18 01:23:20 +00:00
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(tagIDs[tagIdxWithImage]),
|
|
|
|
strconv.Itoa(tagIDs[tagIdx1WithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierIncludes,
|
|
|
|
}
|
|
|
|
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
Tags: &tagCriterion,
|
|
|
|
}
|
|
|
|
|
2021-11-06 22:34:33 +00:00
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
2021-01-18 01:23:20 +00:00
|
|
|
assert.Len(t, images, 2)
|
|
|
|
|
|
|
|
// ensure ids are correct
|
|
|
|
for _, image := range images {
|
|
|
|
assert.True(t, image.ID == imageIDs[imageIdxWithTag] || image.ID == imageIDs[imageIdxWithTwoTags])
|
|
|
|
}
|
|
|
|
|
Tag hierarchy (#1519)
* Add migration script for tag relations table
* Expand hierarchical filter features
Expand the features of the hierarchical multi input filter with support
for using a relations table, which only has parent_id and child_id
columns, and support adding an additional intermediate table to join on,
for example for scenes and tags which are linked by the scenes_tags
table as well.
* Add hierarchical filtering for tags
* Add hierarchical tags support to scene markers
Refactor filtering of scene markers to filterBuilder and in the process
add support for hierarchical tags as well.
* List parent and child tags on tag details page
* Support setting parent and child tags
Add support for setting parent and child tags during tag creation and
tag updates.
* Validate no loops are created in tags hierarchy
* Update tag merging to support tag hierarcy
* Add unit tests for tags.EnsureUniqueHierarchy
* Fix applying recursive to with clause
The SQL `RECURSIVE` of a `WITH` clause only needs to be applied once,
imediately after the `WITH`. So this fixes the query building to do just
that, automatically applying the `RECURSIVE` keyword when any added with
clause is added as recursive.
* Rename hierarchical root id column
* Rewrite hierarchical filtering for performance
Completely rewrite the hierarchical filtering to optimize for
performance. Doing the recursive query in combination with a complex
query seems to break SQLite optimizing some things which means that the
recursive part might be 2,5 second slower than adding a static
`VALUES()` list. This is mostly noticable in case of the tag hierarchy
where setting an exclusion with any depth (or depth: all) being applied
has this performance impact of 2,5 second. "Include" also suffered this
issue, but some rewritten query by joining in the *_tags table in one
pass and applying a `WHERE x IS NOT NULL` filter did seem to optimize
that case. But that optimization isn't applied to the `IS NULL` filter
of "exclude". Running a simple query beforehand to get all (recursive)
items and then applying them to the query doesn't have this performance
penalty.
* Remove UI references to child studios and tags
* Add parents to tag export
* Support importing of parent relationship for tags
* Assign stable ids to parent / child badges
* Silence Apollo warning on parents/children fields on tags
Silence warning triggered by Apollo GraphQL by explicitly instructing it
to use the incoming parents/children values. By default it already does
this, but it triggers a warning as it might be unintended that it uses
the incoming values (instead of for example merging both arrays).
Setting merge to false still applies the same behaviour (use only
incoming values) but silences the warning as it's explicitly configured
to work like this.
* Rework detecting unique tag hierarchy
Completely rework the unique tag hierarchy to detect invalid hierarchies
for which a tag is "added in the middle". So when there are tags A <- B
and A <- C, you could previously edit tag B and add tag C as a sub tag
without it being noticed as parent A being applied twice (to tag C).
While afterwards saving tag C would fail as tag A was applied as parent
twice. The updated code correctly detects this scenario as well.
Furthermore the error messaging has been reworked a bit and the message
now mentions both the direct parent / sub tag as well as the tag which
would results in the error. So in aboves example it would now show the
message that tag C can't be applied because tag A already is a parent.
* Update relations on cached tags when needed
Update the relations on cached tags when a tag is created / updated /
deleted so these always reflect the correct state. Otherwise (re)opening
a tag might still show the old relations untill the page is fully
reloaded or the list is navigated. But this obviously is strange when
you for example have tag A, create or update tag B to have a relation to
tag A, and from tags B page click through to tag A and it doesn't show
that it is linked to tag B.
2021-09-09 04:58:43 +00:00
|
|
|
tagCriterion = models.HierarchicalMultiCriterionInput{
|
2021-01-18 01:23:20 +00:00
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(tagIDs[tagIdx1WithImage]),
|
|
|
|
strconv.Itoa(tagIDs[tagIdx2WithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierIncludesAll,
|
|
|
|
}
|
|
|
|
|
2021-11-06 22:34:33 +00:00
|
|
|
images = queryImages(t, sqb, &imageFilter, nil)
|
2021-01-18 01:23:20 +00:00
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithTwoTags], images[0].ID)
|
|
|
|
|
Tag hierarchy (#1519)
* Add migration script for tag relations table
* Expand hierarchical filter features
Expand the features of the hierarchical multi input filter with support
for using a relations table, which only has parent_id and child_id
columns, and support adding an additional intermediate table to join on,
for example for scenes and tags which are linked by the scenes_tags
table as well.
* Add hierarchical filtering for tags
* Add hierarchical tags support to scene markers
Refactor filtering of scene markers to filterBuilder and in the process
add support for hierarchical tags as well.
* List parent and child tags on tag details page
* Support setting parent and child tags
Add support for setting parent and child tags during tag creation and
tag updates.
* Validate no loops are created in tags hierarchy
* Update tag merging to support tag hierarcy
* Add unit tests for tags.EnsureUniqueHierarchy
* Fix applying recursive to with clause
The SQL `RECURSIVE` of a `WITH` clause only needs to be applied once,
imediately after the `WITH`. So this fixes the query building to do just
that, automatically applying the `RECURSIVE` keyword when any added with
clause is added as recursive.
* Rename hierarchical root id column
* Rewrite hierarchical filtering for performance
Completely rewrite the hierarchical filtering to optimize for
performance. Doing the recursive query in combination with a complex
query seems to break SQLite optimizing some things which means that the
recursive part might be 2,5 second slower than adding a static
`VALUES()` list. This is mostly noticable in case of the tag hierarchy
where setting an exclusion with any depth (or depth: all) being applied
has this performance impact of 2,5 second. "Include" also suffered this
issue, but some rewritten query by joining in the *_tags table in one
pass and applying a `WHERE x IS NOT NULL` filter did seem to optimize
that case. But that optimization isn't applied to the `IS NULL` filter
of "exclude". Running a simple query beforehand to get all (recursive)
items and then applying them to the query doesn't have this performance
penalty.
* Remove UI references to child studios and tags
* Add parents to tag export
* Support importing of parent relationship for tags
* Assign stable ids to parent / child badges
* Silence Apollo warning on parents/children fields on tags
Silence warning triggered by Apollo GraphQL by explicitly instructing it
to use the incoming parents/children values. By default it already does
this, but it triggers a warning as it might be unintended that it uses
the incoming values (instead of for example merging both arrays).
Setting merge to false still applies the same behaviour (use only
incoming values) but silences the warning as it's explicitly configured
to work like this.
* Rework detecting unique tag hierarchy
Completely rework the unique tag hierarchy to detect invalid hierarchies
for which a tag is "added in the middle". So when there are tags A <- B
and A <- C, you could previously edit tag B and add tag C as a sub tag
without it being noticed as parent A being applied twice (to tag C).
While afterwards saving tag C would fail as tag A was applied as parent
twice. The updated code correctly detects this scenario as well.
Furthermore the error messaging has been reworked a bit and the message
now mentions both the direct parent / sub tag as well as the tag which
would results in the error. So in aboves example it would now show the
message that tag C can't be applied because tag A already is a parent.
* Update relations on cached tags when needed
Update the relations on cached tags when a tag is created / updated /
deleted so these always reflect the correct state. Otherwise (re)opening
a tag might still show the old relations untill the page is fully
reloaded or the list is navigated. But this obviously is strange when
you for example have tag A, create or update tag B to have a relation to
tag A, and from tags B page click through to tag A and it doesn't show
that it is linked to tag B.
2021-09-09 04:58:43 +00:00
|
|
|
tagCriterion = models.HierarchicalMultiCriterionInput{
|
2021-01-18 01:23:20 +00:00
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(tagIDs[tagIdx1WithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierExcludes,
|
|
|
|
}
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdxWithTwoTags, titleField)
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
|
|
|
|
2021-11-06 22:34:33 +00:00
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
tagCriterion = models.HierarchicalMultiCriterionInput{
|
|
|
|
Modifier: models.CriterionModifierIsNull,
|
2021-01-18 01:23:20 +00:00
|
|
|
}
|
2021-11-06 22:34:33 +00:00
|
|
|
q = getImageStringValue(imageIdxWithGallery, titleField)
|
|
|
|
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithGallery], images[0].ID)
|
|
|
|
|
|
|
|
q = getImageStringValue(imageIdxWithTag, titleField)
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
tagCriterion.Modifier = models.CriterionModifierNotNull
|
|
|
|
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithTag], images[0].ID)
|
|
|
|
|
|
|
|
q = getImageStringValue(imageIdxWithGallery, titleField)
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryStudio(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
2021-06-03 10:52:19 +00:00
|
|
|
studioCriterion := models.HierarchicalMultiCriterionInput{
|
2021-01-18 01:23:20 +00:00
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(studioIDs[studioIdxWithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierIncludes,
|
|
|
|
}
|
|
|
|
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
Studios: &studioCriterion,
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, &imageFilter, nil)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
|
|
|
|
// ensure id is correct
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithStudio], images[0].ID)
|
|
|
|
|
2021-06-03 10:52:19 +00:00
|
|
|
studioCriterion = models.HierarchicalMultiCriterionInput{
|
2021-01-18 01:23:20 +00:00
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(studioIDs[studioIdxWithImage]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierExcludes,
|
|
|
|
}
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdxWithStudio, titleField)
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err = queryImagesWithCount(sqb, &imageFilter, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-06-03 10:52:19 +00:00
|
|
|
func TestImageQueryStudioDepth(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
2021-09-16 10:41:07 +00:00
|
|
|
depth := 2
|
2021-06-03 10:52:19 +00:00
|
|
|
studioCriterion := models.HierarchicalMultiCriterionInput{
|
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(studioIDs[studioIdxWithGrandChild]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierIncludes,
|
2021-09-16 10:41:07 +00:00
|
|
|
Depth: &depth,
|
2021-06-03 10:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
Studios: &studioCriterion,
|
|
|
|
}
|
|
|
|
|
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
|
2021-09-16 10:41:07 +00:00
|
|
|
depth = 1
|
2021-06-03 10:52:19 +00:00
|
|
|
|
|
|
|
images = queryImages(t, sqb, &imageFilter, nil)
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
studioCriterion.Value = []string{strconv.Itoa(studioIDs[studioIdxWithParentAndChild])}
|
|
|
|
images = queryImages(t, sqb, &imageFilter, nil)
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
|
|
|
|
// ensure id is correct
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithGrandChildStudio], images[0].ID)
|
|
|
|
|
2021-09-16 10:41:07 +00:00
|
|
|
depth = 2
|
|
|
|
|
2021-06-03 10:52:19 +00:00
|
|
|
studioCriterion = models.HierarchicalMultiCriterionInput{
|
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(studioIDs[studioIdxWithGrandChild]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierExcludes,
|
2021-09-16 10:41:07 +00:00
|
|
|
Depth: &depth,
|
2021-06-03 10:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdxWithGrandChildStudio, titleField)
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
|
|
|
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
2021-09-16 10:41:07 +00:00
|
|
|
depth = 1
|
2021-06-03 10:52:19 +00:00
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
|
|
|
|
studioCriterion.Value = []string{strconv.Itoa(studioIDs[studioIdxWithParentAndChild])}
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-03-10 01:25:51 +00:00
|
|
|
func queryImages(t *testing.T, sqb models.ImageReader, imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) []*models.Image {
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, imageFilter, findFilter)
|
2021-03-10 01:25:51 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying images: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
return images
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryPerformerTags(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
Tag hierarchy (#1519)
* Add migration script for tag relations table
* Expand hierarchical filter features
Expand the features of the hierarchical multi input filter with support
for using a relations table, which only has parent_id and child_id
columns, and support adding an additional intermediate table to join on,
for example for scenes and tags which are linked by the scenes_tags
table as well.
* Add hierarchical filtering for tags
* Add hierarchical tags support to scene markers
Refactor filtering of scene markers to filterBuilder and in the process
add support for hierarchical tags as well.
* List parent and child tags on tag details page
* Support setting parent and child tags
Add support for setting parent and child tags during tag creation and
tag updates.
* Validate no loops are created in tags hierarchy
* Update tag merging to support tag hierarcy
* Add unit tests for tags.EnsureUniqueHierarchy
* Fix applying recursive to with clause
The SQL `RECURSIVE` of a `WITH` clause only needs to be applied once,
imediately after the `WITH`. So this fixes the query building to do just
that, automatically applying the `RECURSIVE` keyword when any added with
clause is added as recursive.
* Rename hierarchical root id column
* Rewrite hierarchical filtering for performance
Completely rewrite the hierarchical filtering to optimize for
performance. Doing the recursive query in combination with a complex
query seems to break SQLite optimizing some things which means that the
recursive part might be 2,5 second slower than adding a static
`VALUES()` list. This is mostly noticable in case of the tag hierarchy
where setting an exclusion with any depth (or depth: all) being applied
has this performance impact of 2,5 second. "Include" also suffered this
issue, but some rewritten query by joining in the *_tags table in one
pass and applying a `WHERE x IS NOT NULL` filter did seem to optimize
that case. But that optimization isn't applied to the `IS NULL` filter
of "exclude". Running a simple query beforehand to get all (recursive)
items and then applying them to the query doesn't have this performance
penalty.
* Remove UI references to child studios and tags
* Add parents to tag export
* Support importing of parent relationship for tags
* Assign stable ids to parent / child badges
* Silence Apollo warning on parents/children fields on tags
Silence warning triggered by Apollo GraphQL by explicitly instructing it
to use the incoming parents/children values. By default it already does
this, but it triggers a warning as it might be unintended that it uses
the incoming values (instead of for example merging both arrays).
Setting merge to false still applies the same behaviour (use only
incoming values) but silences the warning as it's explicitly configured
to work like this.
* Rework detecting unique tag hierarchy
Completely rework the unique tag hierarchy to detect invalid hierarchies
for which a tag is "added in the middle". So when there are tags A <- B
and A <- C, you could previously edit tag B and add tag C as a sub tag
without it being noticed as parent A being applied twice (to tag C).
While afterwards saving tag C would fail as tag A was applied as parent
twice. The updated code correctly detects this scenario as well.
Furthermore the error messaging has been reworked a bit and the message
now mentions both the direct parent / sub tag as well as the tag which
would results in the error. So in aboves example it would now show the
message that tag C can't be applied because tag A already is a parent.
* Update relations on cached tags when needed
Update the relations on cached tags when a tag is created / updated /
deleted so these always reflect the correct state. Otherwise (re)opening
a tag might still show the old relations untill the page is fully
reloaded or the list is navigated. But this obviously is strange when
you for example have tag A, create or update tag B to have a relation to
tag A, and from tags B page click through to tag A and it doesn't show
that it is linked to tag B.
2021-09-09 04:58:43 +00:00
|
|
|
tagCriterion := models.HierarchicalMultiCriterionInput{
|
2021-03-10 01:25:51 +00:00
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(tagIDs[tagIdxWithPerformer]),
|
|
|
|
strconv.Itoa(tagIDs[tagIdx1WithPerformer]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierIncludes,
|
|
|
|
}
|
|
|
|
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
PerformerTags: &tagCriterion,
|
|
|
|
}
|
|
|
|
|
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
|
|
|
assert.Len(t, images, 2)
|
|
|
|
|
|
|
|
// ensure ids are correct
|
|
|
|
for _, image := range images {
|
|
|
|
assert.True(t, image.ID == imageIDs[imageIdxWithPerformerTag] || image.ID == imageIDs[imageIdxWithPerformerTwoTags])
|
|
|
|
}
|
|
|
|
|
Tag hierarchy (#1519)
* Add migration script for tag relations table
* Expand hierarchical filter features
Expand the features of the hierarchical multi input filter with support
for using a relations table, which only has parent_id and child_id
columns, and support adding an additional intermediate table to join on,
for example for scenes and tags which are linked by the scenes_tags
table as well.
* Add hierarchical filtering for tags
* Add hierarchical tags support to scene markers
Refactor filtering of scene markers to filterBuilder and in the process
add support for hierarchical tags as well.
* List parent and child tags on tag details page
* Support setting parent and child tags
Add support for setting parent and child tags during tag creation and
tag updates.
* Validate no loops are created in tags hierarchy
* Update tag merging to support tag hierarcy
* Add unit tests for tags.EnsureUniqueHierarchy
* Fix applying recursive to with clause
The SQL `RECURSIVE` of a `WITH` clause only needs to be applied once,
imediately after the `WITH`. So this fixes the query building to do just
that, automatically applying the `RECURSIVE` keyword when any added with
clause is added as recursive.
* Rename hierarchical root id column
* Rewrite hierarchical filtering for performance
Completely rewrite the hierarchical filtering to optimize for
performance. Doing the recursive query in combination with a complex
query seems to break SQLite optimizing some things which means that the
recursive part might be 2,5 second slower than adding a static
`VALUES()` list. This is mostly noticable in case of the tag hierarchy
where setting an exclusion with any depth (or depth: all) being applied
has this performance impact of 2,5 second. "Include" also suffered this
issue, but some rewritten query by joining in the *_tags table in one
pass and applying a `WHERE x IS NOT NULL` filter did seem to optimize
that case. But that optimization isn't applied to the `IS NULL` filter
of "exclude". Running a simple query beforehand to get all (recursive)
items and then applying them to the query doesn't have this performance
penalty.
* Remove UI references to child studios and tags
* Add parents to tag export
* Support importing of parent relationship for tags
* Assign stable ids to parent / child badges
* Silence Apollo warning on parents/children fields on tags
Silence warning triggered by Apollo GraphQL by explicitly instructing it
to use the incoming parents/children values. By default it already does
this, but it triggers a warning as it might be unintended that it uses
the incoming values (instead of for example merging both arrays).
Setting merge to false still applies the same behaviour (use only
incoming values) but silences the warning as it's explicitly configured
to work like this.
* Rework detecting unique tag hierarchy
Completely rework the unique tag hierarchy to detect invalid hierarchies
for which a tag is "added in the middle". So when there are tags A <- B
and A <- C, you could previously edit tag B and add tag C as a sub tag
without it being noticed as parent A being applied twice (to tag C).
While afterwards saving tag C would fail as tag A was applied as parent
twice. The updated code correctly detects this scenario as well.
Furthermore the error messaging has been reworked a bit and the message
now mentions both the direct parent / sub tag as well as the tag which
would results in the error. So in aboves example it would now show the
message that tag C can't be applied because tag A already is a parent.
* Update relations on cached tags when needed
Update the relations on cached tags when a tag is created / updated /
deleted so these always reflect the correct state. Otherwise (re)opening
a tag might still show the old relations untill the page is fully
reloaded or the list is navigated. But this obviously is strange when
you for example have tag A, create or update tag B to have a relation to
tag A, and from tags B page click through to tag A and it doesn't show
that it is linked to tag B.
2021-09-09 04:58:43 +00:00
|
|
|
tagCriterion = models.HierarchicalMultiCriterionInput{
|
2021-03-10 01:25:51 +00:00
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(tagIDs[tagIdx1WithPerformer]),
|
|
|
|
strconv.Itoa(tagIDs[tagIdx2WithPerformer]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierIncludesAll,
|
|
|
|
}
|
|
|
|
|
|
|
|
images = queryImages(t, sqb, &imageFilter, nil)
|
|
|
|
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithPerformerTwoTags], images[0].ID)
|
|
|
|
|
Tag hierarchy (#1519)
* Add migration script for tag relations table
* Expand hierarchical filter features
Expand the features of the hierarchical multi input filter with support
for using a relations table, which only has parent_id and child_id
columns, and support adding an additional intermediate table to join on,
for example for scenes and tags which are linked by the scenes_tags
table as well.
* Add hierarchical filtering for tags
* Add hierarchical tags support to scene markers
Refactor filtering of scene markers to filterBuilder and in the process
add support for hierarchical tags as well.
* List parent and child tags on tag details page
* Support setting parent and child tags
Add support for setting parent and child tags during tag creation and
tag updates.
* Validate no loops are created in tags hierarchy
* Update tag merging to support tag hierarcy
* Add unit tests for tags.EnsureUniqueHierarchy
* Fix applying recursive to with clause
The SQL `RECURSIVE` of a `WITH` clause only needs to be applied once,
imediately after the `WITH`. So this fixes the query building to do just
that, automatically applying the `RECURSIVE` keyword when any added with
clause is added as recursive.
* Rename hierarchical root id column
* Rewrite hierarchical filtering for performance
Completely rewrite the hierarchical filtering to optimize for
performance. Doing the recursive query in combination with a complex
query seems to break SQLite optimizing some things which means that the
recursive part might be 2,5 second slower than adding a static
`VALUES()` list. This is mostly noticable in case of the tag hierarchy
where setting an exclusion with any depth (or depth: all) being applied
has this performance impact of 2,5 second. "Include" also suffered this
issue, but some rewritten query by joining in the *_tags table in one
pass and applying a `WHERE x IS NOT NULL` filter did seem to optimize
that case. But that optimization isn't applied to the `IS NULL` filter
of "exclude". Running a simple query beforehand to get all (recursive)
items and then applying them to the query doesn't have this performance
penalty.
* Remove UI references to child studios and tags
* Add parents to tag export
* Support importing of parent relationship for tags
* Assign stable ids to parent / child badges
* Silence Apollo warning on parents/children fields on tags
Silence warning triggered by Apollo GraphQL by explicitly instructing it
to use the incoming parents/children values. By default it already does
this, but it triggers a warning as it might be unintended that it uses
the incoming values (instead of for example merging both arrays).
Setting merge to false still applies the same behaviour (use only
incoming values) but silences the warning as it's explicitly configured
to work like this.
* Rework detecting unique tag hierarchy
Completely rework the unique tag hierarchy to detect invalid hierarchies
for which a tag is "added in the middle". So when there are tags A <- B
and A <- C, you could previously edit tag B and add tag C as a sub tag
without it being noticed as parent A being applied twice (to tag C).
While afterwards saving tag C would fail as tag A was applied as parent
twice. The updated code correctly detects this scenario as well.
Furthermore the error messaging has been reworked a bit and the message
now mentions both the direct parent / sub tag as well as the tag which
would results in the error. So in aboves example it would now show the
message that tag C can't be applied because tag A already is a parent.
* Update relations on cached tags when needed
Update the relations on cached tags when a tag is created / updated /
deleted so these always reflect the correct state. Otherwise (re)opening
a tag might still show the old relations untill the page is fully
reloaded or the list is navigated. But this obviously is strange when
you for example have tag A, create or update tag B to have a relation to
tag A, and from tags B page click through to tag A and it doesn't show
that it is linked to tag B.
2021-09-09 04:58:43 +00:00
|
|
|
tagCriterion = models.HierarchicalMultiCriterionInput{
|
2021-03-10 01:25:51 +00:00
|
|
|
Value: []string{
|
|
|
|
strconv.Itoa(tagIDs[tagIdx1WithPerformer]),
|
|
|
|
},
|
|
|
|
Modifier: models.CriterionModifierExcludes,
|
|
|
|
}
|
|
|
|
|
|
|
|
q := getImageStringValue(imageIdxWithPerformerTwoTags, titleField)
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Q: &q,
|
|
|
|
}
|
|
|
|
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
2021-11-06 22:34:33 +00:00
|
|
|
tagCriterion = models.HierarchicalMultiCriterionInput{
|
|
|
|
Modifier: models.CriterionModifierIsNull,
|
|
|
|
}
|
|
|
|
q = getImageStringValue(imageIdxWithGallery, titleField)
|
|
|
|
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithGallery], images[0].ID)
|
|
|
|
|
|
|
|
q = getImageStringValue(imageIdxWithPerformerTag, titleField)
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
|
|
|
tagCriterion.Modifier = models.CriterionModifierNotNull
|
|
|
|
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
assert.Equal(t, imageIDs[imageIdxWithPerformerTag], images[0].ID)
|
|
|
|
|
|
|
|
q = getImageStringValue(imageIdxWithGallery, titleField)
|
|
|
|
images = queryImages(t, sqb, &imageFilter, &findFilter)
|
|
|
|
assert.Len(t, images, 0)
|
|
|
|
|
2021-03-10 01:25:51 +00:00
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-04-09 08:46:00 +00:00
|
|
|
func TestImageQueryTagCount(t *testing.T) {
|
|
|
|
const tagCount = 1
|
|
|
|
tagCountCriterion := models.IntCriterionInput{
|
|
|
|
Value: tagCount,
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
}
|
|
|
|
|
|
|
|
verifyImagesTagCount(t, tagCountCriterion)
|
|
|
|
|
|
|
|
tagCountCriterion.Modifier = models.CriterionModifierNotEquals
|
|
|
|
verifyImagesTagCount(t, tagCountCriterion)
|
|
|
|
|
|
|
|
tagCountCriterion.Modifier = models.CriterionModifierGreaterThan
|
|
|
|
verifyImagesTagCount(t, tagCountCriterion)
|
|
|
|
|
|
|
|
tagCountCriterion.Modifier = models.CriterionModifierLessThan
|
|
|
|
verifyImagesTagCount(t, tagCountCriterion)
|
|
|
|
}
|
|
|
|
|
|
|
|
func verifyImagesTagCount(t *testing.T, tagCountCriterion models.IntCriterionInput) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
TagCount: &tagCountCriterion,
|
|
|
|
}
|
|
|
|
|
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
|
|
|
assert.Greater(t, len(images), 0)
|
|
|
|
|
|
|
|
for _, image := range images {
|
|
|
|
ids, err := sqb.GetTagIDs(image.ID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
verifyInt(t, len(ids), tagCountCriterion)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryPerformerCount(t *testing.T) {
|
|
|
|
const performerCount = 1
|
|
|
|
performerCountCriterion := models.IntCriterionInput{
|
|
|
|
Value: performerCount,
|
|
|
|
Modifier: models.CriterionModifierEquals,
|
|
|
|
}
|
|
|
|
|
|
|
|
verifyImagesPerformerCount(t, performerCountCriterion)
|
|
|
|
|
|
|
|
performerCountCriterion.Modifier = models.CriterionModifierNotEquals
|
|
|
|
verifyImagesPerformerCount(t, performerCountCriterion)
|
|
|
|
|
|
|
|
performerCountCriterion.Modifier = models.CriterionModifierGreaterThan
|
|
|
|
verifyImagesPerformerCount(t, performerCountCriterion)
|
|
|
|
|
|
|
|
performerCountCriterion.Modifier = models.CriterionModifierLessThan
|
|
|
|
verifyImagesPerformerCount(t, performerCountCriterion)
|
|
|
|
}
|
|
|
|
|
|
|
|
func verifyImagesPerformerCount(t *testing.T, performerCountCriterion models.IntCriterionInput) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sqb := r.Image()
|
|
|
|
imageFilter := models.ImageFilterType{
|
|
|
|
PerformerCount: &performerCountCriterion,
|
|
|
|
}
|
|
|
|
|
|
|
|
images := queryImages(t, sqb, &imageFilter, nil)
|
|
|
|
assert.Greater(t, len(images), 0)
|
|
|
|
|
|
|
|
for _, image := range images {
|
|
|
|
ids, err := sqb.GetPerformerIDs(image.ID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
verifyInt(t, len(ids), performerCountCriterion)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
func TestImageQuerySorting(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
sort := titleField
|
|
|
|
direction := models.SortDirectionEnumAsc
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
Sort: &sort,
|
|
|
|
Direction: &direction,
|
|
|
|
}
|
|
|
|
|
|
|
|
sqb := r.Image()
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, nil, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
// images should be in same order as indexes
|
|
|
|
firstImage := images[0]
|
|
|
|
lastImage := images[len(images)-1]
|
|
|
|
|
|
|
|
assert.Equal(t, imageIDs[0], firstImage.ID)
|
|
|
|
assert.Equal(t, imageIDs[len(imageIDs)-1], lastImage.ID)
|
|
|
|
|
|
|
|
// sort in descending order
|
|
|
|
direction = models.SortDirectionEnumDesc
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err = queryImagesWithCount(sqb, nil, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
firstImage = images[0]
|
|
|
|
lastImage = images[len(images)-1]
|
|
|
|
|
|
|
|
assert.Equal(t, imageIDs[len(imageIDs)-1], firstImage.ID)
|
|
|
|
assert.Equal(t, imageIDs[0], lastImage.ID)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestImageQueryPagination(t *testing.T) {
|
|
|
|
withTxn(func(r models.Repository) error {
|
|
|
|
perPage := 1
|
|
|
|
findFilter := models.FindFilterType{
|
|
|
|
PerPage: &perPage,
|
|
|
|
}
|
|
|
|
|
|
|
|
sqb := r.Image()
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err := queryImagesWithCount(sqb, nil, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
|
|
|
|
firstID := images[0].ID
|
|
|
|
|
|
|
|
page := 2
|
|
|
|
findFilter.Page = &page
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err = queryImagesWithCount(sqb, nil, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, images, 1)
|
|
|
|
secondID := images[0].ID
|
|
|
|
assert.NotEqual(t, firstID, secondID)
|
|
|
|
|
|
|
|
perPage = 2
|
|
|
|
page = 1
|
|
|
|
|
2021-10-25 00:40:13 +00:00
|
|
|
images, _, err = queryImagesWithCount(sqb, nil, &findFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error querying image: %s", err.Error())
|
|
|
|
}
|
|
|
|
assert.Len(t, images, 2)
|
|
|
|
assert.Equal(t, firstID, images[0].ID)
|
|
|
|
assert.Equal(t, secondID, images[1].ID)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO Update
|
|
|
|
// TODO IncrementOCounter
|
|
|
|
// TODO DecrementOCounter
|
|
|
|
// TODO ResetOCounter
|
|
|
|
// TODO Destroy
|
|
|
|
// TODO FindByChecksum
|
|
|
|
// TODO Count
|
|
|
|
// TODO SizeCount
|
|
|
|
// TODO All
|